diff options
994 files changed, 19283 insertions, 11044 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 71193ed0cc0b4..46491a785a7a3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -611,7 +611,7 @@ Using the example above, the analagous pytestCheckHook usage would be: "update" ]; - disabledTestFiles = [ + disabledTestPaths = [ "tests/test_failing.py" ]; ``` @@ -1554,9 +1554,9 @@ Following rules are desired to be respected: * Python libraries are called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in - `pkgs/development/python-modules/<name>/default.nix`. Libraries in - `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid - merge conflicts. + `pkgs/development/python-modules/<name>/default.nix`. +* Libraries in `pkgs/top-level/python-packages.nix` are sorted + alphanumerically to avoid merge conflicts and ease locating attributes. * Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`. * Make sure libraries build for all Python interpreters. @@ -1570,3 +1570,4 @@ Following rules are desired to be respected: [PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This means that characters should be converted to lowercase and `.` and `_` should be replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz ) +* Attribute names in `python-packages.nix` should be sorted alphanumerically. diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 18d3cd9c92694..94f94aaffe32a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -223,7 +223,7 @@ sometimes it may be necessary to disable this so the tests run consecutively. ```nix rustPlatform.buildRustPackage { /* ... */ - cargoParallelTestThreads = false; + dontUseCargoParallelTests = true; } ``` @@ -264,6 +264,198 @@ rustPlatform.buildRustPackage rec { } ``` +## Compiling non-Rust packages that include Rust code + +Several non-Rust packages incorporate Rust code for performance- or +security-sensitive parts. `rustPlatform` exposes several functions and +hooks that can be used to integrate Cargo in non-Rust packages. + +### Vendoring of dependencies + +Since network access is not allowed in sandboxed builds, Rust crate +dependencies need to be retrieved using a fetcher. `rustPlatform` +provides the `fetchCargoTarball` fetcher, which vendors all +dependencies of a crate. For example, given a source path `src` +containing `Cargo.toml` and `Cargo.lock`, `fetchCargoTarball` +can be used as follows: + +```nix +cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; +}; +``` + +The `src` attribute is required, as well as a hash specified through +one of the `sha256` or `hash` attributes. The following optional +attributes can also be used: + +* `name`: the name that is used for the dependencies tarball. If + `name` is not specified, then the name `cargo-deps` will be used. +* `sourceRoot`: when the `Cargo.lock`/`Cargo.toml` are in a + subdirectory, `sourceRoot` specifies the relative path to these + files. +* `patches`: patches to apply before vendoring. This is useful when + the `Cargo.lock`/`Cargo.toml` files need to be patched before + vendoring. + +### Hooks + +`rustPlatform` provides the following hooks to automate Cargo builds: + +* `cargoSetupHook`: configure Cargo to use depenencies vendored + through `fetchCargoTarball`. This hook uses the `cargoDeps` + environment variable to find the vendored dependencies. If a project + already vendors its dependencies, the variable `cargoVendorDir` can + be used instead. When the `Cargo.toml`/`Cargo.lock` files are not in + `sourceRoot`, then the optional `cargoRoot` is used to specify the + Cargo root directory relative to `sourceRoot`. +* `cargoBuildHook`: use Cargo to build a crate. If the crate to be + built is a crate in e.g. a Cargo workspace, the relative path to the + crate to build can be set through the optional `buildAndTestSubdir` + environment variable. Additional Cargo build flags can be passed + through `cargoBuildFlags`. +* `maturinBuildHook`: use [Maturin](https://github.com/PyO3/maturin) + to build a Python wheel. Similar to `cargoBuildHook`, the optional + variable `buildAndTestSubdir` can be used to build a crate in a + Cargo workspace. Additional maturin flags can be passed through + `maturinBuildFlags`. +* `cargoCheckHook`: run tests using Cargo. Additional flags can be + passed to Cargo using `checkFlags` and `checkFlagsArray`. By + default, tests are run in parallel. This can be disabled by setting + `dontUseCargoParallelTests`. +* `cargoInstallHook`: install binaries and static/shared libraries + that were built using `cargoBuildHook`. + +### Examples + +#### Python package using `setuptools-rust` + +For Python packages using `setuptools-rust`, you can use +`fetchCargoTarball` and `cargoSetupHook` to retrieve and set up Cargo +dependencies. The build itself is then performed by +`buildPythonPackage`. + +The following example outlines how the `tokenizers` Python package is +built. Since the Python package is in the `source/bindings/python` +directory of the *tokenizers* project's source archive, we use +`sourceRoot` to point the tooling to this directory: + +```nix +{ fetchFromGitHub +, buildPythonPackage +, rustPlatform +, setuptools-rust +}: + +buildPythonPackage rec { + pname = "tokenizers"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = "python-v${version}"; + hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src sourceRoot; + name = "${pname}-${version}"; + hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; + }; + + sourceRoot = "source/bindings/python"; + + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + # ... +} +``` + +In some projects, the Rust crate is not in the main Python source +directory. In such cases, the `cargoRoot` attribute can be used to +specify the crate's directory relative to `sourceRoot`. In the +following example, the crate is in `src/rust`, as specified in the +`cargoRoot` attribute. Note that we also need to specify the correct +path for `fetchCargoTarball`. + +```nix + +{ buildPythonPackage +, fetchPypi +, rustPlatform +, setuptools-rust +, openssl +}: + +buildPythonPackage rec { + pname = "cryptography"; + version = "3.4.2"; # Also update the hash in vectors.nix + + src = fetchPypi { + inherit pname version; + sha256 = "1i1mx5y9hkyfi9jrrkcw804hmkcglxi6rmf7vin7jfnbr2bf4q64"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${pname}-${version}/${cargoRoot}"; + name = "${pname}-${version}"; + hash = "sha256-PS562W4L1NimqDV2H0jl5vYhL08H9est/pbIxSdYVfo="; + }; + + cargoRoot = "src/rust"; + + # ... +} +``` + +#### Python package using `maturin` + +Python packages that use [Maturin](https://github.com/PyO3/maturin) +can be built with `fetchCargoTarball`, `cargoSetupHook`, and +`maturinBuildHook`. For example, the following (partial) derivation +builds the `retworkx` Python package. `fetchCargoTarball` and +`cargoSetupHook` are used to fetch and set up the crate dependencies. +`maturinBuildHook` is used to perform the build. + +```nix +{ lib +, buildPythonPackage +, rustPlatform +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "retworkx"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "Qiskit"; + repo = "retworkx"; + rev = version; + sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; + }; + + format = "pyproject"; + + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + + # ... +} +``` + ## Compiling Rust crates using Nix instead of Cargo ### Simple operation diff --git a/lib/licenses.nix b/lib/licenses.nix index ee136c7337c19..993783db3ed6b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -7,7 +7,7 @@ let in -lib.mapAttrs (n: v: v // { shortName = n; }) { +lib.mapAttrs (n: v: v // { shortName = n; }) ({ /* License identifiers from spdx.org where possible. * If you cannot find your license here, then look for a similar license or * add it to this list. The URL mentioned above is a good source for inspiration. @@ -877,4 +877,4 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Lesser General Public License v3.0"; deprecated = true; }; -} +}) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 075d87b403f04..d3a35283b78dd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2417,6 +2417,16 @@ githubId = 6806011; name = "Robert Schütz"; }; + dottedmag = { + email = "dottedmag@dottedmag.net"; + github = "dottedmag"; + githubId = 16120; + name = "Misha Gusarov"; + keys = [{ + longkeyid = "rsa4096/0x9D20F6503E338888"; + fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; + }]; + }; doublec = { email = "chris.double@double.co.nz"; github = "doublec"; @@ -6055,7 +6065,7 @@ name = "Celine Mercier"; }; metadark = { - email = "kira.bruneau@gmail.com"; + email = "kira.bruneau@pm.me"; name = "Kira Bruneau"; github = "metadark"; githubId = 382041; @@ -8039,6 +8049,12 @@ githubId = 3708689; name = "Roberto Di Remigio"; }; + robertoszek = { + email = "robertoszek@robertoszek.xyz"; + github = "robertoszek"; + githubId = 1080963; + name = "Roberto"; + }; robgssp = { email = "robgssp@gmail.com"; github = "robgssp"; @@ -10768,4 +10784,10 @@ github = "felixscheinost"; githubId = 31761492; }; + benneti = { + name = "Benedikt Tissot"; + email = "benedikt.tissot@googlemail.com"; + github = "benneti"; + githubId = 11725645; + }; } diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index b0267281b389d..873905373af0f 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { name = "nixpkgs-lint-1"; - buildInputs = [ makeWrapper perl perlPackages.XMLSimple ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl perlPackages.XMLSimple ]; dontUnpack = true; buildPhase = "true"; diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 302a6d3f3749e..c730ed4e85fbc 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -523,6 +523,21 @@ self: super: as an hardware RNG, as it will automatically run the krngd task to periodically collect random data from the device and mix it into the kernel's RNG. </para> + <para> + The default SMTP port for GitLab has been changed to + <literal>25</literal> from its previous default of + <literal>465</literal>. If you depended on this default, you + should now set the <xref linkend="opt-services.gitlab.smtp.port" /> + option. + </para> + </listitem> + <listitem> + <para> + The default version of ImageMagick has been updated from 6 to 7. + You can use <package>imagemagick6</package>, + <package>imagemagick6_light</package>, and + <package>imagemagick6Big</package> if you need the older version. + </para> </listitem> </itemizedlist> </section> @@ -730,6 +745,13 @@ self: super: terminology has been deprecated and should be replaced with Far/Near in the configuration file. </para> </listitem> + <listitem> + <para> + The nix-gc service now accepts randomizedDelaySec (default: 0) and persistent (default: true) parameters. + By default nix-gc will now run immediately if it would have been triggered at least + once during the time when the timer was inactive. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index ee76c9c5bf240..8690c42e7ac93 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { # Generate the squashfs image. mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \ - -keep-as-directory -all-root -b 1048576 -comp ${comp} + -no-hardlinks -keep-as-directory -all-root -b 1048576 -comp ${comp} ''; } diff --git a/nixos/modules/hardware/ksm.nix b/nixos/modules/hardware/ksm.nix index 0938dbdc11018..829c3532c4597 100644 --- a/nixos/modules/hardware/ksm.nix +++ b/nixos/modules/hardware/ksm.nix @@ -26,13 +26,13 @@ in { systemd.services.enable-ksm = { description = "Enable Kernel Same-Page Merging"; wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; - script = '' - if [ -e /sys/kernel/mm/ksm ]; then + script = + '' echo 1 > /sys/kernel/mm/ksm/run - ${optionalString (cfg.sleep != null) ''echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs''} - fi - ''; + '' + optionalString (cfg.sleep != null) + '' + echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs + ''; }; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d8432a8ff88a5..d40edb2408f98 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -382,6 +382,7 @@ ./services/hardware/sane.nix ./services/hardware/sane_extra_backends/brscan4.nix ./services/hardware/sane_extra_backends/dsseries.nix + ./services/hardware/spacenavd.nix ./services/hardware/tcsd.nix ./services/hardware/tlp.nix ./services/hardware/thinkfan.nix diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index 4c97485d97261..3e619fe32ef17 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -3,21 +3,22 @@ with lib; let + cfg = config.services.acpid; canonicalHandlers = { powerEvent = { event = "button/power.*"; - action = config.services.acpid.powerEventCommands; + action = cfg.powerEventCommands; }; lidEvent = { event = "button/lid.*"; - action = config.services.acpid.lidEventCommands; + action = cfg.lidEventCommands; }; acEvent = { event = "ac_adapter.*"; - action = config.services.acpid.acEventCommands; + action = cfg.acEventCommands; }; }; @@ -33,7 +34,7 @@ let echo "event=${handler.event}" > $fn echo "action=${pkgs.writeShellScriptBin "${name}.sh" handler.action }/bin/${name}.sh '%e'" >> $fn ''; - in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // config.services.acpid.handlers)) + in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // cfg.handlers)) } ''; @@ -47,11 +48,7 @@ in services.acpid = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the ACPI daemon."; - }; + enable = mkEnableOption "the ACPI daemon"; logEvents = mkOption { type = types.bool; @@ -129,26 +126,28 @@ in ###### implementation - config = mkIf config.services.acpid.enable { + config = mkIf cfg.enable { systemd.services.acpid = { description = "ACPI Daemon"; + documentation = [ "man:acpid(8)" ]; wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; - - path = [ pkgs.acpid ]; serviceConfig = { - Type = "forking"; + ExecStart = escapeShellArgs + ([ "${pkgs.acpid}/bin/acpid" + "--foreground" + "--netlink" + "--confdir" "${acpiConfDir}" + ] ++ optional cfg.logEvents "--logevents" + ); }; - unitConfig = { ConditionVirtualization = "!systemd-nspawn"; ConditionPathExists = [ "/proc/acpi" ]; }; - script = "acpid ${optionalString config.services.acpid.logEvents "--logevents"} --confdir ${acpiConfDir}"; }; }; diff --git a/nixos/modules/services/hardware/spacenavd.nix b/nixos/modules/services/hardware/spacenavd.nix new file mode 100644 index 0000000000000..7afae76cc4fbd --- /dev/null +++ b/nixos/modules/services/hardware/spacenavd.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.hardware.spacenavd; + +in { + + options = { + hardware.spacenavd = { + enable = mkEnableOption "spacenavd to support 3DConnexion devices"; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.spacenavd = { + description = "Daemon for the Spacenavigator 6DOF mice by 3Dconnexion"; + after = [ "syslog.target" ]; + wantedBy = [ "graphical.target" ]; + serviceConfig = { + ExecStart = "${pkgs.spacenavd}/bin/spacenavd -d -l syslog"; + StandardError = "syslog"; + }; + }; + }; +} diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index 8c609bbf825b6..a65d4250c2e54 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -48,7 +48,7 @@ in { systemd.services.trezord = { description = "Trezor Bridge"; - after = [ "systemd-udev-settle.service" "network.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = []; serviceConfig = { diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb deleted file mode 100644 index 0b58c59c7a513..0000000000000 --- a/nixos/modules/services/misc/defaultUnicornConfig.rb +++ /dev/null @@ -1,69 +0,0 @@ -worker_processes 3 - -listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024 -listen "/run/gitlab/gitlab.socket", :backlog => 1024 - -working_directory ENV["GITLAB_PATH"] - -pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" - -timeout 60 - -# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings -# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow -preload_app true -GC.respond_to?(:copy_on_write_friendly=) and - GC.copy_on_write_friendly = true - -check_client_connection false - -before_fork do |server, worker| - # the following is highly recommended for Rails + "preload_app true" - # as there's no need for the master process to hold a connection - defined?(ActiveRecord::Base) and - ActiveRecord::Base.connection.disconnect! - - # The following is only recommended for memory/DB-constrained - # installations. It is not needed if your system can house - # twice as many worker_processes as you have configured. - # - # This allows a new master process to incrementally - # phase out the old master process with SIGTTOU to avoid a - # thundering herd (especially in the "preload_app false" case) - # when doing a transparent upgrade. The last worker spawned - # will then kill off the old master process with a SIGQUIT. - old_pid = "#{server.config[:pid]}.oldbin" - if old_pid != server.pid - begin - sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU - Process.kill(sig, File.read(old_pid).to_i) - rescue Errno::ENOENT, Errno::ESRCH - end - end - - # Throttle the master from forking too quickly by sleeping. Due - # to the implementation of standard Unix signal handlers, this - # helps (but does not completely) prevent identical, repeated signals - # from being lost when the receiving process is busy. - # sleep 1 -end - -after_fork do |server, worker| - # per-process listener ports for debugging/admin/migrations - # addr = "127.0.0.1:#{9293 + worker.nr}" - # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) - - # the following is *required* for Rails + "preload_app true", - defined?(ActiveRecord::Base) and - ActiveRecord::Base.establish_connection - - # reset prometheus client, this will cause any opened metrics files to be closed - defined?(::Prometheus::Client.reinitialize_on_pid_change) && - Prometheus::Client.reinitialize_on_pid_change - - # if preload_app is true, then you may also want to check and - # restart any other shared sockets/descriptors such as Memcached, - # and Redis. TokyoCabinet file handles are safe to reuse - # between any number of forked children (assuming your kernel - # correctly implements pread()/pwrite() system calls) -end diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 61faeab7d3212..1d45af36349c8 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -142,7 +142,7 @@ let gitlabEnv = { HOME = "${cfg.statePath}/home"; - UNICORN_PATH = "${cfg.statePath}/"; + PUMA_PATH = "${cfg.statePath}/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; SCHEMA = "${cfg.statePath}/db/structure.sql"; GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; @@ -424,7 +424,7 @@ in { port = mkOption { type = types.int; - default = 465; + default = 25; description = "Port of the SMTP server for Gitlab."; }; @@ -641,6 +641,11 @@ in { environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ]; + systemd.targets.gitlab = { + description = "Common target for all GitLab services."; + wantedBy = [ "multi-user.target" ]; + }; + # Redis is required for the sidekiq queue runner. services.redis.enable = mkDefault true; @@ -655,36 +660,45 @@ in { # here. systemd.services.gitlab-postgresql = let pgsql = config.services.postgresql; in mkIf databaseActuallyCreateLocally { after = [ "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - path = [ pgsql.package ]; + bindsTo = [ "postgresql.service" ]; + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; + path = [ + pgsql.package + pkgs.util-linux + ]; script = '' set -eu - PSQL="${pkgs.util-linux}/bin/runuser -u ${pgsql.superUser} -- psql --port=${toString pgsql.port}" + PSQL() { + psql --port=${toString pgsql.port} "$@" + } - $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"' - current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'") + PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"' + current_owner=$(PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'") if [[ "$current_owner" != "${cfg.databaseUsername}" ]]; then - $PSQL -tAc 'ALTER DATABASE "${cfg.databaseName}" OWNER TO "${cfg.databaseUsername}"' + PSQL -tAc 'ALTER DATABASE "${cfg.databaseName}" OWNER TO "${cfg.databaseUsername}"' if [[ -e "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" ]]; then echo "Reassigning ownership of database ${cfg.databaseName} to user ${cfg.databaseUsername} failed on last boot. Failing..." exit 1 fi touch "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" - $PSQL "${cfg.databaseName}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.databaseUsername}\"" + PSQL "${cfg.databaseName}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.databaseUsername}\"" rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" fi - $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm" - $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS btree_gist;" + PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm" + PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS btree_gist;" ''; serviceConfig = { + User = pgsql.superUser; Type = "oneshot"; + RemainAfterExit = true; }; }; # Use postfix to send out mails. - services.postfix.enable = mkDefault true; + services.postfix.enable = mkDefault (cfg.smtp.enable && cfg.smtp.address == "localhost"); users.users.${cfg.user} = { group = cfg.group; @@ -703,7 +717,6 @@ in { "d ${cfg.statePath} 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -" - "d ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -" @@ -726,13 +739,156 @@ in { "L+ /run/gitlab/uploads - - - - ${cfg.statePath}/uploads" "L+ /run/gitlab/shell-config.yml - - - - ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)}" - - "L+ ${cfg.statePath}/config/unicorn.rb - - - - ${./defaultUnicornConfig.rb}" ]; + + systemd.services.gitlab-config = { + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; + path = with pkgs; [ + jq + openssl + replace + git + ]; + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + Group = cfg.group; + TimeoutSec = "infinity"; + Restart = "on-failure"; + WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; + RemainAfterExit = true; + + ExecStartPre = let + preStartFullPrivileges = '' + shopt -s dotglob nullglob + set -eu + + chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/* + if [[ -n "$(ls -A '${cfg.statePath}'/config/)" ]]; then + chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/config/* + fi + ''; + in "+${pkgs.writeShellScript "gitlab-pre-start-full-privileges" preStartFullPrivileges}"; + + ExecStart = pkgs.writeShellScript "gitlab-config" '' + set -eu + + umask u=rwx,g=rx,o= + + cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION + rm -rf ${cfg.statePath}/db/* + rm -f ${cfg.statePath}/lib + find '${cfg.statePath}/config/' -maxdepth 1 -mindepth 1 -type d -execdir rm -rf {} \; + cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config + cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db + ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb + + ${cfg.packages.gitlab-shell}/bin/install + + ${optionalString cfg.smtp.enable '' + install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb + ${optionalString (cfg.smtp.passwordFile != null) '' + smtp_password=$(<'${cfg.smtp.passwordFile}') + replace-literal -e '@smtpPassword@' "$smtp_password" '${cfg.statePath}/config/initializers/smtp_settings.rb' + ''} + ''} + + ( + umask u=rwx,g=,o= + + openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret + + rm -f '${cfg.statePath}/config/database.yml' + + ${if cfg.databasePasswordFile != null then '' + export db_password="$(<'${cfg.databasePasswordFile}')" + + if [[ -z "$db_password" ]]; then + >&2 echo "Database password was an empty string!" + exit 1 + fi + + jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ + '.production.password = $ENV.db_password' \ + >'${cfg.statePath}/config/database.yml' + '' + else '' + jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ + >'${cfg.statePath}/config/database.yml' + '' + } + + ${utils.genJqSecretsReplacementSnippet + gitlabConfig + "${cfg.statePath}/config/gitlab.yml" + } + + rm -f '${cfg.statePath}/config/secrets.yml' + + export secret="$(<'${cfg.secrets.secretFile}')" + export db="$(<'${cfg.secrets.dbFile}')" + export otp="$(<'${cfg.secrets.otpFile}')" + export jws="$(<'${cfg.secrets.jwsFile}')" + jq -n '{production: {secret_key_base: $ENV.secret, + otp_key_base: $ENV.otp, + db_key_base: $ENV.db, + openid_connect_signing_key: $ENV.jws}}' \ + > '${cfg.statePath}/config/secrets.yml' + ) + + # We remove potentially broken links to old gitlab-shell versions + rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks + + git config --global core.autocrlf "input" + ''; + }; + }; + + systemd.services.gitlab-db-config = { + after = [ "gitlab-config.service" "gitlab-postgresql.service" "postgresql.service" ]; + bindsTo = [ + "gitlab-config.service" + ] ++ optional (cfg.databaseHost == "") "postgresql.service" + ++ optional databaseActuallyCreateLocally "gitlab-postgresql.service"; + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + Group = cfg.group; + TimeoutSec = "infinity"; + Restart = "on-failure"; + WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; + RemainAfterExit = true; + + ExecStart = pkgs.writeShellScript "gitlab-db-config" '' + set -eu + umask u=rwx,g=rx,o= + + initial_root_password="$(<'${cfg.initialRootPasswordFile}')" + ${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \ + GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}' > /dev/null + ''; + }; + }; + systemd.services.gitlab-sidekiq = { - after = [ "network.target" "redis.service" "gitlab.service" ]; - wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "redis.service" + "postgresql.service" + "gitlab-config.service" + "gitlab-db-config.service" + ]; + bindsTo = [ + "redis.service" + "gitlab-config.service" + "gitlab-db-config.service" + ] ++ optional (cfg.databaseHost == "") "postgresql.service"; + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; environment = gitlabEnv; path = with pkgs; [ postgresqlPackage @@ -758,9 +914,10 @@ in { }; systemd.services.gitaly = { - after = [ "network.target" "gitlab.service" ]; - bindsTo = [ "gitlab.service" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "gitlab-config.service" ]; + bindsTo = [ "gitlab-config.service" ]; + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; path = with pkgs; [ openssh procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562 @@ -783,8 +940,10 @@ in { systemd.services.gitlab-pages = mkIf (gitlabConfig.production.pages.enabled or false) { description = "GitLab static pages daemon"; - after = [ "network.target" "redis.service" "gitlab.service" ]; # gitlab.service creates configs - wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "gitlab-config.service" ]; + bindsTo = [ "gitlab-config.service" ]; + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; path = [ pkgs.unzip ]; @@ -803,7 +962,8 @@ in { systemd.services.gitlab-workhorse = { after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; path = with pkgs; [ exiftool git @@ -832,8 +992,10 @@ in { systemd.services.gitlab-mailroom = mkIf (gitlabConfig.production.incoming_email.enabled or false) { description = "GitLab incoming mail daemon"; - after = [ "network.target" "redis.service" "gitlab.service" ]; # gitlab.service creates configs - wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "redis.service" "gitlab-config.service" ]; + bindsTo = [ "gitlab-config.service" ]; + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; environment = gitlabEnv; serviceConfig = { Type = "simple"; @@ -842,15 +1004,26 @@ in { User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec mail_room -c ${cfg.packages.gitlab}/share/gitlab/config.dist/mail_room.yml"; + ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec mail_room -c ${cfg.statePath}/config/mail_room.yml"; WorkingDirectory = gitlabEnv.HOME; }; }; systemd.services.gitlab = { - after = [ "gitlab-workhorse.service" "network.target" "gitlab-postgresql.service" "redis.service" ]; - requires = [ "gitlab-sidekiq.service" ]; - wantedBy = [ "multi-user.target" ]; + after = [ + "gitlab-workhorse.service" + "network.target" + "redis.service" + "gitlab-config.service" + "gitlab-db-config.service" + ]; + bindsTo = [ + "redis.service" + "gitlab-config.service" + "gitlab-db-config.service" + ] ++ optional (cfg.databaseHost == "") "postgresql.service"; + wantedBy = [ "gitlab.target" ]; + partOf = [ "gitlab.target" ]; environment = gitlabEnv; path = with pkgs; [ postgresqlPackage @@ -868,96 +1041,7 @@ in { TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStartPre = let - preStartFullPrivileges = '' - shopt -s dotglob nullglob - set -eu - - chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/* - chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/config/* - ''; - preStart = '' - set -eu - - cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION - rm -rf ${cfg.statePath}/db/* - rm -rf ${cfg.statePath}/config/initializers/* - rm -f ${cfg.statePath}/lib - cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config - cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db - ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb - - ${cfg.packages.gitlab-shell}/bin/install - - ${optionalString cfg.smtp.enable '' - install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb - ${optionalString (cfg.smtp.passwordFile != null) '' - smtp_password=$(<'${cfg.smtp.passwordFile}') - ${pkgs.replace}/bin/replace-literal -e '@smtpPassword@' "$smtp_password" '${cfg.statePath}/config/initializers/smtp_settings.rb' - ''} - ''} - - ( - umask u=rwx,g=,o= - - ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret - - if [[ -h '${cfg.statePath}/config/database.yml' ]]; then - rm '${cfg.statePath}/config/database.yml' - fi - - ${if cfg.databasePasswordFile != null then '' - export db_password="$(<'${cfg.databasePasswordFile}')" - - if [[ -z "$db_password" ]]; then - >&2 echo "Database password was an empty string!" - exit 1 - fi - - ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ - '.production.password = $ENV.db_password' \ - >'${cfg.statePath}/config/database.yml' - '' - else '' - ${pkgs.jq}/bin/jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ - >'${cfg.statePath}/config/database.yml' - '' - } - - ${utils.genJqSecretsReplacementSnippet - gitlabConfig - "${cfg.statePath}/config/gitlab.yml" - } - - if [[ -h '${cfg.statePath}/config/secrets.yml' ]]; then - rm '${cfg.statePath}/config/secrets.yml' - fi - - export secret="$(<'${cfg.secrets.secretFile}')" - export db="$(<'${cfg.secrets.dbFile}')" - export otp="$(<'${cfg.secrets.otpFile}')" - export jws="$(<'${cfg.secrets.jwsFile}')" - ${pkgs.jq}/bin/jq -n '{production: {secret_key_base: $ENV.secret, - otp_key_base: $ENV.otp, - db_key_base: $ENV.db, - openid_connect_signing_key: $ENV.jws}}' \ - > '${cfg.statePath}/config/secrets.yml' - ) - - initial_root_password="$(<'${cfg.initialRootPasswordFile}')" - ${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \ - GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}' > /dev/null - - # We remove potentially broken links to old gitlab-shell versions - rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks - - ${pkgs.git}/bin/git config --global core.autocrlf "input" - ''; - in [ - "+${pkgs.writeShellScript "gitlab-pre-start-full-privileges" preStartFullPrivileges}" - "${pkgs.writeShellScript "gitlab-pre-start" preStart}" - ]; - ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/unicorn -c ${cfg.statePath}/config/unicorn.rb -E production"; + ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/puma -C ${cfg.statePath}/config/puma.rb -e production"; }; }; diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 0c9c7548305ba..4053afa69be56 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -115,4 +115,6 @@ in }; }; }; + + meta.maintainers = with lib.maintainers; [ erictapen ]; } diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 12bed05757ad5..a7a6a3b59644e 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -21,13 +21,45 @@ in }; dates = mkOption { + type = types.str; default = "03:15"; + example = "weekly"; + description = '' + How often or when garbage collection is performed. For most desktop and server systems + a sufficient garbage collection is once a week. + + The format is described in + <citerefentry><refentrytitle>systemd.time</refentrytitle> + <manvolnum>7</manvolnum></citerefentry>. + ''; + }; + + randomizedDelaySec = mkOption { + default = "0"; type = types.str; + example = "45min"; description = '' - Specification (in the format described by + Add a randomized delay before each automatic upgrade. + The delay will be chosen between zero and this value. + This value must be a time span in the format specified by <citerefentry><refentrytitle>systemd.time</refentrytitle> - <manvolnum>7</manvolnum></citerefentry>) of the time at - which the garbage collector will run. + <manvolnum>7</manvolnum></citerefentry> + ''; + }; + + persistent = mkOption { + default = true; + type = types.bool; + example = false; + description = '' + Takes a boolean argument. If true, the time when the service + unit was last triggered is stored on disk. When the timer is + activated, the service unit is triggered immediately if it + would have been triggered at least once during the time when + the timer was inactive. Such triggering is nonetheless + subject to the delay imposed by RandomizedDelaySec=. This is + useful to catch up on missed runs of the service when the + system was powered down. ''; }; @@ -50,11 +82,18 @@ in config = { - systemd.services.nix-gc = - { description = "Nix Garbage Collector"; - script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}"; - startAt = optional cfg.automatic cfg.dates; + systemd.services.nix-gc = { + description = "Nix Garbage Collector"; + script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}"; + startAt = optional cfg.automatic cfg.dates; + }; + + systemd.timers.nix-gc = lib.mkIf cfg.automatic { + timerConfig = { + RandomizedDelaySec = cfg.randomizedDelaySec; + Persistent = cfg.persistent; }; + }; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 9103a6f932dbb..bd74e1a9cdb54 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -468,7 +468,7 @@ let ''; }; - value = mkOption { + values = mkOption { type = types.listOf types.str; default = []; description = '' diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 7f50b8fd8d441..b2bb5055cd4c4 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -22,7 +22,9 @@ let php = cfg.phpPackage.override { apacheHttpd = pkg; }; - phpMajorVersion = lib.versions.major (lib.getVersion php); + phpModuleName = let + majorVersion = lib.versions.major (lib.getVersion php); + in (if majorVersion == "8" then "php" else "php${majorVersion}"); mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = pkg; }; @@ -63,7 +65,7 @@ let ++ optional enableSSL "ssl" ++ optional enableUserDir "userdir" ++ optional cfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; } - ++ optional cfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; } + ++ optional cfg.enablePHP { name = phpModuleName; path = "${php}/modules/lib${phpModuleName}.so"; } ++ optional cfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } ++ cfg.extraModules; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 9fdbe753dad50..e04fcdaf4145d 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -37,6 +37,11 @@ let . /etc/profile cd "$HOME" + # Allow the user to execute commands at the beginning of the X session. + if test -f ~/.xprofile; then + source ~/.xprofile + fi + ${optionalString cfg.displayManager.job.logToJournal '' if [ -z "$_DID_SYSTEMD_CAT" ]; then export _DID_SYSTEMD_CAT=1 @@ -64,22 +69,23 @@ let # Speed up application start by 50-150ms according to # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html - rm -rf "$HOME/.compose-cache" - mkdir "$HOME/.compose-cache" + compose_cache="''${XCOMPOSECACHE:-$HOME/.compose-cache}" + mkdir -p "$compose_cache" + # To avoid accidentally deleting a wrongly set up XCOMPOSECACHE directory, + # defensively try to delete cache *files* only, following the file format specified in + # https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/master/modules/im/ximcp/imLcIm.c#L353-358 + # sprintf (*res, "%s/%c%d_%03x_%08x_%08x", dir, _XimGetMyEndian(), XIM_CACHE_VERSION, (unsigned int)sizeof (DefTree), hash, hash2); + ${pkgs.findutils}/bin/find "$compose_cache" -maxdepth 1 -regextype posix-extended -regex '.*/[Bl][0-9]+_[0-9a-f]{3}_[0-9a-f]{8}_[0-9a-f]{8}' -delete + unset compose_cache # Work around KDE errors when a user first logs in and # .local/share doesn't exist yet. - mkdir -p "$HOME/.local/share" + mkdir -p "''${XDG_DATA_HOME:-$HOME/.local/share}" unset _DID_SYSTEMD_CAT ${cfg.displayManager.sessionCommands} - # Allow the user to execute commands at the beginning of the X session. - if test -f ~/.xprofile; then - source ~/.xprofile - fi - # Start systemd user services for graphical sessions /run/current-system/systemd/bin/systemctl --user start graphical-session.target diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 914d3e62eb423..bbdd5a4070600 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -436,7 +436,8 @@ let "IPv4ProxyARP" "IPv6ProxyNDP" "IPv6ProxyNDPAddress" - "IPv6PrefixDelegation" + "IPv6SendRA" + "DHCPv6PrefixDelegation" "IPv6MTUBytes" "Bridge" "Bond" @@ -477,7 +478,8 @@ let (assertMinimum "IPv6HopLimit" 0) (assertValueOneOf "IPv4ProxyARP" boolValues) (assertValueOneOf "IPv6ProxyNDP" boolValues) - (assertValueOneOf "IPv6PrefixDelegation" ["static" "dhcpv6" "yes" "false"]) + (assertValueOneOf "IPv6SendRA" boolValues) + (assertValueOneOf "DHCPv6PrefixDelegation" boolValues) (assertByteFormat "IPv6MTUBytes") (assertValueOneOf "ActiveSlave" boolValues) (assertValueOneOf "PrimarySlave" boolValues) @@ -643,18 +645,63 @@ let sectionDHCPv6 = checkUnitConfig "DHCPv6" [ (assertOnlyFields [ + "UseAddress" "UseDNS" "UseNTP" + "RouteMetric" "RapidCommit" + "MUDURL" + "RequestOptions" + "SendVendorOption" "ForceDHCPv6PDOtherInformation" "PrefixDelegationHint" - "RouteMetric" + "WithoutRA" + "SendOption" + "UserClass" + "VendorClass" ]) + (assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) + (assertInt "RouteMetric") (assertValueOneOf "RapidCommit" boolValues) (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) - (assertInt "RouteMetric") + (assertValueOneOf "WithoutRA" ["solicit" "information-request"]) + (assertRange "SendOption" 1 65536) + ]; + + sectionDHCPv6PrefixDelegation = checkUnitConfig "DHCPv6PrefixDelegation" [ + (assertOnlyFields [ + "SubnetId" + "Announce" + "Assign" + "Token" + ]) + (assertValueOneOf "Announce" boolValues) + (assertValueOneOf "Assign" boolValues) + ]; + + sectionIPv6AcceptRA = checkUnitConfig "IPv6AcceptRA" [ + (assertOnlyFields [ + "UseDNS" + "UseDomains" + "RouteTable" + "UseAutonomousPrefix" + "UseOnLinkPrefix" + "RouterDenyList" + "RouterAllowList" + "PrefixDenyList" + "PrefixAllowList" + "RouteDenyList" + "RouteAllowList" + "DHCPv6Client" + ]) + (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) + (assertRange "RouteTable" 0 4294967295) + (assertValueOneOf "UseAutonomousPrefix" boolValues) + (assertValueOneOf "UseOnLinkPrefix" boolValues) + (assertValueOneOf "DHCPv6Client" (boolValues ++ ["always"])) ]; sectionDHCPServer = checkUnitConfig "DHCPServer" [ @@ -685,7 +732,7 @@ let (assertValueOneOf "EmitTimezone" boolValues) ]; - sectionIPv6PrefixDelegation = checkUnitConfig "IPv6PrefixDelegation" [ + sectionIPv6SendRA = checkUnitConfig "IPv6SendRA" [ (assertOnlyFields [ "Managed" "OtherInformation" @@ -1090,6 +1137,30 @@ let ''; }; + dhcpV6PrefixDelegationConfig = mkOption { + default = {}; + example = { SubnetId = "auto"; Announce = true; }; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPv6PrefixDelegation; + description = '' + Each attribute in this set specifies an option in the + <literal>[DHCPv6PrefixDelegation]</literal> section of the unit. See + <citerefentry><refentrytitle>systemd.network</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + ''; + }; + + ipv6AcceptRAConfig = mkOption { + default = {}; + example = { UseDNS = true; DHCPv6Client = "always"; }; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6AcceptRA; + description = '' + Each attribute in this set specifies an option in the + <literal>[IPv6AcceptRA]</literal> section of the unit. See + <citerefentry><refentrytitle>systemd.network</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + ''; + }; + dhcpServerConfig = mkOption { default = {}; example = { PoolOffset = 50; EmitDNS = false; }; @@ -1102,13 +1173,20 @@ let ''; }; + # systemd.network.networks.*.ipv6PrefixDelegationConfig has been deprecated + # in 247 in favor of systemd.network.networks.*.ipv6SendRAConfig. ipv6PrefixDelegationConfig = mkOption { + visible = false; + apply = _: throw "The option `systemd.network.networks.*.ipv6PrefixDelegationConfig` has been replaced by `systemd.network.networks.*.ipv6SendRAConfig`."; + }; + + ipv6SendRAConfig = mkOption { default = {}; example = { EmitDNS = true; Managed = true; OtherInformation = true; }; - type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6PrefixDelegation; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6SendRA; description = '' Each attribute in this set specifies an option in the - <literal>[IPv6PrefixDelegation]</literal> section of the unit. See + <literal>[IPv6SendRA]</literal> section of the unit. See <citerefentry><refentrytitle>systemd.network</refentrytitle> <manvolnum>5</manvolnum></citerefentry> for details. ''; @@ -1457,13 +1535,21 @@ let [DHCPv6] ${attrsToSection def.dhcpV6Config} '' + + optionalString (def.dhcpV6PrefixDelegationConfig != { }) '' + [DHCPv6PrefixDelegation] + ${attrsToSection def.dhcpV6PrefixDelegationConfig} + '' + + optionalString (def.ipv6AcceptRAConfig != { }) '' + [IPv6AcceptRA] + ${attrsToSection def.ipv6AcceptRAConfig} + '' + optionalString (def.dhcpServerConfig != { }) '' [DHCPServer] ${attrsToSection def.dhcpServerConfig} '' - + optionalString (def.ipv6PrefixDelegationConfig != { }) '' - [IPv6PrefixDelegation] - ${attrsToSection def.ipv6PrefixDelegationConfig} + + optionalString (def.ipv6SendRAConfig != { }) '' + [IPv6SendRA] + ${attrsToSection def.ipv6SendRAConfig} '' + flip concatMapStrings def.ipv6Prefixes (x: '' [IPv6Prefix] @@ -1479,7 +1565,6 @@ let in { - options = { systemd.network.enable = mkOption { diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 5b39f34200cdc..ddaf985878e04 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -614,11 +614,16 @@ echo /sbin/modprobe > /proc/sys/kernel/modprobe # Start stage 2. `switch_root' deletes all files in the ramfs on the -# current root. Note that $stage2Init might be an absolute symlink, -# in which case "-e" won't work because we're not in the chroot yet. -if [ ! -e "$targetRoot/$stage2Init" ] && [ ! -L "$targetRoot/$stage2Init" ] ; then - echo "stage 2 init script ($targetRoot/$stage2Init) not found" - fail +# current root. The path has to be valid in the chroot not outside. +if [ ! -e "$targetRoot/$stage2Init" ]; then + stage2Check=${stage2Init} + while [ "$stage2Check" != "${stage2Check%/*}" ] && [ ! -L "$targetRoot/$stage2Check" ]; do + stage2Check=${stage2Check%/*} + done + if [ ! -L "$targetRoot/$stage2Check" ]; then + echo "stage 2 init script ($targetRoot/$stage2Init) not found" + fail + fi fi mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev $targetRoot/run diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 088bffd7c5084..23e1e611a71e9 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -93,17 +93,7 @@ in (if i.useDHCP != null then i.useDHCP else false)); address = forEach (interfaceIps i) (ip: "${ip.address}/${toString ip.prefixLength}"); - # IPv6PrivacyExtensions=kernel seems to be broken with networkd. - # Instead of using IPv6PrivacyExtensions=kernel, configure it according to the value of - # `tempAddress`: - networkConfig.IPv6PrivacyExtensions = { - # generate temporary addresses and use them by default - "default" = true; - # generate temporary addresses but keep using the standard EUI-64 ones by default - "enabled" = "prefer-public"; - # completely disable temporary addresses - "disabled" = false; - }.${i.tempAddress}; + networkConfig.IPv6PrivacyExtensions = "kernel"; linkConfig = optionalAttrs (i.macAddress != null) { MACAddress = i.macAddress; } // optionalAttrs (i.mtu != null) { diff --git a/nixos/modules/virtualisation/anbox.nix b/nixos/modules/virtualisation/anbox.nix index da5df35807346..7b096bd1a9fbb 100644 --- a/nixos/modules/virtualisation/anbox.nix +++ b/nixos/modules/virtualisation/anbox.nix @@ -98,7 +98,6 @@ in environment.XDG_RUNTIME_DIR="${anboxloc}"; wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; preStart = let initsh = pkgs.writeText "nixos-init" ('' #!/system/bin/sh diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 4b2adf4cc699b..d686cb503d861 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -66,7 +66,7 @@ in { type = types.bool; default = false; description = '' - enables various settings to avoid common pitfalls when + Enables various settings to avoid common pitfalls when running containers requiring many file operations. Fixes errors like "Too many open files" or "neighbour: ndisc_cache: neighbor table overflow!". @@ -74,6 +74,17 @@ in { for details. ''; }; + + startTimeout = mkOption { + type = types.int; + default = 600; + apply = toString; + description = '' + Time to wait (in seconds) for LXD to become ready to process requests. + If LXD does not reply within the configured time, lxd.service will be + considered failed and systemd will attempt to restart it. + ''; + }; }; }; @@ -81,40 +92,58 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - security.apparmor = { - enable = true; - profiles = [ - "${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start" - "${cfg.lxcPackage}/etc/apparmor.d/lxc-containers" - ]; - packages = [ cfg.lxcPackage ]; - }; + # Note: the following options are also declared in virtualisation.lxc, but + # the latter can't be simply enabled to reuse the formers, because it + # does a bunch of unrelated things. + systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; + + security.apparmor.packages = [ pkgs.lxcPackage ]; + security.apparmor.profiles = [ + "${cfg.lxcPackage}/etc/apparmor.d/lxc-containers" + "${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start" + ]; # TODO: remove once LXD gets proper support for cgroupsv2 # (currently most of the e.g. CPU accounting stuff doesn't work) systemd.enableUnifiedCgroupHierarchy = false; + systemd.sockets.lxd = { + description = "LXD UNIX socket"; + wantedBy = [ "sockets.target" ]; + + socketConfig = { + ListenStream = "/var/lib/lxd/unix.socket"; + SocketMode = "0660"; + SocketGroup = "lxd"; + Service = "lxd.service"; + }; + }; + systemd.services.lxd = { description = "LXD Container Management Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; + after = [ "network-online.target" "lxcfs.service" ]; + requires = [ "network-online.target" "lxd.socket" "lxcfs.service" ]; + documentation = [ "man:lxd(1)" ]; - path = lib.optional config.boot.zfs.enabled config.boot.zfs.package; - - preStart = '' - mkdir -m 0755 -p /var/lib/lxc/rootfs - ''; + path = optional cfg.zfsSupport config.boot.zfs.package; serviceConfig = { ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd"; - Type = "simple"; + ExecStartPost = "${cfg.package}/bin/lxd waitready --timeout=${cfg.startTimeout}"; + ExecStop = "${cfg.package}/bin/lxd shutdown"; + KillMode = "process"; # when stopping, leave the containers alone LimitMEMLOCK = "infinity"; LimitNOFILE = "1048576"; LimitNPROC = "infinity"; TasksMax = "infinity"; + Restart = "on-failure"; + TimeoutStartSec = "${cfg.startTimeout}s"; + TimeoutStopSec = "30s"; + # By default, `lxd` loads configuration files from hard-coded # `/usr/share/lxc/config` - since this is a no-go for us, we have to # explicitly tell it where the actual configuration files are diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index f06977f88fc16..3754fe6dac6da 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -271,8 +271,8 @@ let DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices; }; - system = config.nixpkgs.localSystem.system; + kernelVersion = config.boot.kernelPackages.kernel.version; bindMountOpts = { name, ... }: { @@ -321,7 +321,6 @@ let }; }; - mkBindFlag = d: let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind="; mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}"; @@ -482,11 +481,16 @@ in networking.useDHCP = false; assertions = [ { - assertion = config.privateNetwork -> stringLength name < 12; + assertion = + (builtins.compareVersions kernelVersion "5.8" <= 0) + -> config.privateNetwork + -> stringLength name <= 11; message = '' Container name `${name}` is too long: When `privateNetwork` is enabled, container names can not be longer than 11 characters, because the container's interface name is derived from it. - This might be fixed in the future. See https://github.com/NixOS/nixpkgs/issues/38509 + You should either make the container name shorter or upgrade to a more recent kernel that + supports interface altnames (i.e. at least Linux 5.8 - please see https://github.com/NixOS/nixpkgs/issues/38509 + for details). ''; } ]; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 5360cff22f3c6..d9935bcafb716 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -277,6 +277,18 @@ in ''; }; + virtualisation.msize = + mkOption { + default = null; + type = types.nullOr types.ints.unsigned; + description = + '' + msize (maximum packet size) option passed to 9p file systems, in + bytes. Increasing this should increase performance significantly, + at the cost of higher RAM usage. + ''; + }; + virtualisation.diskSize = mkOption { default = 512; @@ -666,7 +678,7 @@ in ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; + options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}"; neededForBoot = true; }; "/tmp" = mkIf config.boot.tmpOnTmpfs @@ -679,13 +691,13 @@ in "/tmp/xchg" = { device = "xchg"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" ]; + options = [ "trans=virtio" "version=9p2000.L" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}"; neededForBoot = true; }; "/tmp/shared" = { device = "shared"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" ]; + options = [ "trans=virtio" "version=9p2000.L" ] ++ lib.optional (cfg.msize != null) "msize=${toString cfg.msize}"; neededForBoot = true; }; } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index bf094dbe98481..7d676e15fa971 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -55,6 +55,7 @@ in cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {}; + ceph-single-node-bluestore = handleTestOn ["x86_64-linux"] ./ceph-single-node-bluestore.nix {}; certmgr = handleTest ./certmgr.nix {}; cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {}; charliecloud = handleTest ./charliecloud.nix {}; @@ -72,6 +73,7 @@ in containers-imperative = handleTest ./containers-imperative.nix {}; containers-ip = handleTest ./containers-ip.nix {}; containers-macvlans = handleTest ./containers-macvlans.nix {}; + containers-names = handleTest ./containers-names.nix {}; containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {}; containers-portforward = handleTest ./containers-portforward.nix {}; containers-reloadable = handleTest ./containers-reloadable.nix {}; @@ -195,6 +197,7 @@ in keymap = handleTest ./keymap.nix {}; knot = handleTest ./knot.nix {}; krb5 = discoverTests (import ./krb5 {}); + ksm = handleTest ./ksm.nix {}; kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {}; # kubernetes.e2e should eventually replace kubernetes.rbac when it works #kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {}; @@ -237,6 +240,7 @@ in mosquitto = handleTest ./mosquitto.nix {}; mpd = handleTest ./mpd.nix {}; mumble = handleTest ./mumble.nix {}; + musescore = handleTest ./musescore.nix {}; munin = handleTest ./munin.nix {}; mutableUsers = handleTest ./mutable-users.nix {}; mxisd = handleTest ./mxisd.nix {}; @@ -303,6 +307,9 @@ in pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; php = handleTest ./php {}; + php73 = handleTest ./php { php = pkgs.php73; }; + php74 = handleTest ./php { php = pkgs.php74; }; + php80 = handleTest ./php { php = pkgs.php80; }; pinnwand = handleTest ./pinnwand.nix {}; plasma5 = handleTest ./plasma5.nix {}; pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {}; diff --git a/nixos/tests/ceph-single-node-bluestore.nix b/nixos/tests/ceph-single-node-bluestore.nix new file mode 100644 index 0000000000000..cc873e8aee576 --- /dev/null +++ b/nixos/tests/ceph-single-node-bluestore.nix @@ -0,0 +1,196 @@ +import ./make-test-python.nix ({pkgs, lib, ...}: + +let + cfg = { + clusterId = "066ae264-2a5d-4729-8001-6ad265f50b03"; + monA = { + name = "a"; + ip = "192.168.1.1"; + }; + osd0 = { + name = "0"; + key = "AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg=="; + uuid = "55ba2294-3e24-478f-bee0-9dca4c231dd9"; + }; + osd1 = { + name = "1"; + key = "AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ=="; + uuid = "5e97a838-85b6-43b0-8950-cb56d554d1e5"; + }; + osd2 = { + name = "2"; + key = "AQAdyhZeIaUlARAAGRoidDAmS6Vkp546UFEf5w=="; + uuid = "ea999274-13d0-4dd5-9af9-ad25a324f72f"; + }; + }; + generateCephConfig = { daemonConfig }: { + enable = true; + global = { + fsid = cfg.clusterId; + monHost = cfg.monA.ip; + monInitialMembers = cfg.monA.name; + }; + } // daemonConfig; + + generateHost = { pkgs, cephConfig, networkConfig, ... }: { + virtualisation = { + memorySize = 512; + emptyDiskImages = [ 20480 20480 20480 ]; + vlans = [ 1 ]; + }; + + networking = networkConfig; + + environment.systemPackages = with pkgs; [ + bash + sudo + ceph + xfsprogs + ]; + + boot.kernelModules = [ "xfs" ]; + + services.ceph = cephConfig; + }; + + networkMonA = { + dhcpcd.enable = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = cfg.monA.ip; prefixLength = 24; } + ]; + }; + cephConfigMonA = generateCephConfig { daemonConfig = { + mon = { + enable = true; + daemons = [ cfg.monA.name ]; + }; + mgr = { + enable = true; + daemons = [ cfg.monA.name ]; + }; + osd = { + enable = true; + daemons = [ cfg.osd0.name cfg.osd1.name cfg.osd2.name ]; + }; + }; }; + + # Following deployment is based on the manual deployment described here: + # https://docs.ceph.com/docs/master/install/manual-deployment/ + # For other ways to deploy a ceph cluster, look at the documentation at + # https://docs.ceph.com/docs/master/ + testscript = { ... }: '' + start_all() + + monA.wait_for_unit("network.target") + + # Bootstrap ceph-mon daemon + monA.succeed( + "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", + "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'", + "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", + "monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap", + "sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring", + "sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done", + "systemctl start ceph-mon-${cfg.monA.name}", + ) + monA.wait_for_unit("ceph-mon-${cfg.monA.name}") + monA.succeed("ceph mon enable-msgr2") + + # Can't check ceph status until a mon is up + monA.succeed("ceph -s | grep 'mon: 1 daemons'") + + # Start the ceph-mgr daemon, after copying in the keyring + monA.succeed( + "sudo -u ceph mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}/", + "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring", + "systemctl start ceph-mgr-${cfg.monA.name}", + ) + monA.wait_for_unit("ceph-mgr-a") + monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + + # Bootstrap OSDs + monA.succeed( + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}", + "echo bluestore > /var/lib/ceph/osd/ceph-${cfg.osd0.name}/type", + "ln -sf /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}/block", + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}", + "echo bluestore > /var/lib/ceph/osd/ceph-${cfg.osd1.name}/type", + "ln -sf /dev/vdc /var/lib/ceph/osd/ceph-${cfg.osd1.name}/block", + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd2.name}", + "echo bluestore > /var/lib/ceph/osd/ceph-${cfg.osd2.name}/type", + "ln -sf /dev/vdd /var/lib/ceph/osd/ceph-${cfg.osd2.name}/block", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd2.name}/keyring --name osd.${cfg.osd2.name} --add-key ${cfg.osd2.key}", + 'echo \'{"cephx_secret": "${cfg.osd0.key}"}\' | ceph osd new ${cfg.osd0.uuid} -i -', + 'echo \'{"cephx_secret": "${cfg.osd1.key}"}\' | ceph osd new ${cfg.osd1.uuid} -i -', + 'echo \'{"cephx_secret": "${cfg.osd2.key}"}\' | ceph osd new ${cfg.osd2.uuid} -i -', + ) + + # Initialize the OSDs with regular filestore + monA.succeed( + "ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}", + "ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}", + "ceph-osd -i ${cfg.osd2.name} --mkfs --osd-uuid ${cfg.osd2.uuid}", + "chown -R ceph:ceph /var/lib/ceph/osd", + "systemctl start ceph-osd-${cfg.osd0.name}", + "systemctl start ceph-osd-${cfg.osd1.name}", + "systemctl start ceph-osd-${cfg.osd2.name}", + ) + monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + + monA.succeed( + "ceph osd pool create single-node-test 32 32", + "ceph osd pool ls | grep 'single-node-test'", + "ceph osd pool rename single-node-test single-node-other-test", + "ceph osd pool ls | grep 'single-node-other-test'", + ) + monA.wait_until_succeeds("ceph -s | grep '2 pools, 33 pgs'") + monA.succeed( + "ceph osd getcrushmap -o crush", + "crushtool -d crush -o decrushed", + "sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush", + "crushtool -c modcrush -o recrushed", + "ceph osd setcrushmap -i recrushed", + "ceph osd pool set single-node-other-test size 2", + ) + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + monA.wait_until_succeeds("ceph -s | grep '33 active+clean'") + monA.fail( + "ceph osd pool ls | grep 'multi-node-test'", + "ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it", + ) + + # Shut down ceph by stopping ceph.target. + monA.succeed("systemctl stop ceph.target") + + # Start it up + monA.succeed("systemctl start ceph.target") + monA.wait_for_unit("ceph-mon-${cfg.monA.name}") + monA.wait_for_unit("ceph-mgr-${cfg.monA.name}") + monA.wait_for_unit("ceph-osd-${cfg.osd0.name}") + monA.wait_for_unit("ceph-osd-${cfg.osd1.name}") + monA.wait_for_unit("ceph-osd-${cfg.osd2.name}") + + # Ensure the cluster comes back up again + monA.succeed("ceph -s | grep 'mon: 1 daemons'") + monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'") + monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + ''; +in { + name = "basic-single-node-ceph-cluster-bluestore"; + meta = with pkgs.lib.maintainers; { + maintainers = [ lukegb ]; + }; + + nodes = { + monA = generateHost { pkgs = pkgs; cephConfig = cephConfigMonA; networkConfig = networkMonA; }; + }; + + testScript = testscript; +}) diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index 1208aa8fced7e..12fa67c8b015b 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -1,5 +1,3 @@ -# Test for NixOS' container support. - let hostIp = "192.168.0.1"; containerIp = "192.168.0.100/24"; @@ -7,10 +5,10 @@ let containerIp6 = "fc00::2/7"; in -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-bridge"; - meta = with pkgs.lib.maintainers; { - maintainers = [ aristid aszlig eelco kampfschlaefer ]; + meta = { + maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-custom-pkgs.nix b/nixos/tests/containers-custom-pkgs.nix index 1412c32bfb5f1..c050e49bc29d2 100644 --- a/nixos/tests/containers-custom-pkgs.nix +++ b/nixos/tests/containers-custom-pkgs.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, lib, ...} : let +import ./make-test-python.nix ({ pkgs, lib, ... }: let customPkgs = pkgs.appendOverlays [ (self: super: { hello = super.hello.overrideAttrs (old: { @@ -8,8 +8,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : let in { name = "containers-custom-pkgs"; - meta = with lib.maintainers; { - maintainers = [ adisbladis earvstedt ]; + meta = { + maintainers = with lib.maintainers; [ adisbladis earvstedt ]; }; machine = { config, ... }: { diff --git a/nixos/tests/containers-ephemeral.nix b/nixos/tests/containers-ephemeral.nix index 692554ac0ba25..fabf0593f23af 100644 --- a/nixos/tests/containers-ephemeral.nix +++ b/nixos/tests/containers-ephemeral.nix @@ -1,7 +1,8 @@ -# Test for NixOS' container support. - -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-ephemeral"; + meta = { + maintainers = with lib.maintainers; [ patryk27 ]; + }; machine = { pkgs, ... }: { virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix index 212f3d0f46cbc..cbbb252583254 100644 --- a/nixos/tests/containers-extra_veth.nix +++ b/nixos/tests/containers-extra_veth.nix @@ -1,9 +1,7 @@ -# Test for NixOS' container support. - -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-extra_veth"; - meta = with pkgs.lib.maintainers; { - maintainers = [ kampfschlaefer ]; + meta = { + maintainers = with lib.maintainers; [ kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix index 65a983c42a789..1f24ed1f3c2c4 100644 --- a/nixos/tests/containers-hosts.nix +++ b/nixos/tests/containers-hosts.nix @@ -1,9 +1,7 @@ -# Test for NixOS' container support. - -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-hosts"; - meta = with pkgs.lib.maintainers; { - maintainers = [ montag451 ]; + meta = { + maintainers = with lib.maintainers; [ montag451 ]; }; machine = diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 393b4a5135dd5..0ff0d3f954528 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -1,9 +1,7 @@ -# Test for NixOS' container support. - -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-imperative"; - meta = with pkgs.lib.maintainers; { - maintainers = [ aristid aszlig eelco kampfschlaefer ]; + meta = { + maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix index 0265ed92d41cb..5abea2dbad9fa 100644 --- a/nixos/tests/containers-ip.nix +++ b/nixos/tests/containers-ip.nix @@ -1,5 +1,3 @@ -# Test for NixOS' container support. - let webserverFor = hostAddress: localAddress: { inherit hostAddress localAddress; @@ -13,10 +11,10 @@ let }; }; -in import ./make-test-python.nix ({ pkgs, ...} : { +in import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-ipv4-ipv6"; - meta = with pkgs.lib.maintainers; { - maintainers = [ aristid aszlig eelco kampfschlaefer ]; + meta = { + maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix index 9425252cb8862..d0f41be8c1251 100644 --- a/nixos/tests/containers-macvlans.nix +++ b/nixos/tests/containers-macvlans.nix @@ -1,15 +1,13 @@ -# Test for NixOS' container support. - let # containers IP on VLAN 1 containerIp1 = "192.168.1.253"; containerIp2 = "192.168.1.254"; in -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-macvlans"; - meta = with pkgs.lib.maintainers; { - maintainers = [ montag451 ]; + meta = { + maintainers = with lib.maintainers; [ montag451 ]; }; nodes = { diff --git a/nixos/tests/containers-names.nix b/nixos/tests/containers-names.nix new file mode 100644 index 0000000000000..9ad2bfb748a8d --- /dev/null +++ b/nixos/tests/containers-names.nix @@ -0,0 +1,37 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "containers-names"; + meta = { + maintainers = with lib.maintainers; [ patryk27 ]; + }; + + machine = { ... }: { + # We're using the newest kernel, so that we can test containers with long names. + # Please see https://github.com/NixOS/nixpkgs/issues/38509 for details. + boot.kernelPackages = pkgs.linuxPackages_latest; + + containers = let + container = subnet: { + autoStart = true; + privateNetwork = true; + hostAddress = "192.168.${subnet}.1"; + localAddress = "192.168.${subnet}.2"; + config = { }; + }; + + in { + first = container "1"; + second = container "2"; + really-long-name = container "3"; + really-long-long-name-2 = container "4"; + }; + }; + + testScript = '' + machine.wait_for_unit("default.target") + + machine.succeed("ip link show | grep ve-first") + machine.succeed("ip link show | grep ve-second") + machine.succeed("ip link show | grep ve-really-lFYWO") + machine.succeed("ip link show | grep ve-really-l3QgY") + ''; +}) diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix index 0b55c3418edfb..57bd0eedcc335 100644 --- a/nixos/tests/containers-physical_interfaces.nix +++ b/nixos/tests/containers-physical_interfaces.nix @@ -1,8 +1,7 @@ - -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-physical_interfaces"; - meta = with pkgs.lib.maintainers; { - maintainers = [ kampfschlaefer ]; + meta = { + maintainers = with lib.maintainers; [ kampfschlaefer ]; }; nodes = { diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index d0be3c7d43ec6..221a6f50efd1d 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -1,5 +1,3 @@ -# Test for NixOS' container support. - let hostIp = "192.168.0.1"; hostPort = 10080; @@ -7,10 +5,10 @@ let containerPort = 80; in -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-portforward"; - meta = with pkgs.lib.maintainers; { - maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ]; + meta = { + maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ianwookim ]; }; machine = diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 8772469176727..876e62c1da9ea 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -1,7 +1,6 @@ -import ./make-test-python.nix ({ pkgs, lib, ...} : +import ./make-test-python.nix ({ pkgs, lib, ... }: let client_base = { - containers.test1 = { autoStart = true; config = { @@ -16,8 +15,8 @@ let }; in { name = "containers-reloadable"; - meta = with pkgs.lib.maintainers; { - maintainers = [ danbst ]; + meta = { + maintainers = with lib.maintainers; [ danbst ]; }; nodes = { diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix index b35552b5b1919..e1ad8157b2883 100644 --- a/nixos/tests/containers-restart_networking.nix +++ b/nixos/tests/containers-restart_networking.nix @@ -1,5 +1,3 @@ -# Test for NixOS' container support. - let client_base = { networking.firewall.enable = false; @@ -16,11 +14,11 @@ let }; }; }; -in import ./make-test-python.nix ({ pkgs, ...} : +in import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-restart_networking"; - meta = with pkgs.lib.maintainers; { - maintainers = [ kampfschlaefer ]; + meta = { + maintainers = with lib.maintainers; [ kampfschlaefer ]; }; nodes = { diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 7ebf0d02a2406..fd9f9a252ca8c 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -1,9 +1,7 @@ -# Test for NixOS' container support. - -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-tmpfs"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ]; + meta = { + maintainers = with lib.maintainers; [ patryk27 ]; }; machine = diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index ba085338944a0..baad675229cce 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -11,6 +11,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { nodes = { gitlab = { ... }: { + imports = [ common/user-account.nix ]; + virtualisation.memorySize = if pkgs.stdenv.is64bit then 4096 else 2047; systemd.services.gitlab.serviceConfig.Restart = mkForce "no"; systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no"; @@ -27,11 +29,31 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { }; }; + services.dovecot2 = { + enable = true; + enableImap = true; + }; + services.gitlab = { enable = true; databasePasswordFile = pkgs.writeText "dbPassword" "xo0daiF4"; initialRootPasswordFile = pkgs.writeText "rootPassword" initialRootPassword; smtp.enable = true; + extraConfig = { + incoming_email = { + enabled = true; + mailbox = "inbox"; + address = "alice@localhost"; + user = "alice"; + password = "foobar"; + host = "localhost"; + port = 143; + }; + pages = { + enabled = true; + host = "localhost"; + }; + }; secrets = { secretFile = pkgs.writeText "secret" "r8X9keSKynU7p4aKlh4GO1Bo77g5a7vj"; otpFile = pkgs.writeText "otpsecret" "Zu5hGx3YvQx40DvI8WoZJQpX2paSDOlG"; @@ -64,12 +86,16 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { in '' gitlab.start() + gitlab.wait_for_unit("gitaly.service") gitlab.wait_for_unit("gitlab-workhorse.service") + gitlab.wait_for_unit("gitlab-pages.service") + gitlab.wait_for_unit("gitlab-mailroom.service") gitlab.wait_for_unit("gitlab.service") gitlab.wait_for_unit("gitlab-sidekiq.service") gitlab.wait_for_file("/var/gitlab/state/tmp/sockets/gitlab.socket") gitlab.wait_until_succeeds("curl -sSf http://gitlab/users/sign_in") + gitlab.succeed( "curl -isSf http://gitlab | grep -i location | grep -q http://gitlab/users/sign_in" ) diff --git a/nixos/tests/ksm.nix b/nixos/tests/ksm.nix new file mode 100644 index 0000000000000..8f84b32020ab9 --- /dev/null +++ b/nixos/tests/ksm.nix @@ -0,0 +1,22 @@ +import ./make-test-python.nix ({ lib, ...} : + +{ + name = "ksm"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + machine = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + hardware.ksm.enable = true; + hardware.ksm.sleep = 300; + }; + + testScript = + '' + machine.start() + machine.wait_until_succeeds("test $(</sys/kernel/mm/ksm/run) -eq 1") + machine.wait_until_succeeds("test $(</sys/kernel/mm/ksm/sleep_millisecs) -eq 300") + ''; +}) diff --git a/nixos/tests/musescore.nix b/nixos/tests/musescore.nix new file mode 100644 index 0000000000000..96481a9a8bf48 --- /dev/null +++ b/nixos/tests/musescore.nix @@ -0,0 +1,86 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +let + # Make sure we don't have to go through the startup tutorial + customMuseScoreConfig = pkgs.writeText "MuseScore3.ini" '' + [application] + startup\firstStart=false + + [ui] + application\startup\showTours=false + application\startup\showStartCenter=false + ''; +in +{ + name = "musescore"; + meta = with pkgs.lib.maintainers; { + maintainers = [ turion ]; + }; + + machine = { ... }: + + { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + environment.systemPackages = with pkgs; [ + musescore + pdfgrep + ]; + }; + + enableOCR = true; + + testScript = { ... }: '' + start_all() + machine.wait_for_x() + + # Inject custom settings + machine.succeed("mkdir -p /root/.config/MuseScore/") + machine.succeed( + "cp ${customMuseScoreConfig} /root/.config/MuseScore/MuseScore3.ini" + ) + + # Start MuseScore window + machine.execute("DISPLAY=:0.0 mscore &") + + # Wait until MuseScore has launched + machine.wait_for_window("MuseScore") + + # Wait until the window has completely initialised + machine.wait_for_text("MuseScore") + + # Start entering notes + machine.send_key("n") + # Type the beginning of https://de.wikipedia.org/wiki/Alle_meine_Entchen + machine.send_chars("cdef6gg5aaaa7g") + # Make sure the VM catches up with all the keys + machine.sleep(1) + + machine.screenshot("MuseScore0") + + # Go to the export dialogue and create a PDF + machine.send_key("alt-f") + machine.sleep(1) + machine.send_key("e") + + # Wait until the export dialogue appears. + machine.wait_for_window("Export") + machine.screenshot("MuseScore1") + machine.send_key("ret") + machine.sleep(1) + machine.send_key("ret") + + machine.screenshot("MuseScore2") + + # Wait until PDF is exported + machine.wait_for_file("/root/Documents/MuseScore3/Scores/Untitled.pdf") + + # Check that it contains the title of the score + machine.succeed("pdfgrep Title /root/Documents/MuseScore3/Scores/Untitled.pdf") + + machine.screenshot("MuseScore3") + ''; +}) diff --git a/nixos/tests/php/default.nix b/nixos/tests/php/default.nix index ee7a3b56a3ef0..6ecaed2460464 100644 --- a/nixos/tests/php/default.nix +++ b/nixos/tests/php/default.nix @@ -1,8 +1,9 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../../.. { inherit system config; } +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../../.. { inherit system config; } +, php ? pkgs.php }: { - fpm = import ./fpm.nix { inherit system pkgs; }; - httpd = import ./httpd.nix { inherit system pkgs; }; - pcre = import ./pcre.nix { inherit system pkgs; }; + fpm = import ./fpm.nix { inherit system pkgs php; }; + httpd = import ./httpd.nix { inherit system pkgs php; }; + pcre = import ./pcre.nix { inherit system pkgs php; }; } diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 9ad515ebdde06..f84394ccea45f 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -1,5 +1,5 @@ -import ../make-test-python.nix ({pkgs, lib, ...}: { - name = "php-fpm-nginx-test"; +import ../make-test-python.nix ({pkgs, lib, php, ...}: { + name = "php-${php.version}-fpm-nginx-test"; meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { @@ -25,6 +25,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { services.phpfpm.pools."foobar" = { user = "nginx"; + phpPackage = php; settings = { "listen.group" = "nginx"; "listen.mode" = "0600"; @@ -44,7 +45,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { # Check so we get an evaluated PHP back response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") - assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected" + assert "PHP Version ${php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]: diff --git a/nixos/tests/php/httpd.nix b/nixos/tests/php/httpd.nix index 27ea7a24e3a99..a5ca9b3c5d1fe 100644 --- a/nixos/tests/php/httpd.nix +++ b/nixos/tests/php/httpd.nix @@ -1,5 +1,5 @@ -import ../make-test-python.nix ({pkgs, lib, ...}: { - name = "php-httpd-test"; +import ../make-test-python.nix ({pkgs, lib, php, ...}: { + name = "php-${php.version}-httpd-test"; meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { @@ -14,6 +14,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { index = "index.php index.html"; }; }; + phpPackage = php; enablePHP = true; }; }; @@ -22,7 +23,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { # Check so we get an evaluated PHP back response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") - assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected" + assert "PHP Version ${php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]: diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index 3ea19304bffd5..97572f63af33a 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -1,7 +1,7 @@ let testString = "can-use-subgroups"; -in import ../make-test-python.nix ({lib, ...}: { - name = "php-httpd-pcre-jit-test"; +in import ../make-test-python.nix ({lib, php, ...}: { + name = "php-${php.version}-httpd-pcre-jit-test"; meta.maintainers = lib.teams.php.members; machine = { lib, pkgs, ... }: { @@ -9,6 +9,7 @@ in import ../make-test-python.nix ({lib, ...}: { services.httpd = { enable = true; adminAddr = "please@dont.contact"; + phpPackage = php; enablePHP = true; phpOptions = "pcre.jit = true"; extraConfig = let diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index bce78f09fdcce..5831c8692f69e 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -165,7 +165,7 @@ import ./make-test-python.nix ({pkgs, ...}: { # accept the delegated prefix. PrefixDelegationHint = "::/48"; }; - ipv6PrefixDelegationConfig = { + ipv6SendRAConfig = { # Let networkd know that we would very much like to use DHCPv6 # to obtain the "managed" information. Not sure why they can't # just take that from the upstream RAs. @@ -179,24 +179,20 @@ import ./make-test-python.nix ({pkgs, ...}: { name = "eth2"; networkConfig = { Description = "Client interface"; - # the client shouldn't be allowed to send us RAs, that would be weird. + # The client shouldn't be allowed to send us RAs, that would be weird. IPv6AcceptRA = false; - # Just delegate prefixes from the DHCPv6 PD pool. - # If you also want to distribute a local ULA prefix you want to - # set this to `yes` as that includes both static prefixes as well - # as PD prefixes. - IPv6PrefixDelegation = "dhcpv6"; + # Delegate prefixes from the DHCPv6 PD pool. + DHCPv6PrefixDelegation = true; + IPv6SendRA = true; }; - # finally "act as router" (according to systemd.network(5)) - ipv6PrefixDelegationConfig = { - RouterLifetimeSec = 300; # required as otherwise no RA's are being emitted - # In a production environment you should consider setting these as well: + # In a production environment you should consider setting these as well: + # ipv6SendRAConfig = { #EmitDNS = true; #EmitDomains = true; #DNS= = "fe80::1"; # or whatever "well known" IP your router will have on the inside. - }; + # }; # This adds a "random" ULA prefix to the interface that is being # advertised to the clients. diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix index c88231636226b..d4b8bb15ced6d 100644 --- a/nixos/tests/unbound.nix +++ b/nixos/tests/unbound.nix @@ -27,6 +27,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # disable the root anchor update as we do not have internet access during # the test execution services.unbound.enableRootTrustAnchor = false; + + # we want to test the full-variant of the package to also get DoH support + services.unbound.package = pkgs.unbound-full; }; }; @@ -81,13 +84,16 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: networking.firewall.allowedTCPPorts = [ 53 # regular DNS 853 # DNS over TLS + 443 # DNS over HTTPS ]; networking.firewall.allowedUDPPorts = [ 53 ]; services.unbound = { enable = true; allowedAccess = [ "192.168.0.0/24" "fd21::/64" "::1" "127.0.0.0/8" ]; - interfaces = [ "::1" "127.0.0.1" "192.168.0.2" "fd21::2" "192.168.0.2@853" "fd21::2@853" "::1@853" "127.0.0.1@853" ]; + interfaces = [ "::1" "127.0.0.1" "192.168.0.2" "fd21::2" + "192.168.0.2@853" "fd21::2@853" "::1@853" "127.0.0.1@853" + "192.168.0.2@443" "fd21::2@443" "::1@443" "127.0.0.1@443" ]; forwardAddresses = [ (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv6.addresses).address (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv4.addresses).address @@ -217,6 +223,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: expected, ["+tcp", "+tls"] + args, ) + query( + machine, + remote, + query_type, + zone, + expected, + ["+https"] + args, + ) client.start() diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index ade595732c3bd..25cb96965092c 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -9,7 +9,8 @@ sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732"; }; - buildInputs = [ makeWrapper python3 alsaUtils timidity ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 alsaUtils timidity ]; patchPhase = '' sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 29c5130f575c1..7d6d51011cc2e 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { else throw "baudline isn't supported (yet?) on ${stdenv.hostPlatform.system}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # Prebuilt binary distribution. # "patchelf --set-rpath" seems to break the application (cannot start), using diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 0360922c81961..15ebb85136b02 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { patchShebangs ./install.sh ''; - buildInputs = [ bash makeWrapper ]; + nativeBuildInputs = [ bash makeWrapper ]; installPhase = '' ./install.sh --prefix=$out/bin diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index be0f2f72529c5..e665edabd0744 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -24,7 +24,7 @@ let ./clementine-spotify-blob.patch ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ boost @@ -68,7 +68,7 @@ let inherit src patches nativeBuildInputs postPatch; # gst_plugins needed for setup-hooks - buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins; + buildInputs = buildInputs ++ gst_plugins; preConfigure = '' rm -rf ext/{,lib}clementine-spotifyblob @@ -102,7 +102,7 @@ let # Use the same patches and sources as Clementine inherit src nativeBuildInputs patches postPatch; - buildInputs = buildInputs ++ [ libspotify makeWrapper ]; + buildInputs = buildInputs ++ [ libspotify ]; # Only build and install the Spotify blob preBuild = '' cd ext/clementine-spotifyblob diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 0724632a63e13..a2e71b955ec41 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0y045my65hr3hjyx13jrnyg6g3wb41phqb1m7azc4l6vx6r4124b"; }; - buildInputs = [ makeWrapper pythonPackages.mpd2 ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonPackages.mpd2 ]; dontBuild = true; diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix index cd45ef5926b07..66108deab1e32 100644 --- a/pkgs/applications/audio/deadbeef/wrapper.nix +++ b/pkgs/applications/audio/deadbeef/wrapper.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ deadbeef ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/deadbeef \ diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 6d7d2e2c2bae2..81ce11b9ea190 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -30,7 +30,7 @@ let inherit src; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru = { inherit wrap wrapWithBuildEnv; @@ -159,8 +159,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; @@ -195,7 +194,7 @@ let in stdenv.mkDerivation ((faust2ApplBase args) // { - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postFixup = '' for script in "$out"/bin/*; do diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 990d073528e14..051caf120fa26 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -168,8 +168,7 @@ let stdenv.mkDerivation ((faust2ApplBase args) // { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; @@ -209,7 +208,7 @@ let in stdenv.mkDerivation ((faust2ApplBase args) // { - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postFixup = '' for script in "$out"/bin/*; do diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 0be1cc45717b2..f86eed1d34da8 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { }; dontBuild = true; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ dpkg makeWrapper ]; unpackPhase = '' dpkg -x $src . diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index f111c4e99d7cd..325d115b58168 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ] + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 ] ++ (with perlPackages; [ perl XMLParser ]); NIX_LDFLAGS = "-ldl"; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index eb355a4340965..74bbeb9b7bb73 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 patches = [ ./socket.patch ./gcc-47.patch ]; - buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper - pkg-config readline ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ]; propagatedBuildInputs = [ libuuid ]; NIX_LDFLAGS = "-lm -lpthread -luuid"; diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index 118b54ad8587f..ec034ae238de4 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -11,8 +11,8 @@ in stdenv.mkDerivation rec { sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ MMA libjack2 libsmf python pyGtkGlade pygtksourceview ]; patchPhase = '' sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 30d654ab87aeb..92f8506483f51 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mda-lv2"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; + sha256 = "sha256-zWYRcCSuBJzzrKg/npBKcCdyJOI6lp9yqcXQEKSYV9s="; }; nativeBuildInputs = [ pkg-config wafHook python3 ]; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 47f8e5a22e62d..0c1ad144a4afc 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -3,6 +3,7 @@ , portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects , qtquickcontrols2, qtscript, qtsvg, qttools , qtwebengine, qtxmlpatterns +, nixosTests }: mkDerivation rec { @@ -40,6 +41,8 @@ mkDerivation rec { qtscript qtsvg qttools qtwebengine qtxmlpatterns ]; + passthru.tests = nixosTests.musescore; + meta = with lib; { description = "Music notation and composition software"; homepage = "https://musescore.org/"; diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/applications/audio/pragha/default.nix index bc6ef526ea7ba..da5a64f708eb0 100644 --- a/pkgs/applications/audio/pragha/default.nix +++ b/pkgs/applications/audio/pragha/default.nix @@ -36,13 +36,13 @@ assert withLastfm -> withCD; mkDerivation rec { pname = "pragha"; - version = "1.3.4"; + version = "1.3.99.1"; src = fetchFromGitHub { owner = "pragha-music-player"; repo = "pragha"; rev = "v${version}"; - sha256 = "sha256:0n8gx8amg5l9g4w7s4agjf8mlmpgjydgzx3vryp9lzzs9xrd5vqh"; + sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix index 80968e2700b49..3444ef9acbdc1 100644 --- a/pkgs/applications/audio/puredata/wrapper.nix +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -7,7 +7,7 @@ in symlinkJoin { paths = [ puredata ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/pd \ diff --git a/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/pkgs/applications/audio/real_time_config_quick_scan/default.nix index 3fb476b65cc4b..8bc2553f521b0 100644 --- a/pkgs/applications/audio/real_time_config_quick_scan/default.nix +++ b/pkgs/applications/audio/real_time_config_quick_scan/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "16kanzp5i353x972zjkwgi3m8z90wc58613mlfzb0n01djdnm6k5"; }; - buildInputs = [ perlPackages.perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; dontBuild = true; diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index b7abfa40b8636..e8a275db98d84 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; configureFlags = [ "--enable-cli" ]; - buildInputs = [ ruby cdparanoia makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ruby cdparanoia ]; postInstall = '' wrapProgram "$out/bin/rrip_cli" \ --prefix PATH : "${ruby}/bin" \ diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 43ecb67d64a3b..655a047a3a63f 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -81,7 +81,8 @@ stdenv.mkDerivation { sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1"; }; - buildInputs = [ squashfsTools makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ squashfsTools ]; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index 3409d8a490708..943bd0d8032bf 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a"; }; - buildInputs = [ alsaLib libX11 makeWrapper tcl tk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ alsaLib libX11 tcl tk ]; configurePhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 690a25d6b4d4a..1809777ed542a 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-nnnGqkT4sAunaT7GPysYQGeV34ZrRFaHK/gJRafvR3U="; + sha256 = "sha256-+WQ3p2ddyQpJqCLc1HqFZlKK85VkX2Iv2eXEcVkBs6g="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 2599eb43b1c10..7c03d06da590c 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.0"; + version = "4.0.7"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-M0kgd/txqc04WNLNZiq+imHMM9YGFd12jMWJyY2ExrY="; + sha256 = "sha256-CDNH7vYLG7Gn22yl+cXtGAD+c8tbNU52FmdxneTM2u4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d130b3d045412..3d72a91551f2a 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }: +{ lib, fetchurl, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index d1cd2e7d3e41c..0005fdb6339fb 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "prikhi"; repo = "lightdm-mini-greeter"; rev = version; - sha256 = "10hga7pmfyjdvj4xwm3djwrhk50brcpycj3p3c57pa0vnx4ill3s"; + sha256 = "sha256-cVOnd3k+9hFQjROiwPpxZcCxD2NiH1eclJHF88eV6BM="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 1c3c4aade5ff0..6be6defd19825 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -72,8 +72,8 @@ let installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ + --set-default JAVA_HOME "$out/jre" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --set JAVA_HOME "$out/jre" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ --set FONTCONFIG_FILE ${fontsConf} \ --prefix PATH : "${lib.makeBinPath [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 1dc8b9ca7ff4e..fa4f7a40d96ae 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,13 +14,13 @@ let sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9"; }; betaVersion = { - version = "4.2.0.20"; # "Android Studio 4.2 Beta 4" - build = "202.7094744"; - sha256Hash = "10c4qfq6d9ggs88s8h3pryhlnzw17m60qci78rjbh32wmm02sciz"; + version = "4.2.0.21"; # "Android Studio 4.2 Beta 5" + build = "202.7141121"; + sha256Hash = "05610xf9zz3yxarx6fv83fynlvqw9jl7h2a40yj3xx5kb7mzdnf2"; }; latestVersion = { # canary & dev - version = "2020.3.1.5"; # "Android Studio Arctic Fox (2020.3.1) Canary 5" - sha256Hash = "0x749sbg7qa5ncwwaywcldlhyyyyfh05bms2czz1rv6h7zgq16vq"; + version = "2020.3.1.7"; # "Android Studio Arctic Fox (2020.3.1) Canary 7" + sha256Hash = "03gq4s8rmg7si0r2y1w26v9bjwhj6gzmrdny5z3j5pq8xsfjfqiw"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index e7a9a26f066c9..875f8612fde66 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,18 +3,19 @@ let versions = { atom = { - version = "1.48.0"; - sha256 = "1693bxbylf6jhld9bdcr5pigk36wqlbj89praldpz9s96yxig9s1"; + version = "1.54.0"; + sha256 = "sha256-21AURgomEjuiTzeJ4MIx0mkyVi0b0mVdmFsFGNLXRP4"; }; atom-beta = { - version = "1.49.0"; + version = "1.55.0"; beta = 0; - sha256 = "1fr6m4a7shdj3wpn6g4n95cqpkkg2x9srwjf7bqxv9f3d5jb1y33"; + sha256 = "sha256-PICkTt54cPkDJVnXBTtSHUQVbmosOpZfVAiD5A3/n+Q="; + broken = true; }; }; - common = pname: {version, sha256, beta ? null}: + common = pname: {version, sha256, beta ? null, broken ? false}: let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}"; name = "${pname}-${fullVersion}"; in stdenv.mkDerivation { @@ -88,6 +89,7 @@ let license = licenses.mit; maintainers = with maintainers; [ offline ysndr ]; platforms = platforms.x86_64; + inherit broken; }; }; in lib.mapAttrs common versions diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index cff482e887d36..2c067250309b1 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -162,7 +162,7 @@ in rec { # Eclipse. name = (lib.meta.appendToName "with-plugins" eclipse).name; in - runCommand name { buildInputs = [ makeWrapper ]; } '' + runCommand name { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin $out/etc # Prepare an eclipse.ini with the plugin directory. diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index d986903cc5778..1cc47d5ca856c 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -685,10 +685,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.14"; + version = "1.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.14.tar"; - sha256 = "1jz4134pk8dwzsqih9wybx4l9yl244cgcilw8rdnnqmm8i6vxgrp"; + url = "https://elpa.gnu.org/packages/csv-mode-1.15.tar"; + sha256 = "0pigqhqg5mfza6jdskcr9yvrzdxnd68iyp3vyb8p8wskdacmbiyx"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -726,16 +726,16 @@ license = lib.licenses.free; }; }) {}; - dash = callPackage ({ elpaBuild, fetchurl, lib }: + dash = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dash"; ename = "dash"; - version = "2.12.0"; + version = "2.18.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dash-2.12.0.tar"; - sha256 = "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05"; + url = "https://elpa.gnu.org/packages/dash-2.18.1.tar"; + sha256 = "17mrvmrfh5c3kri4r3gf1c3gz4i5vl9ac60grpx4103b56y4cgra"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/dash.html"; license = lib.licenses.free; @@ -2373,10 +2373,10 @@ elpaBuild { pname = "oauth2"; ename = "oauth2"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/oauth2-0.15.el"; - sha256 = "0ij17g6i8d4cyzc8v6sy2qglwhzd767331gavll6d507krdh3ca3"; + url = "https://elpa.gnu.org/packages/oauth2-0.16.tar"; + sha256 = "1rzly2nwjywrfgcmp8zidbmjl2ahyd8l8507lb1mxm4xqryvf316"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -2714,6 +2714,21 @@ license = lib.licenses.free; }; }) {}; + pyim = callPackage ({ async, elpaBuild, emacs, fetchurl, lib, xr }: + elpaBuild { + pname = "pyim"; + ename = "pyim"; + version = "3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pyim-3.2.tar"; + sha256 = "1rr9mq334dqf7mx1ii7910zkigw7chl63iws4sw0qsn014kjlb0a"; + }; + packageRequires = [ async emacs xr ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pyim.html"; + license = lib.licenses.free; + }; + }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; @@ -3058,10 +3073,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "2.1"; + version = "2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-2.1.tar"; - sha256 = "1ahl1ys72rvqs2bf9zv9648h65fx0283ibqlk1b8ayahc04w6qbl"; + url = "https://elpa.gnu.org/packages/rt-liberation-2.2.tar"; + sha256 = "01nkkrgygq5p5s0pfxpcn794jr6ln65ad809v9mvzz7972xw625s"; }; packageRequires = []; meta = { @@ -3563,10 +3578,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.0.1"; + version = "2.5.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.0.1.tar"; - sha256 = "0kqlc03bbsdywp0m3mf0m62hqyam8vg81phh7nqmpdjzskrdc1yy"; + url = "https://elpa.gnu.org/packages/tramp-2.5.0.2.tar"; + sha256 = "16f782rjkmxxs5sz3wv4d46i7hbl483ashmrkvljf7lpnrl91s93"; }; packageRequires = [ emacs ]; meta = { @@ -3604,6 +3619,21 @@ license = lib.licenses.free; }; }) {}; + transient = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "transient"; + ename = "transient"; + version = "0.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/transient-0.3.0.tar"; + sha256 = "1a457apfl762nn5xf1h3hbvrgs9hybkxh0jwb2y713zkhhck66cp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/transient.html"; + license = lib.licenses.free; + }; + }) {}; trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: elpaBuild { pname = "trie"; @@ -4062,10 +4092,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.20"; + version = "1.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.20.tar"; - sha256 = "0i3vfsp110z60gabn9x9rv21fvm7nnr234mvmpp7gx4l4hpadvzy"; + url = "https://elpa.gnu.org/packages/xr-1.21.tar"; + sha256 = "0mc10d33lsqs0ihcja8w78jzh2pk0dfm9m86kap6r3hi6wkr1cmi"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f5adf6319138a..6a099639d5915 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -132,9 +132,24 @@ let flycheck-rtags = fix-rtags super.flycheck-rtags; pdf-tools = super.pdf-tools.overrideAttrs (old: { - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; - preBuild = "make server/epdfinfo"; + nativeBuildInputs = [ + pkgs.autoconf + pkgs.automake + pkgs.pkg-config + pkgs.removeReferencesTo + ]; + buildInputs = old.buildInputs ++ [ pkgs.libpng pkgs.zlib pkgs.poppler ]; + preBuild = '' + make server/epdfinfo + remove-references-to \ + -t ${pkgs.stdenv.cc.libc.dev} \ + -t ${pkgs.glib.dev} \ + -t ${pkgs.libpng.dev} \ + -t ${pkgs.poppler.dev} \ + -t ${pkgs.zlib.dev} \ + -t ${pkgs.cairo.dev} \ + server/epdfinfo + ''; recipe = pkgs.writeText "recipe" '' (pdf-tools :repo "politza/pdf-tools" :fetcher github @@ -299,6 +314,14 @@ let buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; nativeBuildInputs = [ pkgs.pkg-config ]; + patches = [ + (pkgs.fetchpatch { + name = "telega-server-bin-store-prefer.patch"; + url = "https://github.com/zevlg/telega.el/commit/72550f984ca869309d197203ef7de99182d71729.patch"; + sha256 = "18xvz53bygksak6h5f8cz79y83p2va15i8qz7n4s3g9gsklmkj2p"; + }) + ]; + postPatch = '' substituteInPlace telega-customize.el \ --replace 'defcustom telega-server-command "telega-server"' \ diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 9260900853cba..0308f8d976bf3 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210208"; + version = "20210301"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210208.tar"; - sha256 = "1awqk2dk3sgglq6fqgaz8y8rqw3p5rcnkp7i6m15n7wlq9nx7njp"; + url = "https://orgmode.org/elpa/org-20210301.tar"; + sha256 = "0930km35lvbw89ifrqmcv96fjmp4fi12yv3spn51q27sfsmzqsrj"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210208"; + version = "20210301"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210208.tar"; - sha256 = "13yrzx7sdndf38hamm1m82kfgnqgm8752mjxmmqw1iqr3r33ihi3"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210301.tar"; + sha256 = "11mwar5x848iwc1cdssr3vyx0amji840x6f0dmjpigngpcnj02m8"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 9d936e4b3dcc1..a5707370ce040 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -191,6 +191,29 @@ } }, { + "ename": "aas", + "commit": "30cedefefdab6d423bfc8851463a7892c266be70", + "sha256": "0nn740r5w62a783ky9nsm3bzagcvamj0psd120vkdx28ml3g9xyr", + "fetcher": "github", + "repo": "ymarco/auto-activating-snippets", + "unstable": { + "version": [ + 20210217, + 1642 + ], + "commit": "5064c60408c3ab45693c5f516003141d56a57629", + "sha256": "1m3rfagmwjc13fqcf0ysmzxy11j6b42h9bfc0yvnzchjdqgrm4db" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "ffafc54e02475b9e7f7bcbe1d8ed3f11bcb4b542", + "sha256": "054sfzvm1ihaxy4hnhl424y5py8k7wi73rb0lqvbi4v8iphihzhr" + } + }, + { "ename": "abc-mode", "commit": "aaee9dc5de06747374f311d86a550d3cc15beed1", "sha256": "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx", @@ -1006,8 +1029,8 @@ "auto-complete", "yasnippet" ], - "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", - "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" }, "stable": { "version": [ @@ -1032,8 +1055,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20210129, - 951 + 20210218, + 559 ], "deps": [ "dash", @@ -1043,8 +1066,8 @@ "s", "xcscope" ], - "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", - "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" }, "stable": { "version": [ @@ -1763,11 +1786,11 @@ "repo": "louabill/ado-mode", "unstable": { "version": [ - 20210202, - 2006 + 20210219, + 1548 ], - "commit": "c9af0cac90b912ce0dd02fbf470f513dea2d4f43", - "sha256": "0z4vi4q6awss52afp4nnxxdhmhdchp8qn6hqyhdikr8lgvja4pq6" + "commit": "438e2b9ca1ce9fd1043998359dfe5a32a0ddb6d0", + "sha256": "1fpk7lc5z9v8an9x8j1v3l2pkbg93368qv23jzsqs84r3ndw5b7k" }, "stable": { "version": [ @@ -1888,15 +1911,15 @@ "repo": "agda/agda", "unstable": { "version": [ - 20200922, - 1231 + 20210220, + 2039 ], "deps": [ "annotation", "eri" ], - "commit": "e6862ebe3e8f2f29325378d820f7fa94656be479", - "sha256": "1iwi8jm3mp77zmcvn813mcnih1sq56mpl66r2qlkl72paqli790i" + "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0", + "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8" }, "stable": { "version": [ @@ -2355,11 +2378,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210208, - 0 + 20210228, + 1440 ], - "commit": "2f5ea7259ed104a0ef8727f640ee2525108038d5", - "sha256": "1lvnzjarnzjkrkmhbwgny64ym7s6m4if6lc2fpapcx9hh6bq9h6c" + "commit": "e685f7bc0808e23717637536ccffd79a40f0512d", + "sha256": "1gbpl6yxb08jlawy4a98bl6ap888f5lx451fvd80z19gjabiad7f" }, "stable": { "version": [ @@ -2376,20 +2399,20 @@ }, { "ename": "all-the-icons-dired", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1qj639z24ln29hv6c51g1vsa2jsy4qrlhf8c7d5w9bxcrcn2fnr9", + "commit": "26f650e465b22a0afdb77318aebfcfbdb832c9ce", + "sha256": "0qa2x3c9j779yr1q0kfi4696zhbgc1drafskl7rymdpia3vqkwd0", "fetcher": "github", - "repo": "jtbm37/all-the-icons-dired", + "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20200403, - 1018 + 20210211, + 1226 ], "deps": [ "all-the-icons" ], - "commit": "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5", - "sha256": "0zhyhz4lhx0d8wwh1xxxf7ck4s621fk9757ql2ypxbr4iqh7sjlp" + "commit": "dd685166818b92470bcccb3e398f2d443f513e63", + "sha256": "0yqcmy61ncybfjmbgyzcak9zn017lx6sd1s792y7g7l0klj1l2va" } }, { @@ -2419,14 +2442,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20201218, - 356 + 20210218, + 1006 ], "deps": [ "all-the-icons" ], - "commit": "0260cd194d150126bcb81823742ab53036942c73", - "sha256": "1snxbi5wv5qa78vx487rdrarpydrabxz3s6a9ck54wkf91mkbcvv" + "commit": "d08e8d4043d8731b81f74421cf0455ba8845113a", + "sha256": "1sk83c9inm14s0v11ij43ldkskyhwf3lyfm5nq4pa0nbn1dpkvb0" }, "stable": { "version": [ @@ -2488,8 +2511,8 @@ "all-the-icons", "ivy-rich" ], - "commit": "3cfc62cea6f26279e062d6056fa0fec7b6f7ac1c", - "sha256": "03xpsrdh2z1d7sax83a5dv1alb5kmnbfvxwvqib3f7bllggw4wpg" + "commit": "f2b48400b2da0bbf64e9c749fa4a5d332ab7c91f", + "sha256": "1pdxz8arkhjc3sgg13s07fxlxxgq5y6amapg6daxafl1yvh99jrb" }, "stable": { "version": [ @@ -2803,15 +2826,11 @@ "repo": "didibus/anakondo", "unstable": { "version": [ - 20200503, - 123 - ], - "deps": [ - "clojure-mode", - "projectile" + 20210221, + 1727 ], - "commit": "ba6b56c18f2b0ae035b448813b27114d19fb821c", - "sha256": "0dbhkinfn6ahvi9pi7kghlc0fccil15lx0pd1rpgv4d7n3bnsdna" + "commit": "c48518560815c49d8d78fb9069906d17e883385e", + "sha256": "1fzsqd150gpmrj8kz3zy9cd78x9vank7ra720mljhyf04z0h1mj6" }, "stable": { "version": [ @@ -3127,8 +3146,8 @@ 20200914, 644 ], - "commit": "e6862ebe3e8f2f29325378d820f7fa94656be479", - "sha256": "1iwi8jm3mp77zmcvn813mcnih1sq56mpl66r2qlkl72paqli790i" + "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0", + "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8" }, "stable": { "version": [ @@ -3579,11 +3598,19 @@ "repo": "emacsorphanage/applescript-mode", "unstable": { "version": [ - 20090321, - 632 + 20210223, + 1539 ], - "commit": "8f888cd80af1e0902b5609143facd3051bc94892", - "sha256": "0d3bqx6346vmniv001jgd6wggp80kv1kqc38sdgd88862gkqnqyg" + "commit": "a45c426b7e4a450faea004ef5b842fd37e17a7c6", + "sha256": "1f7bvcv4qqqa5bsfrcs69yc1phgnyrh5mbnb2hhgq72z8ymmrn7q" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "42b3db3838821f240e05752de4337359d25d8c04", + "sha256": "1z0z0pxy5f5lsw4pskk77dfql5s89iqb6zzkm4pr5r5pcqbhla1s" } }, { @@ -3763,14 +3790,14 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20201231, - 214 + 20210216, + 926 ], "deps": [ "spinner" ], - "commit": "10af99792c8e4b97ea542c55bfed246781fdd1ba", - "sha256": "1gz4hmmijlilqqh7scyidh5kbbmyvq12dhnjgnn9h6y9q5qabibq" + "commit": "969b49ef6c954a067b3cbca43a4cdc1c04b1a62a", + "sha256": "0cjygkddlla2ygiyn506mwqjfn52lqpwfbv1fbwcqljvfspc65am" } }, { @@ -4178,15 +4205,15 @@ "repo": "alpha22jp/atomic-chrome", "unstable": { "version": [ - 20210117, - 408 + 20210221, + 59 ], "deps": [ "let-alist", "websocket" ], - "commit": "ae2a6158a6a216dddbe281d0b0b00af7a2fdd558", - "sha256": "1wb770157p85nmsmqb2pspkw0jfrrlp43bp7cmdjv561gh0mbrak" + "commit": "d0414210c8eea8b80d293e79f2c8991948ab38cb", + "sha256": "1h4zf81gizi5qf86zxdsm9v0l2rvbsmw6fbr92ggw2r55cnqqrib" }, "stable": { "version": [ @@ -4210,8 +4237,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20210205, - 1027 + 20210219, + 1001 ], "deps": [ "dash", @@ -4219,8 +4246,8 @@ "flycheck", "s" ], - "commit": "c84d68846995dbfe15f1237bf4ce0bc83c37bc52", - "sha256": "14446mn96kmmn1l915jf54x3cvrmkjnzrgsp8091xicxfvmhmpyq" + "commit": "778382eba8e1a449862b1573e90c1e79cf5caeb1", + "sha256": "0a2n1p2nasd2ikv86p3sm5sn4qb3avj2sni9gja3yn6kdqn8s8jp" }, "stable": { "version": [ @@ -4245,26 +4272,26 @@ "repo": "tsuu32/auctex-cluttex", "unstable": { "version": [ - 20201029, - 1241 + 20210226, + 302 ], "deps": [ "auctex" ], - "commit": "e01f42ef4db28d284db010dbb590b197520f73d4", - "sha256": "0iq14adyry26n5c6i67fd6aiwlcw4a9shndljlvvzc7g82kdw7vl" + "commit": "4e05ad8976f352e67d56d9a479a4a570dfe7ba73", + "sha256": "0zgd7yascqn2dwjd20f1v962q7b24wibla5fwnbl9df1x36asqhs" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "auctex" ], - "commit": "e358f7148092d8ed64703641b5621e130cce458d", - "sha256": "1whzcp9wvpwn1c33n7mqxx8v6g4apg3cq5h2ffl74423ysymry71" + "commit": "4e05ad8976f352e67d56d9a479a4a570dfe7ba73", + "sha256": "0zgd7yascqn2dwjd20f1v962q7b24wibla5fwnbl9df1x36asqhs" } }, { @@ -5283,8 +5310,8 @@ 20190331, 2230 ], - "commit": "19e2f1766b4a845ce5a4ccc87de62608f385bd11", - "sha256": "1gpzi092732chg0mvrwmr01c2njip1d2m15lj9fa1ii6sddfpand" + "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c", + "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3" } }, { @@ -5427,8 +5454,8 @@ "avy", "embark" ], - "commit": "3a9c581cb7518f738dce8d6a0f1d1eb6c78b6622", - "sha256": "1aik11mq5yqk9zwqqfizh9vsb8gglisrf02hlx28s32h2hybsd3n" + "commit": "0c7323953e628c8797270a37c0f639fe23092175", + "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l" }, "stable": { "version": [ @@ -5641,8 +5668,8 @@ 20210131, 2053 ], - "commit": "d9c1c85ea731a18f271bd003a5b1736e26fa172a", - "sha256": "1clcbgs5dk3jas6sclsfj6ibrb0n2508xapyp85lb0nm01i07jb9" + "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f", + "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218" } }, { @@ -6165,21 +6192,20 @@ "repo": "AlonTzarafi/battle-haxe", "unstable": { "version": [ - 20200222, - 56 + 20210219, + 354 ], "deps": [ "async", "cl-lib", "company", "dash", - "dash-functional", "f", "helm", "s" ], - "commit": "64d20c9ea3fd503fdefafda122e7095c192e72a3", - "sha256": "15ykwqg100vjl014awwwzmch84vwqyrlm46c22w9x3dgqk8yxyi2" + "commit": "2f32c81dcecfc68fd410cb9d2aca303d6e3028c7", + "sha256": "0br1iy9zcjqaxmm691axrcbfxmid76rsbkcp1vrpzrdqvrkskpww" } }, { @@ -6193,8 +6219,8 @@ 20200627, 1625 ], - "commit": "689f5df2c728129f288ed6eed82cde5df8c2ad1f", - "sha256": "09mj52wqdlysdqrs8mabm6373pqrab7zjbc4y5ll54a5iz7fv7yb" + "commit": "43026c5e09dfca86fb84b9a857708ad419f2215f", + "sha256": "0bwabpx56ybk114456x0p4k8xqh0s060ig40jdsqibq89h6m1nab" }, "stable": { "version": [ @@ -6639,11 +6665,11 @@ "url": "https://git.sr.ht/~technomancy/better-defaults", "unstable": { "version": [ - 20200717, - 2012 + 20210222, + 1928 ], - "commit": "fd4346735d61be88e6eafabf1f62c4c16548f1b3", - "sha256": "1cnqwrkiml8jz4hbdv16pb97v6g528mvpqx1lg01v45h4mky82bn" + "commit": "4c5409406ee35c5ba46880c6cfe98df4b14dc631", + "sha256": "0agj1zyspm3bqj7apfjwhllnmydyj00x2iv7nvy03szpnwvm11fq" }, "stable": { "version": [ @@ -6741,14 +6767,14 @@ "repo": "zk-phi/bfbuilder", "unstable": { "version": [ - 20200816, - 519 + 20210228, + 1740 ], "deps": [ "cl-lib" ], - "commit": "00cbf1010dc3fee5a0b8e7c0e0b6041bb6251bdf", - "sha256": "1n1aq3kwsjc3hlgas73bs22pvrn69hfba1wcbqs2j28j2j9j00b2" + "commit": "689f320a9a1326cdeff43b8538e0d739f8519c4b", + "sha256": "0wrzyv38dmsdfjwsbf89pa5l2gzbbx86jmy8nflfs86im0g9qcp1" } }, { @@ -6925,8 +6951,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20210108, - 1155 + 20210223, + 840 ], "deps": [ "biblio", @@ -6936,8 +6962,8 @@ "parsebib", "s" ], - "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", - "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" + "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6", + "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2" }, "stable": { "version": [ @@ -7519,6 +7545,30 @@ } }, { + "ename": "blox", + "commit": "cacd156d195ffddeba880a8ebb4f38a07db0b15f", + "sha256": "0w0j9xskvyb91i473wr1rj4q61i151ckslm87hszh9sqc9wv38p3", + "fetcher": "github", + "repo": "kennethloeffler/blox", + "unstable": { + "version": [ + 20210225, + 1900 + ], + "commit": "2bf0e618451fb1da11263d8a35ffcd9210590c0a", + "sha256": "0lkhdm9jhy8wlmrmd9nqrbrczh5k75q38n6bq3gfhppycmysh9d5" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "commit": "f27e79d6da65d8877ebb4e84a40350b61c3f0362", + "sha256": "1id5jgaa4yjkgzn00s54lcbdwll85nw0dfsa228mvkvigdn5rya6" + } + }, + { "ename": "bm", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g", @@ -7757,16 +7807,17 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20210212, - 2136 + 20210228, + 1839 ], "deps": [ "dash", "expand-region", - "multiple-cursors" + "multiple-cursors", + "pcre2el" ], - "commit": "d34d5cfc902702537e82df11d743fd0ac8ffe1d2", - "sha256": "0545alciqa51gi6rnw8mhb0xjab8f22dnb2vh238in3bxf2i349h" + "commit": "58107055dadb735941537c90457753dbc1ea7005", + "sha256": "15x29jpfkfizkl3b9ghmd1wclvigcm05y6l7i9c6clclwqzzm5zw" }, "stable": { "version": [ @@ -8140,11 +8191,11 @@ "repo": "topikettunen/brutal-emacs", "unstable": { "version": [ - 20210206, - 1 + 20210226, + 1538 ], - "commit": "3959cf1737691d8eb41ec9c652d959f24c7de150", - "sha256": "1pq4iyl0z8wwzahjcdncmvwc4nz4zh9nmb54zjx7mrdcqvzh2x7v" + "commit": "8173b7d041cccfa3e5bb3f3f85ec8c6109fd264b", + "sha256": "1y6b9q3byvwsi6d5sjc642189c5cjbinylqis3d248qws2dp6kvq" } }, { @@ -8997,20 +9048,20 @@ "repo": "wendelscardua/ca65-mode", "unstable": { "version": [ - 20210202, - 39 + 20210218, + 106 ], - "commit": "100e0f1ff7678733404a03b5a5eefb5daf2081c2", - "sha256": "0r66sw7scw0y1vfby7mcrf8kxhyvsaqhn9v2n098ih1x06ah0640" + "commit": "590d90cc0e1c1864dd7ce03df99b741ba866d52a", + "sha256": "0snmxnhi7g5qx7p1z9zzlpc2zd20iq94hfvf2vavjpxw1fz4sk46" }, "stable": { "version": [ 0, 3, - 1 + 3 ], - "commit": "431e61b886611d1c5f08266b482c18fd03a61130", - "sha256": "0043v8a861714xalk3hf0gbpmx223432qbsgimizar59ysczagma" + "commit": "590d90cc0e1c1864dd7ce03df99b741ba866d52a", + "sha256": "0snmxnhi7g5qx7p1z9zzlpc2zd20iq94hfvf2vavjpxw1fz4sk46" } }, { @@ -9173,15 +9224,14 @@ "repo": "walseb/calc-at-point", "unstable": { "version": [ - 20200406, - 1618 + 20210219, + 1252 ], "deps": [ - "dash", - "dash-functional" + "dash" ], - "commit": "11e40c8db9493ada71964b73069c6db529016492", - "sha256": "06dmm6b2xflkwgk5mysi3ycbi6yz5n0sci191a15nnzxg7vh1fbf" + "commit": "0c1a9e94b519b0edb0abcbacdf6101eea2f2a524", + "sha256": "04yg0rf6i95s913hs6zn01rajpbc1gk2hcpzkxyjy3mj1lqhh45s" } }, { @@ -9551,15 +9601,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20210124, - 1516 + 20210217, + 904 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "e66beb9b2f1f8dce48aa31f42cb5c384328554c6", - "sha256": "0hf7ij307nndxs96a3xqzcgpn8fblpx4px817ib08kfqzi6ph99j" + "commit": "9442af81d64f73935d3590948c97594f0bc79d4a", + "sha256": "1xci8kx10vxaniyzxgzzs0zd7m7s0grd0bbrxaxhyjjdvic77mq1" }, "stable": { "version": [ @@ -9590,6 +9640,21 @@ } }, { + "ename": "cascading-dir-locals", + "commit": "4140f4b373119deba3142cbc6037e6634d74a4de", + "sha256": "1g5disv23wn70h7sr0z9pbh9ws66rbzw7s8q07xzvhk1yfggr0ls", + "fetcher": "github", + "repo": "fritzgrabo/cascading-dir-locals", + "unstable": { + "version": [ + 20210221, + 1516 + ], + "commit": "efdf5e6d62b955ee0ca3c170eae1d388799f9fa0", + "sha256": "1jwd99kk5l588n7wwi1x3b4bgimm66x1icna3n20pwaj49kf0zy8" + } + }, + { "ename": "caseformat", "commit": "ba158fbeebcda6b6122b18c97ab8042b1c0a0bc0", "sha256": "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk", @@ -9631,8 +9696,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210211, - 727 + 20210214, + 1455 ], "deps": [ "ansi", @@ -9644,8 +9709,8 @@ "s", "shut-up" ], - "commit": "5ac82efeea812a83c636d5273ddf5b99bb72f8a2", - "sha256": "19dg2z9mmqzpvjs5xnyj0yh2j212cakvkaf660ha6j03c203nbw4" + "commit": "b81a3caa3fa3696fd385aa7072f8dc3a57408c4a", + "sha256": "18w7kdr140s2km0mphznrlvx5w06q93q6z370wf4spkaflks6cjy" }, "stable": { "version": [ @@ -10027,15 +10092,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20210114, - 2059 + 20210226, + 2246 ], "deps": [ "cl-lib", "powerline" ], - "commit": "50fd573ce9ed9f914940c79c82e411511ca5c8a8", - "sha256": "0dxis8w931chcbfwggc0jdirsxys42n2g21wqnqy892k70p7by1j" + "commit": "5bbcc80778f6fd618f9f9c13dbc2c4f4ae1eef90", + "sha256": "0clz8d6w9j1pbqd6vk4pkan5mhidxpr802wfkh3sfq77r44hhl8x" }, "stable": { "version": [ @@ -10162,8 +10227,8 @@ 20171115, 2108 ], - "commit": "711f389a527d65b39c91f5c10fc24cededb62ccf", - "sha256": "1q134lk70qkm3cw0m2cn024bvahfwlyvpap50f150rfpkz1v4v5v" + "commit": "79e9fb4d4b2b630f11d09c25fa560a0aacd68e53", + "sha256": "05ysyvb318ilwamx9v82rv6wrh1xnv74i4flpm4x6db7apkh4kma" }, "stable": { "version": [ @@ -10247,30 +10312,30 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20210121, - 2007 + 20210217, + 1848 ], "deps": [ "dash", "posframe", "s" ], - "commit": "fdcb5031ca364770475fc432b36599b7d34be502", - "sha256": "1ffdxyw3f791s11hw0qlybxqhg9q0994hc8w21n9vg856by9h7yq" + "commit": "7c42f2c82c7ae689f3ef291b066688c58ab96298", + "sha256": "1x8y4cc1cgln4qv6yzhsiqgnziilg5fh07bvg9ygcjmdhvnhsvcm" }, "stable": { "version": [ 1, 5, - 1 + 4 ], "deps": [ "dash", "posframe", "s" ], - "commit": "f47e9b7b96172023cbc0e3aaeb62462829d3134d", - "sha256": "1sia4dnp2jfjx2npklgg9yhdgs5vzjxvyk6nj0z1fvpqxfdkg60m" + "commit": "7c42f2c82c7ae689f3ef291b066688c58ab96298", + "sha256": "1x8y4cc1cgln4qv6yzhsiqgnziilg5fh07bvg9ygcjmdhvnhsvcm" } }, { @@ -10863,8 +10928,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210209, - 632 + 20210227, + 546 ], "deps": [ "clojure-mode", @@ -10875,8 +10940,8 @@ "sesman", "spinner" ], - "commit": "6b397733f7ebe5dbd4d9c717c0acb13a69f88d7d", - "sha256": "1mqws9386fph96ypr516i9dlm15nxyiwfsvqpgnzi366sdpx9bid" + "commit": "ae03e85a0adcd301d220e7a500aec4d5a26fbfc7", + "sha256": "0lv422m1ym6m894mbwcbv1145dnh6xk1fa242cngvlkg7j5xksh6" }, "stable": { "version": [ @@ -11127,14 +11192,14 @@ "repo": "sulami/circleci-api.el", "unstable": { "version": [ - 20201221, - 1036 + 20210227, + 1607 ], "deps": [ "request" ], - "commit": "870d6b550210cb1fd97a8dabad2c284e54416b4b", - "sha256": "0ph12r4lfy653qbp00hbry06n0gddfm3c7kmqp2v3c03bdsn5l9c" + "commit": "2e39c5896819bb2063f9d7795c4299f419cf5542", + "sha256": "0j184sgqxh3f34ni6bfb69mfir94glcyl0wpqmpsn9siq54s82ag" } }, { @@ -11574,8 +11639,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20210101, - 1036 + 20210216, + 928 ], "deps": [ "cider", @@ -11588,14 +11653,14 @@ "seq", "yasnippet" ], - "commit": "9dcc50da7ce6f3c10276c87f09022e80c03e8bef", - "sha256": "10b83yyhkppgzjxaqk8l1c2476x8cvnpn6vf1gj2v5y23c7s2mbs" + "commit": "b24ce76acefe792975f00147c94b4dd784e65b80", + "sha256": "1pyskl9xcqrk6r2zbp5i9402inngqps7wwb4nbdbrgi4di9b8in7" }, "stable": { "version": [ 2, 5, - 0 + 1 ], "deps": [ "cider", @@ -11608,8 +11673,8 @@ "seq", "yasnippet" ], - "commit": "92d372393a031e5fa73ef926447afe72b574cb45", - "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4" + "commit": "b24ce76acefe792975f00147c94b4dd784e65b80", + "sha256": "1pyskl9xcqrk6r2zbp5i9402inngqps7wwb4nbdbrgi4di9b8in7" } }, { @@ -11836,11 +11901,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20201126, - 1558 + 20210226, + 1336 ], - "commit": "53ef8ac076ae7811627fbdd408e519ab7fca9a0b", - "sha256": "0rhvrfmg6rgpas8v1hf5gmm9bqyk16nfjgcwl13fxzxsdyh0va7m" + "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63", + "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by" }, "stable": { "version": [ @@ -11866,8 +11931,8 @@ "deps": [ "clojure-mode" ], - "commit": "53ef8ac076ae7811627fbdd408e519ab7fca9a0b", - "sha256": "0rhvrfmg6rgpas8v1hf5gmm9bqyk16nfjgcwl13fxzxsdyh0va7m" + "commit": "cccddea53b816c5d06c3f4fe0ba798b9f7047a63", + "sha256": "1yah2csfd932r0r7lb9pmc26y3f024vgdw477hfl83gfalc9n9by" }, "stable": { "version": [ @@ -12169,17 +12234,19 @@ 20210104, 1831 ], - "commit": "99e9167caa8fa65e72553fa38adb24071b51fd71", - "sha256": "0c0cxskd7nrswv3ihmkm9hgldfhw4grrsl2ihkw1idz5hj05y3rg" + "commit": "569547f0c4931c1ce163146d95375ead258c09d9", + "sha256": "02iwd0yrz9b9aw2v5vvqf43cscch85wgia386bkp4xaq2dd9h31s" }, "stable": { "version": [ 3, - 19, - 4 + 20, + 0, + -1, + 2 ], - "commit": "0c86d15459eeef2ddd15644b7bb3d7854f226334", - "sha256": "1m56r4glwzvy92hafb8kh16x4qa0dhp0v464p7n1hb18bb53xl8h" + "commit": "498b7da2e471fd8ef5a41433505358df4f117044", + "sha256": "1j7sray4d5zpfy6mkmhxg83scwjvkvr5q98nlaxsi01nir1ywxla" } }, { @@ -13138,11 +13205,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210122, - 2314 + 20210224, + 2244 ], - "commit": "5c25e114c3ac1bee3671abd47f46592a3151d549", - "sha256": "0y6gqc9w4zw1048hlyx0l46gcngbyrmdvzk30flwfphg1ancmcrj" + "commit": "88001d794d963049339883216b6606de0a1209ea", + "sha256": "097s1zan4xg7vrkcapylcbs0a9ky1wbglxf9sz44aslwzrsgvy1p" }, "stable": { "version": [ @@ -13280,8 +13347,8 @@ "axiom-environment", "company" ], - "commit": "d9c1c85ea731a18f271bd003a5b1736e26fa172a", - "sha256": "1clcbgs5dk3jas6sclsfj6ibrb0n2508xapyp85lb0nm01i07jb9" + "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f", + "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218" } }, { @@ -13772,6 +13839,24 @@ } }, { + "ename": "company-ipa", + "commit": "4ba3b53bd37c252eed24a5e8c61b7d9c91f9e2ee", + "sha256": "0xxx0kzspcxk9lblhcw19bjzsv64jwdda8jvv6hf9liql3c3npp9", + "fetcher": "gitlab", + "repo": "mguzmann89/company-ipa", + "unstable": { + "version": [ + 20210222, + 30 + ], + "deps": [ + "company" + ], + "commit": "e9d919e0d15d3f986471d9d6cb46b67519f5088f", + "sha256": "1bg8y35rfyqdbn9y85iriq10iskc3dq0jgv3zqqykp5mriy5y8gd" + } + }, + { "ename": "company-irony", "commit": "d2b6a8d57b192325dcd30fddc9ff8dd1516ad680", "sha256": "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km", @@ -14207,8 +14292,8 @@ "cl-lib", "company" ], - "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", - "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" }, "stable": { "version": [ @@ -14373,27 +14458,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200716, - 1414 + 20210227, + 600 ], "deps": [ "company", "prescient" ], - "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", - "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" + "commit": "b6da466e552a710a9362c73a3c1c265984de9790", + "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall" }, "stable": { "version": [ 5, - 0 + 1 ], "deps": [ "company", "prescient" ], - "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", - "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" + "commit": "2c0e9fc061ab723ec532428f312974ca7d8def12", + "sha256": "0d6kbczkamhhcmc8bf01q6k1x0g7dwjihwllzsldgga3dclyh4ks" } }, { @@ -14777,8 +14862,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20210208, - 1808 + 20210228, + 435 ], "deps": [ "cl-lib", @@ -14787,8 +14872,8 @@ "s", "unicode-escape" ], - "commit": "235c99dc9fe629a42e6432d54d46310e2b5b426d", - "sha256": "1w8y9sv0k6r9q2d7a06bh6ackxckijyb9qd4w9s3lnbryrx1n6rk" + "commit": "9226f887e6b5e86599283a3b0f0b1774eb34fd7e", + "sha256": "0ljswlm745459grkp9dvdb49z5j53ki8xp2nxz7szcqa7xgpfs64" } }, { @@ -15353,11 +15438,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210212, - 2204 + 20210228, + 133 ], - "commit": "3bb31bd5f23a2c5fbc3b9d314e60f85b6f9e11c2", - "sha256": "1g6zgnbff6yqzz5wh4nqkbwzkrm96dmynfg0ak50lsy7brfyi1yh" + "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b", + "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9" }, "stable": { "version": [ @@ -15376,15 +15461,15 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210210, - 1821 + 20210226, + 1214 ], "deps": [ "consult", "flycheck" ], - "commit": "3bb31bd5f23a2c5fbc3b9d314e60f85b6f9e11c2", - "sha256": "1g6zgnbff6yqzz5wh4nqkbwzkrm96dmynfg0ak50lsy7brfyi1yh" + "commit": "c5d74b191fb4ee70509e2592fa16a9398f96977b", + "sha256": "0dl9q9hg9yn7fargckkyjgiibxiy72y5vc909dg03q6v4azsg1r9" }, "stable": { "version": [ @@ -15400,6 +15485,57 @@ } }, { + "ename": "consult-notmuch", + "commit": "e61a3f8cba4e5e303379f80c9fdd773fdde66406", + "sha256": "09kslrizpk5jh9czjn4xrcs1k9661dgly9z08dwsvb76pnjzd7wg", + "fetcher": "git", + "url": "https://codeberg.org/jao/consult-notmuch.git", + "unstable": { + "version": [ + 20210220, + 411 + ], + "deps": [ + "consult", + "notmuch" + ], + "commit": "823c1fefc4a393039bced29d6b4c9a9d2aa720fe", + "sha256": "0rhn1ha65xnrv03sn94ii5hl7ycpiz97xz13sxzchla64bwjqy75" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "consult", + "notmuch" + ], + "commit": "0bcdad24c8cc4ac530fcafd90ab728ed5dfbf0ed", + "sha256": "1s9glbwdwk29pp5nj4ab6giakhjqx4rcy4zbf7ml7h83qi59sd68" + } + }, + { + "ename": "consult-spotify", + "commit": "fb515b013942cf5ef4590e7cbc17f11f10c7692f", + "sha256": "0y393qwvjv7blc8d4qih9ksm2521az28v29hgczjlady0fjp9bn9", + "fetcher": "git", + "url": "https://codeberg.org/jao/espotify", + "unstable": { + "version": [ + 20210220, + 2229 + ], + "deps": [ + "consult", + "espotify", + "marginalia" + ], + "commit": "e714905b71993b6234a4aee6138d5b659605fe57", + "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw" + } + }, + { "ename": "contextual", "commit": "de20db067590624bbd2ca5a7a537b7f11ada84f2", "sha256": "1xwjjchmn3xqxbgvqishh8i75scc4kjgdzlp5j64d443pfgyr56a", @@ -15712,26 +15848,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210129, - 1143 + 20210226, + 1256 ], "deps": [ + "ivy", "swiper" ], - "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49", - "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" }, "stable": { "version": [ 0, 13, - 0 + 2 ], "deps": [ + "ivy", "swiper" ], - "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb", - "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -15912,14 +16050,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210131, - 824 + 20210226, + 1218 ], "deps": [ "counsel" ], - "commit": "305eaa4a1ad6487e22eaa7ad36c33fa0d4a9456d", - "sha256": "1649yhmiimi2fm8av22b7h1nlb7lm1j1g9wgbsb6fk9wpvndazfx" + "commit": "e41a39cd07c594b5fa1c6757e9464be56a3dadea", + "sha256": "1dcph2ak1r5yrw0hfygrb6d80y3jkx1fsj1rrp7sg3p37rnfhq94" }, "stable": { "version": [ @@ -15979,15 +16117,15 @@ "repo": "FelipeLema/emacs-counsel-gtags", "unstable": { "version": [ - 20201211, - 1755 + 20210222, + 1803 ], "deps": [ "counsel", "seq" ], - "commit": "e4a662c38cd217bae9c0bd80f2c9b53cc2cffcb7", - "sha256": "0gb8gbphckyk834mxl704fawvykigmk0cl8klmyfap0nb55h846b" + "commit": "1d52eaeffeb60266434d4f7416a108ca058fde91", + "sha256": "13jx6hscdcfqwzk1pcmzrv7frglcnd1ywl22ddxzzymi339r4lyj" }, "stable": { "version": [ @@ -16693,11 +16831,19 @@ "repo": "Boruch-Baum/emacs-crossword", "unstable": { "version": [ - 20210212, - 1602 + 20210216, + 1703 ], - "commit": "8da505a40d077f06afefb8c6de507a62f5b3ad9a", - "sha256": "0j7qzdxssp35n642caa5vdy4bs9p1sbhara21ncbsln09aisg78d" + "commit": "fa80bfef81168509ddbd840d95c6671efe91c253", + "sha256": "12kgzzsnh9bh6aiip53ib28yapajg326xd7g45apjkl8irazr4db" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "fa80bfef81168509ddbd840d95c6671efe91c253", + "sha256": "12kgzzsnh9bh6aiip53ib28yapajg326xd7g45apjkl8irazr4db" } }, { @@ -16708,14 +16854,14 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20201129, - 1921 + 20210224, + 910 ], "deps": [ "seq" ], - "commit": "ba4a1f38eee0ae7597f67a1424bbf5c0c09473bf", - "sha256": "0swykynbxsvxwxqjf41aqydkfrwy6f5ngl4pp8py5r5vh78a91ih" + "commit": "a471cbed343dc5ff3a7150214726fe4ea0d3cf9e", + "sha256": "152c7x1zj4rwq9bj9d8xw4znspfik2g7aigazq9smv12fkmzvzrr" }, "stable": { "version": [ @@ -16981,16 +17127,15 @@ "repo": "neeasade/ct.el", "unstable": { "version": [ - 20210205, - 1249 + 20210219, + 1344 ], "deps": [ "dash", - "dash-functional", "hsluv" ], - "commit": "356f6c765773b90e538f7801cb7281345cdbe4aa", - "sha256": "1m0mifqjsfr3487n1hypcxb5f0895y4xwkri7djwi3brv3nx52rv" + "commit": "c302ee94feee0c5efc511e8f9fd8cb2f6dfe3490", + "sha256": "0230h5qvg5jbpyry4xxmh41c0wpinmm04k5hc1qsc2mvqhv3n9n5" } }, { @@ -17066,19 +17211,19 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20210118, - 132 + 20210227, + 552 ], - "commit": "928f98da5fdb8ca50c0957015f964dea8cde8b5f", - "sha256": "0sp09rk63dfvc1h40rmzwhac0dzp19w6zqzqigdsn6zrpk8g9vjg" + "commit": "4fd7d9dffbbf91dfcaccccb54c571f53c279e94f", + "sha256": "076xjd8aia8q96hakcw861a4hmkfdx0aafhnkwww4fk7vv50b7qx" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "d398a9bfbd959489fd6515b62dbf818a61d0e4d6", - "sha256": "1f0k3432brc96am6az6xr1nks1vacqzixhdgwfn2xklb8if9a5xi" + "commit": "d7fad32584c3e569046691bf7f27b21e294c0a2a", + "sha256": "06wq6scqy2ax0h6aahy2r7hn3bbmkzl4w99bkrc3cqd4ij78sc8g" } }, { @@ -17459,17 +17604,17 @@ 20190111, 2150 ], - "commit": "c2fea5bf4a6e011a039f8764862bb6338a2ae546", - "sha256": "114c7ilcim908664wp8llnnnf496l39bm7y0fprydh2zwn7cqdng" + "commit": "9a761a637fce6a7b70735ae2248963d63e569e14", + "sha256": "1f7zk28ywx47ig5fa6plq4415lbvd4972j4jjgb05qrg853zpca5" }, "stable": { "version": [ 0, 29, - 21 + 22 ], - "commit": "976f5483c6df8570f34076ef25af7e7512dd9347", - "sha256": "1951kwfnngy2k7m3adqi17rb7f17yrr5n9zpvvmw7vxpfmca66ka" + "commit": "3e470fcc3a4e9a33b66d5db6ab761c773888a1ea", + "sha256": "1fbi0ladg9c37hw3js72i72nza8hfjzm5c8w95c6bmzsl22lszwi" } }, { @@ -17626,8 +17771,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20210101, - 907 + 20210221, + 1947 ], "deps": [ "company", @@ -17638,8 +17783,8 @@ "lcr", "s" ], - "commit": "7b32bf21d5b9f7232c4b5c3760abf306e9ed9a0c", - "sha256": "1if4p6ikj7dry2c0xyli4m02f6xabriddm25xp4nksm8mj9cjgby" + "commit": "7b1ab644214e03b86dcf7436fd22a65cce2fa858", + "sha256": "177d9gk2fayx1nmd1gs6cf3mi35jakxn2di785qlhk7h5alai9hc" }, "stable": { "version": [ @@ -17667,21 +17812,21 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210207, - 1923 + 20210222, + 419 ], "deps": [ "bui", "dash", - "dash-functional", "f", + "ht", "lsp-mode", "lsp-treemacs", "posframe", "s" ], - "commit": "5450af5c1cc7c46b1ecd47e9ba1ec2de9f62f9d9", - "sha256": "1mk5prfx0nsi1528ar3yw0sgkgyk60697w9i14ljq6lhbnz6cx8n" + "commit": "aa15b9c49b7e09bb23f9a4ff7855122f0eb19976", + "sha256": "02gws113c95567qp2zvxzqdhzapkcx9qnf00k2l0j52f7i0kz49b" }, "stable": { "version": [ @@ -17934,20 +18079,20 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210210, - 1427 + 20210228, + 2221 ], - "commit": "be4e939b8982fa9a6ac5286027ea8ae1ff9b9b19", - "sha256": "1b0wpvwivzsym6hiaxybhfy8mvq8cbxi97dcm1ci2sc33fv6vq74" + "commit": "6a086fccc95e96db2a819346d1eaf504654d9713", + "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p" }, "stable": { "version": [ 2, - 17, - 0 + 18, + 1 ], - "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", - "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" + "commit": "1a53e13d7964c84cf756ead353eb6dc094b65fd5", + "sha256": "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva" } }, { @@ -18007,26 +18152,26 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210206, - 1519 + 20210210, + 1449 ], "deps": [ "dash" ], - "commit": "be4e939b8982fa9a6ac5286027ea8ae1ff9b9b19", - "sha256": "1b0wpvwivzsym6hiaxybhfy8mvq8cbxi97dcm1ci2sc33fv6vq74" + "commit": "6a086fccc95e96db2a819346d1eaf504654d9713", + "sha256": "12b13p74p8iw8lxm2lh5lar15fs7j2mcyx837ddmag11qspdyy4p" }, "stable": { "version": [ 2, - 17, - 0 + 18, + 1 ], "deps": [ "dash" ], - "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", - "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" + "commit": "1a53e13d7964c84cf756ead353eb6dc094b65fd5", + "sha256": "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva" } }, { @@ -18037,14 +18182,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210125, - 909 + 20210218, + 1550 ], "deps": [ "page-break-lines" ], - "commit": "18b38b49b60c005909f91f047c0507f47cc75fd3", - "sha256": "0ajw2wr02j0avjr5zdjllqhm7f1y27p6xjc6grgv90mmka926486" + "commit": "411ff9ff9368f03d09097ad1d395d632fd4d9f40", + "sha256": "0db8h1004ndn1b9cvh27fj5w5r6p83nmskcy983cw5qris02vrkx" }, "stable": { "version": [ @@ -18427,16 +18572,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20210113, - 829 + 20210219, + 748 ], "deps": [ "dash", "s", "spinner" ], - "commit": "3ea915f0c4f3b37a482cbf6faa070845d7ab1876", - "sha256": "1w922p46i3bf7mq5jj0i27b3ndiip2x46b1qy924y9874sc5ifxk" + "commit": "ca16c37ffa5caa5f698bc049012489a2e3071bcc", + "sha256": "055yxchqbqp4pbw9w9phibnp0a2qw1jsb1a5xbfc558phi2vbxdd" }, "stable": { "version": [ @@ -18612,8 +18757,8 @@ 20201227, 2319 ], - "commit": "dd143e7e6cf5384d203a76e50fe677a77f1cd615", - "sha256": "1zpf35x1w4ldijqx3a2qlykhy9xgw3mqzxhfv0r3qn37k7lg0m58" + "commit": "e5aad0510139cca42b37614d3599951ac0a28ccc", + "sha256": "0kp3ngmdwip7c4c9mvw1l04p13gjjfaigwdiaycbzd5jzlgdh6rq" } }, { @@ -18976,6 +19121,21 @@ } }, { + "ename": "desktop-mail-user-agent", + "commit": "d0ac6ab8716a772a38e368bfe91229aa9bcbee29", + "sha256": "1w8yr1viwkcp3g499zgk20j0q38891s9smgwvn8bly25bas9z1x7", + "fetcher": "github", + "repo": "lassik/emacs-desktop-mail-user-agent", + "unstable": { + "version": [ + 20210228, + 1335 + ], + "commit": "cf45bbbdd77b105df8d2a51e27b46d480ef992c8", + "sha256": "0a18sfy9diwcrzhcykd7pnw990kmlfb60zdxbi0nmkyqzx5gj1hi" + } + }, + { "ename": "desktop-registry", "commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f", "sha256": "1sfj0w6hlrx37js63fn1v5xc9ngmahv07g42z68717md6w3c8g0v", @@ -19094,11 +19254,11 @@ "repo": "raxod502/diary-manager", "unstable": { "version": [ - 20200404, - 1549 + 20210226, + 416 ], - "commit": "4f9d3104f0d89fe3e39c878d2035e6b6d9510659", - "sha256": "094x2n9nlqwxdppkw7wsyxwp34gf0b1dfyxp97nn712mfy98g1fc" + "commit": "12f194bd411e52b72bdf555e48e9a831e5ff8357", + "sha256": "0mn90abd2ak5f9b1s3q5h3l2lfhi91mwx4j50hs8q91s0r43hixz" }, "stable": { "version": [ @@ -19227,8 +19387,8 @@ 20201006, 1436 ], - "commit": "940f967bca64a8012892040c2e2f262d8709c41a", - "sha256": "1pm4a3jx2aq1cz9s9nfs1zm0s4crqarai3hr6dyihjqyf0szwrvq" + "commit": "3fcf861f1f8b91d97000bda32345bc92df8e2d37", + "sha256": "0x0awnasdjkmmrm11dqs4spkx2j3prkiqrmf5w3lxp2v28i4m2qk" } }, { @@ -19239,14 +19399,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210213, - 41 + 20210223, + 2303 ], "deps": [ "cl-lib" ], - "commit": "4c46b3b9851c85d15bff1e3ec92e5fc6043322bc", - "sha256": "1na2daa3d6hclj9hr8f9l029716c3pzky9ybwq08iv68msf3lvhn" + "commit": "738c5d6a6bffe46b18249c77d59ae1d9e2d4d126", + "sha256": "1dn77ysxi9h1yz7f3lpw2gv4jsbwgjqbci5b6blgk5zaqpkj8nrd" }, "stable": { "version": [ @@ -19269,16 +19429,16 @@ "repo": "dieggsy/difflib.el", "unstable": { "version": [ - 20171227, - 1518 + 20210224, + 2242 ], "deps": [ "cl-generic", "ht", "s" ], - "commit": "b08850251812d71e62fd6956081299590acdf37b", - "sha256": "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a" + "commit": "646fc4388274fe765bbf4661e17a24e4d081250c", + "sha256": "1qagl3ffg01zjqrgpq32h4ya869066n8ll9yq8lk40argjm523fa" }, "stable": { "version": [ @@ -19741,20 +19901,20 @@ "repo": "knu/dired-fdclone.el", "unstable": { "version": [ - 20180403, - 608 + 20210226, + 532 ], - "commit": "903d7a736d240ef7352989a4e5d0ff9129c2ee3c", - "sha256": "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw" + "commit": "3ba369f5fc48a8fdf06d1c6ee1167b5a6eb7c1b3", + "sha256": "1qh19f0ry7ri7vibcsb9y36ni7k8spjlnl01knlx7cs65qza8mpf" }, "stable": { "version": [ 1, 5, - 4 + 6 ], - "commit": "903d7a736d240ef7352989a4e5d0ff9129c2ee3c", - "sha256": "0vkdsm29g1cvvv1j8xgjwr94x20zx8k2wvmncrpakcwq6d47cfxw" + "commit": "1473c20fe91ebbe8c44bf2c6551a5f76fbc3b65b", + "sha256": "0dca8arnh07mdvrwiaxfgfirrsjcwl4vdap7czd4rdkbmgvkv994" } }, { @@ -19840,11 +20000,11 @@ "repo": "mattiasb/dired-hide-dotfiles", "unstable": { "version": [ - 20170314, - 2039 + 20210222, + 1919 ], - "commit": "b715f643ec805b3b8aca334595e6589320f04a49", - "sha256": "1n6l25lrhp1x8nhc54kqal96wq96kkfyvz5yzvlw1qd3yk4s567i" + "commit": "6a379f23f64045f5950d229254ce6f32dbbf5364", + "sha256": "0cwsjndvnv9a62ism7ckj27jdqx362947lyizka78qvmv369avv3" }, "stable": { "version": [ @@ -20191,14 +20351,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20210109, - 1854 + 20210227, + 1046 ], "deps": [ "dired-subtree" ], - "commit": "18986f015c993508af0b1b4e43e11dbd7af98057", - "sha256": "1zla8q26sif8795n5vncwgz2j7c45bh3gnjkwqgpdg4carrw5s60" + "commit": "beea35753bc7b0df86f1a966989d626e0aa20481", + "sha256": "16yi9k1lmmfyys2vgfjxpq3mh82g208c54b1nvm6cm8kqxy1x10q" }, "stable": { "version": [ @@ -21300,22 +21460,19 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20210106, - 235 + 20210301, + 52 ], - "commit": "58b7380189de21496235382900838aa0db2dcf92", - "sha256": "1n3kis5g7m25sl68iw9jw7jkfz7jab82v37xk492d77rr9cbvjwx" + "commit": "07dde72b0e356d772fb65b969bd6decfa166e4d7", + "sha256": "17hpwhv0mg7ai90sczb6p4i6fwi9s1i3dsbnmk9rf6w6f5y0r1wk" }, "stable": { "version": [ 1, - 3 - ], - "deps": [ - "s" + 4 ], - "commit": "d31f7685ebc5832d957e25070a930aa42984327d", - "sha256": "1br73dsls42fn4rwagljkpa3l4wwj6f7jxfn3gmgl6c54z81av3v" + "commit": "ed1d04c89cd8b53963f2dcae7cb3a46967e0abbf", + "sha256": "1ypkihd9si769r6k0lfrv8jq8mjv4gyhiwyi820sayfppvma5rj0" } }, { @@ -21357,6 +21514,36 @@ } }, { + "ename": "docstr", + "commit": "d2638156924dc2a327dca5f20ca63479878690c2", + "sha256": "1kga9h5vy4nzwhcvshxk1lpg1n7lfbygxbdpln7vfizpw065f3m7", + "fetcher": "github", + "repo": "jcs-elpa/docstr", + "unstable": { + "version": [ + 20210222, + 1525 + ], + "deps": [ + "s" + ], + "commit": "6103a63385f5dfa828a3e759f3668f6be630cd54", + "sha256": "0w69m94i2aqhfcwnvvpkkfrz1vd871rf0fn68jm123mxg1hc76ac" + }, + "stable": { + "version": [ + 5, + 7, + 0 + ], + "deps": [ + "s" + ], + "commit": "63b0460a4785b4b4aee5cc072b52fb2d3a7eef6e", + "sha256": "0qw8ycb2jmv015agm0yc1p3aymxccv79wfczypf0ncrkv448sbvi" + } + }, + { "ename": "doct", "commit": "f075d73b3269eec73dda992ce2bee67ccdfe4911", "sha256": "0z4h2pmlmzaz2726pmd2y7g63k5ncw4fwd5jh5rv744f5pxxfs2m", @@ -21483,16 +21670,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210124, - 1610 + 20210227, + 1747 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "116c733fd580f729e275d3b6b3954667d5dfdd5a", - "sha256": "0jx6ha2dg32mk5gy4p86ij61xssmd3q2za0xla9nfb23nrfm7g93" + "commit": "1d8d8f885d1e2cdde31c256e11fce95a5b1fcce3", + "sha256": "1irvb4s6y80jpi6lwr7fviwisfnv4nvay29dssbj66k2jqlwyjqz" }, "stable": { "version": [ @@ -21536,14 +21723,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210212, - 1921 + 20210226, + 1558 ], "deps": [ "cl-lib" ], - "commit": "80cc62813bcb4e1f28b256a09d1e3d00a4b50b55", - "sha256": "1q2mv4w6bw8caaq25hzj5z45firll2h7cd0gxzsy53xm199sdi4g" + "commit": "35b86f228f76ef4f782562c9d3188769e433b17b", + "sha256": "1xyykbygb0dajbwmfl50pq7azzhzis53nqg8az9c7rw1fd9bds9f" }, "stable": { "version": [ @@ -21787,11 +21974,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20201120, - 758 + 20210220, + 1358 ], - "commit": "18e8aa5ed78d10b372414b7def917337224bf2f5", - "sha256": "0fw3qar6dwcq5ahf9ca2glshka1ddb4im21hfy069sbdaxdajj4d" + "commit": "b5e50ed1e30ee054fb6a0827e78382b038e83c46", + "sha256": "0bdlcvx95r0hwxpvdfac6xjcs59jn4mi29yny7bjz3x463czidcy" }, "stable": { "version": [ @@ -22014,8 +22201,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20210209, - 1841 + 20210227, + 2121 ], "deps": [ "cl-lib", @@ -22023,8 +22210,8 @@ "s", "seq" ], - "commit": "270320f5a31dbef543f95b15608526629d613366", - "sha256": "1w6ylljrdrrp0087gkz83rf0fr1qnpqsm3lsg6k681wnvxz916gv" + "commit": "945f014d2a3618caa5031f6a8fbc8daf1a5754ae", + "sha256": "13rdlp0j3f4kvms29akhrbr5l2y58x48jlzgaivi6qhhh2ggya8w" } }, { @@ -22050,19 +22237,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20210205, - 1727 + 20210214, + 811 ], - "commit": "4a30d8edac7fbc5936fc07050e3ebfb94f97c1e7", - "sha256": "1k0kwg4yqa29pcn5zzkp16qm8i0zwlxsazng1hnb5nvvqirsxv7c" + "commit": "95c08dc4841b37902fad63a5a976d20e7a5ce3b0", + "sha256": "11r68sh3yrrfib7pixnazispwsffrygmgplffrv8qq57xrqzyxih" }, "stable": { "version": [ 1, - 3 + 4 ], - "commit": "854b9a1ce93d9926018a0eb18e6e552769c5407d", - "sha256": "0hw8md2qp8r89ndgz82yf4iydm5yc9cj2s3g75h6hm940mp4fgxm" + "commit": "95c08dc4841b37902fad63a5a976d20e7a5ce3b0", + "sha256": "11r68sh3yrrfib7pixnazispwsffrygmgplffrv8qq57xrqzyxih" } }, { @@ -22132,16 +22319,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20201205, - 1625 + 20210227, + 2100 ], "deps": [ "dash", "popup", "s" ], - "commit": "ff9fc9360d39f5e07c1f480f8b0656b49606781b", - "sha256": "13anm4wrm7v5x9wsv5h0bxsvr36h228afqp0zxyv008xghqmzwbv" + "commit": "782c2f9595d4288ac0f662d6620e23b8e33f0790", + "sha256": "0sczljv4isgc6r4x46g876kivgq8ywr8z4gb4w1cis9bivrlbdsf" }, "stable": { "version": [ @@ -22185,8 +22372,8 @@ 20210213, 757 ], - "commit": "e1564823e86b797d41b2bb833c1f877f165df8d8", - "sha256": "05yl7p8f7l3gfyvxyjks2jcl9p6ghpxsia29903009ry5jiprjcr" + "commit": "a8c6ed8bb27af690955e51eabbef0382b7e2d41e", + "sha256": "1c2r9njzm4l3rvhz0854qymf70dbmawfiahm0iaf5gva480kjv3a" }, "stable": { "version": [ @@ -22236,20 +22423,20 @@ "repo": "integral-dw/dw-passphrase-generator", "unstable": { "version": [ - 20201006, - 1927 + 20210226, + 2028 ], - "commit": "9c989595536775b380d46f28452c136070b8e4ab", - "sha256": "0xhf8gik49gc8lb4i7wcff2c3554xkqav0wsy3qipm02npslxdax" + "commit": "66d92f592b35fd168f23d7c58d698a1ed2dcaa0a", + "sha256": "1pfz1wwrdpdkd29309dryy7ficl1h1rfmgv7fbpy9p33vs9mdi9p" }, "stable": { "version": [ 1, 0, - 0 + 1 ], - "commit": "9c989595536775b380d46f28452c136070b8e4ab", - "sha256": "0xhf8gik49gc8lb4i7wcff2c3554xkqav0wsy3qipm02npslxdax" + "commit": "66d92f592b35fd168f23d7c58d698a1ed2dcaa0a", + "sha256": "1pfz1wwrdpdkd29309dryy7ficl1h1rfmgv7fbpy9p33vs9mdi9p" } }, { @@ -22278,11 +22465,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20201212, - 2106 + 20210227, + 1818 ], - "commit": "6277d31e6ec896ceaa9533ed156cece26359ba17", - "sha256": "12wkm04smmd3hgx6k3waa0wma0p8r23nh1ksm484znd7gij2bcrl" + "commit": "fe965628177b0ee0bced7aa4fa42b6f5519c2d0e", + "sha256": "17q91qnxbmbmsdnq9pnhn7q8wmq4bafl2z701783ka7nwf4z3ihl" } }, { @@ -22823,16 +23010,15 @@ "repo": "rexim/ebf", "unstable": { "version": [ - 20160211, - 1758 + 20210225, + 1211 ], "deps": [ "cl-lib", - "dash", - "dash-functional" + "dash" ], - "commit": "4cd9c26354d8be6571354b2954d21fba882e78a2", - "sha256": "1pgn6fcg5cnbpk93hc2vw95sna07x0s1v2i6lq9bmij2msvar611" + "commit": "6cbeb4d62416f4cfd5be8906667342af8ecc44a6", + "sha256": "1d9vbn8gmiqcpxqmsv8ir3cc7clm7x1c6hz8drws3cakxk0wffn9" }, "stable": { "version": [ @@ -22857,14 +23043,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210110, - 1450 + 20210219, + 1115 ], "deps": [ "parsebib" ], - "commit": "8a6e7ec3773ad0d87716bc0766eb1b4ff548f856", - "sha256": "012v001dy49cspak16cr90fwz0y6r2l01r3j25h0gdd5gm91dggv" + "commit": "32f97677bcfca2157583473af507c17e24f88f55", + "sha256": "1wd63jiik98ya5z4bkdpnznw03c1qri9wb8nn0w9smia9888a640" }, "stable": { "version": [ @@ -23345,14 +23531,15 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210209, - 947 + 20210221, + 1617 ], "deps": [ - "cl-lib" + "cl-lib", + "nadvice" ], - "commit": "f830b86316338fcc5b26a07eaeab6c34104b9ddc", - "sha256": "092cc8dgf1z1cxgjmkysca76z93xw1a1bjb5k4y0jiw6jsr4d1h0" + "commit": "048c553999c90db0b6066b3ec647a79f4af9985d", + "sha256": "0i1h0p78dm256y7gg2fzhks4x8hq89s5i5m39pipfwy4srkp3d19" }, "stable": { "version": [ @@ -23682,8 +23869,8 @@ 20200107, 2333 ], - "commit": "6a83f224a3cbe2d97c1641d49e443c503e54ddb6", - "sha256": "0r0ncy89h0gg8ah842rpmmkpn10xfgihh5bj3vswxi4g6b5mqqsz" + "commit": "df4e47f7c8adfe90d9bf408459772a6cb4e71b70", + "sha256": "1n0dcrhwpl24whxzwhxf7qjlqlllzl5aahdq8h2zdgb6xz912k64" }, "stable": { "version": [ @@ -23703,8 +23890,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210203, - 1041 + 20210227, + 1019 ], "deps": [ "eldoc", @@ -23713,8 +23900,8 @@ "project", "xref" ], - "commit": "398b81eeec44b35b39480a38f1b1357bc8550a1c", - "sha256": "1w0ndyzdnjldpwgyb8dgfiyhxk2ks6vmxkk2v6y4kn7ch3qwbg8z" + "commit": "92b0c5d385cc6f3593f60c2f93917fd8b2d44207", + "sha256": "1rlgindfq43622gj8jsdkx3b590lhkr2zn18djyfd7g29j26b4wm" }, "stable": { "version": [ @@ -23864,8 +24051,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210211, - 1542 + 20210228, + 15 ], "deps": [ "anaphora", @@ -23876,8 +24063,8 @@ "websocket", "with-editor" ], - "commit": "069e54cc1270ff4957699e5e9481b56b7b4bef8b", - "sha256": "0scl5lxl5dzcxbpw2xmqxcqpajfvvzl9zgmhl96i1q52f08mplhf" + "commit": "dfd968c0ae92f368a1861a15b54d4e4385271469", + "sha256": "1cna661kqkw1sz1dz7pba06d9l581k6g3vjl99vrraq1f7k4afcl" }, "stable": { "version": [ @@ -24157,11 +24344,11 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20200716, - 1428 + 20210226, + 411 ], - "commit": "a47067b4d63f3674d284a772bfe773021540c043", - "sha256": "17gpysk41qf40xa4vab79d3dmi7l3xay5gb27wn7fmj9nrzbm4sm" + "commit": "5e823dc9a29e3be22597d93912f06119c38030d6", + "sha256": "0i7gvjy97cbfll93h5b9zyr1p075lklx7rdahkdy46c4kw6vy5py" }, "stable": { "version": [ @@ -24423,19 +24610,20 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20210124, - 1814 + 20210228, + 2242 ], - "commit": "dc8e1ebf0af386eee46097ee20c20b193d1d6a2d", - "sha256": "1rvnpysd0cwpg1n6fvg94a5s5psav6vn76v10pv8a2y1nqirjjc9" + "commit": "47228bf2e4f187dc332301c5e06768b5d36c4392", + "sha256": "0kly9lw34sl3pmcgck2j058fjnh2hkhz9hd009j6s4lj0a1fbiar" }, "stable": { "version": [ 0, - 8 + 8, + 1 ], - "commit": "0cd211d21628ab35b21cd9ab0f16b0fc8438cac8", - "sha256": "1dfqajcghh9mww5c0hp9qya2nss87xd5x096bb17vgg5dpx5px3s" + "commit": "c4f9b7ff4d12c59cc80b4a67f856601ba7cff2cd", + "sha256": "19s45hdhcg5l608awfxvmhd61xzp7dd5pvviv89xzzksx74l1188" } }, { @@ -24705,20 +24893,20 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210212, - 1601 + 20210226, + 258 ], - "commit": "0b44362cb93ce49c36a94289d5fa5da8279c5f52", - "sha256": "1j96sq266511z9mfqqv3n50f8i1nqaxkwcy7jg7vg6sqhsf40sdd" + "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", + "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" }, "stable": { "version": [ 3, 4, - 0 + 1 ], - "commit": "362bbe5b38353d033c5299f621fea39e2c75a5e0", - "sha256": "1y95410hrcp23zc84sn79bxla9xr2fqh7wwagza05iaprv7zbbw0" + "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", + "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" } }, { @@ -24824,26 +25012,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210130, - 159 + 20210226, + 106 ], "deps": [ "elfeed" ], - "commit": "43609d6fdf388caac91e848dc50d368f0bf83296", - "sha256": "075955i995d7xzd9cfyrpzyz0mfdvw95s0i00q85nb9wmxyijcb2" + "commit": "6f99f4b9338c1a4e64885a799ac01c5b9e1d3a0a", + "sha256": "1l7xmnn0j5h01416ras5fjb8x68ssq9hzkcz7p4539fgq5m0p9y0" }, "stable": { "version": [ 0, 7, - 1 + 4 ], "deps": [ "elfeed" ], - "commit": "795954c8afda6da0196267c3324290841fcc4647", - "sha256": "0mmfzn1ims4w7nqa65r2cm7vbx8v9269h3n4scmjgjhrzmxh41dj" + "commit": "8c895a786be96db4caab476d4db30202c51b6c70", + "sha256": "0zkkrf7xl91c8156vq0njkqlbdx2949s8pmpy62w2xfl12f2wb98" } }, { @@ -24854,28 +25042,28 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210131, - 143 + 20210226, + 258 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "0b44362cb93ce49c36a94289d5fa5da8279c5f52", - "sha256": "1j96sq266511z9mfqqv3n50f8i1nqaxkwcy7jg7vg6sqhsf40sdd" + "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", + "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" }, "stable": { "version": [ 3, 4, - 0 + 1 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "362bbe5b38353d033c5299f621fea39e2c75a5e0", - "sha256": "1y95410hrcp23zc84sn79bxla9xr2fqh7wwagza05iaprv7zbbw0" + "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", + "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" } }, { @@ -25238,8 +25426,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20210106, - 228 + 20210224, + 2314 ], "deps": [ "dash", @@ -25247,8 +25435,8 @@ "reformatter", "s" ], - "commit": "706ffb8779c7ace330d6e020bb046e331266586a", - "sha256": "1rc6qdkiv13ggjwwcgzmri16i2g5x7jwbjc7g8590rndwbg9w9lc" + "commit": "188b9c743d8ec99ff7735d2581999d07f43b5bbe", + "sha256": "0cjjx4mf4lr1rcalzfl52ps91hyc9pvmsgpnfcb6x3akshbjab6x" }, "stable": { "version": [ @@ -25537,11 +25725,11 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210210, - 339 + 20210217, + 2309 ], - "commit": "164b2034111535c727a9e5d2b7e12884c565923d", - "sha256": "0gidcdfm792513pz3mbydrm36zpjlcji88hlfhkvvxwvrzh7flxx" + "commit": "ceef14444a5d668ec2eac2954db9f3fa8971521c", + "sha256": "0nngpjgc98hb3aq8cq32n3n6qr59jnmm5c81i105x0ard3025jgk" }, "stable": { "version": [ @@ -25600,8 +25788,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20201115, - 1811 + 20210227, + 56 ], "deps": [ "company", @@ -25610,8 +25798,8 @@ "s", "yasnippet" ], - "commit": "4032c7251eb2d74ec8a301a3988b62b7a0f00932", - "sha256": "0bmfazghviwkn14vbk2iabgrnb0xk3xw8cp2cyrg68rxmbpvl527" + "commit": "c31cd91325595573c489b92ad58e492a839d2dec", + "sha256": "0myypqnb4001zf9rpn6sakq900kn6mqhyjkp8vvc5y3j6123gj07" }, "stable": { "version": [ @@ -25913,11 +26101,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20200728, - 819 + 20210228, + 2103 ], - "commit": "01ad699c562887dfe135f21dbf65d72cfe7d9cd9", - "sha256": "05r6y0sqfmxw6d8ngy3l3rz7v015v8hil834py1ghysnqq8farn3" + "commit": "de9d42c86fc3e71239492f64bf4ed7325b056363", + "sha256": "0778izaq1hjcc9i7d0v3p9xb08y6bwj9brcmpyd2yj3lfajbhxdx" }, "stable": { "version": [ @@ -25930,6 +26118,24 @@ } }, { + "ename": "emacs-everywhere", + "commit": "12713e28c8c1fd736f06d4a3271d466941954665", + "sha256": "1ah5isnn6d934rqp0s0bby3k4w6fymjkbsxg8f1m7wckramdi8hn", + "fetcher": "github", + "repo": "tecosaur/emacs-everywhere", + "unstable": { + "version": [ + 20210226, + 1928 + ], + "deps": [ + "cl-lib" + ], + "commit": "18e88648cdac06e62b9470bba03c7512c7f6ad00", + "sha256": "0jwxiaf6ajiqd18albj1y7aqj2r6f5k813kbbwwhixqk1sjd4i0c" + } + }, + { "ename": "emacsc", "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", "sha256": "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk", @@ -25937,20 +26143,20 @@ "repo": "knu/emacsc", "unstable": { "version": [ - 20190917, - 1102 + 20210226, + 555 ], - "commit": "57940b93881efabb375df18093b99800bfb5d5f7", - "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff" + "commit": "75761078047f2a28d74eab527b881128faaa4b75", + "sha256": "190j3gmy9fwm5ibk1zpxczqakjl9vj1c7jc7aik88jrs3l711sn7" }, "stable": { "version": [ 1, 3, - 20190917 + 20210226 ], - "commit": "57940b93881efabb375df18093b99800bfb5d5f7", - "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff" + "commit": "75761078047f2a28d74eab527b881128faaa4b75", + "sha256": "190j3gmy9fwm5ibk1zpxczqakjl9vj1c7jc7aik88jrs3l711sn7" } }, { @@ -26216,11 +26422,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210212, - 1743 + 20210228, + 10 ], - "commit": "3a9c581cb7518f738dce8d6a0f1d1eb6c78b6622", - "sha256": "1aik11mq5yqk9zwqqfizh9vsb8gglisrf02hlx28s32h2hybsd3n" + "commit": "0c7323953e628c8797270a37c0f639fe23092175", + "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l" }, "stable": { "version": [ @@ -26239,15 +26445,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210212, - 228 + 20210223, + 1919 ], "deps": [ "consult", "embark" ], - "commit": "3a9c581cb7518f738dce8d6a0f1d1eb6c78b6622", - "sha256": "1aik11mq5yqk9zwqqfizh9vsb8gglisrf02hlx28s32h2hybsd3n" + "commit": "0c7323953e628c8797270a37c0f639fe23092175", + "sha256": "12zikidvgx2ybk4b4z3pr26jmh7v8cqvljff72a0isi6l4m8zy5l" }, "stable": { "version": [ @@ -26414,15 +26620,15 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210120, - 1745 + 20210228, + 1251 ], "deps": [ "cl-lib", "seq" ], - "commit": "ba16ff6dedf2de5dda219cf38b1d6d092b542de6", - "sha256": "0hvdd4mqghllnir88sszq54y8hss8dhkgc1p8082627bnqx4sbjb" + "commit": "757043ba5c4d259df41f71fa6545a156de107ff8", + "sha256": "05y09nr3l8xh8zg301jbl37yvm213cdq99gwjgzjs1vmlg8hp0nb" }, "stable": { "version": [ @@ -26809,8 +27015,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20210110, - 1928 + 20210301, + 213 ], "deps": [ "cl-lib", @@ -26823,8 +27029,8 @@ "projectile", "s" ], - "commit": "d0540df81c1b5f9f75f69ff92331bbf4b16f2e2c", - "sha256": "1py0140pvi8vyy3digjsz3clp98md05mik8w2xnjb47mb4af39jb" + "commit": "648c2e87516fac37b84fd9bc34a6362d2a9001e2", + "sha256": "1crgj5skqckvw1l445ywkdq23bqkj6b6yf5y3pcyay1aasvjbhmb" }, "stable": { "version": [ @@ -26929,6 +27135,21 @@ } }, { + "ename": "enlightened-theme", + "commit": "93728d3fe62331b49627c1cfa1c4273a43407da8", + "sha256": "18ry83hdmf3fx544s42rhkl5jnlvcvbfbardhwyciyp375jzam92", + "fetcher": "hg", + "url": "https://hg.sr.ht/~slondr/enlightened", + "unstable": { + "version": [ + 20210220, + 2327 + ], + "commit": "1bfebd8f47e8a8357c9e557cf6e95d7027861e6d", + "sha256": "10f8ccavmf4xz6fpd0psbvjdcxsrypswnhcqi92nirb2z72kq4hj" + } + }, + { "ename": "enlive", "commit": "388fa2580e687d9608b11cdc069841831b414b29", "sha256": "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz", @@ -27119,14 +27340,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20210105, - 1456 + 20210227, + 1459 ], "deps": [ "closql" ], - "commit": "b9040a91412824d04134286f31fe287f19496184", - "sha256": "1ml6gyd1ad5n9fq5szrzjysa4nnapvszz5dd5qx68jrn1djg00jy" + "commit": "245157564b9bd1575480044c8b24007b2090dacb", + "sha256": "1bdbwbrrz4brkmg50808vsj70d5yaxb1a71n014nx1a09wnw1hmj" }, "stable": { "version": [ @@ -27553,6 +27774,21 @@ } }, { + "ename": "erc-yank", + "commit": "0b66abddb134e0b4cc76ad73784fa529e6ea7312", + "sha256": "0rpn1zfn2g6lylicil3a4scvygqymb5pdmkyyy2r2mw4xlixh375", + "fetcher": "github", + "repo": "jwiegley/erc-yank", + "unstable": { + "version": [ + 20210220, + 1815 + ], + "commit": "55d96f18c5df9d8fce51fa073d7a12c47a46ac80", + "sha256": "1chigywld4v2shc7ij6gyxfq0xzwyms5nal85b3yh7km2pim5i8h" + } + }, + { "ename": "erc-youtube", "commit": "a80ee9617a30a8ad1d457a0b0c7f35e6ec1c0bb2", "sha256": "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx", @@ -27760,8 +27996,8 @@ 20200914, 644 ], - "commit": "e6862ebe3e8f2f29325378d820f7fa94656be479", - "sha256": "1iwi8jm3mp77zmcvn813mcnih1sq56mpl66r2qlkl72paqli790i" + "commit": "6075f5d751d53f9dc4966ab19371104b6118f4d0", + "sha256": "04z4zydz67r7aawqqx4ps3y2d3ffyq253k8r4xkrzq70ax4lqww8" }, "stable": { "version": [ @@ -27782,20 +28018,21 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20201215, - 830 + 20210226, + 1127 ], - "commit": "26150b438fa1587506a020642ab9335ef7cd3fe2", - "sha256": "0m2csjqviqd219mg99wgb19whq12842hq9mpjc4nhg9bd5n9zrf9" + "commit": "cd074622c9ed4c93d4f12ded40f2a36f91a26bc0", + "sha256": "0pf06a9wgzqm49xqyivddc3r3mc2g6rf3s7zsnxnnsp5wjx4amw3" }, "stable": { "version": [ - 23, - 2, - 4 + 24, + 0, + -1, + 1 ], - "commit": "74d045d62e283948247e03a93d22171802997804", - "sha256": "0567gk8by1l4bfwk2j4l4s0z8xw2qz62km9anw0vkfbshlabhmp3" + "commit": "655bd1a27673720bcee187e9fd9f07d739860ad3", + "sha256": "00k0x24diq2z24582bjk65c07ky1kf5h1zihs06ndl782i5cqjfa" } }, { @@ -28101,14 +28338,14 @@ "repo": "dieggsy/esh-autosuggest", "unstable": { "version": [ - 20190228, - 401 + 20210224, + 2242 ], "deps": [ "company" ], - "commit": "972094808d231a86dc6e43862191167b1997d840", - "sha256": "1nkf3n20bc8fhdw8vmmnrwhaddhmqpjsrxm304ci6r6b4zz71nq6" + "commit": "0f144815ebcc1f911a6a7e6df170f8cc10744c92", + "sha256": "1lss6q24pdkzbxdn3lj85xci1md9bs28j8ib3qsk1cmv6m691y28" }, "stable": { "version": [ @@ -28364,11 +28601,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20210117, - 357 + 20210223, + 936 ], - "commit": "172c9fb80ba2bee37fbb067a69583a6428dcc0a4", - "sha256": "10f3sz0hlqfihq60zz3m3lxqz5xncjiyd8qdcslfxzl2rlwlgx77" + "commit": "eeace52ebb2c730f3665fb235017cd57dc6050a2", + "sha256": "1anlan2ldvx0qzj44dhb44flcs3h0d57v79qzn21jpy4d0y0m3kq" }, "stable": { "version": [ @@ -28524,6 +28761,21 @@ } }, { + "ename": "espotify", + "commit": "fb515b013942cf5ef4590e7cbc17f11f10c7692f", + "sha256": "05kl2l272gafzp4c79f9fg63xc0rc9r5cjz32v7dhd2m0dv257vc", + "fetcher": "git", + "url": "https://codeberg.org/jao/espotify", + "unstable": { + "version": [ + 20210224, + 126 + ], + "commit": "e714905b71993b6234a4aee6138d5b659605fe57", + "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw" + } + }, + { "ename": "espresso-theme", "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d", "sha256": "1njc1ppi1jvb3mdckr19kbk7g0a3dx8j4d6j101ygszzrr24ycmv", @@ -28632,11 +28884,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210210, - 1202 + 20210227, + 2101 ], - "commit": "6dc683130466df1d2b437c6956ce26a910e47156", - "sha256": "0zsrwkr7zma8cb2v98wr1i7lxi2yqzhz3mm8jgb63hmq4042z2w3" + "commit": "4e9a04284d00232e20d44269195e2a524252ebe0", + "sha256": "07k091b04gkmk8mdbqjvr9br19v8b0blrn5ywxvimyy3vwrxb87r" }, "stable": { "version": [ @@ -28955,15 +29207,15 @@ "repo": "dieggsy/eterm-256color", "unstable": { "version": [ - 20190123, - 401 + 20210224, + 2241 ], "deps": [ "f", "xterm-color" ], - "commit": "0f0dab497239ebedbc9c4a48b3ec8cce4a47e980", - "sha256": "00ins8n92p5aspr6bjrvn5y5w0ximakk22yklsfmkav4h10al4as" + "commit": "05fdbd336a888a0f4068578a6d385d8bf812a4e8", + "sha256": "0ln1agcgr607n5akm0ax659g11kfbik7cq8ssnqpr3z7riiv95dm" }, "stable": { "version": [ @@ -29215,15 +29467,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210109, - 807 + 20210228, + 1738 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9", - "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x" + "commit": "a50a15f4057dd474f274464842381aa44e550b4d", + "sha256": "05p49hgxqs650snivcnqrj3xlkaxcs1ki0k9ybf335nnxgdfg4zr" }, "stable": { "version": [ @@ -29641,8 +29893,8 @@ "cl-lib", "evil" ], - "commit": "3030e21ee16a42dfce7f7cf86147b778b3f5d8c1", - "sha256": "0zchmnzkq7bz2c4hl95xwnz5w243ya4ryi6hgbdss7mc9rnyyarh" + "commit": "ac50f21b29b6e3a111e10a9e88ae61c907ac5ee8", + "sha256": "0yl6lw2vz2qf97rvfmd83i3v41yl8bp7srhmxgxmhwksy589s5y9" } }, { @@ -29671,14 +29923,14 @@ "repo": "Dewdrops/evil-extra-operator", "unstable": { "version": [ - 20161213, - 403 + 20210225, + 1239 ], "deps": [ "evil" ], - "commit": "e16a9b36f9901254da9af8a73871061616410fc3", - "sha256": "116srvfck3b244shxm9cmw3yvpprjgr840fvcv6jwwpfaphafxw4" + "commit": "fb249889acacc3e28869491195391fa6f617ae56", + "sha256": "049325xd7yk707mncz8mm8cshryh2ir1zf6ahwikr11iwsxgfajd" } }, { @@ -30740,8 +30992,8 @@ "deps": [ "evil" ], - "commit": "cc9d6886b418389752a0591b9fcb270e83234cf9", - "sha256": "14nin675kb2q7fchawj5f2r7bdga9cxp7jbhmaa8vac03zs6xb4x" + "commit": "a50a15f4057dd474f274464842381aa44e550b4d", + "sha256": "05p49hgxqs650snivcnqrj3xlkaxcs1ki0k9ybf335nnxgdfg4zr" }, "stable": { "version": [ @@ -30771,8 +31023,8 @@ "auctex", "evil" ], - "commit": "ac313efb22d621c093d8d30233bd7dc8b4cc54b4", - "sha256": "1wrx8ihimn1sx3vzzfppcwv0yfh3x95jrkxqvzj0ykckipm3zk0b" + "commit": "5f0d6fb11bce66d32c27c765e93557f6ca89cc7d", + "sha256": "1856liiy75w3r6s5ss6hnzcrypymfp6fpnw0i6ybrw351fkw4k9w" }, "stable": { "version": [ @@ -31448,8 +31700,8 @@ 20200304, 1839 ], - "commit": "ea6b4cbb9985ddae532bd2faf9bb00570c9f2781", - "sha256": "1pc3nnyb6cy4x6xnm25kdhmjmfm2rar7cnxsfck2wg5nm11p0klm" + "commit": "4b8322774d9c1d8b64a0049d1dbbc1e7ce80c1a0", + "sha256": "1x6sbychbz91q7mnfn882ir9blfw98mjcrzby38z1xlx3c9phwyi" }, "stable": { "version": [ @@ -31591,15 +31843,15 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20210207, - 1214 + 20210222, + 1453 ], "deps": [ "f", "s" ], - "commit": "b341d3972af167ff82ad3dd41899c9367e12a7f7", - "sha256": "05nbjkj968gdgpphqn7pjqwv11vmvl30947yq2z024wkvm3vpfmj" + "commit": "5bb115f3270cfe29d36286da889f0ee5bba03cfd", + "sha256": "0xz7vnj2wjzih0rm1bsf1ynjy46wmm0aifa9g8362d8570anmkj5" } }, { @@ -32828,20 +33080,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210212, - 231 + 20210227, + 546 ], - "commit": "5bc4db49e9bfe33292d225e98ff2d7c31ac6d39c", - "sha256": "0grm9q224jmd2vbxfgv5h4nrfbj3arrym1pi6xxwgx13415z1ddz" + "commit": "28de73305f6e83e7eebd5a3e7f7ec2f3c0f4985a", + "sha256": "1afridpi5imdxcv257872nx3g4rgzzi1ld629774da3p36jpvdwl" }, "stable": { "version": [ 6, 0, - 0 + 1 ], - "commit": "7cc9c05d05da5139e8361b72ca83ca30f44fae7d", - "sha256": "1iagywiihwv96y9p811xlx4cmbsj8h76niymprv1vm4fj6cmihr6" + "commit": "06df008d5dc9eaced2dfc216f934a79c66b5cd5e", + "sha256": "1r9x8fzc2ccyqk24q3gijssa9jmfc6lsylayjh24xz42kdbw2kx8" } }, { @@ -32852,11 +33104,11 @@ "repo": "h/find-file-in-repository", "unstable": { "version": [ - 20210128, - 2102 + 20210225, + 1929 ], - "commit": "2dba14e8175b1107dc9d2860d26de628b7548dbf", - "sha256": "0gfrpqdhipa8xmp29f8yqik4vh83mkj5j9kccyq3g9rb0xwjhf0b" + "commit": "047eeeb8bf1958397a048d9ea8aaa43f80bac34e", + "sha256": "1czhnf4ayiygkv3nxw3gdaimy2l6pfy308msnp2sjy0q719ygc79" }, "stable": { "version": [ @@ -33130,20 +33382,20 @@ "repo": "wwwjfy/emacs-fish", "unstable": { "version": [ - 20200213, - 2137 + 20210215, + 1114 ], - "commit": "db257db81058b0b12f788c324c264cc59b9a5bf4", - "sha256": "1f6viga13k90ws8v18az3vh3rdc5vd28xkpx9vfv3542bx1np1im" + "commit": "a7c953b1491ac3a3e00a7b560f2c9f46b3cb5c04", + "sha256": "1spxxkji9xa930sbwvzyjm8jrqk9ra0xqhivw7zd12a4c56nhna9" }, "stable": { "version": [ 0, 1, - 5 + 6 ], - "commit": "688c82decad108029b0434e3bce6c3d129ede6f3", - "sha256": "1s961nhwxpb9xyc26rxpn6hvwn63sng452l03mm2ply32b247f9p" + "commit": "a7c953b1491ac3a3e00a7b560f2c9f46b3cb5c04", + "sha256": "1spxxkji9xa930sbwvzyjm8jrqk9ra0xqhivw7zd12a4c56nhna9" } }, { @@ -33918,14 +34170,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20200830, - 2357 + 20210213, + 1822 ], "deps": [ "flycheck" ], - "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441", - "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx" + "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508", + "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh" } }, { @@ -34523,27 +34775,27 @@ "repo": "flycheck/flycheck-eldev", "unstable": { "version": [ - 20200614, - 1904 + 20210228, + 2234 ], "deps": [ "dash", "flycheck" ], - "commit": "c2e2bea1e69fe5f50a9629dec1d9b468ee92de54", - "sha256": "0rkzjzghfgypplnsx4w4ih9dh8xyysy9wb0jqmbg13zvc3jcb600" + "commit": "d222ce6a8e59385ffeeee7c3a36ee41cf9a8561e", + "sha256": "0lipvy48ilc8cxkzk64j7384rx0w57hjcgxbn9dp31c8i5pygj6y" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "dash", "flycheck" ], - "commit": "1bddbfaa1de22879ea2b900c9f8d6f16940ee9fb", - "sha256": "0ma26gk9a3lw60i172wcwdsyfa19j7fj579b4yb7gf9ibca2hs5m" + "commit": "d222ce6a8e59385ffeeee7c3a36ee41cf9a8561e", + "sha256": "0lipvy48ilc8cxkzk64j7384rx0w57hjcgxbn9dp31c8i5pygj6y" } }, { @@ -34785,21 +35037,21 @@ }, { "ename": "flycheck-grammarly", - "commit": "5fdf51167be86e0871125d5548bddc0c926b79dd", - "sha256": "0rdgb9ig3gda33xwl8p9c11gf274v02zibzd660ncp0cipapvqp7", + "commit": "81d4d4888a531dc4428b76bd1ebf0c008e7e5b0e", + "sha256": "11jhq2pw5pwlb7v78n963r8msy6lzj0naykn8iijqf68j9qazcsy", "fetcher": "github", - "repo": "jcs-elpa/flycheck-grammarly", + "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20201028, - 647 + 20210217, + 909 ], "deps": [ "flycheck", "grammarly" ], - "commit": "64e8ffc0ddf05586398a49ae2ad5704cae6eb4c8", - "sha256": "1yd95pc00q838af9mwmifwh0ncbndv7jzyqi5l26jxv3zbhmkdq1" + "commit": "67c1135193f98cfa4ee1ff83cc502dc11f648334", + "sha256": "1ns5rrpxxwf1n0g568g1dajvpr5i49hnv8v4i4g2sfxyszkijyj7" }, "stable": { "version": [ @@ -35019,8 +35271,8 @@ "deps": [ "flycheck" ], - "commit": "e1c3adfc148caf721691a55cae686b5f31209204", - "sha256": "0b8hs7cdywqblbf5dkgck00x18xirlxi7kqd21cqfd276wvn8wyp" + "commit": "7febbea9ed407eccc4bfd24ae0d3afd1c19394f7", + "sha256": "1vvsswadiks9mpb49vz2q8z69wq0jalsvgalhn10k3pyz7p0abnd" }, "stable": { "version": [ @@ -35177,8 +35429,8 @@ "flycheck", "keg" ], - "commit": "10c70dba667752c3612e69a190e097677fef268d", - "sha256": "137xjq1ky9d9ddklzfmfnd5bz75bw0bkqr4ajq3m8al28wpld3k5" + "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", + "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" } }, { @@ -35728,15 +35980,15 @@ "repo": "alexmurray/flycheck-posframe", "unstable": { "version": [ - 20201122, - 2307 + 20210217, + 327 ], "deps": [ "flycheck", "posframe" ], - "commit": "66b73ddb93b357fe9b849d2aa14d5cc9e89e9ffd", - "sha256": "0hggigwbpcq4w5nrjhp8g7vahl9zdixwrhga8ag8zvrdfr0g1cym" + "commit": "24fd9b3d81eab8dd850c504ae46a5c5f11a46ee0", + "sha256": "0dv9bkagzk61r32i9231zpndizv6avpg8n84nrnh8yyl0w4hzldv" } }, { @@ -36385,11 +36637,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20201212, - 1038 + 20210213, + 1822 ], - "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441", - "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx" + "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508", + "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh" } }, { @@ -36661,20 +36913,20 @@ }, { "ename": "flymake-grammarly", - "commit": "1365aa5edc900493e930429eca4748bb8e6aaf69", - "sha256": "0ipap3vz40v90qlh1a3iiqm5934bsx5xk897m5r5q5ab63k5yq75", + "commit": "8271fbd6a4b47d0d3aa6f50547ac502c4f2a7e4a", + "sha256": "06va2zmg8m8al7rxpa7znvln9yhsjlxhnxgs8q76flx9fhg0pm2j", "fetcher": "github", - "repo": "flymake/flymake-grammarly", + "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20210127, - 834 + 20210217, + 909 ], "deps": [ "grammarly" ], - "commit": "c86109387e277251ba3d9aee4a71f0f452e9b401", - "sha256": "1bz0vs2l59ga7x1gqrywl1dhfs1ihbcsflaznmrvg7p7v9vdrmrc" + "commit": "41d10f26a76208612fa184d1155ab40130f4cbf0", + "sha256": "1f5vflanpq0kdqnp2jz6aj5v0v4wvmr01rlgxjz3yz31bp444a0d" }, "stable": { "version": [ @@ -37066,10 +37318,10 @@ }, { "ename": "flymake-phpcs", - "commit": "6e4d444198f593cfb03c7ca84f3e90db13ef5a01", - "sha256": "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9", + "commit": "a35c3043bfc1ce5a3e0fe1c472c6f494a413ba7c", + "sha256": "1gki8ljlq0x954a7fvsz4qj634w40dmlirjg5bm4585ssnsh04wc", "fetcher": "github", - "repo": "senda-akiha/flymake-phpcs", + "repo": "flymake/flymake-phpcs", "unstable": { "version": [ 20140713, @@ -38058,8 +38310,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210128, - 812 + 20210228, + 1555 ], "deps": [ "closql", @@ -38071,8 +38323,8 @@ "markdown-mode", "transient" ], - "commit": "8683b148d3ce1413aeb4b6dde1b6f55610b5aaf5", - "sha256": "1wgznm6qynz0vgylksgimlqawdv6cd8hi5zxw6cgxii2dgajpr1b" + "commit": "b4df041a25811daa2536f9502461b99379dc0f11", + "sha256": "0v5i3wnlajz7yznksml1rwl8avkjlqf3rbjl0gpr3ylv05hcra9k" }, "stable": { "version": [ @@ -38127,28 +38379,28 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210213, - 804 + 20210224, + 1954 ], "deps": [ "inheritenv", "language-id" ], - "commit": "d64b8afc6dd91f7a990fe12799319c0f72534009", - "sha256": "0wsp0awq237xngmp8glakljdlrv8y107icwmz70avnn97vhikj9b" + "commit": "8f25a5e72f81b60bcf27fdfd653b76e7c4773895", + "sha256": "0yfk59sbv8ydhc1sqwf3254h9qag7zmbs4h9f47kc9kp79a93i26" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ - "cl-lib", + "inheritenv", "language-id" ], - "commit": "8c8c47a863a397d947999fff4358caf20bafca0a", - "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss" + "commit": "caa0269ce89789a702823041ca7b309ddaffb5ce", + "sha256": "1y5a704xbnvb46rp1ra9cjjazzs795hvh3p0di2hr5jsql0a0zwa" } }, { @@ -38272,14 +38524,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210131, - 1220 + 20210225, + 1517 ], "deps": [ "seq" ], - "commit": "b855c916bfe988246572d9982435c7c9837c983c", - "sha256": "15m7dihnnys9r2185bpdqd0iazdbccyrnkrdl7a067hygc3iilal" + "commit": "98e2729b7dfc99607778b07ef03ff994a74c045d", + "sha256": "09c9rmrs8aazmmiq0v71p7yhcgk7ykr0il188xl8qc39m4rky9mz" }, "stable": { "version": [ @@ -38896,8 +39148,8 @@ "deps": [ "cl-lib" ], - "commit": "3654ddbd8b3d54258edcc0f4e30ec482cfa8a255", - "sha256": "0xk7n93m1qsp68jxva9sjaafr98rqhw2swa1d76yg01dbq5fk9pw" + "commit": "1488f29aa774326e5d6bf4f9c2823124606399b3", + "sha256": "1wyyxg3z7s7ga003pjik1116vrj5x9cssmk50s80b4xdxmw04viz" }, "stable": { "version": [ @@ -38954,32 +39206,32 @@ }, { "ename": "fullframe", - "commit": "13d1dc5c39543b65c6bb4150c3690211872c00dc", - "sha256": "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a", - "fetcher": "github", - "repo": "tomterl/fullframe", + "commit": "9eb2ecf435ad197ed6636ee5fb101375aa76d5b0", + "sha256": "01vwijpy10gxjwz9zkd2ri2dzhidrqsihpy90kwb5ip9kbgc4jhr", + "fetcher": "git", + "url": "https://git.sr.ht/~tomterl/fullframe", "unstable": { "version": [ - 20201022, - 939 + 20210226, + 1057 ], "deps": [ "cl-lib" ], - "commit": "8cc4aebf4a1054812b34f9704c38c1616571078c", - "sha256": "13f1lhdsm2sx9h8k9iz3mv5xqfxkfwji2aa6855z0jwn8rqqzqsf" + "commit": "886b831c001b44ec95aec4ff36e8bc1b3003c786", + "sha256": "1q276p3bagx9fhzyzjmz449f95k1z287x4p34980d06klj11lrab" }, "stable": { "version": [ 0, 5, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd", - "sha256": "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi" + "commit": "886b831c001b44ec95aec4ff36e8bc1b3003c786", + "sha256": "1q276p3bagx9fhzyzjmz449f95k1z287x4p34980d06klj11lrab" } }, { @@ -39282,25 +39534,25 @@ }, { "ename": "gams-mode", - "commit": "c895a716636b00c2a158d33aab18f664a8601833", - "sha256": "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci", + "commit": "0c7f6a46adc9bc4b256006e86653a77f8f891db6", + "sha256": "1qlzmrs8771cgp63agwr2j1826jck80420plqy704ckc24f85i00", "fetcher": "github", "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20200131, - 1335 + 20210227, + 251 ], - "commit": "bb4e8a223c8aac5ec9268d1cfcf1a9ea9b3d8a49", - "sha256": "084xjxj03d0ghh1lgrgwlkzf78y3szh47m3qva4r344yg0051yz3" + "commit": "52e984d64c48f518222e0f6bd326236f78d7bf7a", + "sha256": "0fjdm2mlwibi6cz0r7cm4ylxzg7i8fljkwfhflb84xqcaknwr2sk" }, "stable": { "version": [ 6, - 6 + 7 ], - "commit": "bb4e8a223c8aac5ec9268d1cfcf1a9ea9b3d8a49", - "sha256": "084xjxj03d0ghh1lgrgwlkzf78y3szh47m3qva4r344yg0051yz3" + "commit": "52e984d64c48f518222e0f6bd326236f78d7bf7a", + "sha256": "0fjdm2mlwibi6cz0r7cm4ylxzg7i8fljkwfhflb84xqcaknwr2sk" } }, { @@ -39496,11 +39748,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20210103, - 953 + 20210221, + 2032 ], - "commit": "c7a427edf33ab1ebdca7d3df67d740f97037a950", - "sha256": "0lvgmfwlmyxgbyqlw8c79q79ramws88s746nckz0qyy5fckx0ri3" + "commit": "26dd2f4ae0f44879b5273bf87cdd42b8ec4140a1", + "sha256": "05xv5amg5pffgnrlcl0yjlx37p9m5hxllq6xn96sf8dcpgsiprfs" }, "stable": { "version": [ @@ -39567,11 +39819,20 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20210124, - 1755 + 20210226, + 1419 + ], + "commit": "0a227125a4112266c06ed7247de039090314b525", + "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], - "commit": "b4f2be4eec55f0c779311cf97ffd69122b161ac3", - "sha256": "1qvnr591vyd85gm8m0y0r88s3ik163lq55phs0kf0vr2k5xq10p7" + "commit": "0a227125a4112266c06ed7247de039090314b525", + "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" } }, { @@ -39707,8 +39968,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20210211, - 1542 + 20210219, + 806 ], "deps": [ "dash", @@ -39716,8 +39977,8 @@ "magit", "s" ], - "commit": "b1029914d6078e1883674d2f1e1af511202641d9", - "sha256": "0s69a83y629an7fj05gkf3qvzx7hwd6wyx62sw9h021d6xdlk5ap" + "commit": "19a8d6805541cede2523b70fa6601667b420f32f", + "sha256": "1aqcqyi4933p4cixrmjb2g1yghbdshir61q3l90igw6h6nfwbiiq" } }, { @@ -39975,15 +40236,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20201211, - 1717 + 20210227, + 1925 ], "deps": [ "let-alist", "treepy" ], - "commit": "c46de21b8db1f17df126d5f5a361ed90cdd26f99", - "sha256": "0yiccv9813bxix60jx39jflx6vvrgxs8gfs7l8amlmy0h0kssp8g" + "commit": "f26c1f7e575209da047e77c18d415f9dc11015e2", + "sha256": "1cvsslki8nkfh7j7fy0j3f21mf0qc5cz7hv0dm3hw7k25wkrbvb9" }, "stable": { "version": [ @@ -40349,8 +40610,8 @@ "transient", "with-editor" ], - "commit": "47c57839b80c05f792de288da050fabac90639d6", - "sha256": "0bpcy6vxbqx50p2cqskpfrk2chnjp3025zmnx33kvq22860f7qi2" + "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", + "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" }, "stable": { "version": [ @@ -41521,15 +41782,29 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20210122, - 1606 + 20210225, + 1553 ], "deps": [ "async", + "ht", "project" ], - "commit": "03bf9d9f92886bcc7b1b8dc45e3213d6e1be9df5", - "sha256": "13qczr2z83ggc2rw2rkzmsj1xgn4rqmg9mvfkp7wf7232d3hwpg8" + "commit": "344d084ec5ff6c99b31c5ea57e5352c85b57ae26", + "sha256": "0x8m3srxhy0bdl6wqvi7m3q9jai73m5bavij1jwqhr3pc2caxzxm" + }, + "stable": { + "version": [ + 0, + 7 + ], + "deps": [ + "async", + "ht", + "project" + ], + "commit": "344d084ec5ff6c99b31c5ea57e5352c85b57ae26", + "sha256": "0x8m3srxhy0bdl6wqvi7m3q9jai73m5bavij1jwqhr3pc2caxzxm" } }, { @@ -43083,21 +43358,21 @@ "repo": "nlamirault/gotest.el", "unstable": { "version": [ - 20191128, - 1111 + 20210221, + 1905 ], "deps": [ "f", "go-mode", "s" ], - "commit": "70f63eafda1f6a2f0a01a9320cc4d2edee9a17b2", - "sha256": "090xf2w5zgffndpjvg4qfdm77cpsc8vpr00h6j0skjpr3bni79cx" + "commit": "9b1dc4eba1b22d751cb2f0a12e29912e010fac60", + "sha256": "0693fcli1nv9mn60gh30xspwiwhab8vxf09i1s9yxs80ai712i12" }, "stable": { "version": [ 0, - 14, + 15, 0 ], "deps": [ @@ -43105,8 +43380,8 @@ "go-mode", "s" ], - "commit": "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9", - "sha256": "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7" + "commit": "9b1dc4eba1b22d751cb2f0a12e29912e010fac60", + "sha256": "0693fcli1nv9mn60gh30xspwiwhab8vxf09i1s9yxs80ai712i12" } }, { @@ -43261,8 +43536,8 @@ "magit-popup", "s" ], - "commit": "3f73f7597473434ef0b68fa7aa1d1b3ad775eb5a", - "sha256": "1zkpjf7kja4qpfzxz9l6kyzdmzn0w6xnbq2ks2d1szl7czmfvm12" + "commit": "ee5d4c3f398dbd307c06cb092361268ee4afc60c", + "sha256": "0nx4zgafgwhzddsyvb4im0rm0k6bvd0lialr9k21mvs2amxpwmq7" }, "stable": { "version": [ @@ -43482,22 +43757,22 @@ }, { "ename": "grammarly", - "commit": "1bbf7e3434cea3d0f6f72747ea653188ce25f68f", - "sha256": "0h0gikvbyraflm921jmf2jkj1nfgxsdq1ybih449zbhxkvb494d4", + "commit": "6bfa47f73110bdf2ca1b223dbed16f73c08a12f2", + "sha256": "14cmvd50g3v7c6d96mqck4d0pbjvs92s4axkhwc9zw1h2sl4wni2", "fetcher": "github", - "repo": "jcs-elpa/grammarly", + "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20201028, - 612 + 20210219, + 1713 ], "deps": [ "request", "s", "websocket" ], - "commit": "cda079ea8e14455230108994c1bba53ba63a3bdc", - "sha256": "1c6c1bp23r6kpp5xk65njcc9prxgglkdzb9k4px961mbmc4s8hsl" + "commit": "e11a5a67307f05e08812be190b23460a1bf97687", + "sha256": "10ral5vipq3jvg3l8l2vgia97dpsjzkjvidp63n5z6mpjdwblka1" }, "stable": { "version": [ @@ -43877,8 +44152,8 @@ 20200725, 725 ], - "commit": "7a37b76342ebcc30b08b1a6a7d8a043d7fede5b2", - "sha256": "0mcyj8g1d124zpif9m4x911d877fdf3hahdpp76grsvn2qpzq2az" + "commit": "1aebf9c36ecfd6523e84fe092faa6ff06ce2177d", + "sha256": "1m86b1x4rkxy1m3q3yj564jihhxcw8ysbfxc38vl75ldnsgvbmy8" }, "stable": { "version": [ @@ -44239,14 +44514,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20210131, - 1100 + 20210217, + 1507 ], "deps": [ "cl-lib" ], - "commit": "e423be90a4c517f8fb032ba4ea6d776a72db03f9", - "sha256": "12calq514nxd2vkskj497r38v887sz4bg2m4gp2lllw929wj4wpn" + "commit": "e7decda098ee6819b37bacd958260c7c789962cb", + "sha256": "0d0348knda33qb9l729bz5ccig49hhw15dbjayl9y6l23nlwx7yg" } }, { @@ -44321,8 +44596,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20201222, - 907 + 20210224, + 1601 ], "deps": [ "bui", @@ -44331,8 +44606,8 @@ "geiser", "magit-popup" ], - "commit": "bb2a0539f8d68b2292b3d0f3174c139b4c304028", - "sha256": "1qf584slf4lqg4qgxj7vblmx0f0jgas03m5cc93a3wfkgkfm19w6" + "commit": "8ce6d219e87c5097abff9ce6f1f5a4293cdfcb31", + "sha256": "0awbd8x154c4dk4av7inpgd63n07xzng84vvc8qckmgljknc0j7k" }, "stable": { "version": [ @@ -44504,8 +44779,8 @@ "deps": [ "s" ], - "commit": "9079bc333e715a13e57ab366522b15d0307e32cd", - "sha256": "0qigmp1fwphp909vq0h4kj5m97knnwjvjw3w9d1i074gwdq54j9g" + "commit": "847fd910e9d0ac76e2cfeb87512e6923a39d7d5f", + "sha256": "1h2j1gbs47l5njny174146b2naf1wv3bgwv932abhjamj7vl06mq" }, "stable": { "version": [ @@ -44551,11 +44826,11 @@ "repo": "clarete/hackernews.el", "unstable": { "version": [ - 20210117, - 1834 + 20210226, + 1226 ], - "commit": "c9c2bb0f13f5bd64c74dbdf945d9613192c0e454", - "sha256": "17lkjcka6ydd6khhz5jbjlybfpx05153z0d8s1rxaxcwl7z2y6cf" + "commit": "cea521750eddb3a70ccd38789d12b09bbdc7e906", + "sha256": "0mc9v8az97kap11f8np55xkbrl4mbiy6jfg76jaagkdsfizqpx5a" }, "stable": { "version": [ @@ -44969,15 +45244,15 @@ "repo": "haskell/haskell-snippets", "unstable": { "version": [ - 20160919, - 22 + 20210228, + 344 ], "deps": [ "cl-lib", "yasnippet" ], - "commit": "07b0f460b946fd1be26c29652cb0468b47782f3a", - "sha256": "0a7y3awi9hcyahggf0ghsdwvsmrhr9yq634wy9lkqjzrm2hqj0ci" + "commit": "1c29c4a68ce89848b8d371c6510d1de3b586c8b3", + "sha256": "1lwnggarmavyf164cfzbzzkq9ffahhd3bz7gw644czs49sndcawf" }, "stable": { "version": [ @@ -45280,16 +45555,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210212, - 659 + 20210223, + 2045 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "df4f34bc1d6d6478ad8ee543c358314da040fbe1", - "sha256": "17i50b87ycqvb8x69qxbk9zq44k2q7d308dm06ny774mafcprrj9" + "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51", + "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p" }, "stable": { "version": [ @@ -45582,8 +45857,8 @@ "cl-lib", "helm" ], - "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", - "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" + "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6", + "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2" }, "stable": { "version": [ @@ -46194,8 +46469,8 @@ "deps": [ "async" ], - "commit": "df4f34bc1d6d6478ad8ee543c358314da040fbe1", - "sha256": "17i50b87ycqvb8x69qxbk9zq44k2q7d308dm06ny774mafcprrj9" + "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51", + "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p" }, "stable": { "version": [ @@ -46695,15 +46970,15 @@ "repo": "emacs-helm/helm-exwm", "unstable": { "version": [ - 20200325, - 1022 + 20210215, + 858 ], "deps": [ "exwm", "helm" ], - "commit": "00ddb4d2a127087a0b99f0a440562bd54408572d", - "sha256": "0g4k01ps14bp2az8v6dcag9llg045k2b4kdis81xx4lvw76znr9v" + "commit": "5b35a42ff10fbcbf673268987df700ea6b6288e8", + "sha256": "1j7a3jn1599cy7n2q42vqc9kwz252k018vy3sbj8a8v0cz2xvy5z" }, "stable": { "version": [ @@ -47487,16 +47762,16 @@ "repo": "yyoncho/helm-icons", "unstable": { "version": [ - 20210125, - 1913 + 20210219, + 1752 ], "deps": [ "dash", "f", "treemacs" ], - "commit": "14df05527e1c629d8eb8e5937de97fa13aeedbe8", - "sha256": "1ia72l8n9n59ikq4gcjqpc9asnyyykkg4nzs5bzw2wf6i41pn4dl" + "commit": "5a668ef21ba02bf1fce2db18950858c769bf5d05", + "sha256": "0n759vnymjgpf24kn7704vj8l1phsnjrgllqhcv1c50fsni1fajl" } }, { @@ -47878,16 +48153,16 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20200910, - 518 + 20210226, + 2027 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "fc09aa0903ee6abe4955e9a6062dcea667ebff5a", - "sha256": "1gcs6aky8h6g9wkrqjl8j50zm4lnvnjv4xcfxxg2z0j7vln81pbx" + "commit": "74a02f89088484c42ffc184ece338b73abd4d6f6", + "sha256": "1p130xj03wh3pqwf1bb3xl86pqnv1kpmn90mwfg0g52jwl0grv6b" }, "stable": { "version": [ @@ -48231,8 +48506,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20210210, - 1119 + 20210228, + 1853 ], "deps": [ "dash", @@ -48242,8 +48517,8 @@ "org-multi-wiki", "org-ql" ], - "commit": "3b97aa047233d521e937b6040cf9085e77507f28", - "sha256": "0rq37k0ydksc2wsavy4g6wydr2hxcclbipab14qdldvrif35sr24" + "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2", + "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5" }, "stable": { "version": [ @@ -48434,29 +48709,29 @@ "repo": "emacs-helm/helm-pass", "unstable": { "version": [ - 20190315, - 1335 + 20210221, + 1655 ], "deps": [ "auth-source-pass", "helm", "password-store" ], - "commit": "ed5798f2d83937575e8f23fde33323bca9e85131", - "sha256": "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv" + "commit": "4ce46f1801f2e76e53482c65aa0619d427a3fbf9", + "sha256": "19w24isddzamkikq17vbv3y7ha22i7wc09d2nqw1j0qwhrrfkng9" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "auth-source-pass", "helm", "password-store" ], - "commit": "ed5798f2d83937575e8f23fde33323bca9e85131", - "sha256": "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv" + "commit": "4ce46f1801f2e76e53482c65aa0619d427a3fbf9", + "sha256": "19w24isddzamkikq17vbv3y7ha22i7wc09d2nqw1j0qwhrrfkng9" } }, { @@ -49155,8 +49430,8 @@ "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20210124, - 1648 + 20210221, + 923 ], "deps": [ "f", @@ -49164,8 +49439,8 @@ "s", "searcher" ], - "commit": "3c0e4997126b5e7ba2db2dba8f1dbc5cb92d2459", - "sha256": "1fcinlxrvzmlrn17gfpv3n2wf9si084p6yi3jg0jzagnprris8lx" + "commit": "181f60cb8505aec05393a9dbf414733d19f76d2a", + "sha256": "06bnnbay56ngiddkvvwmy3fv4v2gjss8gm7gjcp2064m9njgw5mx" }, "stable": { "version": [ @@ -49251,6 +49526,24 @@ } }, { + "ename": "helm-shell-history", + "commit": "93d2ca7bf89a96a8a2eac59d2a34d8f152fa9752", + "sha256": "1krb7i00rf9dwq9pq8zppiyhhahpk661qbg8hazg7bpsb58kxy8r", + "fetcher": "github", + "repo": "anoopemacs/helm-shell-history", + "unstable": { + "version": [ + 20210214, + 948 + ], + "deps": [ + "helm" + ], + "commit": "0c861f3db721e54053fc65f5651cf548cc1cb600", + "sha256": "00dkwym5xkvxa3w4dgpbk22rhrwl7v73cv6ay3pqcv7rjcc2m3s8" + } + }, + { "ename": "helm-slime", "commit": "c35d43a7a8219de4a7f675147f598966aaecb9db", "sha256": "0qv4c1dd28zqbjxpshga967szrh75a4k51n4x86xkbax7ycca4hh", @@ -49941,18 +50234,17 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20201012, - 614 + 20210219, + 728 ], "deps": [ "dash", - "dash-functional", "elisp-refs", "f", "s" ], - "commit": "584ecc887bb92133119f93a6716cdf7af0b51dca", - "sha256": "04kk8rrkgkggjxqppivc4dbn13dkc786dv0masby0wy58vlxpsfv" + "commit": "0b6720145e1d1e037ec8658b83fddfad2c0ce923", + "sha256": "0rsxd62l81hkpvznclgwvd1r6ca66mx6xm7jlvv8id28jhrqv03w" }, "stable": { "version": [ @@ -50434,11 +50726,11 @@ "repo": "antonj/Highlight-Indentation-for-Emacs", "unstable": { "version": [ - 20201110, - 1327 + 20210221, + 1418 ], - "commit": "4fc4e346c17e4e975a8c8ece3d4e7240357e2869", - "sha256": "1laj0h8vm058miwv0pl8hsh5pyfg98h4y9szzq03ilry4ifx9jz5" + "commit": "d88db4248882da2d4316e76ed673b4ac1fa99ce3", + "sha256": "02a3r3f6nd37yx1gsr6nv168wmx5r5c7b47a5r5fw16d2zlkfmix" }, "stable": { "version": [ @@ -50776,10 +51068,10 @@ }, { "ename": "history", - "commit": "f51d4cc6521546c99197adeb35459fcd53bd67d4", - "sha256": "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g", + "commit": "d1172402073d66c671de75ddf5c9b6ac3f6d64cd", + "sha256": "14n0h6lca450w68lk20q98bdbkfadmsqmv1sb73m0pnvzyh5c04z", "fetcher": "github", - "repo": "boyw165/history", + "repo": "tcw165/history", "unstable": { "version": [ 20160821, @@ -50890,8 +51182,8 @@ 20201126, 818 ], - "commit": "82f42045c11ad8c6f13db3a32dcda970a378d164", - "sha256": "1ydks5mrzsxj7q3kvv8ji6vy4jxfra7lhd3vfyqldp3inhz3rpkz" + "commit": "05a8c5119c717f53e2e9c279d316f04dd744b9b3", + "sha256": "11pa6nlpisaba9db0a8iqs86m4ly93cnd8rszd051dg3av8snx67" } }, { @@ -51140,16 +51432,16 @@ "repo": "alhassy/holy-books", "unstable": { "version": [ - 20210114, - 1607 + 20210227, + 2225 ], "deps": [ "dash", "org", "s" ], - "commit": "3a31424fcf889e594067de314acb4fec238d510b", - "sha256": "1n69j4yx2dyyhvs649n17lqb1b5nwdrsfrj0a3vhyvd3q56j3fkl" + "commit": "53ee29d1b1a1a9cbd664c318b01aa1c13011efff", + "sha256": "0n7qnr23h22lsp2n19z3j30zq6l2rvqj1mldkaki0gvw5whi4r3w" } }, { @@ -51378,16 +51670,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20210205, - 1720 + 20210217, + 1723 ], "deps": [ "org", "promise", "request" ], - "commit": "63addedefcad86fe3cd64b29d87a500849124d4b", - "sha256": "162sqbvxxh19fyg6is1hnqzck01mglw2cahs07lsxmfh58gw2lx6" + "commit": "27e9e015b930175896c07536c25e379a4e1997af", + "sha256": "14f3fqz8sjmjh7si5gk31fh7bnvc9p1rfd9p2l39zvasvk1sxki0" } }, { @@ -51398,14 +51690,14 @@ "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { "version": [ - 20201231, - 1042 + 20210217, + 1128 ], "deps": [ "cl-lib" ], - "commit": "c11a6b7ad3d683d2910572fa7f2a87ffdf503317", - "sha256": "0fjwgxaf7lzby6hz96xz9b97mv4vhczs14cq6j6vxygrkykafwam" + "commit": "bac98b873d07baf039fe252b9d67f71c235dca06", + "sha256": "0rhyhkm84fsff5lyvb0z9rnbhmqn4ix0d8wixzll2n2yclj9d9my" } }, { @@ -52025,14 +52317,14 @@ "repo": "zzkt/i-ching", "unstable": { "version": [ - 20210208, - 1251 + 20210222, + 1519 ], "deps": [ "request" ], - "commit": "706052ba196797fd32e6d6d05e059b1f5dd4f2c9", - "sha256": "16kkdzd49b91dvby4mfghpq4phwilzyqaciar8jvk5sfiilyw7yi" + "commit": "51a3180ed07ae9f8b7ff3f2b822d998495864a07", + "sha256": "1rrykszzcyvrmks2clrpdq5kdldcqp38wc908bhq2b4qw7w3d7sw" } }, { @@ -52212,11 +52504,11 @@ "repo": "jojojames/ibuffer-sidebar", "unstable": { "version": [ - 20180219, - 131 + 20210215, + 1849 ], - "commit": "7ddf1b5a158b33e9a7d3fe5dad7ea626a464d2bc", - "sha256": "18rl379bfilzvyi4f4kmy74l4vq2q8hhy5i8kflcgvn0ibipwqjz" + "commit": "59e20690fc4f5ccd751e7a13a60664b97f053a1c", + "sha256": "1z6japr7n950222x33jinb34z7j6n5spj9cn8nq8f8yf8rgp6n2j" } }, { @@ -52310,11 +52602,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20210212, - 1737 + 20210227, + 2146 ], - "commit": "708d2b673f5e993c8894817b083dd08eef66cebe", - "sha256": "0hxsmk97cis6k34a0iq2pz97nkhpljkbf8x306ra2y5sf6a82rcf" + "commit": "e490b01f7420bc15bc8e7b4594964208c3d31107", + "sha256": "1b069vnjlwnwk62332ndwizjp44dhjxvajv2nndpxqrkpqg9s8jb" }, "stable": { "version": [ @@ -52333,27 +52625,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20210115, - 137 + 20210216, + 2116 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "41ca05a6d234c55c2963599648a9e3c433ad5902", - "sha256": "0skazm21xjp8w80g4iqpi1dj48xnhka03l46v6zz48v5686iqv5d" + "commit": "af9eaab39cc62869d3a3806cdb2c0b981417da16", + "sha256": "0h37yqdh7dx1d3mmzlc037d4ph7p740438x0kpxk36rqw1xp7xqp" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "41ca05a6d234c55c2963599648a9e3c433ad5902", - "sha256": "0skazm21xjp8w80g4iqpi1dj48xnhka03l46v6zz48v5686iqv5d" + "commit": "af9eaab39cc62869d3a3806cdb2c0b981417da16", + "sha256": "0h37yqdh7dx1d3mmzlc037d4ph7p740438x0kpxk36rqw1xp7xqp" } }, { @@ -52871,15 +53163,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20200522, - 808 + 20210223, + 850 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "b77eadd8ac2048d5c882b4464bd9673e45dd6a59", - "sha256": "1v8av6jza1j00ln75zjwaca0vmmv0fhhhi94p84rlfzgzykyb9g1" + "commit": "80aabd2566082aa67d17eccdd80e9f1fb10c9ec8", + "sha256": "1cmmasfmgnzhixhczigz1c2jzhr9yj4v6mwvgxs99vbg2k3p9rcq" }, "stable": { "version": [ @@ -53172,11 +53464,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20210210, - 909 + 20210223, + 1226 ], - "commit": "4083ad2e5a840467668a7c2fb809177726a7c519", - "sha256": "1hcfhlvnqbfkym96bl9qpvcarijbqva2q80ld8vi3hmr2ghrq30y" + "commit": "b5d191c9168918a47373c70e97ae83ba46b946f6", + "sha256": "10qj11q35q9ck5dlkv26ra5zy5p3jckb24jl7y050af0fip1m0vd" } }, { @@ -53688,8 +53980,8 @@ "repo": "NicolasPetton/Indium", "unstable": { "version": [ - 20201103, - 2040 + 20210222, + 1110 ], "deps": [ "company", @@ -53698,8 +53990,8 @@ "json-process-client", "seq" ], - "commit": "b870d1ed6b350d3753e7a148c61c373ca76ba78a", - "sha256": "1fscqkpk3z6pxgy1kf548jbck5p57k02badm7j8ggixbvng63d3g" + "commit": "32487a432d6c0728e1fd69db61c4a07b94bb5798", + "sha256": "11s3mn096bsbsrj14h9wpi0721yhlnnd434yswgj6m12k1wpdmzq" }, "stable": { "version": [ @@ -53741,14 +54033,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20200801, - 1128 + 20210213, + 2044 ], "deps": [ "clojure-mode" ], - "commit": "e291da3cd0c11271ad7372594139974057612172", - "sha256": "1cnr72s3d224l7wk742hlj5mlgr65pchfc2w6dz9gx3ww6by9b8l" + "commit": "e144b335fae20418e783c4067463de38de56b65a", + "sha256": "0jjfgi77pkqissbqvghqwfqlxkzgg69k28q1phgpm06c56z2shnq" }, "stable": { "version": [ @@ -53794,6 +54086,30 @@ } }, { + "ename": "inf-elixir", + "commit": "9d4add1ea6aeca5f19e2827628751ea321912219", + "sha256": "0vaxp92d2v094gqwdw2xvfrh13iqshr94hab81135a9pgggy4rc9", + "fetcher": "github", + "repo": "J3RN/inf-elixir", + "unstable": { + "version": [ + 20210226, + 1653 + ], + "commit": "9c21ae6d7a1313c856fd508880ee121fbea99f4d", + "sha256": "0w6fj1sh1pdsrk5sis2zkbdz0ixbpndaizvlqv2riw3sgpnc41f3" + }, + "stable": { + "version": [ + 2, + 1, + 0 + ], + "commit": "9c21ae6d7a1313c856fd508880ee121fbea99f4d", + "sha256": "0w6fj1sh1pdsrk5sis2zkbdz0ixbpndaizvlqv2riw3sgpnc41f3" + } + }, + { "ename": "inf-mongo", "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", "sha256": "0f12yb3dgkjnpr4d36jwfnncqzz7kl3bnnrmjw7hv223p2ryzwpx", @@ -54168,8 +54484,8 @@ 20210109, 1112 ], - "commit": "c010838770bad2a3fc37fcb5c497bf92d5aca27b", - "sha256": "0pf5q4n4p2szmvgh6zcfb7q9p58fac3k5bvqxq6wialz14m779lr" + "commit": "e8ae7b2345b8b21dd866fc043906ceecd40832c7", + "sha256": "19fxqb6x05480wa4dp4mv2a6cw5sgc8bsm3syqpbhmflymfvxnsy" } }, { @@ -54439,8 +54755,8 @@ 20191129, 958 ], - "commit": "383eb955bf0084a6e6ec03c9bd34511e20e0407d", - "sha256": "11bm00pw0bg8z6b5gyfmb2iss5libp6m4x0mc8agazabxzhmzyx9" + "commit": "e1791a96a2633a9f5ea99fc0a20ebacedcefdaaa", + "sha256": "1biysf8cqfw4q7d2dnlisviign3n5knvrb0g6zdalzv8pnd1cxqr" }, "stable": { "version": [ @@ -55018,20 +55334,20 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210202, - 1423 + 20210225, + 1251 ], - "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49", - "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" }, "stable": { "version": [ 0, 13, - 0 + 2 ], - "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb", - "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -55042,15 +55358,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200615, - 938 + 20210225, + 1251 ], "deps": [ "avy", "ivy" ], - "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49", - "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" + }, + "stable": { + "version": [ + 0, + 13, + 2 + ], + "deps": [ + "avy", + "ivy" + ], + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -55069,8 +55398,8 @@ "cl-lib", "swiper" ], - "commit": "94807a3d3419f90b505eddc3272e244475eeb4f2", - "sha256": "08wfvqdzs05bmfjjaqfxffjbl4j7632bnpncs9khrh6lifz03xh2" + "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6", + "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2" }, "stable": { "version": [ @@ -55397,28 +55726,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200608, - 1010 + 20210225, + 1251 ], "deps": [ "hydra", "ivy" ], - "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49", - "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" }, "stable": { "version": [ 0, 13, - 0 + 2 ], "deps": [ "hydra", "ivy" ], - "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb", - "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -55603,27 +55932,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200716, - 1414 + 20210227, + 600 ], "deps": [ "ivy", "prescient" ], - "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", - "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" + "commit": "b6da466e552a710a9362c73a3c1c265984de9790", + "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall" }, "stable": { "version": [ 5, - 0 + 1 ], "deps": [ "ivy", "prescient" ], - "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", - "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" + "commit": "2c0e9fc061ab723ec532428f312974ca7d8def12", + "sha256": "0d6kbczkamhhcmc8bf01q6k1x0g7dwjihwllzsldgga3dclyh4ks" } }, { @@ -55726,8 +56055,8 @@ "repo": "jcs-elpa/ivy-searcher", "unstable": { "version": [ - 20210124, - 1641 + 20210221, + 923 ], "deps": [ "f", @@ -55735,8 +56064,8 @@ "s", "searcher" ], - "commit": "46a461eb873083bc53d7fd3a15b266c52b3cbfb4", - "sha256": "1qsbbpmk3211lm29mks7r3dfphyikbkkj94028748y6ngwqk1vb4" + "commit": "3a2f5073a0d5842a6b3c386e70cc484e3c4ea77b", + "sha256": "1bk8kaxqq1m76x1i4hy3jqcy05pr6dlzjd4dbyi8lrx9sxnfrnkk" }, "stable": { "version": [ @@ -56525,20 +56854,19 @@ "repo": "Emiller88/emacs-jest", "unstable": { "version": [ - 20201130, - 1920 + 20210219, + 1508 ], "deps": [ "cl-lib", "dash", - "dash-functional", "js2-mode", "magit-popup", "projectile", "s" ], - "commit": "b70698d25ffeaa99520d4571659abb3005657398", - "sha256": "1n3qn9zgc09bpblv7rmm7lxdaz2ii7wjws0vd30ppdc8dy301gfp" + "commit": "0fe875082e54bdbfe924808aa155b938ed90d401", + "sha256": "0dxzml0i4x072jwxsbv0nnj3ws1i3z1x2ybg3fqfnfvzy2vynx3w" } }, { @@ -56549,11 +56877,11 @@ "repo": "rymndhng/jest-test-mode", "unstable": { "version": [ - 20200329, - 506 + 20210228, + 132 ], - "commit": "f04d08db36715d7509fd68448f74f917c6c1a382", - "sha256": "1pmzls19wpg60ql0b5l6rhml8hh8mzpbc0dgylzhps1jghi055s1" + "commit": "fb2bacab9475410c79e6e4ca344f093f7698466d", + "sha256": "0m3p75659krzcyc54ri0x8bwr1zxhkrfmyz8z7z5mjpydb8qb1v8" } }, { @@ -57408,8 +57736,8 @@ 20190714, 1521 ], - "commit": "1623346b308dc8f593346dc947fdc4092d674834", - "sha256": "1kkn4xjn9i207x580902jfpcrhpkvpyzxk4jh1bclbryki9602zv" + "commit": "2f41d292b87916f6989e7ff5dc94da18ae6a9e4e", + "sha256": "1z5v7z98dinlayxzik45gjja93daxym75mh2shsy4wz8yclkw22p" }, "stable": { "version": [ @@ -57883,14 +58211,14 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20201215, - 1656 + 20210219, + 1317 ], "deps": [ "yaml-mode" ], - "commit": "9d37e64b9bdc1778481687ca04e2ee5a96bc0474", - "sha256": "054pasvk5xspdndsc962z3d3z5jgpd28ysag5pxa8dfh3yz65vxq" + "commit": "0df142ac98bcd072dd7017053c9c9c476345aeef", + "sha256": "1nxcp1hq9d1j7whfak60j4dmzsfmq2mgmdxxvlj3az7p7vannd2v" }, "stable": { "version": [ @@ -58174,15 +58502,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210206, - 1553 + 20210225, + 725 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "097ffb434feb149bce548dfe4daf99d604abb1bd", - "sha256": "00svj1w9iyf7qh1s49d955j1q7ja8fcs5kwd6prjmg61whlqnyik" + "commit": "7f27dd887da0e2d2522f711f8954c997de366ac4", + "sha256": "134ijij23vhc5jw1bvfvkikl64lwvnsmbprqsv64791x1fvcbd6y" }, "stable": { "version": [ @@ -58324,14 +58652,14 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20210201, - 821 + 20210226, + 2246 ], "deps": [ "cl-lib" ], - "commit": "10c70dba667752c3612e69a190e097677fef268d", - "sha256": "137xjq1ky9d9ddklzfmfnd5bz75bw0bkqr4ajq3m8al28wpld3k5" + "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", + "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" } }, { @@ -58345,8 +58673,8 @@ 20200601, 333 ], - "commit": "10c70dba667752c3612e69a190e097677fef268d", - "sha256": "137xjq1ky9d9ddklzfmfnd5bz75bw0bkqr4ajq3m8al28wpld3k5" + "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", + "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" } }, { @@ -58959,8 +59287,8 @@ 20180702, 2029 ], - "commit": "7f8a887e153e9924d260069c0184958c0b53e57b", - "sha256": "0hzmsr911y2r701l92hjx0nh1w58407jfkn8ky8mymvszb0qggy3" + "commit": "de520e601fee568b03800e8069118730ccbbdb95", + "sha256": "1yk5ygmhkzhfwk770k6lhqx5hjcwsjrgnf99qzl59af74qxn3wya" }, "stable": { "version": [ @@ -58980,14 +59308,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210113, - 1834 + 20210219, + 51 ], "deps": [ "request" ], - "commit": "e5821f5ccb34262aedcb4ea3a19e583c6a97e2f8", - "sha256": "1g9cn34r948a0g9wyda1kzlq33ddgmarl9j6wbb76g0fgkh7qjh9" + "commit": "0c5e1619f079df822686cf42af5859111b6afd44", + "sha256": "179wsr1ffsl4hm4vnb0zzbw338jni5pz8ndgkfq21jppgzk8mlna" }, "stable": { "version": [ @@ -59244,8 +59572,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20210212, - 2154 + 20210222, + 2212 ], "deps": [ "dash", @@ -59253,8 +59581,8 @@ "transient", "yaml-mode" ], - "commit": "5d5639cac5d98bca74cad44b5a1e128df77050bd", - "sha256": "059yqvr36gycqdbnls2nbsd34q16wxyi2paxqlh7wc053h2y7zp3" + "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e", + "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni" }, "stable": { "version": [ @@ -59286,8 +59614,8 @@ "evil", "kubel" ], - "commit": "5d5639cac5d98bca74cad44b5a1e128df77050bd", - "sha256": "059yqvr36gycqdbnls2nbsd34q16wxyi2paxqlh7wc053h2y7zp3" + "commit": "b46933f9eadbe63162dd6e99e8af4355c60a3b4e", + "sha256": "1km8y1i4c68wxbvxfvnyznv8xd5ygjxnz9j9faaqhya2p60kpwni" }, "stable": { "version": [ @@ -59310,16 +59638,16 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20200911, - 756 + 20210219, + 625 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "f4c763016620a4ddb41698bb8aa02b18e07ac509", - "sha256": "129qfb8c18lj6ln8brf9jqzp16vq930hf31rav7xqzsfp0h8ixwg" + "commit": "de4ff6ccdf58a939908d384efe9cf06b2bcabe12", + "sha256": "0nz34h601him6x1a6fkvzvr4r3f5d55cz520ddsmin9zwpq7rlhq" }, "stable": { "version": [ @@ -59351,8 +59679,8 @@ "evil", "kubernetes" ], - "commit": "f4c763016620a4ddb41698bb8aa02b18e07ac509", - "sha256": "129qfb8c18lj6ln8brf9jqzp16vq930hf31rav7xqzsfp0h8ixwg" + "commit": "de4ff6ccdf58a939908d384efe9cf06b2bcabe12", + "sha256": "0nz34h601him6x1a6fkvzvr4r3f5d55cz520ddsmin9zwpq7rlhq" }, "stable": { "version": [ @@ -59465,6 +59793,36 @@ } }, { + "ename": "l", + "commit": "36d7dce3ad5cfc4047800c84945b714df2af0632", + "sha256": "0wkgl3sw7wr3fqlgb3hzw64fawha4lnxbh12w9d7196bfwnm3ny2", + "fetcher": "git", + "url": "https://git.sr.ht/~tarsius/l", + "unstable": { + "version": [ + 20210214, + 1130 + ], + "deps": [ + "seq" + ], + "commit": "518203abc6cee13c73c2d91282354ed59f00f15e", + "sha256": "1s3fndzjhz0xvbhdb0y7raa7zqrpws1xm79blgfcxcrv2fbmbzan" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "seq" + ], + "commit": "518203abc6cee13c73c2d91282354ed59f00f15e", + "sha256": "1s3fndzjhz0xvbhdb0y7raa7zqrpws1xm79blgfcxcrv2fbmbzan" + } + }, + { "ename": "lab-themes", "commit": "c5817cb4cb3a573f93bacfb8ef340bef0e1c5df4", "sha256": "10gvrrbqp6rxc9kwk8315pa1ldmja42vwr31xskjaq0l4fd28kx0", @@ -59541,16 +59899,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210208, - 908 + 20210220, + 728 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "c05332eb20f98fd1dba05279a5a02a7c819aa342", - "sha256": "0fyrzpphs7lahzqgcljbfd4lgcj566f3wyc4ym8x5jl6vd6kdr0g" + "commit": "e9aeee78c3aede7e39fec993b846e731d7790acf", + "sha256": "1dkbrwd1dchc9h650r7rfw9xcjr342xkyjjrq0lyxwa8v5s4558v" } }, { @@ -60038,11 +60396,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20201211, - 412 + 20210224, + 144 ], - "commit": "e0c4b7484ab6ee3bbf8413f620ccb99af4328d2f", - "sha256": "18vvl8a5s6n1kky31n0khnv89998gy9vfk5q58hkczfadc6nss76" + "commit": "fbe9bfba5ef4c99ee190b259a5e3341dd7a71935", + "sha256": "16rki5xzffws02l2nr2ra0kxapizqdix5373ny9f4hlkvp7bqgzi" }, "stable": { "version": [ @@ -60082,14 +60440,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20201225, - 1406 + 20210222, + 1243 ], "deps": [ "leaf" ], - "commit": "64c5ec702b7fab83770c539d613d8c6610ce510d", - "sha256": "0qzmnbn91g02g6vhilx081xz6n1360a3ri64rpzd8avcgmrkb1vr" + "commit": "4146621f4ae80ef0c30160337119441c1f6334b6", + "sha256": "16iv1cvlky2gij1ndx2d6q8l35axm72bx52n6v5y3h21aibj197n" }, "stable": { "version": [ @@ -60280,11 +60638,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20210118, - 2040 + 20210221, + 1315 ], - "commit": "643f29cd618db5366fa8ff442548d124528355c6", - "sha256": "1vip1yc4vf4213kjxal1bff7bw776b8mhk8f3h56rnp7siah2m1n" + "commit": "3495d1224ee73aa96c1d5bd131dc3a7f23d46336", + "sha256": "137z70baylzv6bm6y2wyl1p3f47hzkvjzqcmwmwjmlkpc0p5j4ac" }, "stable": { "version": [ @@ -60329,8 +60687,8 @@ "log4e", "spinner" ], - "commit": "5b17bc254e225b880e94ff5dad5caa60b270eecc", - "sha256": "18qnzgysdzadwy97s6fcfmcjs8gnrqkgqxfgq1130r1b36gjixqg" + "commit": "9c44791407c3f4f76d903ee43367547803ae9c32", + "sha256": "14nlmgbkb8vyb0r25sdg03lg2h38gj83vspp9v9vsqyiiirhnvnh" }, "stable": { "version": [ @@ -60593,8 +60951,8 @@ 20201007, 2214 ], - "commit": "89683794014cab79d2cb7362f901d03c6d3b8c00", - "sha256": "09cflqn4g9s6hz91882w9vnkwzpbba796jhcyvxr23qbv14q7257" + "commit": "5bb4b76b1d1d2453de69920b3a1a6b2a302aea07", + "sha256": "1dqpksmpnnpi591p76hhv95p5gmkmsw794vzny7rd4xkdgcc39jv" }, "stable": { "version": [ @@ -60837,26 +61195,26 @@ "repo": "jcs-elpa/line-reminder", "unstable": { "version": [ - 20200914, - 611 + 20210216, + 1451 ], "deps": [ "indicators" ], - "commit": "65332e11735e2b3321bcab8e1456c13b6b6c1aa5", - "sha256": "1wcfzpl0vnpw8bfqbxb4jqkiziwcivwh7rdg0kjai1c3xhzfpwds" + "commit": "bc488bbdba2172629183891758cfa9466a64182f", + "sha256": "1993rwd9bgr1lqxgxzwp6h2r57ljsbjh5r08f57jaalanjp4iq55" }, "stable": { "version": [ 0, 4, - 4 + 5 ], "deps": [ "indicators" ], - "commit": "65332e11735e2b3321bcab8e1456c13b6b6c1aa5", - "sha256": "1wcfzpl0vnpw8bfqbxb4jqkiziwcivwh7rdg0kjai1c3xhzfpwds" + "commit": "bc488bbdba2172629183891758cfa9466a64182f", + "sha256": "1993rwd9bgr1lqxgxzwp6h2r57ljsbjh5r08f57jaalanjp4iq55" } }, { @@ -60870,8 +61228,8 @@ 20180219, 1024 ], - "commit": "3f42011e08dd4c15f20b620cdd5008cc1d9ef65f", - "sha256": "0fdl4prvhn905y8js8hd6dysxisrrvz51g5dqd22cs8w06zk6zis" + "commit": "a49afb9c168eaf8aaaf94f0c631b7b74db9a1d82", + "sha256": "0213ppx15rdb5cxg7w8978880fzv3dh2m9p6idkmlfj7bndfd411" }, "stable": { "version": [ @@ -61099,20 +61457,20 @@ "repo": "marcowahl/lisp-butt-mode", "unstable": { "version": [ - 20200727, - 1441 + 20210215, + 2206 ], - "commit": "1b178fec96cb200574a17cb26ac0742d9df571a9", - "sha256": "01hj2kzy1mrzqc806jvgvkiyf7mkjacg944l3dblblyl7zgx8plx" + "commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23", + "sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l" }, "stable": { "version": [ 2, 0, - 2 + 4 ], - "commit": "008d2093608ee8fac184a6682e4ccf7b461dcaa1", - "sha256": "1kxvwd9y9q5ax9509b3xy3qqjpamfxzljyvbm1fc89qy50pdjxyr" + "commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23", + "sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l" } }, { @@ -61459,14 +61817,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20201214, - 1221 + 20210227, + 1744 ], "deps": [ "s" ], - "commit": "1cf4fa18731248c6519667c16a6832b616b2b86f", - "sha256": "19icc2c3s4jmn0i55dfllpvbwm6f3wmscfp8nrgini2wk89260jl" + "commit": "55494982d21de36c182b41896e1ed571bda69541", + "sha256": "06r7d5zgavam9jdnffnb3gznx9k5347dlwc4yj1knhfnphzzvl7a" } }, { @@ -61723,8 +62081,8 @@ "deps": [ "seq" ], - "commit": "fa28bed90b77487e275e3908c3bd0f00f94ab88b", - "sha256": "1f58d1y44m3ac2db8yddhrxjpv2503di08p0v46103pnlm7a245q" + "commit": "f2f1476e88153b167bf4ce755f7455fcb3f98458", + "sha256": "0qnzbamf763h8fwjsn7i47a1amb8nixl25zw58jh4hhl470czi2f" }, "stable": { "version": [ @@ -61857,11 +62215,11 @@ "repo": "fourier/loccur", "unstable": { "version": [ - 20191022, - 1955 + 20210224, + 2041 ], - "commit": "284d7bb285bd382be6c1936077de7e2246fa2374", - "sha256": "16jslrdzxlcl6s5jiylqfv48xrm7fqk765jwcgzayjl94939r22l" + "commit": "01b7afa62589432a98171074abb8c5a1e089034a", + "sha256": "1b1x1xsiwqzsiss1jc6w990v1vfvbn5d5w67yzmx59s9ldjmdqq2" } }, { @@ -62235,8 +62593,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210110, - 15 + 20210215, + 1558 ], "deps": [ "dap-mode", @@ -62247,14 +62605,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "69e36b6c824c165527a25b9e6e754eea659a878e", - "sha256": "1k4dxi1yv0w0k99qlpaz2wsvnb31p33ypqvbh9x3fqj6kp720biq" + "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f", + "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr" }, "stable": { "version": [ 1, 17, - 12 + 13 ], "deps": [ "dap-mode", @@ -62265,8 +62623,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "be9f979fa9cb098d064c3ab26d1f7ea7c65cbd23", - "sha256": "03g97sm3y5y1y8crwlc8kvpgrrljyym5yq6qz9llpwy8cg9srchw" + "commit": "71902caafbb20edb672641e44eca4cdf173e8a4f", + "sha256": "0ml3gfg3swx9gilgbwax8hgpf88b36cmykp7b4d858drm43daiwr" } }, { @@ -62277,15 +62635,15 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20201102, - 1802 + 20210217, + 1102 ], "deps": [ "dash", "lsp-mode" ], - "commit": "38f75193f7a8a0e095975104f3ff1c58b3c7c59c", - "sha256": "0ghbcih8hshiyw0mwr2qjhzjbs1sikxl1ih4m41fk4pzd86vjbm4" + "commit": "a5b9ae58fc46b683bccd97d6722f9bd1663fd79a", + "sha256": "0gddfn5rxf7n4l9llziad95cmnn2zlyam7fwh1jbirrhwidg024q" } }, { @@ -62321,6 +62679,36 @@ } }, { + "ename": "lsp-grammarly", + "commit": "ececaeddf8d7d17ddd9bb20401ff96edb707c06f", + "sha256": "1lwk5pwiglp6xzh8d7fwb0nzr3zaqxcbfx6h9wl7vlnz6sz29z4m", + "fetcher": "github", + "repo": "emacs-grammarly/lsp-grammarly", + "unstable": { + "version": [ + 20210222, + 409 + ], + "deps": [ + "lsp-mode" + ], + "commit": "699a0fda7b83953a19a30d235c6a4006f72f41fb", + "sha256": "0ip55ji04z9mmlmhrwywq7sw4j98jq79lfac2j3nz0q1qx8576w2" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "lsp-mode" + ], + "commit": "16825b8dde5dfb3042f4c6fb94be70d6f10b745d", + "sha256": "1byv93xasdpiyfhszi8vh6z7jmhdhxh6lj91xhlgif0s209nfbs9" + } + }, + { "ename": "lsp-haskell", "commit": "1a7b69312e688211089a23b75910c05efb507e35", "sha256": "0pdcxnfp8ng24bfk695wpx5wcdqnjrjsfpks0xicih3mcdm1x9l8", @@ -62398,13 +62786,12 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210122, - 2024 + 20210228, + 1108 ], "deps": [ "dap-mode", "dash", - "dash-functional", "f", "ht", "lsp-mode", @@ -62412,8 +62799,8 @@ "request", "treemacs" ], - "commit": "e56fb65bf17af46fa13d4527530c491dd798edcd", - "sha256": "0gp31yj65rs30a1a9wjidm6r6qkhpf5azpisdl2dvh4f2jypc2ll" + "commit": "93db10d0b521435824732e1e46ac1fcf05c9893f", + "sha256": "0fskr9s7rp9dcarv3jz4pdkhhik0j6y19s10zp1fknwniql7kvj5" }, "stable": { "version": [ @@ -62597,20 +62984,19 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210213, - 910 + 20210228, + 1524 ], "deps": [ "dash", - "dash-functional", "f", "ht", "lv", "markdown-mode", "spinner" ], - "commit": "83334f62b58feed06c0438671bfc550efcbebe63", - "sha256": "1vkc2ffl08d36cgr69g3fl1lmkpr33qzzsxmm7zzaa0b6hzba58d" + "commit": "555bd9f0ee598f2c5601c7e33ef640f4fbe8e246", + "sha256": "0wjkcyq67447b79rif8hys2sy4gvzzb494jw6h8ab244zbkrrag9" }, "stable": { "version": [ @@ -62758,16 +63144,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20201014, - 1620 + 20210220, + 1714 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "71ff088ac4c93b0edd012f305a3dfd1602c5d21e", - "sha256": "03fgw10fq1s98xrmfzg8y9xv14yig3lgjc44x7mvlc5awsmv5lxa" + "commit": "65fb14128127fb1ddf68dd4cb3140d6c7911a093", + "sha256": "0qhs4cv01b7aqq5r6bk91xgwsp8yg1bpn68xk90iirsxlgfb1ffq" } }, { @@ -62778,14 +63164,14 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20210123, - 1748 + 20210217, + 1823 ], "deps": [ "lsp-mode" ], - "commit": "5470ada6cde6e68fe6ce13ff1146c89c3bae0cc8", - "sha256": "1m9nwnwyabbl7gxkyf43mvi76i6qnkqbpy7f5hvx84674pcjnh06" + "commit": "689f6cf815c8ee2ca2332f31dfda8ddefb0b7e26", + "sha256": "13vc2pwxl2cl2qa3gjkpa6si3760y7xyrlg1ygk3g1633w756h80" }, "stable": { "version": [ @@ -62878,19 +63264,18 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20210131, - 911 + 20210216, + 1250 ], "deps": [ "dash", - "dash-functional", "f", "ht", "lsp-mode", "treemacs" ], - "commit": "10c34fc213f9aff29b5fe86b26bfc216b14c631e", - "sha256": "0l5473fa880993k02rz1bxwcp701q874bv1bx5caa4vygvm0rhiw" + "commit": "3bae4a91e05d55d5ca92da272ffcd497f370e9df", + "sha256": "03dvf5vf74p3vjzv98csidw6hzpx2w7f20xmyy12cpiip76wanf0" }, "stable": { "version": [ @@ -62917,17 +63302,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210202, - 551 + 20210220, + 703 ], "deps": [ "dash", - "dash-functional", "lsp-mode", "markdown-mode" ], - "commit": "732992aa41bb78b7341e28c980817de488b7a317", - "sha256": "1cmsyql92ldb0c4phdk8pws2whb6slhy3r52nf10v45bqh9n167m" + "commit": "0ac3e12138a7eeaf764845d1e7e61b02769003ec", + "sha256": "1xqdmbfvn3i7lpk287jslgc9j6zlfxxw6hamqhb25y22bkqjgxsp" }, "stable": { "version": [ @@ -63259,6 +63643,25 @@ } }, { + "ename": "macrostep-geiser", + "commit": "2e154604ed9abf51f3779fdbff00850d13a91a9e", + "sha256": "09md4gmbk1lhrnj288vcq5apxjwys56np4msm2yfalfh2bhxzcg6", + "fetcher": "github", + "repo": "nbfalcon/macrostep-geiser", + "unstable": { + "version": [ + 20210222, + 1552 + ], + "deps": [ + "geiser", + "macrostep" + ], + "commit": "4409d0f6834e0429c42e0675365bc58284312ad1", + "sha256": "02ydl3lfm269bi7dczkqsk6rbcdir759gd0nk7f477aw6x03hgwf" + } + }, + { "ename": "madhat2r-theme", "commit": "44a382a388821908306c0b8350fba91218515e1b", "sha256": "0y588skd6c2ykyp54d38ibwrqglnaanr15d45d51cvcvp9k7x508", @@ -63371,8 +63774,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210212, - 1313 + 20210228, + 1841 ], "deps": [ "dash", @@ -63380,8 +63783,8 @@ "transient", "with-editor" ], - "commit": "47c57839b80c05f792de288da050fabac90639d6", - "sha256": "0bpcy6vxbqx50p2cqskpfrk2chnjp3025zmnx33kvq22860f7qi2" + "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", + "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" }, "stable": { "version": [ @@ -63416,8 +63819,8 @@ "cl-lib", "magit" ], - "commit": "71b1522a2d681ab5653f48c7a13ad73330e7914f", - "sha256": "152sk0bm33i37ijvnr0427dvfwdzr0jl8s6bjhs9f3ii393k7mwn" + "commit": "870174f23faa00b003b3eb63452228511c2da597", + "sha256": "156d0gd0a2cx9rn0zb9i96s3l62rys1dpxcdix2j6aix6iv669ql" }, "stable": { "version": [ @@ -63664,8 +64067,8 @@ "deps": [ "magit" ], - "commit": "f4b88f0c127faa154f138907bf4e98b1baf12fb6", - "sha256": "10l0z0c0q6sbf3id5dajws30cxzjvi5rgx1hl8jf6nxr5zcmcmm1" + "commit": "a6130871e5f4421618e66d9254d0b5df9f3a1ef2", + "sha256": "1zrgqcxp2jshp52m0sa73kk071hvisqlrk79k9is6smkjss97s8c" }, "stable": { "version": [ @@ -63727,8 +64130,8 @@ "libgit", "magit" ], - "commit": "47c57839b80c05f792de288da050fabac90639d6", - "sha256": "0bpcy6vxbqx50p2cqskpfrk2chnjp3025zmnx33kvq22860f7qi2" + "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", + "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" } }, { @@ -63763,10 +64166,10 @@ }, { "ename": "magit-p4", - "commit": "440d47ca465845eaa601ca8a6e4b15fc197e522b", - "sha256": "19p7h3a21jjr2h52ika14lyczdv6z36gl7hk1v17bffffac8q069", + "commit": "e6c16a59ca48a0b17cae90354e8929d31a5eef1f", + "sha256": "1c5qv1f2d8c114a5z21j0nkw285k3gx787l0c3cd9ls7awxfp1is", "fetcher": "github", - "repo": "qoocku/magit-p4", + "repo": "emacsorphanage/magit-p4", "unstable": { "version": [ 20170414, @@ -63876,14 +64279,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210124, - 1824 + 20210224, + 1417 ], "deps": [ "dash" ], - "commit": "47c57839b80c05f792de288da050fabac90639d6", - "sha256": "0bpcy6vxbqx50p2cqskpfrk2chnjp3025zmnx33kvq22860f7qi2" + "commit": "3db9e0a9821e5d9d9c6aacf5cc1d8ae1a6546ba7", + "sha256": "1js20ga6ymynmfwa94iswqd6j1ffrxni97dpnnsppalg9il0c356" }, "stable": { "version": [ @@ -63963,8 +64366,8 @@ "deps": [ "magit" ], - "commit": "e52e8ab4906996c410f6c6db890b9bfe0951d4ce", - "sha256": "0mp466bnm63pas8z0p6b0684i3rakb6cs5xzkz8jv3z3x34ak12c" + "commit": "8eea04c10d116057d3d4f249e6a184d5ed090263", + "sha256": "1m2p317xkbhfadba30m8lq01k543368ajbxid1v9627slgkcjf89" }, "stable": { "version": [ @@ -64205,15 +64608,15 @@ "repo": "jerrypnz/major-mode-hydra.el", "unstable": { "version": [ - 20191030, - 2354 + 20210221, + 834 ], "deps": [ "dash", "pretty-hydra" ], - "commit": "20362323f66883c1336ffe70be24f91509addf54", - "sha256": "16krmj2lnk7j5ygdjw4hl020qqxg11bnc8sz15yr4fpy1p7hq5cz" + "commit": "84c1929a5153be169ca5c36737439d51dffde505", + "sha256": "1yw9xdyqbf285ljsspg8ajjx1bp1g27xpg85p84fsh88nr015rh5" }, "stable": { "version": [ @@ -64672,11 +65075,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210210, - 112 + 20210224, + 1404 ], - "commit": "51f750994aaa0b6798d97366acfb0d397639af66", - "sha256": "0d6vif3ymwlddk3f8pg02h3s62kx9zzsbgyvc7cb76g6fk3b46kd" + "commit": "2387cba868a21f6c18244b8c84125221a866dfb5", + "sha256": "00pr1zw9si8if76pjvxvalxzwk42320y2k6fnkbpdfm8yv6pxkd1" }, "stable": { "version": [ @@ -64792,11 +65195,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210210, - 636 + 20210220, + 1301 ], - "commit": "d8267c17eb14d3db2ebd079094df524b547607b1", - "sha256": "0h8jpgg0dn8l56kq13gs3dlzr1b6d614gravwjqaywvswiiwnjzn" + "commit": "051734091aba17a54af96b81beebdbfc84c26459", + "sha256": "11qybgasg4im76j4kryynqvqbqpxm1xfs5dxgjhr3whn3wiqba51" }, "stable": { "version": [ @@ -65164,16 +65567,15 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20210108, - 1121 + 20210219, + 1431 ], "deps": [ "dash", - "dash-functional", "s" ], - "commit": "6c83ab7c6e3df95e60e942a9017d0c218228d429", - "sha256": "1v32nip530j4lvvm9gsjr9f6i0p0i59lx3f3j32m25q0yvv4s8z6" + "commit": "08aa7c47ffc85c9cba1c9812e1c14250cc4192e4", + "sha256": "1z371v68aw92iaj5mbsk47mfr44scgkwazbf9i6gzygq84fdm6dh" } }, { @@ -65222,11 +65624,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20201204, - 736 + 20210225, + 1441 ], - "commit": "935c67274b84503640a9f90cce87b533461385ca", - "sha256": "08xjcva2fryw81zw1hd0glvq9pzkpnkcrkwp2i19032zzk3hqcxm" + "commit": "00e25f897c56c91a18bb821cd502270cad91fa0c", + "sha256": "1zbwzfsqkw97ywl60h6ryvrlcq82z8407g29w93cigakfwg6ir6j" } }, { @@ -65743,16 +66145,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210213, - 654 + 20210301, + 59 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "cfcb0d457dd92afb511b9376c9f928f20ab96b89", - "sha256": "03sa5bh8ackmbc2gg4nwnc34ij0g4mcmizn7sf1z54lg0d585fdz" + "commit": "5f01f8be74853f27cff021ad6e750f4b31e9375d", + "sha256": "009kfsis6qib0ax9nlipcvwclqk4kyqwafvsymssvls0r7ar50f9" } }, { @@ -65766,16 +66168,16 @@ 20210129, 1443 ], - "commit": "ecde6900bb9d6dee3683c214993375f65bb39c7c", - "sha256": "1fambd8n4hzbmizc04p5m8an84qklc4gpnhz957dpwd3x4prcx2s" + "commit": "2a0dd5c16178efcc4b8132e3c3b3c2a6cc7b13ea", + "sha256": "0aa0izxahpyzv9vz3g8q6m332ndqb8kxgwx22bxnf01n9v90v2j7" }, "stable": { "version": [ 4, - 0 + 1 ], - "commit": "4b7c642c92ea6e6906709bb4656f6cf02ff35289", - "sha256": "0ylfp0750k79ylzwjd4f36hfh2jwxsvvi39v4bhc8xy9skl9b88q" + "commit": "ab02f60994c81166820791b5f465f467d752b8dc", + "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99" } }, { @@ -65910,16 +66312,16 @@ "repo": "seblemaguer/metal-archives.el", "unstable": { "version": [ - 20201214, - 1027 + 20210223, + 1638 ], "deps": [ "alert", "ht", "request" ], - "commit": "a7602a32e7fd3c7779bc5b5c5e398ea31713ee45", - "sha256": "0s7lzhnafw98447kgpwimlmvfwqaaljvnqwvqppgkqglk551lmd4" + "commit": "a218d63b990365edeef6a2394f72d1f2286aeeae", + "sha256": "1mpsc1xvgl6g3bz0dx10i3x5abivna01f1carwyz9w47zs599svk" } }, { @@ -65939,8 +66341,8 @@ "metal-archives", "org-ml" ], - "commit": "a7602a32e7fd3c7779bc5b5c5e398ea31713ee45", - "sha256": "0s7lzhnafw98447kgpwimlmvfwqaaljvnqwvqppgkqglk551lmd4" + "commit": "a218d63b990365edeef6a2394f72d1f2286aeeae", + "sha256": "1mpsc1xvgl6g3bz0dx10i3x5abivna01f1carwyz9w47zs599svk" } }, { @@ -66717,11 +67119,11 @@ "repo": "Mulling/mlso-theme", "unstable": { "version": [ - 20200828, - 1221 + 20210215, + 1755 ], - "commit": "b47243006470798caa4d3f8fe1af9bd5ef06bbee", - "sha256": "0gwa2izmi2ljh4avfpfq778ym1p91gsssbqz2q95m9py1vvb3xr7" + "commit": "40caa67262c78e7668147f86a2b7ca1dad4b2190", + "sha256": "0wcqj0wf1bhqsbvs52a7nwix71nmiy0xixvmmx2pkg7c7mxpm6v4" } }, { @@ -67047,6 +67449,21 @@ } }, { + "ename": "mode-line-idle", + "commit": "6c854955505f809f7a70e8918ea3a0187e62257c", + "sha256": "0wvy7p27d4qa5f6cg1zqrm8wzfvd0wfwcc5aimcs1hkxlzl1kr6b", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-mode-line-idle", + "unstable": { + "version": [ + 20210215, + 2345 + ], + "commit": "02b1da6278e43cc9cc0356110cc6bfbb37eb8241", + "sha256": "0ky330b2sfbzkbxbfp9b21hdywsjw26bllspglz08hrbni7jmry8" + } + }, + { "ename": "modern-cpp-font-lock", "commit": "4bfc2386049adfe7a8e20da9b69fb73d6cb71387", "sha256": "0h43icb5rqbkc5699kdy2mrjs5448phl18jch45ylp2wy2r8c2qj", @@ -67150,11 +67567,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210213, - 550 + 20210228, + 2012 ], - "commit": "2f80b40710d13017a0756830c9e314cf8e3dd82c", - "sha256": "0xd4w2aqil4dhv37d2a0h1jb2jsh8rz4zidsq2wznvvz4cylb8ay" + "commit": "9d3538f8a5007e33640b8ac1a0b725afc6287174", + "sha256": "0h3y94gglkdlygdkhakxlp5gmpvhrl76z2cm22pads722j1jj5nw" }, "stable": { "version": [ @@ -67174,11 +67591,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20200930, - 853 + 20210226, + 1623 ], - "commit": "76116f6eeb93c7902042f275a496629393730e08", - "sha256": "091wrp80y4k80w8wnv8pxipyf33dxb4qs0yn3m83bb1drn2x3g2p" + "commit": "697864d14f4b620f1be579a975bf97b769d2199e", + "sha256": "19jqf6q2fl89hpf6jl53kl6a64aryf5q2hm1dg14fyiag883m9q9" }, "stable": { "version": [ @@ -67458,20 +67875,20 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20200904, - 1639 + 20210221, + 18 ], - "commit": "47f043c1a883e3b0fd550eafffe71b915eb892c1", - "sha256": "0zh0l2zpnms4s1c33ksj6rr8cc6bd9pxnc73cwvmaysak1650jfq" + "commit": "42e402a89473458f55a71c5bbe785575e9a927ba", + "sha256": "1ma5138src6iglkhd2h8w9k4gqqaxvsngz08cd4v2s8dhqkcayw8" }, "stable": { "version": [ 1, - 1, - 0 + 2, + 1 ], - "commit": "82b471852a23bc4de972cac32da322c2b168ad9c", - "sha256": "09ykh1c21kphfzli1qzrlx13bn6p22873y6rwkx9fnj2232gv9vi" + "commit": "42e402a89473458f55a71c5bbe785575e9a927ba", + "sha256": "1ma5138src6iglkhd2h8w9k4gqqaxvsngz08cd4v2s8dhqkcayw8" } }, { @@ -67506,11 +67923,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20210213, - 721 + 20210228, + 718 ], - "commit": "2d7ca0b0ad76da4d11f8925e72904f03fd1c869e", - "sha256": "0cp8hm9vfb453h47vjxk549km51p06zzw6wjjag42ldj9hnba1v3" + "commit": "a756418dde112a67c4c68355bee46ef17fc45d07", + "sha256": "0csv7afdyzvpnc1znh4fz3d7ddgi51dfkfbr3c1mv6wvwg844j2a" }, "stable": { "version": [ @@ -67841,8 +68258,8 @@ 20210109, 642 ], - "commit": "6ac62d2e888cabb138c8427e6173c04e07bb60e0", - "sha256": "1zrhpiwfsxva5v7vdwilf50d8q8gl6kw1nydaika4f1a5321a35i" + "commit": "36c81efa69ecf6843e8b671a3caffb905a54f72f", + "sha256": "0smfhrcikxzaw4qbvq84ac51rdjw1mm5lm58zb8zyps7pzv3d9s8" }, "stable": { "version": [ @@ -68393,15 +68810,15 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20201229, - 216 + 20210228, + 1556 ], "deps": [ "ht", "xwidgets-reuse" ], - "commit": "55e5467a25d424b2c10b5392e68b370164efa230", - "sha256": "1gagaxpb4psshs8x61icilx4576al2qjs612d65ss857gfmzachi" + "commit": "1a0ceeb874e2a56b3ebe06c8375221031bb90a5c", + "sha256": "0v7d899pvpwvvp9x0yaskhjf1c6bjmqajk2mclfkykadrh89z61j" }, "stable": { "version": [ @@ -68765,16 +69182,16 @@ "repo": "Wilfred/mustache.el", "unstable": { "version": [ - 20210210, - 643 + 20210224, + 710 ], "deps": [ "dash", "ht", "s" ], - "commit": "ebecf704d1431e03f1be6df9e45e07944b359a56", - "sha256": "0bwdm1sx3r8fmc3hp278wqx3x9hxa5gjwywgsym4vfkg2jp3g7zn" + "commit": "6fcb31f5075edc5fc70c63426b2aef91352ca80f", + "sha256": "1rq2p376016y68w6447sd7h6zgzrxbb3skh7fjw7xfq1p6f19kr4" }, "stable": { "version": [ @@ -68899,15 +69316,15 @@ "repo": "agzam/mw-thesaurus.el", "unstable": { "version": [ - 20210106, - 1857 + 20210224, + 449 ], "deps": [ "dash", "request" ], - "commit": "cb0637bd3799820d6738f5d66b8bc2de2333e0e4", - "sha256": "1j5x1rfnxvghdmai7cv9sjqw1azq59pk8h5vm0krgnan2rpx5k4k" + "commit": "96f02694bc28f31c2a280a05d47e6ff589f525f3", + "sha256": "0gy3lyncyvwimkhfmd0qh1kkc0qgf7sgvbyr1aljdn9qh7n5l34k" } }, { @@ -69862,8 +70279,8 @@ "repo": "felko/neuron-mode", "unstable": { "version": [ - 20210208, - 1455 + 20210227, + 1737 ], "deps": [ "company", @@ -69871,8 +70288,8 @@ "markdown-mode", "s" ], - "commit": "02fbfca98b5dfb09f09159914682efea6d6afb5a", - "sha256": "18xj8a5h9rrz134hac9qz8cpqswz79h3h24wb3bf89xvq2kyvq10" + "commit": "a968a923aad07ab15fb35deb79ac95581a427b4c", + "sha256": "1mb55bbsb32gxms488pjw9fsqiic2qfmwkhm3pwcgy194723vcaa" } }, { @@ -70042,6 +70459,30 @@ } }, { + "ename": "nikki", + "commit": "f1e2937a2b4947c922d42f0dea4e764d713a7c29", + "sha256": "0jfg1bziqhbgfrl77ddl2krkrd11xcpy6v2fqcpxmrd0i7jb17qc", + "fetcher": "github", + "repo": "th994/nikki", + "unstable": { + "version": [ + 20210227, + 1707 + ], + "commit": "b2ea20d04a061df88d72bd8dd0412a6e7876458d", + "sha256": "0a4kv2zb6wmacfjsihzr1ac6rsynay30zl2qiyzv21js6wmrwn9c" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "b2ea20d04a061df88d72bd8dd0412a6e7876458d", + "sha256": "0a4kv2zb6wmacfjsihzr1ac6rsynay30zl2qiyzv21js6wmrwn9c" + } + }, + { "ename": "nikola", "commit": "2e8e1a5169f0841db4980aebe97235845bbe7183", "sha256": "1zdakql4p0h2l4i3gipzbx9kwmc41qq2zr0rx794722khcka4sz1", @@ -70121,8 +70562,8 @@ 20181024, 1439 ], - "commit": "9c66e698466ed29a493df8746b767558684205b2", - "sha256": "0lpzicxaj2nf4926j50x29sijgarkrj2wvsmnp1xfj1s38v9pyqd" + "commit": "1a8015038d9a8c6bf0c04a42588fb2a26861be63", + "sha256": "08071i5zv0jg9yb83bq9r2sj6hyw31ziwzg79gsbyr7l8whz7cx8" }, "stable": { "version": [ @@ -70404,18 +70845,17 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20200829, - 1751 + 20210219, + 1949 ], "deps": [ "anaphora", "dash", - "dash-functional", "json-rpc", "rbenv" ], - "commit": "152f3176fff026572d2cfa22adaeb32f42410083", - "sha256": "1sljvp31jccffd6h21lf01lkr4qa093ia0bh7kakx9azvqdz55qf" + "commit": "c6074af3b60ef7af7d9c45b8ad1daa21296a5e04", + "sha256": "0hx8sg6wa688f2bzddbzl81b553vjv8aaafizns9r8icsws7acc0" } }, { @@ -70426,17 +70866,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20210203, - 240 + 20210219, + 1948 ], "deps": [ "anaphora", "dash", - "dash-functional", "request" ], - "commit": "008d4a475dcf9432318d0baed53a0a196453ee75", - "sha256": "0s9wgq1k1f3dlx6rna67p2bpnpd6cn3x9wvi8dlg3wfckg652fjy" + "commit": "b5a221b63c8b311d50807fdfab4ae6b965844f06", + "sha256": "1lq3rh52x0f059lxk0cczins2vggiwjs5m1drj7dkb8lmlxc41y4" } }, { @@ -70828,17 +71267,17 @@ 20210205, 1412 ], - "commit": "8fb42948a209c54e3dcf832119d7f54e9cc0665a", - "sha256": "017fqgwvvrbb8i6bfaappimz8fv41b01ia06xq9fn0a2vzn1pf4r" + "commit": "4c79a2dabe38ac72eb9eb21620f2ffca5f1885c6", + "sha256": "1kfg503j44ivcx9zsqzgjl7ab936vwnw31gb6kpcjhd1kyha0mjm" }, "stable": { "version": [ 0, 31, - 3 + 4 ], - "commit": "d812256aeb91646b5b1c644fa67f07c483cca651", - "sha256": "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v" + "commit": "3a3208bb7b8bfca1c0bcaa5b45b6ef71aa768612", + "sha256": "04q9zwy6mpck82zk70xnx2knh2jmqhf676703kjw0fbvdrzw9qik" } }, { @@ -70938,15 +71377,15 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20201207, - 3 + 20210228, + 2125 ], "deps": [ "dash", "esxml" ], - "commit": "0ece7ccbf79c074a3e4fbad1d1fa06647093f8e4", - "sha256": "116klnjyggwfwvs9nqhpv97m00k63q6lg41ph41kywsqkfy42dlk" + "commit": "b6138895ace3042ed78140b6f4859e544fbca27e", + "sha256": "03knl5zch59r1zrk2kvricvirp6rhcdiywny3n9cmbv653gjzyvi" }, "stable": { "version": [ @@ -71291,6 +71730,25 @@ } }, { + "ename": "numpydoc", + "commit": "e7e20f00482f143ac67589a48f7bc591e075b5da", + "sha256": "1p2ls9qmbl58p4cyrk4f769blc72lfgbwd3sy4hhkv75m4qj4lws", + "fetcher": "github", + "repo": "douglasdavis/numpydoc.el", + "unstable": { + "version": [ + 20210301, + 25 + ], + "deps": [ + "dash", + "s" + ], + "commit": "8a7430de69650dbd2e91fd746c2f8fe1665e5a45", + "sha256": "1n26c8kj6w36v3cz15497r51rkb03ngsgkld5qcy75j8ha7mddwz" + } + }, + { "ename": "nv-delete-back", "commit": "7542fa39060b507a6f455225367e45e89d3e2f92", "sha256": "13izzym4alda05k7ra67lyjx6dx23fjqz2dqk7mrzhik9x552hsr", @@ -71313,17 +71771,16 @@ "repo": "rejeep/nvm.el", "unstable": { "version": [ - 20201005, - 2328 + 20210217, + 744 ], "deps": [ "dash", - "dash-functional", "f", "s" ], - "commit": "f15334f78de7786617a15c9de54f4c79a92865fb", - "sha256": "10v4593yz3afrqj6zilq3dw2fngf0f20dy2mrgbcickvdbvkifby" + "commit": "6f47fac1bc42526a7474488f560d064c08f8dd6e", + "sha256": "01rfgxkahpx17q8k72hxibysysv8pgx6bfy5gbc6finm3f7ak6ia" }, "stable": { "version": [ @@ -71411,6 +71868,25 @@ } }, { + "ename": "oauth2-request", + "commit": "d8fd29717d69408c845d44077b5223902051dbd9", + "sha256": "1yb9wgc1p6rbsarb7yhwwrpsjz2adnf9k590c9sif9vx3llras2g", + "fetcher": "github", + "repo": "conao3/oauth2-request.el", + "unstable": { + "version": [ + 20210215, + 657 + ], + "deps": [ + "oauth2", + "request" + ], + "commit": "86ff048635e002b00e23d6bed2ec6f36c17bca8e", + "sha256": "0z9vkssdxkikwjcb3vrby5dfcixy4lw9r2jp7g9nls6w88l184jf" + } + }, + { "ename": "ob-ammonite", "commit": "508358506a6994baf120be2acba86762f5727c6c", "sha256": "0wr7p3sfn9m8vz87lzas943zcm8vkzgfki9pbs3rh3fxvdc197lb", @@ -71493,8 +71969,8 @@ "deps": [ "axiom-environment" ], - "commit": "d9c1c85ea731a18f271bd003a5b1736e26fa172a", - "sha256": "1clcbgs5dk3jas6sclsfj6ibrb0n2508xapyp85lb0nm01i07jb9" + "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f", + "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218" } }, { @@ -72148,6 +72624,24 @@ } }, { + "ename": "ob-reticulate", + "commit": "cccdf7cfda6b23877d0649145808f0a4e9321b1a", + "sha256": "0jjrdykpcswbwjvy4zzs7sfjyxnzvvc17wa67arharpxgg4d8083", + "fetcher": "github", + "repo": "jackkamm/ob-reticulate", + "unstable": { + "version": [ + 20210214, + 2229 + ], + "deps": [ + "org" + ], + "commit": "8109fb02fb6339b1cf9290df29fc0c1109a33c04", + "sha256": "1wr0acf0nhdz48n8p1q80sv0bd929n7v8ahcrx5zc7wcimbqshl1" + } + }, + { "ename": "ob-rust", "commit": "843affc2fd481647c5377bf9a96b636b39718034", "sha256": "1syzwh399wcwqhg1f3fvl12978dr574wji7cknqvll3hyh0zwd65", @@ -72500,17 +72994,17 @@ 20201204, 945 ], - "commit": "60678b05f75d660fcde4c1b991758af9620dcea8", - "sha256": "07xszr8405lcakzdl6c99x73a6zdfc43dr30rw9qpq4mrs6q5npz" + "commit": "7db8d1377a127b39e2bf985c91b6a9a8d6cbeff2", + "sha256": "1vwmw3dcqxg7sy0ki86gq4kpva5ncwzygzbl5ml9947xklvnw9in" }, "stable": { "version": [ 0, - 16, + 17, 0 ], - "commit": "101d2306f5b0b23bbc25e1155c1ffd51a0bbf61e", - "sha256": "0yf1kf3yhiw39qpybz2aszwl7kjshiv45d81gq7q7xgn9nqnf0z4" + "commit": "bfd6bbe95c614d1d982244c4fd0ba494275d2245", + "sha256": "0vy69sjl184czpwbhcbgzyh8kgj6n3jq8ckllcbwic859aq8lqvn" } }, { @@ -72694,26 +73188,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210107, - 1519 + 20210223, + 1351 ], "deps": [ "org-re-reveal" ], - "commit": "7edfa815105543a183b1503fa49531f77a713840", - "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3" + "commit": "e880c4f65ad20e22ab845fc2918ca74cc37bf39a", + "sha256": "197fn08xhk6cbvi4hqf51v40x0ki5n8h1896g3bpl4fasfy5zicp" }, "stable": { "version": [ 3, - 15, + 17, 0 ], "deps": [ "org-re-reveal" ], - "commit": "7edfa815105543a183b1503fa49531f77a713840", - "sha256": "09sl4bpd5k25cb82q57f39hb74hsilg9271zbs6nxvrshks23wy3" + "commit": "e880c4f65ad20e22ab845fc2918ca74cc37bf39a", + "sha256": "197fn08xhk6cbvi4hqf51v40x0ki5n8h1896g3bpl4fasfy5zicp" } }, { @@ -73386,11 +73880,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210212, - 1645 + 20210227, + 1543 ], - "commit": "edce950fe1353c2284516f7b01bd37bc2d7fa136", - "sha256": "0dgw51f5cp2yxvpq11xkbavbykkr9c275pizcj8d81zw8jrnbs79" + "commit": "9d5b95f40275dc47a57e9d4ee9b9994ee3a4b426", + "sha256": "0ksjvi257m6ij7dd40rjc106grxi727717w8k58h3i5l6f03w70f" }, "stable": { "version": [ @@ -73574,11 +74068,11 @@ "repo": "dfeich/org-screenshot", "unstable": { "version": [ - 20201130, - 1607 + 20210221, + 1336 ], - "commit": "a467a1f04a416252f067b95c0f00a9f10d03c433", - "sha256": "1mi9h69zdm4yhvpsgiqvg214f5k818y3w1hz626cw0vr2jxmgdf2" + "commit": "6a5d5f8fd7cda1200cf088f415b9983e89a03075", + "sha256": "0gqqcgadlzzbqd4sqbwbwx41app6ryz2l3lrng8bz9hq9cx547jj" } }, { @@ -73589,26 +74083,26 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20210208, - 847 + 20210214, + 917 ], "deps": [ "async" ], - "commit": "5da721fff97a44a38a650b23bdf73b74f17d4a36", - "sha256": "0iydrx38ih8vrj7p3sn861ckn52sh8pvwjvl7s3287j3x81affnh" + "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a", + "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja" }, "stable": { "version": [ 0, 2, - 10 + 13 ], "deps": [ "async" ], - "commit": "7bd6e9c934bc659b026b0d1497b2013da44597d8", - "sha256": "04wc7yc47csz1amzm7990f46pr89avcxrpf2kyiw02i1lc50cfpq" + "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a", + "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja" } }, { @@ -74038,11 +74532,11 @@ "repo": "thisirs/org-context", "unstable": { "version": [ - 20200615, - 1554 + 20210216, + 1526 ], - "commit": "8ef429124c13b1a68f7672cb6e6cb9c8b9d9db93", - "sha256": "178hpp3ylafmr2n3ydcqwqjxa8avlb8g1n3swzndc3jjk0gy6vck" + "commit": "a08f1f607f819791b9b95ad4f91c5eaa9fdbb091", + "sha256": "18ld5kqr0l7nklybdwbwrnkrh06w71myfynbwp9rh8q4lhzh73jc" } }, { @@ -74507,8 +75001,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20201113, - 2330 + 20210228, + 2038 ], "deps": [ "alert", @@ -74516,8 +75010,8 @@ "request", "request-deferred" ], - "commit": "0a6f9a7385410b70853eb65c14344ad76cc6815f", - "sha256": "0m6h2psshkr2kvckp2bmaj2y1cp3kbyw2nwwvwg2k3yymkqr8l7l" + "commit": "133cca813abd2823a6e2a9ada295b7b8b115be4f", + "sha256": "1mwspxx1im87qa886w9ib8a104xzi02qky6z5pl8va0mrcnpl86i" }, "stable": { "version": [ @@ -74661,28 +75155,28 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20210212, - 1158 + 20210226, + 1636 ], "deps": [ "dash", "org" ], - "commit": "87752d5b4811f94d0e5b2cc220aa30147a89a7ea", - "sha256": "03c29app8n1a8grv2a7qlqgq7f90ql1raxfnm9slfwk1al3s8j8k" + "commit": "5f9ac60cedb0be935c2b7ccefd484c0a378bc9d9", + "sha256": "0xbxfrrbcklhji6j99hvz7j6k6hv60cjvrwnf5kq3af1wy0kiayg" }, "stable": { "version": [ 1, 5, - 5 + 6 ], "deps": [ "dash", "org" ], - "commit": "87752d5b4811f94d0e5b2cc220aa30147a89a7ea", - "sha256": "03c29app8n1a8grv2a7qlqgq7f90ql1raxfnm9slfwk1al3s8j8k" + "commit": "f7e6dfb349e5c93a134f1d6badacd504b5b345ef", + "sha256": "1h65qa0m3p999pbhw9z98pn7bnz1qczsfybp3zr0g66mi7qqbalq" } }, { @@ -74717,30 +75211,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210208, - 1405 + 20210226, + 1635 ], "deps": [ "dash", "org", "s" ], - "commit": "b0a4892ca4f2f9791ebc78b472680465f5785fc6", - "sha256": "14xhbsar219kbgzg59ynynxx21723f7f0qr39p2ardi16b00pzvs" + "commit": "1f029b28b817dcdc7d1deb734a087ba08e66c6b5", + "sha256": "04qcdf3knpxjjp972skdqgdh56bhh8frvljw1zb5wnln6byvqxr3" }, "stable": { "version": [ 7, 1, - 2 + 5 ], "deps": [ "dash", "org", "s" ], - "commit": "b0a4892ca4f2f9791ebc78b472680465f5785fc6", - "sha256": "14xhbsar219kbgzg59ynynxx21723f7f0qr39p2ardi16b00pzvs" + "commit": "c8998d4b81879c757cc2825200543921e0f6b637", + "sha256": "0cjpvcwfiaanaii91937907nsfadwnnlaq16yx79xk8gcvbrx1fg" } }, { @@ -74953,14 +75447,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210210, - 1421 + 20210222, + 227 ], "deps": [ "all-the-icons" ], - "commit": "bbf6257951cfcee7cb7850eca6af17d797555c86", - "sha256": "1sps2j096rhk0sfvl98lvvcqv8i9886xav7r9r7fw0qa1sc5337z" + "commit": "4662b3a7b9244aa35aae2f469f87be4a44a6b1bb", + "sha256": "1wb00rm6zdlb8hrhph783wi8zjra8m09gi6m2nnfr37al3986g0s" } }, { @@ -75132,30 +75626,30 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20210203, - 1452 + 20210224, + 2308 ], "deps": [ "dash", "org", "s" ], - "commit": "5faf2bd099c51b51af241132578c1a4e06f73d57", - "sha256": "0f1ldhsjnfh1jn3zlgnmw22fml0y1dhvn7gsbf4x2szkcw1i9hfs" + "commit": "1b02583a5cdb8f6b7cd82b31ec80b53753cb7729", + "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz" }, "stable": { "version": [ 5, - 5, - 4 + 6, + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "1c7ace3d536f6f1b63410a63e52975dc37871b77", - "sha256": "0f1ldhsjnfh1jn3zlgnmw22fml0y1dhvn7gsbf4x2szkcw1i9hfs" + "commit": "4fe1f194a8eba00858b78d611ad8a7f14392722d", + "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz" } }, { @@ -75184,11 +75678,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20210127, - 1400 + 20210216, + 1141 ], - "commit": "75d4f32c2526f752bd121aa807ee9256e0e64441", - "sha256": "026p6sk02lk6cc4mrhpjqrfksfxfa1mmn0k68ipa3wgg1rizdhhi" + "commit": "99ac0c85060f9e4710de73db4a19120a0a23c39e", + "sha256": "1xqb9pcj6hw1z6anvy5hm78a90m442cg868d62yyynwkzjyns64q" }, "stable": { "version": [ @@ -75226,8 +75720,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20210122, - 552 + 20210228, + 542 ], "deps": [ "dash", @@ -75235,8 +75729,8 @@ "org-ql", "s" ], - "commit": "3b97aa047233d521e937b6040cf9085e77507f28", - "sha256": "0rq37k0ydksc2wsavy4g6wydr2hxcclbipab14qdldvrif35sr24" + "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2", + "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5" }, "stable": { "version": [ @@ -76016,8 +76510,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210210, - 1810 + 20210225, + 1454 ], "deps": [ "bibtex-completion", @@ -76032,8 +76526,8 @@ "pdf-tools", "s" ], - "commit": "32803203cc4b01e1d4436f0f65138bf569dad8ad", - "sha256": "09g9zblhkfcaks5m4h418v85cwbz308r7sh1qj2v8yxay1360v03" + "commit": "7dbe3ace9bf8ba9bd7c28c73ff960b4732d09071", + "sha256": "0nyqhbdbawg0rfqzgfqhk38hk1mb0naksrmrgha669zzmha6vd29" }, "stable": { "version": [ @@ -76199,15 +76693,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210129, - 954 + 20210226, + 1227 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "c2b097e982108f53bb995c74dde3b1a9dd28cb5b", - "sha256": "0gv5a4bk333vg1xy9pys9j52ikp9n1y17x5mgm4w2gnf2q0s1sc8" + "commit": "356cb0f882ed925913dd41e1901dec0c2f86fb98", + "sha256": "0p616v191h10hz98la52qy19bg1ry4vy6y88hgw0i3ndh6k872s2" }, "stable": { "version": [ @@ -76447,17 +76941,16 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20210208, - 103 + 20210228, + 212 ], "deps": [ "dash", - "dash-functional", "org", "s" ], - "commit": "7b94dcb8daa2495348da0c4177af77e911e0fb3c", - "sha256": "0yvna55zl74q92hzrlmychmi0h1gzsz9kaciy517vgzc3ma8w348" + "commit": "143146d5bab10e32d4a24f4c3e5e30905b0f3176", + "sha256": "1wbb5isfm1ixv2zbys75cn276zcr2927j3h2crb081acygm78qqv" }, "stable": { "version": [ @@ -76481,8 +76974,8 @@ "repo": "ndwarshuis/org-sql", "unstable": { "version": [ - 20210121, - 1746 + 20210220, + 2146 ], "deps": [ "dash", @@ -76490,14 +76983,14 @@ "org-ml", "s" ], - "commit": "9a2a753b41685b241fb3ba6cf5c01073b4648e0f", - "sha256": "1iy25j0qqqic6jzzppg0vq4990r97n9glikrmwzq6hwj9y901bj4" + "commit": "87c712740cc0e934bbb9fd322386adf45f05c543", + "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z" }, "stable": { "version": [ + 2, 1, - 1, - 1 + 0 ], "deps": [ "dash", @@ -76505,8 +76998,8 @@ "org-ml", "s" ], - "commit": "9a2a753b41685b241fb3ba6cf5c01073b4648e0f", - "sha256": "1iy25j0qqqic6jzzppg0vq4990r97n9glikrmwzq6hwj9y901bj4" + "commit": "19eaba4dcadb3f1101a2363aac2a6d2430559c70", + "sha256": "02qdjj6msd023fpbcq2isjw71zx2vnbma343d2yg6x4bk6xrqz7z" } }, { @@ -76517,15 +77010,14 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20201202, - 234 + 20210219, + 1622 ], "deps": [ - "dash", - "dash-functional" + "dash" ], - "commit": "23368e36453ff15b2de06e85702d6f0e0bc9f098", - "sha256": "1iznmya5kk3y9irka7f6yyrnzv3b3zh6kdr2wvyir930kcv52n63" + "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2", + "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf" }, "stable": { "version": [ @@ -76556,8 +77048,8 @@ "org-starter", "swiper" ], - "commit": "23368e36453ff15b2de06e85702d6f0e0bc9f098", - "sha256": "1iznmya5kk3y9irka7f6yyrnzv3b3zh6kdr2wvyir930kcv52n63" + "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2", + "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf" }, "stable": { "version": [ @@ -76581,11 +77073,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20210211, - 933 + 20210222, + 1035 ], - "commit": "a66d1e43882978a9da82c033a809765061c71052", - "sha256": "1xpwpfwbxblybj8h9dqd6d9s0xy95hpkfviviwzprcsrm9i7b971" + "commit": "9b9f7a994be54a10f5ac2a58221d52555574f78d", + "sha256": "1s3p7ig0swp1msvrzbkpyf6nv121rgschcacs3c5ps758yldg5lh" }, "stable": { "version": [ @@ -76671,26 +77163,26 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20210212, - 1458 + 20210216, + 1925 ], "deps": [ "org" ], - "commit": "84362aeccb7e1022f534e7face6aa5456ec9a787", - "sha256": "1700n0zxk58d9akkdhgjhdi9xya1b4x0cchdw42gxbwycrzsjnf3" + "commit": "9d64c42e5029910153ec74cb9b5747b074281140", + "sha256": "12inin2p6pm6vbv3yc06fx343dsp0vp07fjb35w088akhikmqh2a" }, "stable": { "version": [ 1, - 4, + 5, 0 ], "deps": [ "org" ], - "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d", - "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb" + "commit": "9d64c42e5029910153ec74cb9b5747b074281140", + "sha256": "12inin2p6pm6vbv3yc06fx343dsp0vp07fjb35w088akhikmqh2a" } }, { @@ -77054,11 +77546,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20201215, - 1117 + 20210224, + 1213 ], - "commit": "d6e8e91433dfe4968f1343b483f2680f45a77d52", - "sha256": "1zz12xk8vl2qic5hpvl0jcwysbmrfb6rfigvf8hr3nhdm9fp36aw" + "commit": "9d2ba1df456d8d7c6372c8c294dbe3ee81540b33", + "sha256": "145avv616k190wzirlrh7rljysfffhh3j37wr7p6sk13wayqc27h" }, "stable": { "version": [ @@ -77313,16 +77805,16 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20210212, - 1204 + 20210226, + 1635 ], "deps": [ "dash", "org", "s" ], - "commit": "8e22ffe59d241a0f43395f2cd88589ffb0c7db23", - "sha256": "0vcawnrj5ap3h0cy5h1nsiki41scgdhxf83adnvv3lj6gwif1l9a" + "commit": "866010a4391d12c9c1968a74e396d9b0ffa58d78", + "sha256": "0s4xkzz39xd4cdfb325h1d3nwpp4nzfzn9w1wjfpgz9n5mrpmhvp" }, "stable": { "version": [ @@ -77459,15 +77951,15 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20200622, - 1519 + 20210220, + 1845 ], "deps": [ - "dash-functional", + "dash", "s" ], - "commit": "571249c977e0340edb3ef3af45b7841b62ec8065", - "sha256": "1hjqawygbmvdlvzi908b2l4k7ca3g0dg32mpk7vld8xwi49hb1kp" + "commit": "e469373e0c656cec475c145037be1902d2622f09", + "sha256": "1pqrvrs54ggm2hr7b7m9n4wglbmakw0q9651mwxylz6bwm66kcc1" }, "stable": { "version": [ @@ -77760,8 +78252,8 @@ 20201129, 604 ], - "commit": "69b2b5c3c6e581c3da56ec3ca4e2cd6c2e141c51", - "sha256": "0a87izghc9kjjbxylaqiy5ln6hzf4kjsn8fk7s4dpx0mqv5ps7y6" + "commit": "50ce687d0be602c86256211fc8f783f5ef7df8a5", + "sha256": "1hr476lr2lwh4hz8z9yi2n3gdyzaabchn364jzwkppjksq9q0q6h" }, "stable": { "version": [ @@ -77781,11 +78273,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20200829, - 708 + 20210225, + 915 ], - "commit": "bab95388b182c07bc9f0679426514fe7e8c997d9", - "sha256": "18qasx17hgfrmzkljjpni4m2lgic3imyksjg6wa7xrjf0y3kwmgw" + "commit": "bcb38ada8469a7f6f9a915c36760a05b2c68ad88", + "sha256": "1db0wm7dlx1yqnfhbw4m3q3a8x4wk02j1c276qazhff4n03mbhf8" } }, { @@ -77811,14 +78303,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20200825, - 640 + 20210225, + 923 ], "deps": [ "cl-lib" ], - "commit": "e93e8eaeab2137bc391cf6d0643619ce6b066d19", - "sha256": "0rbcdgsb7vzsjiwk5zskv15sf8npxdsbvpzd9r6s7aib83mb5kqa" + "commit": "f411d38de5e36f65336a37e43cfe9a5125b6543a", + "sha256": "05m6xq1c3cc2vpwfgknjx6rad8lr2hd6prbziq04qxp8x8qcs3sj" } }, { @@ -78208,11 +78700,11 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20201031, - 1318 + 20210214, + 1715 ], - "commit": "a34602b59063dd22ca6877466b85b2728f03c242", - "sha256": "1k3zfcmlwfby7yixjdxfynhys2kyhggg0n3d251a9frzrkyg6gxb" + "commit": "bb6db842e4fc2ed4d635001938ebafe93925f48c", + "sha256": "0h54wdsh6g0wmqf356s6br08hq29p6cdrsd14q9w6qaxhmfzbs7m" }, "stable": { "version": [ @@ -78240,21 +78732,6 @@ } }, { - "ename": "outlined-elisp-mode", - "commit": "ae918c301e1c0ae39574ae76d70059718724293b", - "sha256": "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v", - "fetcher": "github", - "repo": "zk-phi/outlined-elisp-mode", - "unstable": { - "version": [ - 20131108, - 1127 - ], - "commit": "c16cb02b540448919ad148f2be6a41523ee5489c", - "sha256": "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv" - } - }, - { "ename": "outlook", "commit": "c5ce3e6800213b117578a1022f25407f2ec1604f", "sha256": "0yq9zl7dr8kkm4rps5np4dwvjfhzsxq9wd1af7zwcmms4l3qry6k", @@ -78514,6 +78991,36 @@ } }, { + "ename": "ox-bb", + "commit": "da730e416206f4cb7a2e1552a3079cec9af89ae5", + "sha256": "1gpx9kls1pmnbr5izv3qxlkd3bg7wbk4il3q3xw006lxcmwl48v8", + "fetcher": "github", + "repo": "mmitch/ox-bb", + "unstable": { + "version": [ + 20210222, + 2002 + ], + "deps": [ + "org" + ], + "commit": "a79dc519cd28c000ebca4254a4744ce2b9b82168", + "sha256": "1ffpslv58kzw9nhrfv2cp42vq0pdx5gm1bk20g6k697ijiz1r1jj" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "org" + ], + "commit": "37e22316afac9dd73dec072ac6420e5c1c4471b6", + "sha256": "0a2vp4br1s4zjvjz7z7j3kzzlnb4rzmash1425rz55zg2v3zsi0a" + } + }, + { "ename": "ox-bibtex-chinese", "commit": "6c09c708c4372451502923cd3cb756f4f98ba97b", "sha256": "0f3xigrkhc86vv23f76fdd4rjsspsd2ck5c65biq2ds247f4gm61", @@ -78675,8 +79182,8 @@ "deps": [ "org" ], - "commit": "be1d5ddd8622d369cb5196b7f9e7d4b21a71a8f1", - "sha256": "0zs7izss7kpqwv5a7crbwbis9w71vkz9qwgbbzhs2my6wmcdyjxi" + "commit": "6805ccc23365620004034c18fbed22a8a07bd4dc", + "sha256": "12z1w6xsdx7p3q20h3bfap7ghxlj7awd6vpf4g3r7acd86fmxkjq" }, "stable": { "version": [ @@ -79003,11 +79510,14 @@ "repo": "DarkBuffalo/ox-report", "unstable": { "version": [ - 20201208, - 1749 + 20210219, + 2023 + ], + "deps": [ + "org-msg" ], - "commit": "b7b1d682a724ef4ea729327395aa6577cba27133", - "sha256": "1cznkrcxi0pfs7i1fvz6zg8b3z2axcmqmjw62s15p0fhn4d2czxf" + "commit": "7e135fb51f252ab1ec5a31e05a1c7e638b656b85", + "sha256": "1lg00p7nr3y5wjm7r53c93gx0ycqjgsrj4w5jxw6fzrdacqdnsz9" }, "stable": { "version": [ @@ -79026,14 +79536,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20201211, - 1518 + 20210215, + 1605 ], "deps": [ "org" ], - "commit": "e8673f4825b1c6e97f8ba895ccaf8c460cba5a09", - "sha256": "08gsb4c7a3hvkp3vdzad2wbs3n6ldxddhqp7bxsgsw7z3gfb4snv" + "commit": "499c5777174dbc7318e3f32fd50357c2823b228a", + "sha256": "1sf7ksda0898lgig1qhdzqm9v2jgrr033ainpb9406ij1v63gsh7" } }, { @@ -79504,15 +80014,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210127, - 158 + 20210227, + 314 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "1dd52c65cf1431aec5b3dbbb16408f25559c5112", - "sha256": "0pq4ksipnli2798c7rvv2wlnk1nkd8j92vz7kpld8y0bgfr62mbr" + "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04", + "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz" }, "stable": { "version": [ @@ -79541,8 +80051,8 @@ "deps": [ "package-lint" ], - "commit": "1dd52c65cf1431aec5b3dbbb16408f25559c5112", - "sha256": "0pq4ksipnli2798c7rvv2wlnk1nkd8j92vz7kpld8y0bgfr62mbr" + "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04", + "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz" }, "stable": { "version": [ @@ -79594,14 +80104,14 @@ "repo": "Silex/package-utils", "unstable": { "version": [ - 20180514, - 1415 + 20210221, + 822 ], "deps": [ "restart-emacs" ], - "commit": "5621b95c56b55499f0463fd8b29501da25d861bd", - "sha256": "1mhsf0l0253d9b7n3c68mw5kwnsk7wf217y7m2fiybh51bdgjfnd" + "commit": "6a26accfdf9c0f1cbceb09d970bf9c25a72f562a", + "sha256": "1gmr3ncr98fb7j3iwig9bbawkpj1f0vmq3nmapwqbaqv6gyy93h1" }, "stable": { "version": [ @@ -79648,17 +80158,16 @@ "repo": "codingteam/pacmacs.el", "unstable": { "version": [ - 20160131, - 832 + 20210225, + 1255 ], "deps": [ "cl-lib", "dash", - "dash-functional", "f" ], - "commit": "d813e9c62c2540fe619234824fc60e128c786442", - "sha256": "0zx72qbqy2n1r6mjylw67zb6nnchp2b49vsdyl0k5bdaq2xyqv6i" + "commit": "5e0bcba1eeb10a4218087ff9cd6217d662fb775b", + "sha256": "15w7wr3bdqmwg459nl6vyf4ymrhqxk9pvli5q55qyvy905n3281j" } }, { @@ -79764,14 +80273,14 @@ "repo": "zainab-ali/pair-tree.el", "unstable": { "version": [ - 20210205, - 1018 + 20210214, + 1651 ], "deps": [ "dash" ], - "commit": "f45418560dfc7773ea896e34fb216f68b90c764d", - "sha256": "10bhwq7g16cvib8s4lg9skskbwp1bjyqrw8h0mip3sgvvjlhckfh" + "commit": "972ba441c40edf9b2c212f64fc6670104749662b", + "sha256": "1v4d17hdh3dvb2a4n10gxlr20zal8c7v456wiknkfrpv06d8awap" } }, { @@ -80195,38 +80704,6 @@ } }, { - "ename": "parinfer", - "commit": "470ab2b5cceef23692523b4668b15a0775a0a5ba", - "sha256": "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i", - "fetcher": "github", - "repo": "DogLooksGood/parinfer-mode", - "unstable": { - "version": [ - 20201021, - 254 - ], - "deps": [ - "cl-lib", - "dash" - ], - "commit": "8659c99a9475ee34af683fdf8f272728c6bebb3a", - "sha256": "06pz7ady4l05y56w3nr7bknv277jr949p9p9yy0dh8slii2acl77" - }, - "stable": { - "version": [ - 0, - 4, - 10 - ], - "deps": [ - "cl-lib", - "dash" - ], - "commit": "5b3b247d68eeaf7404598cbcbf2158e07f16e65d", - "sha256": "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk" - } - }, - { "ename": "parinfer-rust-mode", "commit": "b35f28995db0c21ecaadd5504a10aa2ee5ac2070", "sha256": "06003hh19k1087s8lvsbl04as2yph1zw9qr844s4rbyi838d4pc1", @@ -80234,20 +80711,20 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20201124, - 616 + 20210218, + 1650 ], - "commit": "67eed38129c28f087c0b5dffe8a790978d41a8c1", - "sha256": "074mx8dx4ja0bylsrf05d8n03a7ivix65iz3377h4p3ikmvppc3f" + "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774", + "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x" }, "stable": { "version": [ 0, 8, - 2 + 3 ], - "commit": "0953765ec361c1c0d6f36eb3c5dd706752af2482", - "sha256": "1d9885l1aifrdrg6c4m2kakhs3bbmfmsm02q96j0k0mzzwr7rs41" + "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774", + "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x" } }, { @@ -80291,20 +80768,20 @@ }, { "ename": "parse-it", - "commit": "3f163ca64c2533603410f320c7e9b9b1c2635458", - "sha256": "076b981jdhgv7kqdj6xnckp3x25wfymy0il9fffrpyfs7hrcdzgf", + "commit": "9e89bebbccf9ccf85841b00bf113925f8fb20775", + "sha256": "0l3h3sjr3xipj8lm7ph03jl326mcxscsbh0gx7gfrwfaynjb61kl", "fetcher": "github", "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20210128, - 1345 + 20210222, + 1623 ], "deps": [ "s" ], - "commit": "27a7b6ac6e92644160358958602aeae596ba8bad", - "sha256": "13hh3rfpfcmg6avakgb7rg4nrrifsj8s3yp359933axv2f622gbx" + "commit": "b1b80d1bd1cb852d344a8daf6ba7142be2c9ee7b", + "sha256": "1dckhlzxzr8zj6hbccgs60igigcij9qrvsb3v80z5dqgj24mqab2" }, "stable": { "version": [ @@ -80521,11 +80998,11 @@ "repo": "vandrlexay/emacs-password-genarator", "unstable": { "version": [ - 20201123, - 1610 + 20210224, + 1705 ], - "commit": "d754391d11d1d384833eb82fd34e02d2baec36cb", - "sha256": "1658mzzdk012rwn049dxzrqp1k4vfbvrsksnh06zdn8m6n7xqi28" + "commit": "778f98d507d337f916bb3251fae6e351ebe50aa2", + "sha256": "07k2jsjfl3cyk0piikvn03280hbmggvkwkfin8s1wz54495504g5" } }, { @@ -80536,11 +81013,11 @@ "repo": "juergenhoetzel/password-mode", "unstable": { "version": [ - 20170412, - 629 + 20210214, + 1905 ], - "commit": "ed764a4ec1011526457c71b7c37fa9a659a866ab", - "sha256": "102zydbkr2zrr7w0j11n7pivnsdmq3c6lykf3qc84jifp7j58pgr" + "commit": "ed4a4bedbdd920aad486009932495cb6ab70c3e6", + "sha256": "1xqsrvnqcfmlncqbys21p8pzwxl064lzgs5qfb2m6w0p9ipblkjw" } }, { @@ -80559,8 +81036,8 @@ "s", "with-editor" ], - "commit": "f152064da9832d6d3d2b4e75f43f63bf2d50716f", - "sha256": "0qxzqiljiqxzi1jlgm0c5f1pjz1jnnhq74lm0x9q68cim1vch48n" + "commit": "918992c19231b33b3d4a3288a7288a620e608cb4", + "sha256": "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi" }, "stable": { "version": [ @@ -81489,8 +81966,8 @@ "deps": [ "cl-lib" ], - "commit": "d46082ca2adb8df3f6a7a422cff4af095878c2b6", - "sha256": "1vxnp6bzs1vlvh3cn56g64pb5zsy0ww1f50hlz7sklabc1mpp6sy" + "commit": "697d95f24e055eb9725781d179d7db63d6afd2b5", + "sha256": "18sjkqc94kawgfv3q9ai8m0bq3h63mlyg47bxyv0zyn34n1mpc9l" }, "stable": { "version": [ @@ -82890,11 +83367,11 @@ "repo": "thomasluquet/playerctl.el", "unstable": { "version": [ - 20180301, - 1354 + 20210221, + 1956 ], - "commit": "3eee541423c2e5eb9f23a26fa9aa88c9c5a19ad1", - "sha256": "16qvn1mss5j8vpf1qpq4lwl4hwng64caw3c3shixsncfmgw25z6f" + "commit": "f480cd30bad76e4bc337e4be0cac6300e8154fce", + "sha256": "0f2f9dpi1yxckicybmdp7ns8x1hqhdygcvw8b7z0mhbwwxc7ml6m" } }, { @@ -83804,11 +84281,11 @@ "repo": "baudtack/pomodoro.el", "unstable": { "version": [ - 20210111, - 1934 + 20210225, + 2018 ], - "commit": "662b1f176d6faddd07be32ee6eb974ca02d5ec03", - "sha256": "02iji913mh03hdlzdl4m7lfzzqp3p7437cay5mn8ba4prpqqz76j" + "commit": "ed888b24d0b89a5dec6f5278b1064c530c827321", + "sha256": "0yv1339q5s31wxw8y34pb09b0rlvz9m3gzqb4dc1q8ncq8xb8wl5" } }, { @@ -84100,11 +84577,11 @@ "repo": "emacsorphanage/popwin", "unstable": { "version": [ - 20200908, - 816 + 20210215, + 1849 ], - "commit": "215d6cb509b11c63394a20666565cd9e9b2c2eab", - "sha256": "1x1iimzbwb5izbia6aj6xv49jybzln2qxm5ybcrcq7xync5swiv1" + "commit": "1184368d3610bd0d0ca4a3db4068048c562c2b50", + "sha256": "0inm6wbfkw6b9bwikd77d0zmk6ma9fzfs11acblp5imq202v76ra" }, "stable": { "version": [ @@ -84484,19 +84961,19 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210101, - 2227 + 20210227, + 600 ], - "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", - "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" + "commit": "b6da466e552a710a9362c73a3c1c265984de9790", + "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall" }, "stable": { "version": [ 5, - 0 + 1 ], - "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", - "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" + "commit": "2c0e9fc061ab723ec532428f312974ca7d8def12", + "sha256": "0d6kbczkamhhcmc8bf01q6k1x0g7dwjihwllzsldgga3dclyh4ks" } }, { @@ -84552,15 +85029,15 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20210129, - 826 + 20210224, + 913 ], "deps": [ "iter2", "nvm" ], - "commit": "61f135a82156712b9226d9bf23156c0cce9d5c98", - "sha256": "0z0nrhajx4xs6miaixhb0syzp7ilbbm71qcbvqqdk1fr9819nhgl" + "commit": "d7ab018a9312979a415d27973890129586b13dc5", + "sha256": "1phkvmhrcszhc74l92syrsmjqg1pd233fl2hpfivyclwyapqky76" }, "stable": { "version": [ @@ -84614,17 +85091,16 @@ "repo": "jerrypnz/major-mode-hydra.el", "unstable": { "version": [ - 20190930, - 2106 + 20210221, + 834 ], "deps": [ "dash", - "dash-functional", "hydra", "s" ], - "commit": "20362323f66883c1336ffe70be24f91509addf54", - "sha256": "16krmj2lnk7j5ygdjw4hl020qqxg11bnc8sz15yr4fpy1p7hq5cz" + "commit": "84c1929a5153be169ca5c36737439d51dffde505", + "sha256": "1yw9xdyqbf285ljsspg8ajjx1bp1g27xpg85p84fsh88nr015rh5" }, "stable": { "version": [ @@ -85118,14 +85594,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210125, - 726 + 20210225, + 1816 ], "deps": [ "pkg-info" ], - "commit": "fd5994762a90c2311e8aa40c37373f24e1743a55", - "sha256": "1vlry2pa45v0l3g0lrhi6sp24cf8i0s76nz1pm92iwgk6hpdz560" + "commit": "f3f8a6505d50ca0f03f7deef99a1c8aa3bcd9e58", + "sha256": "014v34kxjz04jgd70kskh0iwms17ydapk43ywwp23f3m89ps1917" }, "stable": { "version": [ @@ -85198,8 +85674,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20201004, - 1011 + 20210218, + 831 ], "deps": [ "f", @@ -85208,13 +85684,13 @@ "projectile", "rake" ], - "commit": "7a256b1b1444fe0001f97095d99252e946dd9777", - "sha256": "1d8wcjrhw0k4ws0bdl1q37pm0cz1smqink1d8hi8fs505brbpfdp" + "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d", + "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb" }, "stable": { "version": [ 0, - 20, + 21, 0 ], "deps": [ @@ -85224,8 +85700,8 @@ "projectile", "rake" ], - "commit": "228f6316f2da229bc82fbbcf52323da951a17871", - "sha256": "1l9l0hza6p1l750i7lvys6gnrdy2j0dmlg6nbb6zr2cq6jbf1lkd" + "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d", + "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb" } }, { @@ -85529,11 +86005,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210131, - 2042 + 20210227, + 1942 ], - "commit": "89300b579aea2471448b8871b94c0e5982c7c059", - "sha256": "0097gkhb9lw8rl1pqk0fchpgkvfynvgvkz7rgwp4dqifn63krq1j" + "commit": "7844e312b2a192c4245d0d05c12908efc5730e3b", + "sha256": "0ky8ivcwkjdclh1vh9hi8wc5zljamby10fd4m73nnkdi2lr6x5nr" }, "stable": { "version": [ @@ -85636,8 +86112,8 @@ 20200619, 1742 ], - "commit": "aee143afe8c17a3d2c7e88b70ffa6e08a73e2683", - "sha256": "184fg4x1v2yyzh5z47mj0shmq45v1cb8d8pdqbrx7ffxr4lmyn74" + "commit": "8080bebf1f2ff87ef96a24135afe7f82d2eb3d2a", + "sha256": "1i82kgi3pwz61a07kmqw2gv79ym32rffwqqx8rlljk139k9j57mc" }, "stable": { "version": [ @@ -85733,20 +86209,19 @@ "repo": "purescript-emacs/psc-ide-emacs", "unstable": { "version": [ - 20200702, - 1540 + 20210219, + 2247 ], "deps": [ "company", "dash", - "dash-functional", "flycheck", "let-alist", "s", "seq" ], - "commit": "663f4e2cf9cbafdd4b9a60c34346596e2a40c87c", - "sha256": "06zgi5inlg244qhabsp4a24kda83i6rdpxf78qb7ygpxwdj4hf44" + "commit": "ce97d719458ea099b40c02f05b6609601c727e66", + "sha256": "0xfw93pdf744h2yswc53qwyawfzkc31rv8dmha3irq7k1nklhq6y" } }, { @@ -85898,14 +86373,14 @@ "repo": "nbfalcon/ptemplate-templates", "unstable": { "version": [ - 20210204, - 1308 + 20210222, + 1555 ], "deps": [ "ptemplate" ], - "commit": "66bcd5d16289809ac771a7f25bd62b6eaa1ab022", - "sha256": "0bz1ipf7spch9fh1dwgnypka0199yfl07avrsg19y2lpbwi7mg0k" + "commit": "f65acbb4991470cb5ae513c9f2a8197ead297704", + "sha256": "094qxh06jibc6kxs2fa5cw1xmj8mf7ykgdw02qpk0rjmczwns9vs" } }, { @@ -86065,14 +86540,14 @@ "repo": "voxpupuli/puppet-mode", "unstable": { "version": [ - 20200505, - 344 + 20210215, + 2347 ], "deps": [ "pkg-info" ], - "commit": "0e2e32a3b1644edd8010bd3d44e83def683348b3", - "sha256": "082r71wn5klihv8npc8qsvsyw4jyib5mqpnqr029kv7cvlcyfghk" + "commit": "9f4fef6489ddd9251213f68c8389328ca75db9a6", + "sha256": "1syaxzsfwd6q9xkbr9mf9hy4k3bray6m3iybcxszqm1qmwdbl6qs" }, "stable": { "version": [ @@ -86493,31 +86968,27 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210109, - 1118 + 20210228, + 653 ], "deps": [ "async", - "popup", - "pyim-basedict", "xr" ], - "commit": "09a3b590cd83bf94b92ea772765db581e3aeb2f1", - "sha256": "0v5b7p8icn9gvdqmbh7xy79xnqi80qhskg00ag8zabmg624mpn2x" + "commit": "e55fd0d23f75d4f30ce268973d8909510fa01731", + "sha256": "1n25546nlc2vw3wb4znjvv490yi0j614hravzsj99ybwkl9bf094" }, "stable": { "version": [ - 2, - 0 + 3, + 2 ], "deps": [ "async", - "popup", - "pyim-basedict", "xr" ], - "commit": "e9b46009c0e80f45ad95c64237bf69cb28dc12e7", - "sha256": "06ahzyi2h353xj17mzsm9fxmkc6cyzd1mjzmvqfw8cyv538nijc0" + "commit": "0c8cd00d2da981e3833bface7d0c476cbb3e93d2", + "sha256": "102ns8vjmpb56afc3vyd62zfvvrnjdclm1fsn4jzj45b2in5wmxx" } }, { @@ -86649,8 +87120,8 @@ 20200503, 1624 ], - "commit": "d825c21e18de5618cfcacea0fd818efa80a6b0fe", - "sha256": "0riipssdnhys8qijayz1syk1haw1z915c0pplv50qi9nf7lli95j" + "commit": "15396a14bc8f977a00b5288356e79467653a2c3c", + "sha256": "0j5dgaplar71lyx05ali8rhd6nmfc2dkphcq3wn0gdmd5qmwbwxk" } }, { @@ -86891,11 +87362,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20201230, - 2132 + 20210216, + 1205 ], - "commit": "41b123b4d4906cce7591900a952bb75a38c5296c", - "sha256": "1dl6vpwqxrdy26gh8kw5xkyj1ka88plm60c6ka2g6ji2s851b6ki" + "commit": "689ff2ddb1102a7fae9491333e418740ea0c0cbc", + "sha256": "05a5qv98y2gbi9vycmcfnbzwnnzmdz2iv7fwd5c5qxfi9bsv24sv" }, "stable": { "version": [ @@ -86915,18 +87386,17 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20210111, - 1046 + 20210219, + 1947 ], "deps": [ "dash", - "dash-functional", "projectile", "s", "transient" ], - "commit": "3fadf1f8bc363d57c54eedd1bf98e6d9db9f0a62", - "sha256": "0ij72rjf3qnsbg3zripxyx3lwzliplm24pfrg867dr6lxczkxwv2" + "commit": "31ae5e0e6813de8d889103f7b8dde252b04b1ae4", + "sha256": "1kf62adlm5nf7r3qar8h1cx11xxrz95bfqii62i9xqdi3i8z7b2l" }, "stable": { "version": [ @@ -87536,15 +88006,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210213, - 24 + 20210226, + 1343 ], "deps": [ "faceup", "pos-tip" ], - "commit": "c73c3fcbe135f6cda7abc246e01bc5dc6b310462", - "sha256": "0crzdaqr1yjziv3dswxa9nn1dirq4pa8rhd0mda09bipvxfjirhp" + "commit": "48084a44e50a3ecd91e40ac5b58eed297e314f3f", + "sha256": "18r0pi6g9nfhzj8l306r28al4pfwkn836arvnpbysqxjknxnvqll" } }, { @@ -88677,8 +89147,8 @@ 20201202, 126 ], - "commit": "d0e61f19a29108d676849e0925f00d002a26d32d", - "sha256": "1r3fmc5c2aqfqpfzdxkj6qi86j8vwmrj1gk3xz263pl3q96pzcya" + "commit": "f831f61797e03a0a1df8d99637a8738ba84d7cdd", + "sha256": "0lfpqzbrxs261cpb1hpmszcck13zkmqs67qf736cg2zx9ypfhx1g" } }, { @@ -88788,6 +89258,27 @@ } }, { + "ename": "reddigg", + "commit": "ec2ec4f094e1faee764ad73a5f9addfbd47117df", + "sha256": "04gzhbflh8q5bnyfsw769dlv9s4y2kkqnix3p9pzqz6inmbabg3w", + "fetcher": "github", + "repo": "thanhvg/emacs-reddigg", + "unstable": { + "version": [ + 20210225, + 1948 + ], + "deps": [ + "ht", + "org", + "promise", + "request" + ], + "commit": "fab7b6881c1c93d96258596602531c2e2dafc1c4", + "sha256": "1wxig3bhifczi9an98rw57wzkxshq5z16n44dy72r37pkc6azax5" + } + }, + { "ename": "redis", "commit": "10fbb970956ee19d812c17900f3c01c5fee0c3f2", "sha256": "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a", @@ -89265,32 +89756,32 @@ }, { "ename": "repl-toggle", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "16k9fk1nl2llk9qli52kiirlx9rlz8yhjh3cy6v5y2b3k0y1cf0b", - "fetcher": "github", - "repo": "tomterl/repl-toggle", + "commit": "ce2df1e493e3bcd63dfb07c3c5475d2dbf410fb8", + "sha256": "099sz9c0fl7b65qahc3gf2hlzmrm19spzm8bsl30wyc9vycik9yk", + "fetcher": "git", + "url": "https://git.sr.ht/~tomterl/repl-toggle", "unstable": { "version": [ - 20210114, - 932 + 20210226, + 1055 ], "deps": [ "fullframe" ], - "commit": "091aea753f59f2af5c581e73d15b4dd7ee394d94", - "sha256": "0r2zr6dxzml418rmar5v6yw6x1wfbrk89lqqvgsbjfps3yk9b27a" + "commit": "7028ae65f136215f8e07a43afc33a6b99fe82857", + "sha256": "0nycm8a4wwkkaif958z4m89slayp17k20lp2h7lvddjx8prn6yfp" }, "stable": { "version": [ 0, - 6, + 7, 1 ], "deps": [ "fullframe" ], - "commit": "a36caac7649fbffbe30f7b06541c9efd723563fc", - "sha256": "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd" + "commit": "7028ae65f136215f8e07a43afc33a6b99fe82857", + "sha256": "0nycm8a4wwkkaif958z4m89slayp17k20lp2h7lvddjx8prn6yfp" } }, { @@ -89447,11 +89938,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20210212, - 505 + 20210214, + 37 ], - "commit": "c5a10680f38cd9b60057a7d213eb9bc7dcec918b", - "sha256": "16vs9ifnsa76kikz64jawwkpfck15xm8cdd3ndi4hl4g6ff8a92s" + "commit": "accd430ee706f5b10fb20003b06bd8209bcdaa82", + "sha256": "0ffbc6x340whbrcfi5n0k81134x6knfc9g7z299fn47b2ihgd6jc" }, "stable": { "version": [ @@ -89471,15 +89962,15 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20181129, - 317 + 20210214, + 37 ], "deps": [ "deferred", "request" ], - "commit": "c5a10680f38cd9b60057a7d213eb9bc7dcec918b", - "sha256": "16vs9ifnsa76kikz64jawwkpfck15xm8cdd3ndi4hl4g6ff8a92s" + "commit": "accd430ee706f5b10fb20003b06bd8209bcdaa82", + "sha256": "0ffbc6x340whbrcfi5n0k81134x6knfc9g7z299fn47b2ihgd6jc" }, "stable": { "version": [ @@ -89859,28 +90350,28 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20210209, - 1953 + 20210227, + 1113 ], "deps": [ "transient", "wgrep" ], - "commit": "a1bc7036dc662b8c38aaac0b4e2ea3bb5934a688", - "sha256": "1q8z71b9vwq1v1n36byr1qqb3h7sjrvkds2yzbs3vvm1mzzl3qa3" + "commit": "8a537d9f033ba1b47f2ebe4d76f68b3dd74aefcb", + "sha256": "1gqh28fwyjxy4haclf23kzr755p8iyh2mvly3vmzpf55y2n1z8ib" }, "stable": { "version": [ 2, 0, - 2 + 3 ], "deps": [ "transient", "wgrep" ], - "commit": "2ec8d1d36cfb9750c9a65c4a2687ea76399fccb3", - "sha256": "15qcnsnbni0aincm9pxpfhff3c5ivd5zs2s2qchjzhcn4kdm6kxr" + "commit": "bb89400d4d5e4eb22917f7048256745ea566a844", + "sha256": "0d8habjr4nv0xbgsk7nj5zid5zywf00vbl5zcx7anda5w1cy2zvr" } }, { @@ -90324,10 +90815,10 @@ }, { "ename": "ron-mode", - "commit": "67c658fe2ee340f3902c7ff5c0138995e69fe5dc", - "sha256": "1w0zicbva3xvqi1qz87fbr4ciq28hg70f0n2q70drh4nqb4ahwm2", + "commit": "e61a3f8cba4e5e303379f80c9fdd773fdde66406", + "sha256": "19hb9snfkm8fdbn8i9whvq0g85xlr4l6hbjyf1vb8355yrwsdcvs", "fetcher": "git", - "url": "https://codeberg.org/Hutzdog/ron-mode", + "url": "https://codeberg.org/Hutzdog/ron-mode.git", "unstable": { "version": [ 20200830, @@ -90578,20 +91069,20 @@ "repo": "rubocop-hq/rubocop-emacs", "unstable": { "version": [ - 20190326, - 1424 + 20210213, + 1215 ], - "commit": "03bf15558a6eb65e4f74000cab29412efd46660e", - "sha256": "0bl1l2qbpdknn93wr95a49gdnpl3pwpjj3rka3s44hvihny9p8q0" + "commit": "1372ee3fc1daf7dc8d96741b03e4aff5f7ae3906", + "sha256": "1svzp1ylc3j5mfp5bgivmxgy60wyfrzgahvcfzr1217dwjbf68jm" }, "stable": { "version": [ 0, - 5, + 6, 0 ], - "commit": "980bedb455e3551d35a212fae515c054888907c1", - "sha256": "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p" + "commit": "608a3c1dccab9a3af467ce75d94dedfbfd37b21d", + "sha256": "0bxz80j7bnrlrd6gd548rvd5jf6m36wyxfc4vzxbcim1xcfjyp09" } }, { @@ -90888,11 +91379,11 @@ "repo": "bard/emacs-run-command", "unstable": { "version": [ - 20210207, - 1145 + 20210224, + 1444 ], - "commit": "a504d6d5f978e9e133daa901eda6c1420e19f307", - "sha256": "02md9ayraclj97jyjs5pz9xnw32j5wr86zjbaly1dwm87avs27g6" + "commit": "cb76adf8e41d393090a4a3c6f390bd75288642c3", + "sha256": "0gkd7yabjdw6si814wzbkr7hi835pah8z6l0kfyhllvqnkp66qsc" } }, { @@ -90906,8 +91397,8 @@ 20201109, 351 ], - "commit": "54787de62839c48428f2e1edc4e2aa64851e9849", - "sha256": "0zbf2nvnwx6yyjjk4xfdpn15bna6r32n02q32qzk6bnqipw54ca3" + "commit": "80661d33cf705c1128975ab371b3ed4139e4e0f8", + "sha256": "1l66phlrrwzrykapd8hmkb0ppb2jqkvr7yc8bpbxk1dxjb9w9na2" } }, { @@ -90994,11 +91485,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20201204, - 1527 + 20210226, + 1106 ], - "commit": "c5c7ed31a2e1106ab4835b135618a34570796dc7", - "sha256": "1r2qm3n4788pyyglp23ghzbfq8xzni1vb2jgzc6v65x1047j5rl3" + "commit": "e9e9e32c4f82a9b895543c120b327ab5536ec42b", + "sha256": "0f63lms4arkqj6161v2787dgfra23a01vi82s9dcylk9z6bqyz4v" }, "stable": { "version": [ @@ -91431,14 +91922,11 @@ "repo": "nicolaisingh/saveplace-pdf-view", "unstable": { "version": [ - 20201216, - 934 - ], - "deps": [ - "pdf-tools" + 20210217, + 1312 ], - "commit": "b0370912049222f3a4c943856de3d69d48d53a35", - "sha256": "1ky1d3aycc1r96z3fy484p99xlmry9y9z61s7l7mw0m231k7kpbd" + "commit": "54ed966b842501c3c092dbf57b372e37b033c578", + "sha256": "0i03qb6qc2agp9s5s7l08f1wl8anqndh6xshg1c3w357vd1whv7i" } }, { @@ -91529,8 +92017,8 @@ 20200830, 301 ], - "commit": "1a814450162a2a8d0dde107f5a72d6152efbb63a", - "sha256": "0zpmsga0y1sgdm22w9k790mm44y4xc1hjcnlf6byhm1raf7yairg" + "commit": "cacada6203a860236aff831f6a863c92dbe2b878", + "sha256": "17k4n0kwfqrn172mi3d2f67jalgc13p6xr10zhs56mbd5bzwg958" } }, { @@ -91724,14 +92212,14 @@ "url": "https://git.sr.ht/~technomancy/scpaste", "unstable": { "version": [ - 20200731, - 1520 + 20210223, + 1902 ], "deps": [ "htmlize" ], - "commit": "779b94d1159bba8dbcf2b1081df7c54a15577066", - "sha256": "02zsknby258l62vga5p7gzbx12aj6cs4ypmrf7acv5pvliwd9wl6" + "commit": "4ec352fb9fe261ffb8b78449dea986dc34d337b3", + "sha256": "0219jzj3rwcx4k6f4grzrarq0v05jgmmracis3jb25rv0cln3i9r" }, "stable": { "version": [ @@ -91916,8 +92404,8 @@ 20201013, 123 ], - "commit": "3cd1e1801aaddd011992d284280b5b43ccbee17b", - "sha256": "0mgc3wc1kga7n3zwy7i338vdxy0nfhv61ra9708lc14rx6zjwk9f" + "commit": "ad94790492d0d66686f3457cea1caeba8bbbdc51", + "sha256": "1b725iz5xhqki33jydq9vrxvrbfraxq2q79jdbrjy548rbsxzyjf" } }, { @@ -92114,10 +92602,10 @@ }, { "ename": "searchq", - "commit": "9738c1be0511540bfd8f324334518c72c9c38c94", - "sha256": "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr", + "commit": "cd08b1a89eba9dcc0ed7f6d6ccb783b6ba0c00ca", + "sha256": "0n3azkzfflxi8fif4m3q886l5gp33z2ylfl2j3h0w36xlgc9h58l", "fetcher": "github", - "repo": "boyw165/searchq", + "repo": "tcw165/searchq", "unstable": { "version": [ 20150829, @@ -92318,19 +92806,19 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210212, - 1714 + 20210228, + 1401 ], - "commit": "a2ba6333e59ddc853318ece229f34016400ca033", - "sha256": "1agpcazga6gxl6k28bdski1sx046699cici8a9hz0nj7s8rkx1zm" + "commit": "bcf371433f3593bfe911369a4c87fbf7287df866", + "sha256": "052323wgs7z68hzfp6y9x262qsd0l6la667hsjvrdc64x6mv0dii" }, "stable": { "version": [ 3, - 0 + 1 ], - "commit": "bec406a47bd95f5b7363be239783a01631858520", - "sha256": "0j10yxlikyg7qxcmp4fnddyd5nc3hlz080d1zcbijq020a08k86g" + "commit": "a9ecaa018f249c15fae8e1af5d4df337e846e92f", + "sha256": "02jrki6vzyfyi1bbslki5pk2348flh9dz18jkc4y7p60bvbr52cb" } }, { @@ -92341,27 +92829,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20201214, - 227 + 20210227, + 600 ], "deps": [ "prescient", "selectrum" ], - "commit": "42adc802d3ba6c747bed7ea1f6e3ffbbdfc7192d", - "sha256": "0v12707jwd2ynk8gp3shgarl6yp3ynal7d4jzds6l2lknr6wi50w" + "commit": "b6da466e552a710a9362c73a3c1c265984de9790", + "sha256": "1gr3dzlwkdh2dbcw2q7qi4r8d3045vhyac6gy6f0g83hm2zvgall" }, "stable": { "version": [ 5, - 0 + 1 ], "deps": [ "prescient", "selectrum" ], - "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", - "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" + "commit": "2c0e9fc061ab723ec532428f312974ca7d8def12", + "sha256": "0d6kbczkamhhcmc8bf01q6k1x0g7dwjihwllzsldgga3dclyh4ks" } }, { @@ -92406,15 +92894,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20201115, - 116 + 20210214, + 853 ], "deps": [ "apel", "flim" ], - "commit": "f279ebe1c1f9c14bdd5d3da01af24277a6167b69", - "sha256": "1a387s4h167lsray5k5gzm8jpnrg5az7y982iamk67rz5i1ccgz5" + "commit": "20d75302509b5fba9849e74b61c1ce93e5819864", + "sha256": "14qy9k64fi8asd4ka9hv5v0aa7mkdnx6252n02gldg760janr7xl" } }, { @@ -92878,6 +93366,21 @@ } }, { + "ename": "shades-of-purple-theme", + "commit": "fec35f46d061fdd454de7406253a1e24b2b501ed", + "sha256": "1gff2c53wvcfdvh1vx35rm3njp2y5742jkmfm0lbi6q68fz19d3j", + "fetcher": "github", + "repo": "arturovm/shades-of-purple-emacs", + "unstable": { + "version": [ + 20210213, + 1939 + ], + "commit": "96c58f2421165d67f300cc5014715fc0517e8f8c", + "sha256": "17cnwc235wm6la3wh1wcrs621jqzka7xnrrbcsk4kv8fnidi81n4" + } + }, + { "ename": "shadowenv", "commit": "b2651055ab67448f90a93cf594342b8212202b82", "sha256": "1qxnbvpnvk3666hwfrh4pnfgb2mrfha6hiri8zfdspdh8g535ygq", @@ -92885,11 +93388,11 @@ "repo": "Shopify/shadowenv.el", "unstable": { "version": [ - 20190903, - 1907 + 20210216, + 2031 ], - "commit": "5f24c90bb8e7333ee4315619672dc2ec69d198be", - "sha256": "0msrhh41nyvyy17skd5y5lzdz7a6lxnlqnflgz4xf2qpnc390kd6" + "commit": "e4563469fe20b9e6e63d7b19c86ac8b8b615df1d", + "sha256": "1p7a4lps2w6dnc5i1fiwx22ij4in70a0h0bl5bp7ab5ba6l22kaw" } }, { @@ -93290,11 +93793,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20201021, - 552 + 20210218, + 2329 ], - "commit": "54c3ccd9b3fa9becc4b108046b117ccd6384449d", - "sha256": "024drmvh1qv2sbl5nxvyrqbwlk4wk8bfsa08rn21rhlbnwknb5ip" + "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37", + "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph" } }, { @@ -93480,15 +93983,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20210213, - 531 + 20210218, + 115 ], "deps": [ "language-detection", "org" ], - "commit": "46573b3823be1f5ea57603a0e4855279848ad037", - "sha256": "12v1snjw4adrnbz6d0f4xkbr8k2kxa4xfkx32zwqp4bvsgi80arv" + "commit": "3f6807543ffc1da16ede10df8a05d5e4414ba7df", + "sha256": "053r87s6jxl3hi8f7215hvn4xm6913l9wrjxwafv76gsdyl9cgz7" }, "stable": { "version": [ @@ -93569,18 +94072,17 @@ "url": "https://git.savannah.nongnu.org/git/emacs-shroud.git", "unstable": { "version": [ - 20200124, - 1833 + 20210220, + 1952 ], "deps": [ "bui", "dash", - "dash-functional", "epg", "s" ], - "commit": "bf8a854ecd440c525b870f9439f6785700af80d3", - "sha256": "1rfmykbv2jipkb8by9jsx51gdh62spilffj3c49h3rfcllqnbv2g" + "commit": "2e6ff2bab4a1e798c090c9d7fbd90b7f3463d5c5", + "sha256": "08nnpzdrh4sq3vddfcdagaxvn4liprmc3dd17lbrvw5qlcadrbvg" }, "stable": { "version": [ @@ -93756,11 +94258,11 @@ "repo": "mswift42/silkworm-theme", "unstable": { "version": [ - 20191005, - 1903 + 20210215, + 1120 ], - "commit": "6cb44e3bfb095588aa3bdf8d0d45b583521f9e2c", - "sha256": "0w5h1gl8npmwmpvhhwchrknd977w4l3vvd2lib7qphinj117fhzv" + "commit": "ff80e9294da0fb093e15097ac62153ef4a64a889", + "sha256": "09zrhfk6w74kc4sml20k6vhnd8b07yppn69rffan5mhr3qr69176" }, "stable": { "version": [ @@ -94112,6 +94614,29 @@ } }, { + "ename": "sketch-themes", + "commit": "d1b2026ff5fe7a2893dd4c71d9089e97c4fd48f1", + "sha256": "18n6blkrn72zyjj4ik3f6w2axmn0rwk8lpbcaynl3y7v7ij35m0r", + "fetcher": "github", + "repo": "dawranliou/sketch-themes", + "unstable": { + "version": [ + 20210222, + 1337 + ], + "commit": "33b63867db76225e46eda0a8a613813151dc5b62", + "sha256": "19dlwp27g1sd1hd0wq8s16fqk8v4ll6xwn2hl1a9axkdk97mps27" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "df8182628052bf55e7779fb6967383629059b5c0", + "sha256": "0184vmhl3m84qavx1vnrp16fwfpd1fpynfb5vwaa4nvg55ly247i" + } + }, + { "ename": "skewer-less", "commit": "fb63f7417f39bd718972f54e57360708eb48b977", "sha256": "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl", @@ -94315,15 +94840,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210202, - 1426 + 20210214, + 2243 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "f135f69c5c97bb1f2456d05ee1e84ad6b4495ca3", - "sha256": "0xx4zm0anp9vvhl5j1xvq039jyhs96fbbq21pap0c4h1rfv5mgin" + "commit": "68c58c0194ff03cd147fcec99f0ee90ba9178875", + "sha256": "0lammq7116hm79nldxlghi978m7bldccfdc9vy1rlfjj4mhnrlq0" }, "stable": { "version": [ @@ -94540,11 +95065,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210207, - 940 + 20210224, + 1024 ], - "commit": "3278819ddf71d16444e6cea293dd41ca83ea9bae", - "sha256": "1acq2jsk3hbk3lq5klwf825kykyvqrrzicawy5wvssmbvxcgpy8s" + "commit": "fb84318c08f59bc786e047006fc81e2ace568309", + "sha256": "0z123k9ak7yjb9bxb5qx48f33ma8066rhkqh8xc14z7shk75jybj" }, "stable": { "version": [ @@ -95048,15 +95573,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20201229, - 1937 + 20210213, + 1851 ], "deps": [ "cl-lib", "dash" ], - "commit": "63695c64233d215a92bf08e762f643cdb595bdd9", - "sha256": "0yx9xamrpjpn6qshcdzc43pj3avb0nq4q40nmid28vb4giab4927" + "commit": "fb1ce4b4013fe6f86dde9dd5bd5d4c032ab0d45b", + "sha256": "0wl3fg761ddigqfcbgprgn8d03qapbsh803qp36pq09mgi29s161" }, "stable": { "version": [ @@ -95491,21 +96016,6 @@ } }, { - "ename": "snippet", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1yld7y1hsrqs0f0iq7zfwknil5zqv65npm67nh548hbyy3rhgd68", - "fetcher": "github", - "repo": "pkazmier/snippet.el", - "unstable": { - "version": [ - 20130210, - 2315 - ], - "commit": "11d00dd803874b93836f2010b08bd2c97b0f3c63", - "sha256": "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y" - } - }, - { "ename": "snitch", "commit": "8d08307e483c328075bbf933b2ea0c03bffe8b7c", "sha256": "1zck9r251jj3q6q1glxj20812yhkv630qnd2y7q1kkjgp68gby7g", @@ -96421,11 +96931,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20210206, - 728 + 20210301, + 224 ], - "commit": "7cb1809498442b1e52f586bcde36b387777ec316", - "sha256": "0zqczxnrjwl9y0q54gsxz906cds8q9bk7mhlplsgnlm7w9aipr2l" + "commit": "63704d435255c1fe3d7579f0344e244c2fbdb706", + "sha256": "1fbpbj7jzm4djlbzvzjld2gs46wiy6gm9hd1pjg2rr987fl882rg" } }, { @@ -96567,16 +97077,16 @@ "repo": "naiquevin/sphinx-doc.el", "unstable": { "version": [ - 20160116, - 1117 + 20210213, + 1250 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "f39da2e6cae55d5d7c7ce887e69755b7529bcd67", - "sha256": "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch" + "commit": "1eda612a44ef027e5229895daa77db99a21b8801", + "sha256": "0q72i95yx3xa57jlgr7dik6prf20hi8bp8xf3f5c6ificv7i5378" }, "stable": { "version": [ @@ -96979,14 +97489,14 @@ "repo": "purcell/sqlformat", "unstable": { "version": [ - 20200327, - 2329 + 20210218, + 312 ], "deps": [ "reformatter" ], - "commit": "9e6351dc97a6f58f221d6e1baa7bab292309c437", - "sha256": "1r49c8ick1vk7zl4h0472z0p6j3d5b839al3s687acgqdymb24kk" + "commit": "a7b38b20320b2b4f9ec109845fed3661da9b4a49", + "sha256": "164x6vskcby6h7jaz119wqn5x73pnsf53qq314v0q4ncw2917bym" }, "stable": { "version": [ @@ -97137,11 +97647,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210212, - 2231 + 20210228, + 1834 ], - "commit": "537b4c350e562660aa406b99660f80275254714e", - "sha256": "1ihyrdpsqf06d4s91hnd9lgwsas5r2pajdinj1jydqdy6z7g0bba" + "commit": "12eec5df609b16f16b520eceb0681b74d9ae8aa6", + "sha256": "043mra5ysz00jxziqglzpkg5nmhc15lvv4n7q26c5yv2dn4nbdsq" }, "stable": { "version": [ @@ -97254,11 +97764,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20210127, + 20210217, 1051 ], - "commit": "7539916b1eb4f44b2a682111424f3aca1233c482", - "sha256": "04hmf8haqpvd0vjrmr65rnh6xd3pginpg7330r1gsbhkbhpy3p53" + "commit": "820f60af17e71898303f4f3c2576f0619528a492", + "sha256": "1haypfhpbxsv2rm1wpskjdm0ddv34qvaiiyw8qhy1nn64q4b5xx0" } }, { @@ -97565,8 +98075,8 @@ 20200606, 1308 ], - "commit": "11aa5944459e464a96f41d934e23da5320c13333", - "sha256": "0nc388hi362rks9q60yvs2gbbf9v6qp031c0linv29wdqvavwva1" + "commit": "755c709c02e4e091ceb934fd5672db416fc94dbd", + "sha256": "08fb1qlld0dyi7i1pd5xb1g6z2681nyrqfl1ihq0gr8dal6mc772" }, "stable": { "version": [ @@ -97908,11 +98418,11 @@ "repo": "PythonNut/su.el", "unstable": { "version": [ - 20200820, - 57 + 20210226, + 42 ], - "commit": "eadfacdbcb8d54d83f6f6cfe7990b492f7217453", - "sha256": "0xwkkzs4pl3wgjq7n43klkh814h3kzh0mwnka07dbb0gv1xmaigl" + "commit": "787f78989253f4568942a4cece5f135f005e135f", + "sha256": "1sr6lwjd2py0pncbx4qxa8wfxa3fnmfhxr944aid672hba2pdx7s" } }, { @@ -98326,11 +98836,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20210111, - 1314 + 20210222, + 1037 ], - "commit": "266db1fc882efe17bba7033d69ec663ab4cca5f9", - "sha256": "0v1brx89qswf9803spxi9rb02mfppg1fhx7azd9q7wvh4r1n98v3" + "commit": "25d0018036f44ff9bd685a1c9a76d8ba57c1024d", + "sha256": "070i3k5djw2m1763ihqngpxfmdxq7gs058fvjaaf62dpkqy9vv3a" } }, { @@ -98371,11 +98881,11 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20201129, - 608 + 20210227, + 1105 ], - "commit": "87489d28450559078aa15b4a435143a297508e48", - "sha256": "0gyhmv60dx0zxx4bmhzsd7q5vfnkpfwlj6539bn272fwcr7zncp8" + "commit": "a34a2e1128fa99f999c34c3bc6642fb62b887f34", + "sha256": "01apd8agfdhr662lkiy5rh2xvr913754f9zz7f5hn4vkmfgambrh" } }, { @@ -98633,26 +99143,26 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210202, - 2312 + 20210225, + 1251 ], "deps": [ "ivy" ], - "commit": "e0374dc0bbcd8ab0ec24baf308d331251d4f9c49", - "sha256": "1zvcp35vnnz5iybihrw0r21pvkghn73ni2m9jkgf352n8zza7z9g" + "commit": "e005666df39ca767e6d5ab71b1a55d8c08395259", + "sha256": "1c5d3ca2xll6x3px30cpasq2sd32shr37ivdm50wqr9q1yl22dm2" }, "stable": { "version": [ 0, 13, - 0 + 2 ], "deps": [ "ivy" ], - "commit": "cd634c6f51458f81898ecf2821ac3169cb65a1eb", - "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" + "commit": "1deef7672b25e2cb89dfe5cc6e8865bc6f2bcd4e", + "sha256": "0mbdjralgb591hffzi60v0b2rw8idxky9pc8xwn1395jv30kkzfb" } }, { @@ -98955,11 +99465,11 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210113, - 1943 + 20210219, + 2348 ], "deps": [ - "dash-functional", + "dash", "evil", "evil-cleverparens", "evil-surround", @@ -98970,8 +99480,8 @@ "smartparens", "undo-tree" ], - "commit": "c535794b539627b26b7e73481e41f3c870d4b33e", - "sha256": "0pyyjbwcacql4l45fi6jxxvrm4alz9rm8pp6abikh5di98yidjm6" + "commit": "a8e573324a56e131b92967802a8df88bedd1ef6f", + "sha256": "015ijjzzrx6gjh1qgb7ja6fwffialck814y1japg6d6smkd8b82i" }, "stable": { "version": [ @@ -99344,6 +99854,54 @@ } }, { + "ename": "tab-bar-echo-area", + "commit": "82df49c34664a5078d92e6015abc6f965d34791e", + "sha256": "0y91iyllpy4hf2y9saw4p3rj1q34fziw40f64glcsbnv37jkifp3", + "fetcher": "github", + "repo": "fritzgrabo/tab-bar-echo-area", + "unstable": { + "version": [ + 20210221, + 2336 + ], + "commit": "7fe200bf2c7397abe5623d1b05983eaccc467320", + "sha256": "16rf0b33adj780ix3x7xhp74dbx6f2044dzihpl77ar1yd48dhc7" + } + }, + { + "ename": "tab-bar-groups", + "commit": "7c3efd2b2a7030a45244adf07ec9014c6e4540e9", + "sha256": "0c1a26ynjbf6dp2g7lx6iwnrqhri93k57fhfb2dvkb7ya58df7v3", + "fetcher": "github", + "repo": "fritzgrabo/tab-bar-groups", + "unstable": { + "version": [ + 20210213, + 2138 + ], + "deps": [ + "s" + ], + "commit": "930a86edcfe7c0e33e16bfe2501dbe285a443df9", + "sha256": "14vpwh2yh1626jlc1ifyl7lfyv2lsczcgsbjs4flbpv83c9biq8s" + } + }, + { + "ename": "tab-bar-lost-commands", + "commit": "6f2d6b740ab3a35d111381f3358b9f6b52c3df7c", + "sha256": "149rf304ylksdv5l23gz4zkx42cv5ym286j2k0qbj51gfg73kks4", + "fetcher": "github", + "repo": "fritzgrabo/tab-bar-lost-commands", + "unstable": { + "version": [ + 20210215, + 1412 + ], + "commit": "e587cdb5d6d2c8d509c43db4b5bb285415916c4e", + "sha256": "1bnpcfh0lzjz4f1lbj2jqz7ly6d3bv8jhi4lxr5pj3g21437xf4y" + } + }, + { "ename": "tab-group", "commit": "ad758d865bde8c97d27c0d57cabe1606f8b36974", "sha256": "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9", @@ -99596,11 +100154,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20210120, - 2015 + 20210228, + 2046 ], - "commit": "6ef30c69be9da77f0750880da27bab5d81006c6a", - "sha256": "0wfrmp3rix3jxiiq1aijl0k73l8qxi9fp41faxyabr2cqx2pzzsv" + "commit": "62b112a335a62fbc6898401761275cff5d173821", + "sha256": "0xnjwsw6ri46i5gygmn5p9ashwp1lcxglqgnllrq8b918qrayww1" }, "stable": { "version": [ @@ -99787,15 +100345,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210212, - 1021 + 20210228, + 1348 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "f1bb443ce1d24f00203c67b7ebca536832286704", - "sha256": "14ghyvpiwqlrxn76zq6jbwwh3lmp542kaixncwm26ljvmgq22b6p" + "commit": "d3e5d654e1a86019f85dd8c41923fce29fab45d6", + "sha256": "116ff8d8ir7dnmmm6qiy82i9ikziyx0xmy35v2p3dz4qib32n0yh" }, "stable": { "version": [ @@ -99875,11 +100433,11 @@ "repo": "lassik/emacs-teletext", "unstable": { "version": [ - 20201019, - 700 + 20210222, + 901 ], - "commit": "e674ff636e9d15cade171ef432aaeead8109dc48", - "sha256": "0ws2b1kmhrbnhmy2ld7kjkximqpbb8cdcpvz33638ylcvb46vd1x" + "commit": "7092a52b18b4b13b36f4558fade98f89e182e00d", + "sha256": "15rhrkb454kby6n4i669d2l24n7m3xa7nm9p68nbqs04c4sinynq" } }, { @@ -99926,11 +100484,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210210, - 1359 + 20210218, + 1340 ], - "commit": "a3458234b8e0e83c46c6aca11a757c1134752c09", - "sha256": "0l5j2a44sslq1qm0sjaqcnca0y89faxw6ic19zzv5z836m83hl9d" + "commit": "c1bb14cbaf47a24b0765b68ac6f252d0b5e2809f", + "sha256": "1sk8g4gs9103f2sk76x6zx8i74zr79fr30mg87x4shlrnj6a54fq" }, "stable": { "version": [ @@ -100863,18 +101421,18 @@ 20200212, 1903 ], - "commit": "a983a4a27a9e49f9ea7f990e260214a3d2473b61", - "sha256": "0cnasic4xk9x5s81i36dprmg93csmil5p8fadfpmdsfpi83cb9i9" + "commit": "2a5e467de2a63fd59b15c347581f3c5dca349e2b", + "sha256": "0px46fq29xdsgys525l5ba0zbqq9d86c739zqlqnn3safvg5vrih" }, "stable": { "version": [ 2021, 2, - 8, + 22, 0 ], - "commit": "38468becbbda1488b2b204b209a4dac3352d1791", - "sha256": "1z2s12rqgzi4cx77mmim25rh9xgna9i10vv7wljkkfwncnf1xlin" + "commit": "a0eb44d20005e25284d0204f42387ff872bf52b9", + "sha256": "1294wsx9g3k2y5prgxr7w8ms6h0af8c0xijvh4fjil6bsx729c6b" } }, { @@ -100930,20 +101488,20 @@ "deps": [ "haskell-mode" ], - "commit": "8cf18c6a8b1b4c825bdacbdd913d1c355c15bf11", - "sha256": "05ffyh4a9cmv14a64xxscp303wddhi1264xgsiyvllfasz14vjj1" + "commit": "839c9ae0db91509015d7638905d2d7a4811f877d", + "sha256": "1gm8i3bvqkdk2fmkl1lbra1hqlag18bi0fq1mi6grw5lkmmlhay2" }, "stable": { "version": [ 1, 7, - 1 + 2 ], "deps": [ "haskell-mode" ], - "commit": "8cf18c6a8b1b4c825bdacbdd913d1c355c15bf11", - "sha256": "05ffyh4a9cmv14a64xxscp303wddhi1264xgsiyvllfasz14vjj1" + "commit": "223b0f4388dce62c82eb2fb86cf1351d42aef198", + "sha256": "0k93i9smhw5bws2xiybha15g26mwyq0zj6xzxccwh0bfpl76xzqq" } }, { @@ -101440,8 +101998,8 @@ "deps": [ "cl-lib" ], - "commit": "19e2f1766b4a845ce5a4ccc87de62608f385bd11", - "sha256": "1gpzi092732chg0mvrwmr01c2njip1d2m15lj9fa1ii6sddfpand" + "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c", + "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3" } }, { @@ -101740,8 +102298,8 @@ "deps": [ "w32-ime" ], - "commit": "077dfb87054a20a1bbec8d6d0f282f64c6722999", - "sha256": "066vl2qvz14ds66vvyj6cabmf4fbc8x4p12ph340kj4yjncpqcqs" + "commit": "8fd8ae64f71d1d69d7e1bcc47a6f65aa7f8e6993", + "sha256": "020qvjszwkx5klgh865vs5z17ym651i4zzq7c4sz6qwv361ygfm8" }, "stable": { "version": [ @@ -101913,20 +102471,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210117, - 2008 + 20210228, + 1207 ], - "commit": "94582a3fd96450072ab1b7a4e65802dbdb00aebc", - "sha256": "0p96vsva9y6w8fa69vhzzakb9c2sfzihlk9789z3gs5nw88qwkly" + "commit": "1e090b0cd4ea58c9fb5e807e4ebd7bdb9a7b66ba", + "sha256": "0ci7khr2cp185kv4lm4a87fd7sgrjzz12k7w1s4iicaqvfryw9l5" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca", - "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr" + "commit": "9ca983bab26d1a8e189a8c44471d9575284b268d", + "sha256": "0g694ydmb9zjn99hxgfjd3m73kpmnkbrgqhr73b4crbxza5sl29c" } }, { @@ -101974,14 +102532,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20210203, - 2107 + 20210218, + 2015 ], "deps": [ "let-alist" ], - "commit": "e3c1fb176c6d91a8378426e3ea5e6c036f321746", - "sha256": "1dlm3hi22cyw6d0c7i36wkr186v7ll840s1dm4zpd12k11m9sbks" + "commit": "b5c1d391b4be469a07536e901e54a8680387025f", + "sha256": "1z3gzax6i9cwipmi64hg3h98haimlb0xsz4zm1ggqwwq1zd5csvp" }, "stable": { "version": [ @@ -102127,14 +102685,14 @@ "url": "https://git.sr.ht/~tarsius/tray", "unstable": { "version": [ - 20210209, - 1655 + 20210214, + 1119 ], "deps": [ "transient" ], - "commit": "ba04344c90094910cfa4f2f5e56b0b33934cebf7", - "sha256": "1bgshgqwidkk14vq0jmi42wfa81y0bd9rq1r6gzqw024g8syhv47" + "commit": "e2b169daae9d1d6f7e9fc32365247027fb4e87ba", + "sha256": "1wrip00q6lbpllhaz0c7llnm774dq2mizr39ynfssvsdci38z1lm" } }, { @@ -102166,8 +102724,8 @@ "deps": [ "tsc" ], - "commit": "04994785c4ca865bcd4b841d39f40664458b1ec1", - "sha256": "0hyk12s336snwxiz6ca64d3nfyjf70s626rir61ly42m2cyb6ql2" + "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7", + "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg" }, "stable": { "version": [ @@ -102190,45 +102748,57 @@ "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", "unstable": { "version": [ - 20210116, - 1930 + 20210215, + 1506 ], "deps": [ "seq", "tree-sitter" ], - "commit": "7ce723730993ca7879c8660f5ae78c69193a1451", - "sha256": "069851611i4ra8kjknn9nyzrj2xy9qax4f69jxnf99cimw2xd8gr" + "commit": "831a48571ccf14b8a8c607504a6e8e9263ff6dd4", + "sha256": "1dfmlmmf13qzzfpmpc6lgwjhz8hnz5ys2fw4w3rrz6swfaa2vr53" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "seq", + "tree-sitter" + ], + "commit": "831a48571ccf14b8a8c607504a6e8e9263ff6dd4", + "sha256": "1dfmlmmf13qzzfpmpc6lgwjhz8hnz5ys2fw4w3rrz6swfaa2vr53" } }, { "ename": "tree-sitter-langs", - "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3", - "sha256": "147p5hmpys4qhg5ymsmgbc3wx3x2jjw625waprfph7sr6h2cfrps", + "commit": "4029e21f74841db0c82f4a343a3b51b09cae2f25", + "sha256": "0jygxdlh94blfn5gxn949ic2v2x49cvl0rfzmvig3igyfwmm33sp", "fetcher": "github", - "repo": "ubolonton/emacs-tree-sitter", + "repo": "ubolonton/tree-sitter-langs", "unstable": { "version": [ - 20210212, - 1035 + 20210228, + 1450 ], "deps": [ "tree-sitter" ], - "commit": "04994785c4ca865bcd4b841d39f40664458b1ec1", - "sha256": "0hyk12s336snwxiz6ca64d3nfyjf70s626rir61ly42m2cyb6ql2" + "commit": "fcd267f5d141b0de47f0da16306991ece93100a1", + "sha256": "0vyln2gh7x6fkn1wm5z81ibbn7ly440zb68yg7xmyvmxy8xyqfmm" }, "stable": { "version": [ 0, - 13, - 1 + 9, + 2 ], "deps": [ "tree-sitter" ], - "commit": "d569763c143fdf4ba8480befbb4b8ce1e49df5e2", - "sha256": "1rw21nc78m4xngl3i3dmlzrzlqb8rgvlpal6d4f50zdlfbn4pa4v" + "commit": "d13a43e286e9e20daf6c6dd29357ac4992208747", + "sha256": "11ap8rwsa83pq8850sbn9w46imdi3w8zncqp56g57gwgkkq11l6h" } }, { @@ -102275,22 +102845,21 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210201, - 1800 + 20210228, + 1117 ], "deps": [ "ace-window", "cfrs", "cl-lib", "dash", - "f", "ht", "hydra", "pfuture", "s" ], - "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a", - "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -102326,8 +102895,8 @@ "all-the-icons", "treemacs" ], - "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a", - "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" } }, { @@ -102345,8 +102914,8 @@ "evil", "treemacs" ], - "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a", - "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -102375,8 +102944,8 @@ "deps": [ "treemacs" ], - "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a", - "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -102407,8 +102976,8 @@ "pfuture", "treemacs" ], - "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a", - "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -102440,8 +103009,8 @@ "persp-mode", "treemacs" ], - "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a", - "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -102473,8 +103042,8 @@ "perspective", "treemacs" ], - "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a", - "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" } }, { @@ -102492,8 +103061,8 @@ "projectile", "treemacs" ], - "commit": "332d4e0f1f606c472dd083c9cdd4f143ee23020a", - "sha256": "1bgkw8yrjhdpwsjs87yi3hldpvjkl6rpqfd8bpcs6q6anx5dcxxd" + "commit": "0952728fc40022ca7db8e7a58c95e41e8d5448f1", + "sha256": "0qmzqjli07ck460mkr097ji74v4hrdsb5q5d5x7211fdxkfirwss" }, "stable": { "version": [ @@ -102750,8 +103319,8 @@ 20210116, 621 ], - "commit": "04994785c4ca865bcd4b841d39f40664458b1ec1", - "sha256": "0hyk12s336snwxiz6ca64d3nfyjf70s626rir61ly42m2cyb6ql2" + "commit": "1d44e10cf93f6b814fb0a2a69e689537edd530d7", + "sha256": "0vyqvi74d7sb3bv4frrqwfqkw3jhd5nfnw06wx630x13cyq1n6pg" }, "stable": { "version": [ @@ -103494,8 +104063,8 @@ 20200701, 1435 ], - "commit": "c0806c1903c5a0e4c69b6615cdc3366470a9b8ca", - "sha256": "1n594aakmcgyl7qbda86v4wsx8clm62ypiv3h559xz3x72h7mr3j" + "commit": "f4db4c9b9875134df6f5279281099361ae11c2e9", + "sha256": "0s88mz3x9iwz4hj1n4l4nmya473hcv8wsps8dyx4mmgzgpdb1lvf" } }, { @@ -103509,8 +104078,8 @@ 20201218, 400 ], - "commit": "702210384a0c68f04aabc23e08ebd4d6f43ea2c7", - "sha256": "0brd92jln528j7hh8gyv5wz451cfpayvkz9fic7b0wisnwgvq26b" + "commit": "a0389147365c10c974ad68b797b185affb935fe3", + "sha256": "0qdls5h0ryh93ziwd5gibhknz8n9v66fyp55iwjk8zblgahnm6ym" } }, { @@ -104378,8 +104947,8 @@ 20210124, 138 ], - "commit": "727aa7809b2e3ea09a36c61740d04e316ee21070", - "sha256": "1c83gialj6ydm1h4075fk70yr84199s6235jfzc9c7h44jf88gvn" + "commit": "d4b2014c5684b33ff73b4940bdff7b1138c1f85d", + "sha256": "00cx125pq6jad1v8pxq016hzg6wz1d06l4pc6z9r60l89y2m9hm2" } }, { @@ -104528,14 +105097,14 @@ "repo": "dougm/vagrant-tramp", "unstable": { "version": [ - 20200118, - 2324 + 20210217, + 704 ], "deps": [ "dash" ], - "commit": "f67925928dd844b74e4002f433e6f0ebd3aae357", - "sha256": "1s022vcjzm78v1j7z29pda3lk9x93fvks4qw5v9kh2yzsrxdq4h8" + "commit": "5f00b42a0c023c461cef7af4de7652d90c788b4d", + "sha256": "1mshxcbwdjs2fs7lzqhs3pqbmdmy2fyzkf9b6r8rsxqlisa4x6sn" } }, { @@ -104643,11 +105212,11 @@ "repo": "thisirs/vc-auto-commit", "unstable": { "version": [ - 20170107, - 1333 + 20210216, + 1517 ], - "commit": "446f664f4ec835532f4f18ba18b5fb731f6030aa", - "sha256": "18jjl656ps75p7n3hf16mcjrgiagnjvb8m8dl4i261cbnq98qmav" + "commit": "56f478016a541b395092a9d3cdc0da84a37b30a1", + "sha256": "1aw5j6akrkzr4pgf10scbfqr9axny3pf3k7yslg7g5ss1fd71afl" } }, { @@ -104658,11 +105227,11 @@ "repo": "thisirs/vc-check-status", "unstable": { "version": [ - 20170107, - 1334 + 20210216, + 1525 ], - "commit": "37734beb16bfd8633ea328059bf9a47eed826d5c", - "sha256": "0mspksr2i6hkb7bhs38ydmn0d2mn7g1hjva60paq86kl7k76f7ra" + "commit": "d95ef8f0799cd3dd83726ffa9b01b076f378ce34", + "sha256": "10sr9qxfx64f7a2kj93vi7lmm1pdj6qf81ci0ykkmrffmjdlf846" } }, { @@ -105062,15 +105631,15 @@ "repo": "applied-science/emacs-vega-view", "unstable": { "version": [ - 20200520, - 1202 + 20210227, + 1507 ], "deps": [ "cider", "parseedn" ], - "commit": "8a9e3f9344fd1b81ec52ea9655313c0490ab5d7b", - "sha256": "1b49lszx5gs9yc1zisklqqgijygdnfy2zryhipn7i1nvmpjzglv9" + "commit": "bb8159ad25886d81fcc2d3a9ec5af7ef669a87a6", + "sha256": "18g0fygi8dgwj2harnrqvilv0v3rrrdphqybmnshjmnfngkak55s" } }, { @@ -105883,11 +106452,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210209, - 356 + 20210217, + 737 ], - "commit": "a3fadd28370aa43f03d4f7b197be8fa074f311f5", - "sha256": "02vy7kxpv3k1viyf977apk0nmr53wb988h8zv19w1llp9lwa578f" + "commit": "e19da61668783239e47b1a7390fca10f38ceffa9", + "sha256": "04x9514vl8315racjn3c4b1kp6wiy33d1q7b637zfzsf6w72ybpa" } }, { @@ -105898,14 +106467,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210130, - 1149 + 20210226, + 1800 ], "deps": [ "vterm" ], - "commit": "277a2071426562c385f87ef265dfafaf5051afb3", - "sha256": "10y2qxz3rz746sbfmkff0rh1vcjjdlkc9dw5gy5k1qnj8b3mi8pg" + "commit": "91f788e90b12dd940e3bc9c7b24108be37b99c03", + "sha256": "1gdf27b89d47js89wi1amicrm49qryi0d3qyjzav4ryf8m7xx54m" } }, { @@ -105989,8 +106558,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20210208, - 827 + 20210216, + 751 ], "deps": [ "bind-key", @@ -105999,8 +106568,8 @@ "s", "versuri" ], - "commit": "7063ccde4269925827283553f794bfe48866ffda", - "sha256": "1bkwlwa95v967bpafzkgjv0ac4h8nknjlwdsgslvanfxz046py15" + "commit": "196683c3860793f2255bd0b3091ac9d538fa3ba7", + "sha256": "1465fx3h6ylgqg98m08ja0f48xwsxqai1vnigbb1fwlaxg3k23lm" }, "stable": { "version": [ @@ -106085,11 +106654,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210201, - 2305 + 20210226, + 23 ], - "commit": "54c3ccd9b3fa9becc4b108046b117ccd6384449d", - "sha256": "024drmvh1qv2sbl5nxvyrqbwlk4wk8bfsa08rn21rhlbnwknb5ip" + "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37", + "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph" } }, { @@ -106648,11 +107217,14 @@ "repo": "eschulte/emacs-web-server", "unstable": { "version": [ - 20201217, - 1252 + 20210209, + 58 ], - "commit": "4d865cc4720f668aed7a8c3bcfddfbf534ecfb67", - "sha256": "14kx3anbffs53hdcq7347b3rd33lk6ajvwrz5mhnnj1kmdxy7dxh" + "deps": [ + "cl-lib" + ], + "commit": "3aa5084bcb733aa77997b9210b4437903f6f29ce", + "sha256": "1cg27byi1g0s3yfzdkji4xzc15ci5kqb2j0mj5dfdms4db12dir4" } }, { @@ -106699,14 +107271,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210211, - 255 + 20210222, + 102 ], "deps": [ "templatel" ], - "commit": "95ee894dea36ac1f0d39266169123ee1ba7674ed", - "sha256": "1ap1nk9f560qvggvpknnk33xjbk7n4hisiv98xin20s60vjwspx3" + "commit": "96aa798389536eee543ffeb0fa3c34dbd123c359", + "sha256": "0mjgw2rs67h6jgpjnidsbb4xly8dmxwgblas5vi1ddqfppzchgfr" }, "stable": { "version": [ @@ -106885,11 +107457,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210212, - 1514 + 20210227, + 1749 ], - "commit": "2c0ade85ef96ce311dcf10f915af5c3696c333bf", - "sha256": "173csa3pv5230q9r9iz5j3nf34m8kd9jcrcvc17yv5bp7njmak4d" + "commit": "831005d21ac373d5d12a1ef2d524e83a6b114c56", + "sha256": "1grqvy901bkx0pqfy2zfyqzmk5wdarihg27lyjlz1hpiyl74y3sp" } }, { @@ -107570,15 +108142,15 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20210211, - 1713 + 20210214, + 1451 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "76b2298c27e69941ed5200363fbcac7487875f83", - "sha256": "0slbhn09vbv10mxmgym0fmk4yf28q9aj2bnmkf2fh3p766ps9n1a" + "commit": "cb61b9381ef9865e725c4641588d7b8945d35003", + "sha256": "0ppx6kbc03l18z0dwd6y0anf8bqnf9vcpdz7h552q8sycrrwfq0h" }, "stable": { "version": [ @@ -108123,8 +108695,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210128, - 1005 + 20210224, + 1905 ], "deps": [ "ace-link", @@ -108132,8 +108704,8 @@ "swiper", "zoutline" ], - "commit": "718ad44ff340e0298ee843130067f42d799350a4", - "sha256": "16nqx4ridk6asibxhp9l8pw33kc862i42wkjm14m8r5y6gi67k7d" + "commit": "eed052db551f60483b4189e9c87cbb16f6d5947a", + "sha256": "1800q96gchagwqplpwscgjqb9f7zcc0qb2z07cbq6a17dc4rqcpl" }, "stable": { "version": [ @@ -108582,11 +109154,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210212, - 2334 + 20210224, + 2052 ], - "commit": "3e5c9db36b9a01b485fffd12219a1685ea1e1fc6", - "sha256": "03496m1vs7kkh2rwymj5nbr2cv07s3vdlic9mm30rim0cpw3gax6" + "commit": "df7001159f7e8c9a61c0e360e8ea47b51deb38d9", + "sha256": "1hcm86w7mkc3ms2hy1fljjnk88yin1lax6ww3aq7r2yijjsv9a4w" } }, { @@ -109087,8 +109659,8 @@ 20210110, 640 ], - "commit": "3e7360553f46461cbcacdb18cbb7a214d55b89f7", - "sha256": "1cqp0azbnhsi7l2xis6b0pwcpn4v40cqx5p79ymhhza8ch8q7rx6" + "commit": "9f0cd128fd118fbdf9ea64816c38c0d45adb9733", + "sha256": "0c326d218p8pp1dcs1zz3q2mgvda82c9drh73hgb8n610f2gvd9d" } }, { @@ -109356,8 +109928,8 @@ 20200511, 2005 ], - "commit": "91159ce448e3bc9cc5759051e2b126599567893e", - "sha256": "1f0zb417y40iwx3x116lyp74hv9x6z5c500ydvig3qsjf7l82dx2" + "commit": "96068216a4f0c4894bf780cd36164fe840cf81d5", + "sha256": "11wrvmnr74pqga8a00gd4zskan8wkgah9fyn0bwgp0x4qx4xni17" } }, { @@ -109981,11 +110553,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20210201, - 605 + 20210216, + 29 ], - "commit": "77036b1067c16451cbc9fdca254f31b6725b795b", - "sha256": "0dm9rd0dr1dv6adq4rmj3z9l94y2jq1kd8p1d2r3qw6jqz8w035d" + "commit": "eb2a38c71a955fa934ac7a907b9924b3755e40c7", + "sha256": "0zvk10mgy3q10qmigqx2g1vfxvrwzs27lq4gq0qkh7k4qish2zgx" }, "stable": { "version": [ @@ -110039,11 +110611,11 @@ "repo": "spiderbit/ytdious", "unstable": { "version": [ - 20210207, - 1841 + 20210228, + 2111 ], - "commit": "6005ff920b7df97724094b1afa2a6a3d0fcc6a60", - "sha256": "17dp67awxpv8zi961rbhzgzkyxvnj2498p6ld0bjh3v7nqg0zfwg" + "commit": "941460b51e43ef6764e15e2b9c4af54c3e56115f", + "sha256": "0ihqzxahqvk8jnn05k06lzhi6pd9c1a2q7qqybnmds85amkwmsad" } }, { @@ -110360,25 +110932,25 @@ "repo": "NicolasPetton/zerodark-theme", "unstable": { "version": [ - 20210212, - 956 + 20210216, + 1640 ], "deps": [ "all-the-icons" ], - "commit": "744c1a5b06277f0f9b70abb30a93b35818773532", - "sha256": "1v5by5kq7ifqz172x80y3ddlkywl3dccvqvz6skxq7rz8w4gx5d3" + "commit": "65a4b57d064cd4bfe61750d105206c3654ac5bba", + "sha256": "1jiyz68pswbmh5fbkwndw83kim150rg2wz7i2a5lac3vj7zqr0nc" }, "stable": { "version": [ 4, - 6 + 7 ], "deps": [ "all-the-icons" ], - "commit": "df22536a244293591575e56970bf83814faa7c14", - "sha256": "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6" + "commit": "342055346446bb8306ac2d3d2ac1f4236c84a404", + "sha256": "1r5s4mvwlxsb9ylr6dkfxpm1l0pbqkmn5gwjdcfk762cnxlam8cm" } }, { @@ -110389,15 +110961,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20201230, - 2127 + 20210214, + 1135 ], "deps": [ "ace-window", "deft" ], - "commit": "09d31b083e0d08bd4dda3e60af44711c090140b0", - "sha256": "14hawr28rcr4scjchjx71g6wvvnym9ai20iz615a751iilg4mw7a" + "commit": "8ea36747ff499e82a911c367eba8f7423c6301a4", + "sha256": "0p0hz0s3fzpig3vinj7wv3vs29ba5rshw4glxrk3q1hlv3hh4q4s" }, "stable": { "version": [ @@ -110796,15 +111368,15 @@ "repo": "egh/zotxt-emacs", "unstable": { "version": [ - 20210115, - 456 + 20210222, + 347 ], "deps": [ "deferred", "request" ], - "commit": "87d8c4836c5f43530db8f00a66b7b69087236875", - "sha256": "01w529yr96kx7xg2w670ci61aljd1alrbqy1qxnj9yiymqsnmys1" + "commit": "a760009b9ecfa0b3362e77a6b44453821768d02e", + "sha256": "0vfdpgb0ln3xrx4i32mqisaj7qm2yx73rhagx6adr8hjw78gysfy" }, "stable": { "version": [ @@ -110902,14 +111474,14 @@ "repo": "fourier/ztree", "unstable": { "version": [ - 20210210, - 2022 + 20210215, + 2111 ], "deps": [ "cl-lib" ], - "commit": "6eee81d2691009ce60b2edf7c298b227caf1b0d6", - "sha256": "1xmimjflylssx63g1kpd5n34gdlpivgg9ih8nwplad57bxiy2yqb" + "commit": "dc5f76923436ea87b802b56a54185b6888177a8c", + "sha256": "17y1hjhygh2kq487ab1s8n2ba9npdmqg6354jv3gha6ar3mib1qi" } }, { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 12c3c57bbec35..6726790d50fe8 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -136,7 +136,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" "--with-gif=no" "--with-tiff=no" ]) ++ lib.optional withXwidgets "--with-xwidgets" - ++ lib.optional nativeComp "--with-nativecomp" + ++ lib.optional nativeComp "--with-native-compilation" ++ lib.optional withImageMagick "--with-imagemagick" ; diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix index e134113e23faa..c31c1fe10c053 100644 --- a/pkgs/applications/editors/jupp/default.nix +++ b/pkgs/applications/editors/jupp/default.nix @@ -1,31 +1,41 @@ -{ lib, stdenv, fetchurl, ncurses, gpm }: +{ lib +, stdenv +, fetchurl +, ncurses +, gpm +}: stdenv.mkDerivation rec { - pname = "jupp"; - version = "39"; + version = "40"; srcName = "joe-3.1${pname}${version}"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz" - "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ]; - sha256 = "14gys92dy3kq9ikigry7q2x4w5v2z76d97vp212bddrxiqy5np8d"; + "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" + ]; + sha256 = "S+1DnN5/K+KU6W5J7z6RPqkPvl6RTbiIQD46J+gDWxo="; }; preConfigure = "chmod +x ./configure"; - buildInputs = [ ncurses gpm ]; + buildInputs = [ + gpm + ncurses + ]; configureFlags = [ "--enable-curses" - "--enable-termcap" - "--enable-termidx" "--enable-getpwnam" "--enable-largefile" + "--enable-termcap" + "--enable-termidx" ]; meta = with lib; { + homepage = "http://www.mirbsd.org/jupp.htm"; + downloadPage = "https://www.mirbsd.org/MirOS/dist/jupp/"; description = "A portable fork of Joe's editor"; longDescription = '' This is the portable version of JOE's Own Editor, which is currently @@ -35,8 +45,8 @@ stdenv.mkDerivation rec { and has a lot of bugs fixed. It is based upon an older version of joe because these behave better overall. ''; - homepage = "http://www.mirbsd.org/jupp.htm"; - license = licenses.gpl1; + license = licenses.gpl1Only; maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix index 7ac56d9cb1e0c..451507885ce03 100644 --- a/pkgs/applications/editors/kakoune/wrapper.nix +++ b/pkgs/applications/editors/kakoune/wrapper.nix @@ -9,7 +9,7 @@ in symlinkJoin { name = "kakoune-${kakoune.version}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; paths = [ kakoune ] ++ requestedPlugins; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index e0704cdbc859d..aa7b7b1944862 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -29,7 +29,8 @@ in inherit sha256; }; - buildInputs = [ makeWrapper libXScrnSaver ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libXScrnSaver ]; desktopItem = makeDesktopItem { name = "kodestudio"; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 63be87ee86c7f..90879b352e184 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = metadata.sha256; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index cb53eb9d9d450..30d1e5b75787d 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.5"; + version = "5.6"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0jkyd3yzcidnvnj1k9bmplzlbd303x6xxblpp5np7zs1kfzq22rr"; + sha256 = "0ckscf3klm2k1zjvcv8mkza1yp80g7ss56n73790fk83lzj87qgw"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 5c6c6c1a8d574..41ff62a619fb8 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -106,7 +106,7 @@ let preferLocalBuild = true; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; passthru = { unwrapped = neovim; }; meta = neovim.meta // { diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 9206b296b9acb..f968b85c6ff1d 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -56,7 +56,8 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - buildInputs = [ makeWrapper perl python unzip libicns imagemagick ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl python unzip libicns imagemagick ]; meta = { description = "An integrated development environment for Java, C, C++ and PHP"; diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix new file mode 100644 index 0000000000000..1c6f005863b05 --- /dev/null +++ b/pkgs/applications/editors/poke/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchurl +, gettext +, help2man +, pkg-config +, texinfo +, makeWrapper +, boehmgc +, readline +, guiSupport ? false, tcl, tcllib, tk +, miSupport ? true, json_c +, nbdSupport ? true, libnbd +, textStylingSupport ? true +, dejagnu +}: + +let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; +in stdenv.mkDerivation rec { + pname = "poke"; + version = "1.0"; + + src = fetchurl { + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-3pMLhwDAdys8LNDQyjX1D9PXe9+CxiUetRa0noyiWwo="; + }; + + postPatch = '' + patchShebangs . + ''; + + strictDeps = true; + + nativeBuildInputs = [ + gettext + help2man + pkg-config + texinfo + ] ++ lib.optional guiSupport makeWrapper; + + buildInputs = [ boehmgc readline ] + ++ lib.optional guiSupport tk + ++ lib.optional miSupport json_c + ++ lib.optional nbdSupport libnbd + ++ lib.optional textStylingSupport gettext + ++ lib.optional (!isCross) dejagnu; + + configureFlags = lib.optionals guiSupport [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--with-tkinclude=${tk.dev}/include" + ]; + + enableParallelBuilding = true; + + doCheck = !isCross; + checkInputs = lib.optionals (!isCross) [ dejagnu ]; + + postFixup = lib.optionalString guiSupport '' + wrapProgram "$out/bin/poke-gui" \ + --prefix TCLLIBPATH ' ' ${tcllib}/lib/tcllib${tcllib.version} + ''; + + meta = with lib; { + description = "Interactive, extensible editor for binary data"; + homepage = "http://www.jemarch.net/poke"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres metadark ]; + platforms = platforms.unix; + }; +} + +# TODO: Enable guiSupport by default once it's more than just a stub diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index e66febbf7fc28..0d50c24d3976e 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils -, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }: +, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: let version = "3.5.18"; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index e474ff5f19bb0..6e3580a563cc0 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 6ea6b6c60940e..7ed3dee9b6b9e 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -29,7 +29,7 @@ let "/Applications/MacVim.app/Contents/MacOS" "/Applications/MacVim.app/Contents/bin" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # We need to do surgery on the resulting app. We can't just make a wrapper for vim because this # is a GUI app. We need to copy the actual GUI executable image as AppKit uses the loaded image's # path to locate the bundle. We can use symlinks for other executables and resources though. diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index c30b52782ef30..d2c91f155d53b 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -57,7 +57,8 @@ in # When no extensions are requested, we simply redirect to the original # non-wrapped vscode executable. runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { - buildInputs = [ vscode makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ vscode ]; dontPatchELF = true; dontStrip = true; meta = vscode.meta; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 66ad424253eb1..a6b4af7892d66 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.11-60"; + version = "6.9.12-1"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "12810882a0kf4zlgyi290z9bjs921m05njbljkjfw6s1hf0mncl0"; + sha256 = "1s1zr0fqnm9jl1ni07if2klvf2lfg26dgxdbspksq5xdhsxxn841"; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -77,7 +77,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.imagemagick.org/"; + homepage = "https://legacy.imagemagick.org/"; + changelog = "https://legacy.imagemagick.org/script/changelog.php"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 1c4f05b42dac9..57d1f794d0f63 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,9 +1,8 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, -gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi ? null }: - -assert mpi != null; +gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi, +spaceNavSupport ? true, libspnav, qtx11extras }: let pythonPackages = python3Packages; @@ -34,7 +33,7 @@ in mkDerivation rec { matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost GitPython # for addon manager scipy pyyaml # (at least for) PyrateWorkbench - ]); + ]) ++ lib.optionals spaceNavSupport [ libspnav qtx11extras ]; cmakeFlags = [ "-DBUILD_QT5=ON" diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 8fde04d0d1df6..bb81a374fea21 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -11,7 +11,7 @@ in symlinkJoin { paths = [ gimp ] ++ selectedPlugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' for each in gimp-${versionBranch} gimp-console-${versionBranch}; do diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix index cdfb2f668731c..daa540d31e504 100644 --- a/pkgs/applications/graphics/glimpse/wrapper.nix +++ b/pkgs/applications/graphics/glimpse/wrapper.nix @@ -12,7 +12,7 @@ symlinkJoin { paths = [ glimpse ] ++ selectedPlugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 7e3238e94bbc7..312316b33974c 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -15,7 +15,8 @@ let url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip"; sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; inherit jre; # JAR files that are intended to be used by other packages diff --git a/pkgs/applications/graphics/inkscape/with-extensions.nix b/pkgs/applications/graphics/inkscape/with-extensions.nix index cca7b1fc3a54c..c558a6bb06225 100644 --- a/pkgs/applications/graphics/inkscape/with-extensions.nix +++ b/pkgs/applications/graphics/inkscape/with-extensions.nix @@ -10,7 +10,7 @@ symlinkJoin { paths = [ inkscape ] ++ inkscapeExtensions; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' rm -f $out/bin/inkscape diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 313920d8154e2..1dfc4393c46bd 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -17,7 +17,7 @@ let tesseractWithData = tesseractBase.overrideAttrs (_: { inherit tesseractBase tessdata; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 0c5c8f3ff2816..3187f573de704 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -38,7 +38,7 @@ in sourceRoot = "Unigine_Valley-${version}"; instPath = "lib/unigine/valley"; - buildInputs = [file makeWrapper]; + nativeBuildInputs = [file makeWrapper]; libPath = lib.makeLibraryPath [ stdenv.cc.cc # libstdc++.so.6 diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 2076723a372bd..ad94c79e0f3cb 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -2,9 +2,9 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, qtwebengine, - grantlee, + grantlee, grantleetheme, kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison, - akonadi, akonadi-mime, kcontacts, kmime, + akonadi, akonadi-mime, kcontacts, kmime, libkleo, }: mkDerivation { @@ -16,9 +16,9 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtwebengine - grantlee + grantlee grantleetheme kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison - akonadi-mime kcontacts kmime + akonadi-mime kcontacts kmime libkleo ]; propagatedBuildInputs = [ akonadi ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch b/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch index 58390cba226b4..3e5ccc9cdaa54 100644 --- a/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/0001-akonadi-paths.patch @@ -1,6 +1,6 @@ -From 90969b9b36400d47b1afe761fb8468c1acb8a04a Mon Sep 17 00:00:00 2001 +From f4d718502ecd8242500078a7783e27caba72871e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> -Date: Mon, 13 Jul 2020 11:41:19 -0500 +Date: Sun, 31 Jan 2021 11:00:03 -0600 Subject: [PATCH 1/3] akonadi paths --- @@ -11,10 +11,10 @@ Subject: [PATCH 1/3] akonadi paths 4 files changed, 11 insertions(+), 40 deletions(-) diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp -index 23b4a1f..c13b658 100644 +index 31e0cf2..6436e87 100644 --- a/src/akonadicontrol/agentmanager.cpp +++ b/src/akonadicontrol/agentmanager.cpp -@@ -61,7 +61,7 @@ public: +@@ -48,7 +48,7 @@ public: []() { QCoreApplication::instance()->exit(255); }); @@ -23,7 +23,7 @@ index 23b4a1f..c13b658 100644 } ~StorageProcessControl() override -@@ -84,7 +84,7 @@ public: +@@ -70,7 +70,7 @@ public: []() { qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; }); @@ -33,10 +33,10 @@ index 23b4a1f..c13b658 100644 ~AgentServerProcessControl() override diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp -index 4e58f7e..e8bb532 100644 +index c98946c..aa307ca 100644 --- a/src/akonadicontrol/agentprocessinstance.cpp +++ b/src/akonadicontrol/agentprocessinstance.cpp -@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) +@@ -49,7 +49,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) } else { Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); const QStringList arguments = QStringList() << executable << identifier(); @@ -46,10 +46,10 @@ index 4e58f7e..e8bb532 100644 } return true; diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index cac40f5..527649b 100644 +index d595a3a..99324f6 100644 --- a/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp -@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -69,7 +69,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -57,7 +57,7 @@ index cac40f5..527649b 100644 QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -78,16 +77,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) #endif const bool defaultInternalServer = true; @@ -75,7 +75,7 @@ index cac40f5..527649b 100644 if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown") -@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -97,10 +87,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) #endif } @@ -88,7 +88,7 @@ index cac40f5..527649b 100644 qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -117,7 +107,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -97,7 +97,7 @@ index cac40f5..527649b 100644 mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -127,9 +117,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -107,17 +107,17 @@ index cac40f5..527649b 100644 qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &settings) - settings.setValue(QStringLiteral("Name"), mDatabaseName); - settings.setValue(QStringLiteral("Host"), mHostName); - settings.setValue(QStringLiteral("Options"), mConnectionOptions); -- if (!mMysqldPath.isEmpty()) { -- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath); -- } - settings.setValue(QStringLiteral("StartServer"), mInternalServer); - settings.endGroup(); - settings.sync(); -@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer() +@@ -139,9 +126,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) + settings.setValue(QStringLiteral("Name"), mDatabaseName); + settings.setValue(QStringLiteral("Host"), mHostName); + settings.setValue(QStringLiteral("Options"), mConnectionOptions); +- if (!mMysqldPath.isEmpty()) { +- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath); +- } + settings.setValue(QStringLiteral("StartServer"), mInternalServer); + settings.endGroup(); + settings.sync(); +@@ -214,7 +198,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file @@ -127,10 +127,10 @@ index cac40f5..527649b 100644 const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp -index 09cdbd5..1c8996b 100644 +index dd273fc..05288d9 100644 --- a/src/server/storage/dbconfigpostgresql.cpp +++ b/src/server/storage/dbconfigpostgresql.cpp -@@ -141,9 +141,7 @@ bool DbConfigPostgresql::init(QSettings &settings) +@@ -127,9 +127,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -140,7 +140,7 @@ index 09cdbd5..1c8996b 100644 QString defaultPgData; #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows -@@ -154,12 +152,8 @@ bool DbConfigPostgresql::init(QSettings &settings) +@@ -140,12 +138,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); if (mInternalServer) { @@ -154,7 +154,7 @@ index 09cdbd5..1c8996b 100644 defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } -@@ -178,20 +172,14 @@ bool DbConfigPostgresql::init(QSettings &settings) +@@ -164,20 +158,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -177,14 +177,14 @@ index 09cdbd5..1c8996b 100644 qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath; mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString(); if (mPgData.isEmpty()) { -@@ -207,7 +195,6 @@ bool DbConfigPostgresql::init(QSettings &settings) - settings.setValue(QStringLiteral("Port"), mHostPort); - } - settings.setValue(QStringLiteral("Options"), mConnectionOptions); -- settings.setValue(QStringLiteral("ServerPath"), mServerPath); - settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); - settings.setValue(QStringLiteral("StartServer"), mInternalServer); - settings.endGroup(); +@@ -194,7 +182,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) + settings.setValue(QStringLiteral("Port"), mHostPort); + } + settings.setValue(QStringLiteral("Options"), mConnectionOptions); +- settings.setValue(QStringLiteral("ServerPath"), mServerPath); + settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); + settings.setValue(QStringLiteral("StartServer"), mInternalServer); + settings.endGroup(); -- -2.25.4 +2.29.2 diff --git a/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch index ac9b3146e179a..24f59f6791612 100644 --- a/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch +++ b/pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch @@ -1,6 +1,6 @@ -From b8c6a2a017321649db8fec553a644b8da2300514 Mon Sep 17 00:00:00 2001 +From badd4be311afd37a99126c60490f1ae5daced6c4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> -Date: Mon, 13 Jul 2020 11:41:35 -0500 +Date: Sun, 31 Jan 2021 11:00:15 -0600 Subject: [PATCH 2/3] akonadi timestamps --- @@ -8,10 +8,10 @@ Subject: [PATCH 2/3] akonadi timestamps 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index 527649b..08c3dd4 100644 +index 99324f6..3c170a8 100644 --- a/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp -@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer() +@@ -240,8 +240,7 @@ bool DbConfigMysql::startInternalServer() bool confUpdate = false; QFile actualFile(actualConfig); // update conf only if either global (or local) is newer than actual @@ -22,5 +22,5 @@ index 527649b..08c3dd4 100644 QFile localFile(localConfig); if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { -- -2.25.4 +2.29.2 diff --git a/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch b/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch index 1a0bc000c804d..3aa61da73e415 100644 --- a/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch +++ b/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch @@ -1,6 +1,6 @@ -From 7afe018382cf68b477b35f87b666424d62d19ef4 Mon Sep 17 00:00:00 2001 +From 82bfa975af60757374ffad787e56a981d6df0f98 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> -Date: Mon, 13 Jul 2020 11:41:55 -0500 +Date: Sun, 31 Jan 2021 11:01:24 -0600 Subject: [PATCH 3/3] akonadi revert make relocatable --- @@ -9,10 +9,10 @@ Subject: [PATCH 3/3] akonadi revert make relocatable 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d927471..83a74c0 100644 +index 4bb5fec..35720b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -330,9 +330,6 @@ configure_package_config_file( +@@ -343,9 +343,6 @@ configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} @@ -23,29 +23,23 @@ index d927471..83a74c0 100644 install(FILES diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in -index 421e1df..e3abf27 100644 +index bcf7320..1574319 100644 --- a/KF5AkonadiConfig.cmake.in +++ b/KF5AkonadiConfig.cmake.in -@@ -24,8 +24,8 @@ if(BUILD_TESTING) - find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") - endif() +@@ -1,10 +1,10 @@ + @PACKAGE_INIT@ -set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") -set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") +set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") +set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") - find_dependency(Boost "@Boost_MINIMUM_VERSION@") - -@@ -33,7 +33,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) - # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") - #################################################################################### - # CMAKE_AUTOMOC + # set the directories + if(NOT AKONADI_INSTALL_DIR) -- -2.25.4 +2.29.2 diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index d24e19f89e7e2..e0b0e2324b142 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -3,7 +3,7 @@ extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, - signond, + signond, lzma, }: mkDerivation { @@ -21,7 +21,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin - ki18n kiconthemes kio kwindowsystem accounts-qt qttools signond + ki18n kiconthemes kio kwindowsystem lzma accounts-qt qttools signond ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index b316ab4e56893..c7ef5c4615cee 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, - akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs, + akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kholidays, kidentitymanagement, kmime, pimcommon, qttools, }: @@ -11,16 +11,9 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = [ - # Patch for Qt 5.15.2 until version 20.12.0 - (fetchpatch { - url = "https://invent.kde.org/pim/calendarsupport/-/commit/b4193facb223bd5b73a65318dec8ced51b66adf7.patch"; - sha256 = "sha256:1da11rqbxxrl06ld3avc41p064arz4n6w5nxq8r008v8ws3s64dy"; - }) - ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools + akonadi akonadi-mime akonadi-notes kcalutils kholidays pimcommon qttools ]; propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 33f392fdccc71..b312a566a700f 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -109,10 +109,9 @@ let kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; - kdenlive = callPackage ./kdenlive.nix {}; + kdenlive = callPackage ./kdenlive {}; kdepim-runtime = callPackage ./kdepim-runtime {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; - kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; kdiamond = callPackage ./kdiamond.nix {}; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 3774c7e00b63c..a558ad266773a 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -5,7 +5,7 @@ kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, kparts, ktexteditor, kwindowsystem, phonon, solid, - wayland, qtwayland + wayland, qtbase, qtwayland }: mkDerivation { @@ -13,6 +13,7 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; + broken = lib.versionOlder qtbase.version "5.14"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedUserEnvPkgs = [ baloo ]; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index e3bba77f97284..d659c551bd689 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/20.08.3/src -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.1/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index 2a8b82352b40b..f19ee16098433 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ffmpeg_3, kio + ffmpeg_3, kio, taglib }: mkDerivation { @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ffmpeg_3 kio ]; + buildInputs = [ ffmpeg_3 kio taglib ]; } diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index 1aeff531862fa..95a89b01b8cd1 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kio, kparts, kxmlgui, qtscript, solid + kio, kparts, kxmlgui, qtbase, qtscript, solid }: mkDerivation { @@ -9,6 +9,7 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh vcunat ]; + broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix index 981c184d15150..7f2c284ad74df 100644 --- a/pkgs/applications/kde/incidenceeditor.nix +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs, + akonadi, akonadi-mime, calendarsupport, eventviews, kdiagram, kldap, kmime, pimcommon, qtbase }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram + akonadi akonadi-mime calendarsupport eventviews kdiagram kldap kmime pimcommon qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index 452c5142157d1..2672d815fb0a3 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, - kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts, + kcrash, kdbusaddons, ki18n, kontactinterface, kparts, kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison, qgpgme, qtbase, }: @@ -13,17 +13,10 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = [ - # Patch for Qt 5.15.2 until version 20.12.0 - (fetchpatch { - url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch"; - sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853"; - }) - ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash - kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit + kdbusaddons ki18n kontactinterface kparts kpimtextedit kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase ]; } diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index 70ee3f7418543..8709f26bd121e 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -3,12 +3,13 @@ extra-cmake-modules, kauth, kcodecs, kcompletion, kconfig, kconfigwidgets, kdbusaddons, kdoctools, - kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio, - knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon, + kguiaddons, ki18n, kiconthemes, kidletime, kjobwidgets, kcmutils, + kdelibs4support, kio, knotifications, knotifyconfig, kservice, kwidgetsaddons, + kwindowsystem, kxmlgui, phonon, kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils, kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, - pimcommon, kpimtextedit, kdepim-apps-libs, messagelib, + pimcommon, kpimtextedit, messagelib, qtx11extras, @@ -24,12 +25,13 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kauth kcodecs kcompletion kconfig kconfigwidgets kdbusaddons kdoctools - kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio - knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon + kguiaddons ki18n kiconthemes kidletime kjobwidgets kcmutils kdelibs4support + kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem + kxmlgui phonon - kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore kcalutils - kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime - pimcommon kpimtextedit kdepim-apps-libs messagelib + kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore + kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport + kmime pimcommon kpimtextedit messagelib qtx11extras ]; diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix index f4dd7ec145d06..0287830485e44 100644 --- a/pkgs/applications/kde/kdebugsettings.nix +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, gettext, kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, - python + qtbase, python }: mkDerivation { @@ -11,6 +11,7 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.rittelle ]; + broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index 94656b026710f..a7da03ffdd145 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kcoreaddons, ki18n, kio, kwidgetsaddons, samba + kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qtbase, }: mkDerivation { @@ -9,7 +9,8 @@ mkDerivation { meta = { license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; + broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ]; + buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ]; } diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive/default.nix index 47afcd0a67e39..47afcd0a67e39 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive/default.nix diff --git a/pkgs/applications/kde/ffmpeg-path.patch b/pkgs/applications/kde/kdenlive/ffmpeg-path.patch index a0cef882f596d..a0cef882f596d 100644 --- a/pkgs/applications/kde/ffmpeg-path.patch +++ b/pkgs/applications/kde/kdenlive/ffmpeg-path.patch diff --git a/pkgs/applications/kde/mlt-path.patch b/pkgs/applications/kde/kdenlive/mlt-path.patch index 9bfb66c1a8395..9bfb66c1a8395 100644 --- a/pkgs/applications/kde/mlt-path.patch +++ b/pkgs/applications/kde/kdenlive/mlt-path.patch diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index 0939b0ecd26ff..42532644a1a6b 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -3,7 +3,7 @@ extra-cmake-modules, shared-mime-info, akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative, - kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, + kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, kitinerary, kontactinterface }: @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ akonadi-import-wizard akonadi-notes calendarsupport eventviews incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative - kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar + kholidays ki18n kmime ktexteditor ktnef libgravatar libksieve mailcommon mailimporter messagelib poppler prison kpkpass kitinerary kontactinterface ]; diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix deleted file mode 100644 index 19f476fd781ec..0000000000000 --- a/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, - akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets, - kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison, -}: - -mkDerivation { - pname = "kdepim-apps-libs"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets - kcontacts ki18n kiconthemes kio libkleo pimcommon prison - ]; - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index fa3fe033035f5..e742f566678fe 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, - kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim, + kconfigwidgets, kcoreaddons, kdelibs4support, libkdepim, kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap, kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, @@ -19,7 +19,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig - kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n + kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim knotifications knotifyconfig kontactinterface kparts kpty kservice ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index a449a1e4f51e6..d4d49c6a94262 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -12,15 +12,5 @@ mkDerivation { buildInputs = [ kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2 ]; - - patches = [ - (fetchpatch { - # Portaway from Obsolete methods of QPrinter - # Part of v20.12.0 - url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch"; - sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU="; - }) - ]; - outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix index 72fcf8ff220a8..eb188ccef1168 100644 --- a/pkgs/applications/kde/konqueror.nix +++ b/pkgs/applications/kde/konqueror.nix @@ -2,7 +2,7 @@ , mkDerivation , extra-cmake-modules, kdoctools , kdelibs4support, kcmutils, khtml, kdesu -, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland +, qtbase, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland }: mkDerivation { @@ -24,5 +24,6 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; + broken = lib.versionOlder qtbase.version "5.13"; }; } diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix index 3dfa28e9dfe7f..801c6845e409a 100644 --- a/pkgs/applications/kde/kontact.nix +++ b/pkgs/applications/kde/kontact.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, qtwebengine, kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem, - akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit, + akonadi, grantleetheme, kontactinterface, kpimtextedit, mailcommon, libkdepim, pimcommon }: @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ qtwebengine kcmutils kcrash kdbusaddons kparts kwindowsystem - akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit + akonadi grantleetheme kontactinterface kpimtextedit mailcommon libkdepim pimcommon ]; } diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix index f28e0406b134c..a6a28427772e0 100644 --- a/pkgs/applications/kde/korganizer.nix +++ b/pkgs/applications/kde/korganizer.nix @@ -5,7 +5,7 @@ phonon, knewstuff, akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search, - calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs, + calendarsupport, eventviews, incidenceeditor, kcalutils, kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface, kpimtextedit, pimcommon, }: @@ -22,7 +22,7 @@ mkDerivation { phonon knewstuff akonadi-calendar akonadi-contacts akonadi-notes akonadi-search - calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs + calendarsupport eventviews incidenceeditor kcalutils kholidays kidentitymanagement kldap kmailtransport kontactinterface kpimtextedit pimcommon ]; diff --git a/pkgs/applications/kde/kpat.nix b/pkgs/applications/kde/kpat.nix index d1e47af6b7245..96bd6dd542ece 100644 --- a/pkgs/applications/kde/kpat.nix +++ b/pkgs/applications/kde/kpat.nix @@ -5,6 +5,7 @@ , shared-mime-info , libkdegames , freecell-solver +, black-hole-solver }: mkDerivation { @@ -14,6 +15,7 @@ mkDerivation { shared-mime-info ]; buildInputs = [ + black-hole-solver knewstuff libkdegames freecell-solver diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 01cc39d9895d8..b0e79b0ff896f 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, makeWrapper, kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons, - kwindowsystem, libvncserver, freerdp + kwindowsystem, libvncserver, freerdp, qtbase, }: mkDerivation { @@ -21,5 +21,6 @@ mkDerivation { license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; + broken = lib.versionOlder qtbase.version "5.14"; }; } diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index d47a5504417ae..6709a1f072a58 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee, grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, - kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, + kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, pimcommon, qca-qt5, qtwebengine, syntax-highlighting }: @@ -17,7 +17,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs - kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap + kconfig kconfigwidgets kiconthemes kio kjobwidgets kldap kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qca-qt5 syntax-highlighting ]; diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 5ff13eaf24088..f78d29db6bc9f 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1731 +4,1795 @@ { akonadi = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akonadi-20.08.3.tar.xz"; - sha256 = "1hwaan45cyw2nmfmdp5pbhvm00xdxy9la68ms3sa8a67zcsfljhl"; - name = "akonadi-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akonadi-20.12.1.tar.xz"; + sha256 = "1173365c84fq5vn58blsmbdp9x34gf2yrwvsi89i0l7xhpz8zx5k"; + name = "akonadi-20.12.1.tar.xz"; }; }; akonadi-calendar = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-20.08.3.tar.xz"; - sha256 = "18rwvn5i6i4ng335rxpwx3a2m4vyq96w9m3fa1gvmr8ls7vkaqrk"; - name = "akonadi-calendar-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-20.12.1.tar.xz"; + sha256 = "0zzy4f03zypj4crjy0fhk5xjgipflal3gpfibav2wcmgx034znw5"; + name = "akonadi-calendar-20.12.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-tools-20.08.3.tar.xz"; - sha256 = "1pnm3xi26bnbjmnv9zwi9w5rkr1pdry50hzy3gxw7b0g11zz036w"; - name = "akonadi-calendar-tools-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-tools-20.12.1.tar.xz"; + sha256 = "1x5zmv32iaf17n9b8y034yhwq0dhwjwxw3i5cj97k4dpyar5s72q"; + name = "akonadi-calendar-tools-20.12.1.tar.xz"; }; }; akonadiconsole = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akonadiconsole-20.08.3.tar.xz"; - sha256 = "061r0p9pj22x0hiz6piz4vramll3w5xy92sx8nfhcp2gmnvj9890"; - name = "akonadiconsole-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akonadiconsole-20.12.1.tar.xz"; + sha256 = "0rf7ckra0yjkwspmd4401lssiss2p8qrw9rd6j5gbw7kii05bcmz"; + name = "akonadiconsole-20.12.1.tar.xz"; }; }; akonadi-contacts = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akonadi-contacts-20.08.3.tar.xz"; - sha256 = "18n9x41fmh4q9q9lfv882iwk6j1hvgpl11y4qn873vwr9sdrcf4s"; - name = "akonadi-contacts-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akonadi-contacts-20.12.1.tar.xz"; + sha256 = "0gxcs8nn07y6ln5ymsbdhcm63zqxcq2ja2sxziim65bfg9g85arl"; + name = "akonadi-contacts-20.12.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akonadi-import-wizard-20.08.3.tar.xz"; - sha256 = "0gny0rxvyks5w4rdb73ly06lyvz7kcfvff1268bn6i96xr83kmim"; - name = "akonadi-import-wizard-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akonadi-import-wizard-20.12.1.tar.xz"; + sha256 = "1wdhgvv2zblyhcxrvby7ic3449hdmcnn3hvcswgwrgbcy4bzz7zz"; + name = "akonadi-import-wizard-20.12.1.tar.xz"; }; }; akonadi-mime = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akonadi-mime-20.08.3.tar.xz"; - sha256 = "12ps633y64mj72iryd9z2nmrf7lxbkqj7xnzj28549cvg6jizgl7"; - name = "akonadi-mime-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akonadi-mime-20.12.1.tar.xz"; + sha256 = "1xsrc8572zlslabn47km58sr48wdb0pmfrh3jbn9227w9iwir3z5"; + name = "akonadi-mime-20.12.1.tar.xz"; }; }; akonadi-notes = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akonadi-notes-20.08.3.tar.xz"; - sha256 = "1z90r37lqc7ydmily730idd4s8rcbr6i3a8x9m647snbala16z36"; - name = "akonadi-notes-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akonadi-notes-20.12.1.tar.xz"; + sha256 = "15d23wm0kymifcxcbip0hpnzwmzdjwxmcvqvmwgq00vy81j6k7wm"; + name = "akonadi-notes-20.12.1.tar.xz"; }; }; akonadi-search = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akonadi-search-20.08.3.tar.xz"; - sha256 = "0izpkvjybp6r79rai0p5j74bm0f8ksgsl3z34ggb51j6vj9rla7h"; - name = "akonadi-search-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akonadi-search-20.12.1.tar.xz"; + sha256 = "065qp3nf8274fh0bna8hjs28p030wgfnr3gnp7b2791kzp25l488"; + name = "akonadi-search-20.12.1.tar.xz"; }; }; akregator = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/akregator-20.08.3.tar.xz"; - sha256 = "1gqh820s5by3r9lz7r16r0krh916idsks6sgy26hcrwfmva45wn5"; - name = "akregator-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/akregator-20.12.1.tar.xz"; + sha256 = "0xs5adbq9ra0ziccl1z0nsm6kvrf8vjwa8djd3nwc2csjw8wim5k"; + name = "akregator-20.12.1.tar.xz"; }; }; analitza = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/analitza-20.08.3.tar.xz"; - sha256 = "16s6kjyclj73lq8z8mvrbsl75h1nrnv7syp6wpip6gvfs5ynai90"; - name = "analitza-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/analitza-20.12.1.tar.xz"; + sha256 = "1qnqqbrjpzndbffjwqlyfqmxxxz04fi3i2g8dx6y8q79z927fzkd"; + name = "analitza-20.12.1.tar.xz"; }; }; ark = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ark-20.08.3.tar.xz"; - sha256 = "03kwjp2nj570k9ph8bgj042sjj4x0h9jwv8nwx0pfpcxkgxv5pzy"; - name = "ark-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ark-20.12.1.tar.xz"; + sha256 = "18zaaawwhlci23hkzjl535qsi8wdjc05hij3r76225jb1jb6cwrm"; + name = "ark-20.12.1.tar.xz"; }; }; artikulate = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/artikulate-20.08.3.tar.xz"; - sha256 = "0bx97qi6zi7jmlzm3g7qamnzg0966g4w9xpskbxbr4cgjr312x19"; - name = "artikulate-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/artikulate-20.12.1.tar.xz"; + sha256 = "1cvpya408r521p9398mk0xn8pb6awqm74qcjy2r0ylx0l6bkv3ca"; + name = "artikulate-20.12.1.tar.xz"; }; }; audiocd-kio = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/audiocd-kio-20.08.3.tar.xz"; - sha256 = "01n4nyda7l7by1nyx2sgxdl8qkdfndk0w6hj0qc6a7fllcfj5cpb"; - name = "audiocd-kio-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/audiocd-kio-20.12.1.tar.xz"; + sha256 = "1rlr1w0cy3q31jsaqiv50frqcl3x5jq31pnrkmyhgy23mays8ly1"; + name = "audiocd-kio-20.12.1.tar.xz"; }; }; baloo-widgets = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/baloo-widgets-20.08.3.tar.xz"; - sha256 = "0ciidrsvwc3ppxhw7w5116q4lfbsvij9jsvyzm292pmjln2vikrg"; - name = "baloo-widgets-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/baloo-widgets-20.12.1.tar.xz"; + sha256 = "115y0cdlsdzx6c017gr8x6in9jxyw0sqyamakqgfyy5phn203yr3"; + name = "baloo-widgets-20.12.1.tar.xz"; }; }; blinken = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/blinken-20.08.3.tar.xz"; - sha256 = "1gfw0w66nm3sx81bnr0p0yz1bhjj63lvd3cr86x3b2pny5rcw1da"; - name = "blinken-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/blinken-20.12.1.tar.xz"; + sha256 = "05dbmh1lk1ag735yiv7vql6fx15lw9a3qihxflzhbfrgng7dsxks"; + name = "blinken-20.12.1.tar.xz"; }; }; bomber = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/bomber-20.08.3.tar.xz"; - sha256 = "1nw1a9cf0nqgk00hvzcqch3bl97lx6bih0wsax5q0z1kzwlz0kgr"; - name = "bomber-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/bomber-20.12.1.tar.xz"; + sha256 = "07iy6b8hwklb5mgrf8sagmrza78p3yf7i4x7w9lb2z9v2x5qw22y"; + name = "bomber-20.12.1.tar.xz"; }; }; bovo = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/bovo-20.08.3.tar.xz"; - sha256 = "06pbivyvfgjx6zkadvwfwnrg9vjy4rf52k2a74qjcnl2ms16sr1g"; - name = "bovo-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/bovo-20.12.1.tar.xz"; + sha256 = "1wrw81xrayhjadvjfi0zdc0vw445f4zmd32n0rca78i68ls5qbxv"; + name = "bovo-20.12.1.tar.xz"; }; }; calendarsupport = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/calendarsupport-20.08.3.tar.xz"; - sha256 = "09w06n745764fs440nh0piy5sahfn50kh3zrljhgzadcij6165vd"; - name = "calendarsupport-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/calendarsupport-20.12.1.tar.xz"; + sha256 = "1accj2vx6zvqp632i5c85q4rzpg54xlihzf1rs80sdb9lch8nwrp"; + name = "calendarsupport-20.12.1.tar.xz"; }; }; cantor = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/cantor-20.08.3.tar.xz"; - sha256 = "1njqycx0v3zq5mdcvfdfgxs8vgl01v80s27qgapsxxrgr9hgxbhl"; - name = "cantor-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/cantor-20.12.1.tar.xz"; + sha256 = "1qj6lmcgmqr110qw2r906b0kp73f9gzvm75ry1gdb77bza5g67x2"; + name = "cantor-20.12.1.tar.xz"; }; }; cervisia = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/cervisia-20.08.3.tar.xz"; - sha256 = "1bsc72kxcmzx25408ngzqzj4a0168vqfr3a2gvmm6d8klbgpm3gv"; - name = "cervisia-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/cervisia-20.12.1.tar.xz"; + sha256 = "0hnpysp01z5a3gmm2jr2m1y7a5hcfl32lhmnrm0rg589pdxb30xf"; + name = "cervisia-20.12.1.tar.xz"; }; }; dolphin = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/dolphin-20.08.3.tar.xz"; - sha256 = "107n763qix95b1hgy86hddpj9x2clzhaiw8q8yjn9lzj1rz5facx"; - name = "dolphin-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/dolphin-20.12.1.tar.xz"; + sha256 = "0n2g8mqq28xrjy17jyja4siaf2ac2b8gppqc19wjxn981zs545mp"; + name = "dolphin-20.12.1.tar.xz"; }; }; dolphin-plugins = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/dolphin-plugins-20.08.3.tar.xz"; - sha256 = "0fmay0sycfj9s7zyxbldgcal5lj2psi0n9zrgq812s5qr4rb5c8c"; - name = "dolphin-plugins-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/dolphin-plugins-20.12.1.tar.xz"; + sha256 = "0kn79c3w6qx70d7f8kdavl5ifq1pmcs4dc88i0zma8hskgvcjvcj"; + name = "dolphin-plugins-20.12.1.tar.xz"; }; }; dragon = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/dragon-20.08.3.tar.xz"; - sha256 = "14qsb7h8w58i9jsh1gpcj8pwjgy7y3mqfy51hca82yrd82z5b9rn"; - name = "dragon-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/dragon-20.12.1.tar.xz"; + sha256 = "0nj2cba4w7q4q1w7lv63s9zgqrvha5figp5w9apklqps4z1d2p0s"; + name = "dragon-20.12.1.tar.xz"; }; }; elisa = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/elisa-20.08.3.tar.xz"; - sha256 = "0893nbj0jsapnfd09cp961k2m7lq6sjvzynpa4hfp9ch1jbc912c"; - name = "elisa-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/elisa-20.12.1.tar.xz"; + sha256 = "1lmgxi7xdyzjyi15ighkp2ylc6riqzgjmnfjc7p6na88vl2h2diy"; + name = "elisa-20.12.1.tar.xz"; }; }; eventviews = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/eventviews-20.08.3.tar.xz"; - sha256 = "158j5g3i0wbbxpg9jmr50dvbpms4c4vgcnpmn3b3vfbszzwsy6rg"; - name = "eventviews-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/eventviews-20.12.1.tar.xz"; + sha256 = "10nq8gx1bybhjx5dnrx2x5gslg8nw3vazy22jz03slgspm0gsajc"; + name = "eventviews-20.12.1.tar.xz"; }; }; ffmpegthumbs = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ffmpegthumbs-20.08.3.tar.xz"; - sha256 = "186hpq949r3xx2a64nqjy4pcn67d6kdvsy80zr238lgb9qqcqygi"; - name = "ffmpegthumbs-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ffmpegthumbs-20.12.1.tar.xz"; + sha256 = "17p9xqyfsaibhkfkhbx9mxjkdl5xdc3h91gsrkkwkqyfa5vs9c5g"; + name = "ffmpegthumbs-20.12.1.tar.xz"; }; }; filelight = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/filelight-20.08.3.tar.xz"; - sha256 = "1jljsnjdhnqphh1kanj6hi2rswq3i9119iah1j33jy5pladcyf5q"; - name = "filelight-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/filelight-20.12.1.tar.xz"; + sha256 = "0k7ia3q1j520n3i1va7v4nhdfycxv54sis6vq62ihm53kb0jrj4i"; + name = "filelight-20.12.1.tar.xz"; }; }; granatier = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/granatier-20.08.3.tar.xz"; - sha256 = "195bc2rcz11v76c0cwa9mb7rfixjn7sb0a52wrzz0sf9624m0rcs"; - name = "granatier-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/granatier-20.12.1.tar.xz"; + sha256 = "0mhqjg0wznvf1dc7f9dmw6ccva84g09cds2jls37zzblqbfdnzw3"; + name = "granatier-20.12.1.tar.xz"; }; }; grantlee-editor = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/grantlee-editor-20.08.3.tar.xz"; - sha256 = "1k2rdicd68jdk3pazyn3q0vj99n0vnkpzkrnacpymkjy85cjgrv9"; - name = "grantlee-editor-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/grantlee-editor-20.12.1.tar.xz"; + sha256 = "1684k6gpmvbbxjha5qkvfvas2lws0zm5v5s41z6yjxyshrbc29jh"; + name = "grantlee-editor-20.12.1.tar.xz"; }; }; grantleetheme = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/grantleetheme-20.08.3.tar.xz"; - sha256 = "07b7v5v2vyz3vyj1jjzryzaak8bbqg8a2caxwb6s7cwhy19y6my5"; - name = "grantleetheme-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/grantleetheme-20.12.1.tar.xz"; + sha256 = "1w87pz09lb3n511w0qir70c317j4gqgc7iyw3cgs2pqzz9f19vcx"; + name = "grantleetheme-20.12.1.tar.xz"; }; }; gwenview = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/gwenview-20.08.3.tar.xz"; - sha256 = "09mwp3z97hgd7c15w0hz8k61qn5icb81rj27nxzy877ph1xnrixc"; - name = "gwenview-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/gwenview-20.12.1.tar.xz"; + sha256 = "0xjipr1ib8r42xsd75ack2198q6gf3xxl1zc9ir2ihdk3sg6lsb1"; + name = "gwenview-20.12.1.tar.xz"; }; }; incidenceeditor = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/incidenceeditor-20.08.3.tar.xz"; - sha256 = "15kkl8z1nig9qyxfrq54c3sqh1xs1lzlbm5rphj34y0yb8dbn8kx"; - name = "incidenceeditor-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/incidenceeditor-20.12.1.tar.xz"; + sha256 = "1hdyy1sisavxjhwgpxh4ab4a3cvsvjj6hfa9w8kn8ypipd6nmqac"; + name = "incidenceeditor-20.12.1.tar.xz"; + }; + }; + itinerary = { + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/itinerary-20.12.1.tar.xz"; + sha256 = "02mmbj32ankv06mlgdrfyppkfi1dkgy9ky22d6bnz3l1vyld76s9"; + name = "itinerary-20.12.1.tar.xz"; }; }; juk = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/juk-20.08.3.tar.xz"; - sha256 = "1jvj0r4grm55cnck4apnh4fh44mv1ycm0pprrkh57iwj1dlf7kif"; - name = "juk-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/juk-20.12.1.tar.xz"; + sha256 = "0rx4dmnk15xrf9knwsvjmf963xn59rlzwwsa6wrjjpi8r6br8x4r"; + name = "juk-20.12.1.tar.xz"; }; }; k3b = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/k3b-20.08.3.tar.xz"; - sha256 = "0qg2p6gdg0clgv6qab5vr0i451m9hqqmpwq335w8m9nwb6wg30cx"; - name = "k3b-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/k3b-20.12.1.tar.xz"; + sha256 = "02ybzn8gg82r7i7rg8swyza30zwsf3fassmp6hqffn15g4kc2lrp"; + name = "k3b-20.12.1.tar.xz"; }; }; kaccounts-integration = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-integration-20.08.3.tar.xz"; - sha256 = "006cglw5ai274a1r5jbk109mdrvw8v6fp3cdyi1kbrq7lp3123a2"; - name = "kaccounts-integration-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-integration-20.12.1.tar.xz"; + sha256 = "01xy3ih2fw4xnf5jkadrbq1dzmvvvrslbq4afj9501vhzyfqgm92"; + name = "kaccounts-integration-20.12.1.tar.xz"; }; }; kaccounts-providers = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-providers-20.08.3.tar.xz"; - sha256 = "1vpv366bzj0sk7dqyxrq06a8ixgaaqi125mf2gmybvhj5yvrn3fp"; - name = "kaccounts-providers-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-providers-20.12.1.tar.xz"; + sha256 = "1f3gr63jwm7b8nkpdmpkgvsrhrpaxf7wcl0gczhdli1v6svjv8vq"; + name = "kaccounts-providers-20.12.1.tar.xz"; }; }; kaddressbook = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kaddressbook-20.08.3.tar.xz"; - sha256 = "00mia1jh2c5rcnsyx3wizjdg65pvpazfb8ayppjzv4rrc2nhr9nn"; - name = "kaddressbook-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kaddressbook-20.12.1.tar.xz"; + sha256 = "0j6mjj902h5zpipywp5xhbifrbgrb1lz1cg317md7ya4wc7z36fp"; + name = "kaddressbook-20.12.1.tar.xz"; }; }; kajongg = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kajongg-20.08.3.tar.xz"; - sha256 = "0wr045xqm1q03vy0jbgrldpdc9k3lgnhd39yhi574la367ayffpa"; - name = "kajongg-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kajongg-20.12.1.tar.xz"; + sha256 = "0v9sq5l6w3x78dpimdlbm36g9n4qy06xr0bzfzn2jf3bzgzrn2zk"; + name = "kajongg-20.12.1.tar.xz"; }; }; kalarm = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kalarm-20.08.3.tar.xz"; - sha256 = "0194rapyvnpmhkba0rgclrai1ywx9anr8dski0j6z1yg0kgav8df"; - name = "kalarm-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kalarm-20.12.1.tar.xz"; + sha256 = "0k4fxrzxb6vvpdqlln4g7iz1s34d9jkk415c44f1i34kl2mfsyq0"; + name = "kalarm-20.12.1.tar.xz"; }; }; kalarmcal = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kalarmcal-20.08.3.tar.xz"; - sha256 = "1i9hi3y4j2pmdmlj13kl13vfplxrh8w23fxz0mmawi1wn533fp66"; - name = "kalarmcal-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kalarmcal-20.12.1.tar.xz"; + sha256 = "104fbq2mf20p67rs7x76h36qk8d0srkkll2pq39ln4hc7nhsrws5"; + name = "kalarmcal-20.12.1.tar.xz"; }; }; kalgebra = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kalgebra-20.08.3.tar.xz"; - sha256 = "0k7miil5ilrw68j6xl9g6cf3zfw7g52h0gfwd5j248nx2nxr150c"; - name = "kalgebra-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kalgebra-20.12.1.tar.xz"; + sha256 = "10y9zygpik418y5781xmy5xysvf3xa97sbzdbch8lrvxwprbmkzm"; + name = "kalgebra-20.12.1.tar.xz"; }; }; kalzium = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kalzium-20.08.3.tar.xz"; - sha256 = "1r80bnpdrybsdwcblpj7cg32dv90l79gs0i42gpm6inilfr3vp5n"; - name = "kalzium-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kalzium-20.12.1.tar.xz"; + sha256 = "1n1ar12zq2maa4dn5yq7m6l3m60n7c98c460mrd6rp7f73kadnsj"; + name = "kalzium-20.12.1.tar.xz"; }; }; kamera = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kamera-20.08.3.tar.xz"; - sha256 = "06fwxdgbyywdrf1r0w17w3chfr0s8jhqswz9chmdfds9f2bb45cr"; - name = "kamera-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kamera-20.12.1.tar.xz"; + sha256 = "1bj01d9h26ifq8nsa1bw49xfihmisnbk7p557zpqvixxayq6v8dq"; + name = "kamera-20.12.1.tar.xz"; }; }; kamoso = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kamoso-20.08.3.tar.xz"; - sha256 = "0zhl3va65ajz3hdggg0jvvgvj14s461pjw9adw9bnfcbs4jzkl2y"; - name = "kamoso-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kamoso-20.12.1.tar.xz"; + sha256 = "087m9lphj6s0xssaryyh91gh9v3ji5423rjd549dkd3vscgda4lb"; + name = "kamoso-20.12.1.tar.xz"; }; }; kanagram = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kanagram-20.08.3.tar.xz"; - sha256 = "1cyx8yq03xaw34ic69ghz9gafk8l30qinp0kkp9a1wh4pry8rnxf"; - name = "kanagram-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kanagram-20.12.1.tar.xz"; + sha256 = "0bflybrm3kz1p1n6fksihvd8m0h0jj968b2wjz88663bs48jqf6q"; + name = "kanagram-20.12.1.tar.xz"; }; }; kapman = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kapman-20.08.3.tar.xz"; - sha256 = "0nh1f0v026rib5ahj1mhvs99yabrgdq71bis465vfpm4favnirzy"; - name = "kapman-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kapman-20.12.1.tar.xz"; + sha256 = "1hs88q4h5l58fvr09vb5ns9pdj4k064ax5ccnj9yan4bn0s9b4f9"; + name = "kapman-20.12.1.tar.xz"; }; }; kapptemplate = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kapptemplate-20.08.3.tar.xz"; - sha256 = "1r98ym9sazjzknxfw58hjiyxhmi49fyhrdn02v0b8fm711vprxab"; - name = "kapptemplate-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kapptemplate-20.12.1.tar.xz"; + sha256 = "1a8fpwbvs2zmmak7zyv75z67ja31vx68s9lz9vldmiik9rrslyy6"; + name = "kapptemplate-20.12.1.tar.xz"; }; }; kate = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kate-20.08.3.tar.xz"; - sha256 = "1m7ximinknc0l9zqv4p25ybn6zysz59l4vvdb9xkhjp53aqskdz9"; - name = "kate-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kate-20.12.1.tar.xz"; + sha256 = "13m24b3fxb1d1k9rg2xfa7i28cjx68g9dbjrbd34acmpg01vp6vk"; + name = "kate-20.12.1.tar.xz"; }; }; katomic = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/katomic-20.08.3.tar.xz"; - sha256 = "1v31x6371r9ccvc676vq5dlpkp4829xf0r37dnvdxlfm22mgsdnk"; - name = "katomic-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/katomic-20.12.1.tar.xz"; + sha256 = "15s5kwddd1m9g5lhpc61bj6yzxpwzcc8fm24yhslb8l44nk685id"; + name = "katomic-20.12.1.tar.xz"; }; }; kbackup = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kbackup-20.08.3.tar.xz"; - sha256 = "1sayzvj46ckhn5zgp7qi6zmrmd7bjh5mg05mcl5pfwv4dcvxkrng"; - name = "kbackup-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kbackup-20.12.1.tar.xz"; + sha256 = "043dkgpdk56jmx0z8izlgj8r9j8h9rvjc3yalpqd5nrlgmj0smym"; + name = "kbackup-20.12.1.tar.xz"; }; }; kblackbox = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kblackbox-20.08.3.tar.xz"; - sha256 = "0vka2pswbza1z8f97nhxcjrczx4w1x0qyjpzs9ycn9a14smqpsrh"; - name = "kblackbox-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kblackbox-20.12.1.tar.xz"; + sha256 = "001yf4j14xzpabwg37yisls5na9rpxpgs45d4wdlqa90d50syzl7"; + name = "kblackbox-20.12.1.tar.xz"; }; }; kblocks = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kblocks-20.08.3.tar.xz"; - sha256 = "1jc063xn6dphydf49kv0izzy0nv06dr412xxjvkp7vccwv9qd5gf"; - name = "kblocks-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kblocks-20.12.1.tar.xz"; + sha256 = "029dxqg2d6c08r99ng16lc3b1dnnrj5bpz25zgv90aygzx31qq4s"; + name = "kblocks-20.12.1.tar.xz"; }; }; kbounce = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kbounce-20.08.3.tar.xz"; - sha256 = "0863vlirljvf101mdv6jxprj9axs4cikrnld3wvxrcqw3w2dy6wy"; - name = "kbounce-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kbounce-20.12.1.tar.xz"; + sha256 = "1vdc7xhbh0wpvk66sqs0xly0mmbpw922vg4kjjn21awamv4r52pm"; + name = "kbounce-20.12.1.tar.xz"; }; }; kbreakout = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kbreakout-20.08.3.tar.xz"; - sha256 = "14nd1dnbdyxv59y8iildhydhxgal38hvj7bk6544glwl8yalak8z"; - name = "kbreakout-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kbreakout-20.12.1.tar.xz"; + sha256 = "11bx32lffagmyvxx2wss794fy3icz9k5yq4mjs2qxpf9pyvg6qgd"; + name = "kbreakout-20.12.1.tar.xz"; }; }; kbruch = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kbruch-20.08.3.tar.xz"; - sha256 = "03s1hl4h8rsx0gn7wqfssi1ga4igx48jb47gpw6f9rfjm8f199vb"; - name = "kbruch-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kbruch-20.12.1.tar.xz"; + sha256 = "06sbr6wrn4nh69hq96i5rgzbr9g0rc6c54h9g2zpnpff339lnsqi"; + name = "kbruch-20.12.1.tar.xz"; }; }; kcachegrind = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kcachegrind-20.08.3.tar.xz"; - sha256 = "17j06z9cpj5qhfbp1xgw4qmhi4jckf2i99c9brys4ifb3p0rkbrs"; - name = "kcachegrind-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kcachegrind-20.12.1.tar.xz"; + sha256 = "0v06y1mybda4rmvjrjxhmxp7bj0wp6v45xahn08j253d20k7qixi"; + name = "kcachegrind-20.12.1.tar.xz"; }; }; kcalc = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kcalc-20.08.3.tar.xz"; - sha256 = "1mk30fkv51w3fqlpkzgm1yj5sp98h26kkphplqkjva5v6s1jzmjy"; - name = "kcalc-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kcalc-20.12.1.tar.xz"; + sha256 = "1p59i6k0kq4xgcfsgcsb9z3yrrzgk564fh0apwmbawrmg6pp78dw"; + name = "kcalc-20.12.1.tar.xz"; }; }; kcalutils = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kcalutils-20.08.3.tar.xz"; - sha256 = "1i2yh4gvdwlylj7f7p32g1z7lzh3p19rrbd96l1gqhy700f2whpw"; - name = "kcalutils-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kcalutils-20.12.1.tar.xz"; + sha256 = "0b7w9n8sf31qbpxiw998xd4dls46mxf2bvl4n937vgzisfwb5sxs"; + name = "kcalutils-20.12.1.tar.xz"; }; }; kcharselect = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kcharselect-20.08.3.tar.xz"; - sha256 = "1p6rijjfa2jk4vr0ivjn6p5qf2ys5kvhw0cwfyjs45ff7zg0s2ga"; - name = "kcharselect-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kcharselect-20.12.1.tar.xz"; + sha256 = "1ss5zwp0zggk9phdccj7bcn8h49p9avzg8qm38c3wnwddgaw1pdb"; + name = "kcharselect-20.12.1.tar.xz"; }; }; kcolorchooser = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kcolorchooser-20.08.3.tar.xz"; - sha256 = "1874qa04whiivyydxfcn0f1xch515ga1af4ym42zqz64j3kq7i47"; - name = "kcolorchooser-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kcolorchooser-20.12.1.tar.xz"; + sha256 = "07qvwk8amvmgiwxrl6gbyf25ms666hradmg1vl8lf3hmfxx6j40z"; + name = "kcolorchooser-20.12.1.tar.xz"; }; }; kcron = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kcron-20.08.3.tar.xz"; - sha256 = "1piwssyg9fvah25gql6w0n8xf634f6gy475cz52gb1bl7rp72q6j"; - name = "kcron-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kcron-20.12.1.tar.xz"; + sha256 = "01xabwaxhxgwk6kh44rz3fm20jis2f6g9mrska5s03gxk7n0p1dc"; + name = "kcron-20.12.1.tar.xz"; }; }; kdebugsettings = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdebugsettings-20.08.3.tar.xz"; - sha256 = "11xnvr9qib3hnp48whsw659c724s2114p5dr3fswvhm3hkw1aky7"; - name = "kdebugsettings-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdebugsettings-20.12.1.tar.xz"; + sha256 = "1jlxp6v6yci4cff1mcz0w7dz0hfjig0wck9cc9maaw1a9swqc3r1"; + name = "kdebugsettings-20.12.1.tar.xz"; }; }; kdeconnect-kde = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdeconnect-kde-20.08.3.tar.xz"; - sha256 = "0x10ga81qlsahavmv356xzjxyds41y2b4v338rqcyqkxvfmxj01k"; - name = "kdeconnect-kde-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdeconnect-kde-20.12.1.tar.xz"; + sha256 = "0q11319ydibn1jgch98r66gzh3n6nb67l7xgzg0crdalm3dvf5gw"; + name = "kdeconnect-kde-20.12.1.tar.xz"; }; }; kde-dev-scripts = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-scripts-20.08.3.tar.xz"; - sha256 = "0x8ba4mlxx17vk674738xln2dy696b148fa3s87za4yb4jj9gc5n"; - name = "kde-dev-scripts-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-scripts-20.12.1.tar.xz"; + sha256 = "0hlabgf75qmww1161nd4ggqccp6h9ibsfkzpxdqvgxr9f1f31zz5"; + name = "kde-dev-scripts-20.12.1.tar.xz"; }; }; kde-dev-utils = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-utils-20.08.3.tar.xz"; - sha256 = "0k7zb1km89nnqfi2p1mhp6dvwkhmgbcgw89301acag34yy954dvn"; - name = "kde-dev-utils-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-utils-20.12.1.tar.xz"; + sha256 = "1bir6ifq5wlwgdna48s5c1al7hfq6vl9pi2yvbnzf0rz4ix1sw4r"; + name = "kde-dev-utils-20.12.1.tar.xz"; }; }; kdeedu-data = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdeedu-data-20.08.3.tar.xz"; - sha256 = "1k164h4n8r4yjlll5900fz764lr0qiy3q1fpcpkr8f1n7qs7f797"; - name = "kdeedu-data-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdeedu-data-20.12.1.tar.xz"; + sha256 = "1hzrwkb2333dkvp1n50p18gfci21klafibaknm4hdrk96b3s4fxp"; + name = "kdeedu-data-20.12.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-mobipocket-20.08.3.tar.xz"; - sha256 = "0ifxbwn7pmxr7y4ri617a303b27nqwqa418isgfrfk11jc4yyxhq"; - name = "kdegraphics-mobipocket-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-mobipocket-20.12.1.tar.xz"; + sha256 = "1n3x4cf5ck0lfn70d9g0iiy4pddc0r49gwir71q5six5l4pz21hd"; + name = "kdegraphics-mobipocket-20.12.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-thumbnailers-20.08.3.tar.xz"; - sha256 = "0mbzkw7pxcfmkpb8ivhahnxkkrkjhmbjqy2l9gqx35gp5855gmxf"; - name = "kdegraphics-thumbnailers-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-thumbnailers-20.12.1.tar.xz"; + sha256 = "0lrijvphyc6wbkb499zf0gjpmqrjgrx5li93kvpsil1ivfpflv7w"; + name = "kdegraphics-thumbnailers-20.12.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdenetwork-filesharing-20.08.3.tar.xz"; - sha256 = "0id19wmiivdrx10r1hwbwi7bx6g1v9g5lpbhlmfrapvy82ijfmbg"; - name = "kdenetwork-filesharing-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdenetwork-filesharing-20.12.1.tar.xz"; + sha256 = "0axi5vdgqkjdcbq0x34b3lnh1497vk54p9aca9d2wfhkd55zjbcv"; + name = "kdenetwork-filesharing-20.12.1.tar.xz"; }; }; kdenlive = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdenlive-20.08.3.tar.xz"; - sha256 = "187d5khqq9ckmqp8amd7ghlvig1z97w2jzm9s4zsfhjzyqv3d3wz"; - name = "kdenlive-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdenlive-20.12.1.tar.xz"; + sha256 = "0n543nswn0gxasc1445nqg35z5466a3ssivigxz4acqw66nj4vlv"; + name = "kdenlive-20.12.1.tar.xz"; }; }; kdepim-addons = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdepim-addons-20.08.3.tar.xz"; - sha256 = "17m8pwiig46pc6x4ylvymb3b6c7xcm2df3vjma665kcir1dr0q7p"; - name = "kdepim-addons-20.08.3.tar.xz"; - }; - }; - kdepim-apps-libs = { - version = "20.08.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdepim-apps-libs-20.08.3.tar.xz"; - sha256 = "08iw1p9mv4jic7pk6skxc5anp7k46lhcdqxpq1i6wlhbrk6bpsvg"; - name = "kdepim-apps-libs-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdepim-addons-20.12.1.tar.xz"; + sha256 = "1dc5sl9ksk5i2sgs2vf41blb5cdpl8fv3vzmrrz9sl3r75pga5m0"; + name = "kdepim-addons-20.12.1.tar.xz"; }; }; kdepim-runtime = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdepim-runtime-20.08.3.tar.xz"; - sha256 = "0zz2zwq3gr177vgkwz6b70q4n2ra4ym58f167pgvi9kxv3884fib"; - name = "kdepim-runtime-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdepim-runtime-20.12.1.tar.xz"; + sha256 = "1np7xbdhm2wczm04cmsr25a74421i28iln39myiybq01im2ahapq"; + name = "kdepim-runtime-20.12.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-kioslaves-20.08.3.tar.xz"; - sha256 = "1kwzms0qha058cm92d4f8pr89r3bqaqx5zfw6gz05s6lg892j5in"; - name = "kdesdk-kioslaves-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-kioslaves-20.12.1.tar.xz"; + sha256 = "18yy2s39sxfzi5lcky1jvlv7z77ygidhnfa4zhwas27yhcc6h0w4"; + name = "kdesdk-kioslaves-20.12.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-thumbnailers-20.08.3.tar.xz"; - sha256 = "10fc0agpvzpqdxqynd70vzya0g1nbdw0ylbnl9w35n9jhww42jff"; - name = "kdesdk-thumbnailers-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-thumbnailers-20.12.1.tar.xz"; + sha256 = "1hgqd2d2a9iwaxvd4xd7sdj7pyf3p3v2xg6v9dyy9y39q2f1qs23"; + name = "kdesdk-thumbnailers-20.12.1.tar.xz"; }; }; kdf = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdf-20.08.3.tar.xz"; - sha256 = "02k5nhsf1zzkx9cl3r2500pj2zfmvjhlfsb3smgpka6in7iivxyp"; - name = "kdf-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdf-20.12.1.tar.xz"; + sha256 = "0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1"; + name = "kdf-20.12.1.tar.xz"; }; }; kdialog = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdialog-20.08.3.tar.xz"; - sha256 = "0knl6176bjazjiacg1qqaldlqcjlb3bi829sliq1sdh4lzzwrbzk"; - name = "kdialog-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdialog-20.12.1.tar.xz"; + sha256 = "13n6bc3aqi9v6i4p4vkwzjv4rsqinx45n028ls6ndlapayd750f4"; + name = "kdialog-20.12.1.tar.xz"; }; }; kdiamond = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kdiamond-20.08.3.tar.xz"; - sha256 = "0ls1kg3wank1al46knq12jilmp8gaa4rn7zbgflcrhgy5gw8l5px"; - name = "kdiamond-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kdiamond-20.12.1.tar.xz"; + sha256 = "0iaq3cai1sn3vlym4zshfziviy9k4s7pm92c7bzwa9adfak6y9h4"; + name = "kdiamond-20.12.1.tar.xz"; }; }; keditbookmarks = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/keditbookmarks-20.08.3.tar.xz"; - sha256 = "0m8ap5hvjgldj9hdk6shpkv8xylhhjla2xn1zs86pvj4la3zh4f8"; - name = "keditbookmarks-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/keditbookmarks-20.12.1.tar.xz"; + sha256 = "1a41zpl2wzqdmp13m915agcc2nlxndyamy5aqyn98y3s8k5n6d9p"; + name = "keditbookmarks-20.12.1.tar.xz"; }; }; kfind = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kfind-20.08.3.tar.xz"; - sha256 = "10i5mw6q2parq5w7pi955kgfvdlw8hwis2p7r9vkvabjdk69nkdr"; - name = "kfind-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kfind-20.12.1.tar.xz"; + sha256 = "0rlxq4dl221ycxcybav7yf88wz23v07n5yzp7jgrd602lk5k8jdp"; + name = "kfind-20.12.1.tar.xz"; }; }; kfloppy = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kfloppy-20.08.3.tar.xz"; - sha256 = "1cp0pwgldscc7va508gk43im3fv0lsxd5sbhpw8kxlzjlpbwlp8v"; - name = "kfloppy-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kfloppy-20.12.1.tar.xz"; + sha256 = "1wpcv2ipx0izg60rbgf8qwhys3bhw8i36qpsvh8bihkzij28xc84"; + name = "kfloppy-20.12.1.tar.xz"; }; }; kfourinline = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kfourinline-20.08.3.tar.xz"; - sha256 = "0h1n44dncr2siw447n7b0gkx3380vajvqjsgjvapkg7m7bmz7nsv"; - name = "kfourinline-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kfourinline-20.12.1.tar.xz"; + sha256 = "1fv68smci1f59xzqzqj36qry2ibgr0ps731vhvafn210q8h2f5b5"; + name = "kfourinline-20.12.1.tar.xz"; }; }; kgeography = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kgeography-20.08.3.tar.xz"; - sha256 = "1mk5cip55chc8pmh8wfl7an5x076ywisr0i7isqcjaij2cv54283"; - name = "kgeography-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kgeography-20.12.1.tar.xz"; + sha256 = "13jsrfv17lzlwi9rg7i8q2sfl8n19k15qdbv1y5lggykvf8prp8h"; + name = "kgeography-20.12.1.tar.xz"; }; }; kget = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kget-20.08.3.tar.xz"; - sha256 = "144ydk8bbfirph464mkkvwpnynj465i2ynhm8n9d330kcrhnaxd0"; - name = "kget-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kget-20.12.1.tar.xz"; + sha256 = "03s8wpfrzl3j6whxbfbmbydghaghcnr8xbskf4wkyk9kvyk4bqha"; + name = "kget-20.12.1.tar.xz"; }; }; kgoldrunner = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kgoldrunner-20.08.3.tar.xz"; - sha256 = "101cdl04wb6xbq95b51ax36570y9ahkcy5gccqsyvc307ij9yg7r"; - name = "kgoldrunner-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kgoldrunner-20.12.1.tar.xz"; + sha256 = "0n96clxf0bmhm8hlyvd7q9w1zhjn5irvh2vrf9d79ng44zgygjvh"; + name = "kgoldrunner-20.12.1.tar.xz"; }; }; kgpg = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kgpg-20.08.3.tar.xz"; - sha256 = "1ip21yal37yxg5i5sfy6lgfb3sz9lld0dwa7a1w4lbddf9w3akd6"; - name = "kgpg-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kgpg-20.12.1.tar.xz"; + sha256 = "05wwdbx90wg3rm6hcin1dykbrbzz82g01dxnkgh21zzab72wmx8a"; + name = "kgpg-20.12.1.tar.xz"; }; }; khangman = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/khangman-20.08.3.tar.xz"; - sha256 = "1zwdd2gpjkld3vkawp0lj83il257ryxf8wpmbgzn1wz8sxxi01jj"; - name = "khangman-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/khangman-20.12.1.tar.xz"; + sha256 = "0ljavjbh69qyp2323pqlkibzjkwgddmdjd35m0m5n4nwvnz3l5y7"; + name = "khangman-20.12.1.tar.xz"; }; }; khelpcenter = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/khelpcenter-20.08.3.tar.xz"; - sha256 = "1xan4awwgs08k7ksfy80rfcxqd6bi8i1fjdgy55hh7wshv76zf5r"; - name = "khelpcenter-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/khelpcenter-20.12.1.tar.xz"; + sha256 = "1cba8siq3g78xjap4mhfkgvk9n031qy81ir08fpwk6zp9fkkgqb6"; + name = "khelpcenter-20.12.1.tar.xz"; }; }; kidentitymanagement = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kidentitymanagement-20.08.3.tar.xz"; - sha256 = "0vkydvf4yw3qlqrg9m1zdm6j0c1crxdvc7l24yls9fjbj957vbls"; - name = "kidentitymanagement-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kidentitymanagement-20.12.1.tar.xz"; + sha256 = "1f8l8xbwy7qk5hadvknr45ihhg1j7zpqvpf5wxj3h6zg9fmadly9"; + name = "kidentitymanagement-20.12.1.tar.xz"; }; }; kig = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kig-20.08.3.tar.xz"; - sha256 = "1dvizdfkvl7p7hr4xm4zh51lpr8qr3s5j5zz162s7arr7sws4w8h"; - name = "kig-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kig-20.12.1.tar.xz"; + sha256 = "0ns4rhk822p7jjqy9wnhkbrbais4ih1viw405rl5r5xlqn9bvsiz"; + name = "kig-20.12.1.tar.xz"; }; }; kigo = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kigo-20.08.3.tar.xz"; - sha256 = "0sx3klivzn8h96mpnbkiv2nbi2l6w0j6fclj7q3ql3cm81jh6n15"; - name = "kigo-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kigo-20.12.1.tar.xz"; + sha256 = "0lvcc423mw3gs6c5x4lrlny07q93pa8ivaqphq6y4771n5y5dqqa"; + name = "kigo-20.12.1.tar.xz"; }; }; killbots = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/killbots-20.08.3.tar.xz"; - sha256 = "1j41my0brpqpvd8xibv39z4x4kmw1sqz7wy7ibhh0zir3jh64n83"; - name = "killbots-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/killbots-20.12.1.tar.xz"; + sha256 = "0cdlixd7rakcxa8f5pf3pmq86mlipg7yhygnii858165v0gwkpx3"; + name = "killbots-20.12.1.tar.xz"; }; }; kimagemapeditor = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kimagemapeditor-20.08.3.tar.xz"; - sha256 = "1m9mrksdl08ijmpmx3lhdysnm70mrnqz9rlbcn1h95p2sq0bk8cg"; - name = "kimagemapeditor-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kimagemapeditor-20.12.1.tar.xz"; + sha256 = "0vj2w3bgkq020gdi5q1zh650ipf4zc0hvzx5fpjknx4hd8b52rf8"; + name = "kimagemapeditor-20.12.1.tar.xz"; }; }; kimap = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kimap-20.08.3.tar.xz"; - sha256 = "16paglkqgnyzwjydhn02qw7zg0d4casir4bsfch15wdmqv389mrg"; - name = "kimap-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kimap-20.12.1.tar.xz"; + sha256 = "1x6lapmb3srw3pddi7rmlzjdsw54x94pkr6jyrncpfpqqsgb3l4v"; + name = "kimap-20.12.1.tar.xz"; }; }; kio-extras = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kio-extras-20.08.3.tar.xz"; - sha256 = "0i7k9asc97r9z4lfk5hyf7mcbx0za7j6v4dhqn43j5v4x2i0201c"; - name = "kio-extras-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kio-extras-20.12.1.tar.xz"; + sha256 = "1ym07jzy4w21frf3j5aadxg8ny7bgrm5dbhrc3xdyyj2rwh3iygg"; + name = "kio-extras-20.12.1.tar.xz"; }; }; kio-gdrive = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kio-gdrive-20.08.3.tar.xz"; - sha256 = "0pp0nvsnfdm8vskw194qjfac4agnlsjm44w1704b5sqx6i27dafy"; - name = "kio-gdrive-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kio-gdrive-20.12.1.tar.xz"; + sha256 = "0axh8138rcfpa0a7s5w8zi8i6chz3z1q7560v497x6rd3d1z2zp0"; + name = "kio-gdrive-20.12.1.tar.xz"; }; }; kipi-plugins = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kipi-plugins-20.08.3.tar.xz"; - sha256 = "1pplhv8yjfl1ifx9ykf4w2lgma8jvshihmd5c5mz9liqk3lawq15"; - name = "kipi-plugins-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kipi-plugins-20.12.1.tar.xz"; + sha256 = "0pv5f6v37n75vrz4vaw755bjyyqk1mm9dla26k0jy3qr76g8bg9d"; + name = "kipi-plugins-20.12.1.tar.xz"; }; }; kirigami-gallery = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kirigami-gallery-20.08.3.tar.xz"; - sha256 = "0l100ng8ai55s0vl8nkpq4vysy2nc6sk1dbisc2mp7br74ykyfp9"; - name = "kirigami-gallery-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kirigami-gallery-20.12.1.tar.xz"; + sha256 = "00f3alhlvlphcz81465nfrdvvabbzy5n1s06bvwzsvf290h5chbh"; + name = "kirigami-gallery-20.12.1.tar.xz"; }; }; kiriki = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kiriki-20.08.3.tar.xz"; - sha256 = "1gddjii84cbz1dg8k0pnd3dyzar4lvj03j9v84vabggjjjbpir0f"; - name = "kiriki-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kiriki-20.12.1.tar.xz"; + sha256 = "07qsmyf1ylgcwy704s8x9g1h4kalsipqz4z3bj1z5m5a2y9l8y8q"; + name = "kiriki-20.12.1.tar.xz"; }; }; kiten = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kiten-20.08.3.tar.xz"; - sha256 = "0n9mq86gcl6s2f45l8lbp4gsdj356l78xjkdvm14f6qlh81vsqlc"; - name = "kiten-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kiten-20.12.1.tar.xz"; + sha256 = "0dfz2wdscgn0f967lnhzpyb3iz1iw068x0l10542pm5dh32afs4m"; + name = "kiten-20.12.1.tar.xz"; }; }; kitinerary = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kitinerary-20.08.3.tar.xz"; - sha256 = "169pmy5fyjkbya8r2kdkd9s83sim0jplc3lx8bv2xh6r10mvzgm6"; - name = "kitinerary-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kitinerary-20.12.1.tar.xz"; + sha256 = "07zjd3ikbx6rw39ndy04aia8q35r75p5n52fijwnc4fkfc40xyxz"; + name = "kitinerary-20.12.1.tar.xz"; }; }; kjumpingcube = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kjumpingcube-20.08.3.tar.xz"; - sha256 = "19246jwwd686x8i0jrvz2c8mpkf6qhm7rnskzin59dqzr76xrpgz"; - name = "kjumpingcube-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kjumpingcube-20.12.1.tar.xz"; + sha256 = "0li9bq7j30fbdzg981i6jkpxgrv1z84bpig8m5mxfyfhs5c55j69"; + name = "kjumpingcube-20.12.1.tar.xz"; }; }; kldap = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kldap-20.08.3.tar.xz"; - sha256 = "1ihaazsnb9r30m2qhzcp2ns9f5fs7l3agsc9f9wxi4cyw73bq0n3"; - name = "kldap-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kldap-20.12.1.tar.xz"; + sha256 = "02w4hk9j1f1d81k0j8dzrj4hxwk2xwrf48305hzmm658wjvkv4k3"; + name = "kldap-20.12.1.tar.xz"; }; }; kleopatra = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kleopatra-20.08.3.tar.xz"; - sha256 = "1r879g7hw3c5cww58z0kvqj47pgzbiq1vpgxz847smrylqajcpyi"; - name = "kleopatra-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kleopatra-20.12.1.tar.xz"; + sha256 = "1g06mq8vl1jhkyrjfrgsbl44v7yq04m8xbb8dxlyhyv40dwlz7l6"; + name = "kleopatra-20.12.1.tar.xz"; }; }; klettres = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/klettres-20.08.3.tar.xz"; - sha256 = "0irc0f7vjznlsczan30zzprbnvgnbg19vabr97cw9rkkfa28azx9"; - name = "klettres-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/klettres-20.12.1.tar.xz"; + sha256 = "0k66xdkyv6i1zgk9nvz9633pmxygv1bwm4nkbg3izlh4g23rn3kk"; + name = "klettres-20.12.1.tar.xz"; }; }; klickety = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/klickety-20.08.3.tar.xz"; - sha256 = "1qsm9grmy0bnalpdghg48xi68zzk6ysmg6n0d74ldmmnirv3r0zf"; - name = "klickety-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/klickety-20.12.1.tar.xz"; + sha256 = "17ml80p02sndhac5q6lkf7bb1kz9snsia991fghhahcjvd1g2qn6"; + name = "klickety-20.12.1.tar.xz"; }; }; klines = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/klines-20.08.3.tar.xz"; - sha256 = "1l95ph1sjp3r1q065k3rj18lm36krl7bh41zgqh021p692ywc48c"; - name = "klines-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/klines-20.12.1.tar.xz"; + sha256 = "1ba71n90x0s8nf300p53libzfjd0j9r6m0fng636m1qjaz6z9a3c"; + name = "klines-20.12.1.tar.xz"; }; }; kmag = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmag-20.08.3.tar.xz"; - sha256 = "0y44gz3qn91vl840xz25l5kc5jj82k5qqxkgsvvyld2s99rif84k"; - name = "kmag-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmag-20.12.1.tar.xz"; + sha256 = "0m4zy1ybk2p4wzdfrdf64n06ck39sn7s0nb82miizcpscaxqswhj"; + name = "kmag-20.12.1.tar.xz"; }; }; kmahjongg = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmahjongg-20.08.3.tar.xz"; - sha256 = "0wgp9m7xzf5ysmrrnyng4p4jypvzfnqkyw62gknl0qhk531cgq3h"; - name = "kmahjongg-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmahjongg-20.12.1.tar.xz"; + sha256 = "1hszrp81pffg7rp0rk54qx49v3acmqfdi0if47kh9w124iicsi3z"; + name = "kmahjongg-20.12.1.tar.xz"; }; }; kmail = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmail-20.08.3.tar.xz"; - sha256 = "0g59s7wl0n4bp8kw559rdlamlqxl47qvwfms9kr9ign35rvs0ghg"; - name = "kmail-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmail-20.12.1.tar.xz"; + sha256 = "128l57x29mqg3fcx50hviqydl7gw6n2zbjnmzrj7fzgl6gafcdgw"; + name = "kmail-20.12.1.tar.xz"; }; }; kmail-account-wizard = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmail-account-wizard-20.08.3.tar.xz"; - sha256 = "0vama5a02dfgxrl4iz88lbi8dvq3d9b055xil770d90pwp0sljcz"; - name = "kmail-account-wizard-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmail-account-wizard-20.12.1.tar.xz"; + sha256 = "1gl4pvn7lyyc9rsk70yp5mikpdbakp4zgwx3plypqhmqd1z92pin"; + name = "kmail-account-wizard-20.12.1.tar.xz"; }; }; kmailtransport = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmailtransport-20.08.3.tar.xz"; - sha256 = "07552qj3ngwvyss7f8cy87c0gmzc47agn54wk85qq0v1fwr73n6z"; - name = "kmailtransport-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmailtransport-20.12.1.tar.xz"; + sha256 = "08i4fmhkpxil7q6vn045xha54x00jkm19kibphx2q3sb3c6s3plm"; + name = "kmailtransport-20.12.1.tar.xz"; }; }; kmbox = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmbox-20.08.3.tar.xz"; - sha256 = "0ipmwcicn3qklybqy9v41lh7byn7j62ja8b0xf06z9nliwkk4b0b"; - name = "kmbox-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmbox-20.12.1.tar.xz"; + sha256 = "1w172gqanhpkmcd9hc62lsmrkylg8mlfyk3nq3n89k6m2dkcfvqd"; + name = "kmbox-20.12.1.tar.xz"; }; }; kmime = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmime-20.08.3.tar.xz"; - sha256 = "1ndbx712vm4v0fi7p8j28d8z35h3bmsixc97z5r9dg03v1kzd36v"; - name = "kmime-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmime-20.12.1.tar.xz"; + sha256 = "0hr5mh8a4b9bi0dqs055x4mpig7awqy9sd6j0i8lxix4cngcb6a2"; + name = "kmime-20.12.1.tar.xz"; }; }; kmines = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmines-20.08.3.tar.xz"; - sha256 = "1mn5hip3vnzmkk1hy14glsplp7f5pm56yv0d5mz25icfgw0xa6lp"; - name = "kmines-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmines-20.12.1.tar.xz"; + sha256 = "18jzzn03c6mlmc02qg5fimid77b8gs0h4lci6wmj11fmb94g1hic"; + name = "kmines-20.12.1.tar.xz"; }; }; kmix = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmix-20.08.3.tar.xz"; - sha256 = "00gm93faqmqx0hhkxi3k2pn6sq82k2f622vqgk7mwznkpg66mf4k"; - name = "kmix-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmix-20.12.1.tar.xz"; + sha256 = "1q1jz33mwnr5nr2mw92g40g7paclaxhwcvqik91la6dnvl0vpi8p"; + name = "kmix-20.12.1.tar.xz"; }; }; kmousetool = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmousetool-20.08.3.tar.xz"; - sha256 = "09qznykysr42rzz5cmqvhvz91cr8dbzwjd73hwaib2lfs3c2cgbl"; - name = "kmousetool-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmousetool-20.12.1.tar.xz"; + sha256 = "1nahq9cgffcd4llqc8lwkicxjw8nwphvpws9xkalwsswb7ai9jrk"; + name = "kmousetool-20.12.1.tar.xz"; }; }; kmouth = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmouth-20.08.3.tar.xz"; - sha256 = "0ajhnl1sjllfb42nyafpirmlgcs6waqp8qxvgsz5dk5zkb8daqmr"; - name = "kmouth-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmouth-20.12.1.tar.xz"; + sha256 = "0qhparw2qszv7z7lrzb76kyvkcgr9sgry9ir9965dd0sp4c1fhgc"; + name = "kmouth-20.12.1.tar.xz"; }; }; kmplot = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kmplot-20.08.3.tar.xz"; - sha256 = "0cv7q1wmbb3fkf4s6ns4q1il5zr4q02b3xghpp661ma82d8jhjcy"; - name = "kmplot-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kmplot-20.12.1.tar.xz"; + sha256 = "0iz61jjr7z0j5bh5nqdv9nbdbiz0jhda89bxjds0n9636q42rifm"; + name = "kmplot-20.12.1.tar.xz"; }; }; knavalbattle = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/knavalbattle-20.08.3.tar.xz"; - sha256 = "1028i8zl5ynm3vvqajsms2hq8gmmjmjc5dc6r3jyh6r964vxq3nq"; - name = "knavalbattle-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/knavalbattle-20.12.1.tar.xz"; + sha256 = "0k7kqnc8zp3n0ckrmmih12x6h1vgn9s7hrgp7n37bns2g39ij0xn"; + name = "knavalbattle-20.12.1.tar.xz"; }; }; knetwalk = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/knetwalk-20.08.3.tar.xz"; - sha256 = "13pspvi2p68irpbr3f2ck78qmvfl3vahm5qjw2fwhidhpindf9nl"; - name = "knetwalk-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/knetwalk-20.12.1.tar.xz"; + sha256 = "0px8yfi5h9nipgdjcgskrm66dr23yg5ks0kyxjsly6mv41qxjiw8"; + name = "knetwalk-20.12.1.tar.xz"; }; }; knights = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/knights-20.08.3.tar.xz"; - sha256 = "0zqb87mr2x085hi3r9cvdrx2kvxmclh4ffi1ajcb8v1f79wiwzin"; - name = "knights-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/knights-20.12.1.tar.xz"; + sha256 = "098ywblshbr3qx7b8m4qj0036dq3c3mackmsbjnr85acb0204bjb"; + name = "knights-20.12.1.tar.xz"; }; }; knotes = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/knotes-20.08.3.tar.xz"; - sha256 = "0ysw8js2s6njilg4v4vqrl1bzcmqvk42l68pzvyflr112zviqz28"; - name = "knotes-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/knotes-20.12.1.tar.xz"; + sha256 = "11gfk2p240a2gqxgkn9ymf7ds2zpij8h2vbbkax6ariddmhmlqk0"; + name = "knotes-20.12.1.tar.xz"; }; }; kolf = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kolf-20.08.3.tar.xz"; - sha256 = "1ywyny8iq2sxglsvpgw6p3w3w567k6cw6waywfcfy0lcnfarg1n0"; - name = "kolf-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kolf-20.12.1.tar.xz"; + sha256 = "12b424dl6rizj2pdcd4cr01lmp4kmirii79k40v22hn0yn6a9qdv"; + name = "kolf-20.12.1.tar.xz"; }; }; kollision = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kollision-20.08.3.tar.xz"; - sha256 = "1l8a32bni40jz5jna0ip9ggbx7zp1hhiw2mip7v8f6qc4arbknl8"; - name = "kollision-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kollision-20.12.1.tar.xz"; + sha256 = "1hxv4qd5dl61d5440r4hnd9r24prn78ibmnk3m06c15zc3hfdsdn"; + name = "kollision-20.12.1.tar.xz"; }; }; kolourpaint = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kolourpaint-20.08.3.tar.xz"; - sha256 = "0d64gnnb553rxscr8710h5bx8ijxd87jrbix07k41y79i5x60irh"; - name = "kolourpaint-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kolourpaint-20.12.1.tar.xz"; + sha256 = "1a2wgrf9hirvj61k2nd8x7rv5v8i9r1vrvpdmi9ik4qdg6lpvqay"; + name = "kolourpaint-20.12.1.tar.xz"; }; }; kompare = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kompare-20.08.3.tar.xz"; - sha256 = "0r9m2vcw9hbdkfdy24pfpqs2b5r0jyxh1ma2h66hfv4ycd470ilc"; - name = "kompare-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kompare-20.12.1.tar.xz"; + sha256 = "13di8dzp7xzlfacas5f92h1vwiqf64cd0rkc4yv4l2g8aq2jzcqh"; + name = "kompare-20.12.1.tar.xz"; }; }; konqueror = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/konqueror-20.08.3.tar.xz"; - sha256 = "1ssjj83jcbcq8i7wx5zd12z7crh2zg6awbpy38maq3c7747nqz7k"; - name = "konqueror-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/konqueror-20.12.1.tar.xz"; + sha256 = "026f8fybr8azq3diw2k3p3qpmqj9lk6n9ipcl3xkwdss7i5v5w3y"; + name = "konqueror-20.12.1.tar.xz"; }; }; konquest = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/konquest-20.08.3.tar.xz"; - sha256 = "1wq0j02dzdah6yhx8r2cg191617hid9fs780yr317fprkwkgb8cb"; - name = "konquest-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/konquest-20.12.1.tar.xz"; + sha256 = "1s08mvj7z91r86i0zwkcv05fnnr4lzhp596qr38d2yv6rxf5vr57"; + name = "konquest-20.12.1.tar.xz"; }; }; konsole = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/konsole-20.08.3.tar.xz"; - sha256 = "0jjidy756x8n456qbm977a73l8229kk8i489jh52296k8pkh6yjx"; - name = "konsole-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/konsole-20.12.1.tar.xz"; + sha256 = "1v39sx00c115apnm32wn00yir69z1h0y3lblmjmvbjk24hwvx45n"; + name = "konsole-20.12.1.tar.xz"; }; }; kontact = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kontact-20.08.3.tar.xz"; - sha256 = "0qasgxvq7xps0zxk4hf2sizmy90mxyq70m2pq49pq17ij2pa9ynl"; - name = "kontact-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kontact-20.12.1.tar.xz"; + sha256 = "0dr59jj97zxkgc61zgwa8i26m81sfxvymxcrh5midwd24z8nslkz"; + name = "kontact-20.12.1.tar.xz"; }; }; kontactinterface = { - version = "20.08.3"; + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/kontactinterface-20.12.1.tar.xz"; + sha256 = "0sdlgmwvir2s9ys466i4bj4raf2af43w838and64jwsr9qb1hg4j"; + name = "kontactinterface-20.12.1.tar.xz"; + }; + }; + kontrast = { + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kontactinterface-20.08.3.tar.xz"; - sha256 = "1ah2814js08sm49ykarqdw7z03w4fbym5cc4vwmzimcvh2bc78j3"; - name = "kontactinterface-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kontrast-20.12.1.tar.xz"; + sha256 = "0cs31sn4va2hhfi7ps3bz9sy2hlxb8cawn5vijfdhzb9mmc962br"; + name = "kontrast-20.12.1.tar.xz"; + }; + }; + konversation = { + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/konversation-20.12.1.tar.xz"; + sha256 = "1x6pyiv73avc3qmxlbnwwzk3gz6qbr991p896f9yb4rqfqj8j7j4"; + name = "konversation-20.12.1.tar.xz"; }; }; kopete = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kopete-20.08.3.tar.xz"; - sha256 = "1lsab66k0xq1g0w0cxcpadmf9kkc09x8wwbv4i8y3aj2mn7849gh"; - name = "kopete-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kopete-20.12.1.tar.xz"; + sha256 = "1cfbl3jalmaphwrzw443l4q5k1fx4nja65ajgrv3nly8rfabfnfl"; + name = "kopete-20.12.1.tar.xz"; }; }; korganizer = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/korganizer-20.08.3.tar.xz"; - sha256 = "112h6vn2y9d3q3z62cwg3zrak3xgx9affibc9cvr6fzhp4z0x9ps"; - name = "korganizer-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/korganizer-20.12.1.tar.xz"; + sha256 = "1ci6ca6w3a77gf3d7fh9rjkblm5qa2jic176rwmax79qgvjjq8wm"; + name = "korganizer-20.12.1.tar.xz"; + }; + }; + kosmindoormap = { + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/kosmindoormap-20.12.1.tar.xz"; + sha256 = "186kfqaznxyxqchwqsrb4dvk4v69rhqwfg93fcjsp43l14ml5rnx"; + name = "kosmindoormap-20.12.1.tar.xz"; }; }; kpat = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kpat-20.08.3.tar.xz"; - sha256 = "1id4b9jkphi8pp29gc2vb3n9f0g8kl9yy5v8cnyv3jq673aj0fs9"; - name = "kpat-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kpat-20.12.1.tar.xz"; + sha256 = "1kd3i7qhjwxi04x8dkc7q9rgx73zyx3njm5rhq0hc1v32m8nn659"; + name = "kpat-20.12.1.tar.xz"; }; }; kpimtextedit = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kpimtextedit-20.08.3.tar.xz"; - sha256 = "1m4r5zbhbjvj3za78xfp3dibyf7mp9gan5ir5zd0k2p7adp3i652"; - name = "kpimtextedit-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kpimtextedit-20.12.1.tar.xz"; + sha256 = "15m26qssw80nxv1m51jq3q629nginhh4hb69a5y15jgvrv4k59b4"; + name = "kpimtextedit-20.12.1.tar.xz"; }; }; kpkpass = { - version = "20.08.3"; + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/kpkpass-20.12.1.tar.xz"; + sha256 = "09idbgf9gnzyr520indlzhwb9pr5hx3dag26qrfi7l8ywzdkrsr2"; + name = "kpkpass-20.12.1.tar.xz"; + }; + }; + kpmcore = { + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kpkpass-20.08.3.tar.xz"; - sha256 = "0zw3xx5mi38za0xbvld97f5bqvwwgyz47kybyrdm7jrhvmmiiiis"; - name = "kpkpass-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kpmcore-20.12.1.tar.xz"; + sha256 = "0nyqz1jfr9h9n80npvp7yyizbyga6iv8yljq52myk6b40vs9q41v"; + name = "kpmcore-20.12.1.tar.xz"; + }; + }; + kpublictransport = { + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/kpublictransport-20.12.1.tar.xz"; + sha256 = "0saqykqb9rrm3ngvcx910dmhyh1hc3n0x3qfzlzrxlq678ag94hq"; + name = "kpublictransport-20.12.1.tar.xz"; }; }; kqtquickcharts = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kqtquickcharts-20.08.3.tar.xz"; - sha256 = "0l7v8vrc7by0w0yshnh21jaqhspmhkvm5cd0hpay6jc9v2azkcf3"; - name = "kqtquickcharts-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kqtquickcharts-20.12.1.tar.xz"; + sha256 = "0025vj4n0k3g5bsmjq6ydx80izvpx6g73jxz27hp69vbl8p4ylpc"; + name = "kqtquickcharts-20.12.1.tar.xz"; }; }; krdc = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/krdc-20.08.3.tar.xz"; - sha256 = "1g9lxdldljh5a2s4g7g9b98lij168l99ah0vr6nvdl53n35pfr8n"; - name = "krdc-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/krdc-20.12.1.tar.xz"; + sha256 = "067xrhs55di2ff0lxvcl2x7qblmv2pbrgjkc5bjsx6ai6w9bv4dh"; + name = "krdc-20.12.1.tar.xz"; }; }; kreversi = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kreversi-20.08.3.tar.xz"; - sha256 = "0d3y072q61xcik9lf0pz0c9njvarwlvf6hqv5fp5jyqaf2902pmi"; - name = "kreversi-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kreversi-20.12.1.tar.xz"; + sha256 = "1yw9lxzqyxk6fsh2lzsrp2cmdw545hszdz9253lm6b5ppax6z42a"; + name = "kreversi-20.12.1.tar.xz"; }; }; krfb = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/krfb-20.08.3.tar.xz"; - sha256 = "13nypbcdhh53wq72w59z5q46a09g1w4yyi1pmsjwa8r7jnk8cafk"; - name = "krfb-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/krfb-20.12.1.tar.xz"; + sha256 = "0pfxd0nci9g4wkh4qcgk3yhm9rl9yx2d4jpfxgdmiacfp9hkqxj6"; + name = "krfb-20.12.1.tar.xz"; }; }; kross-interpreters = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kross-interpreters-20.08.3.tar.xz"; - sha256 = "0mr5vpbbcv66s6dyrrypy1ai6ba744z8cn4r0iwys35p6am075qj"; - name = "kross-interpreters-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kross-interpreters-20.12.1.tar.xz"; + sha256 = "1csk3xkkkqvffms5ivy08hyd2mizg7ywcrdapxx40m5kwsn6vpxs"; + name = "kross-interpreters-20.12.1.tar.xz"; }; }; kruler = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kruler-20.08.3.tar.xz"; - sha256 = "1vhl8acccdqfdj7lci8r2mig9qf1js4f8v7b4fqljpnc3gdg8749"; - name = "kruler-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kruler-20.12.1.tar.xz"; + sha256 = "1jiz9s647bndpi4gg3f7wwg0c0cv8wf1myjxwdpx5a0ggdr2xh3q"; + name = "kruler-20.12.1.tar.xz"; }; }; kshisen = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kshisen-20.08.3.tar.xz"; - sha256 = "1vy8qh8s60a4ikyw3sh4cbr3p3fk35d4dwdqc263gn4skyrsb1l9"; - name = "kshisen-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kshisen-20.12.1.tar.xz"; + sha256 = "1awnpj66080g2y41014g2pgb5llyqw56b54z6ydhfya4a0a8gsds"; + name = "kshisen-20.12.1.tar.xz"; }; }; ksirk = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ksirk-20.08.3.tar.xz"; - sha256 = "1kxc1b05r8x6pvaiwpvjpgrr88qkm5qs4d3s1ym8rki60c724qpl"; - name = "ksirk-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ksirk-20.12.1.tar.xz"; + sha256 = "11bcmxjjyf095i790f5r3cr5hskw2x9458vwfm7yd57qx3r01axz"; + name = "ksirk-20.12.1.tar.xz"; }; }; ksmtp = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ksmtp-20.08.3.tar.xz"; - sha256 = "1p9clzvmsym2fijwvs3s0zqx57bk82mlks52j5ni3il6lvklaayc"; - name = "ksmtp-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ksmtp-20.12.1.tar.xz"; + sha256 = "1yahcgchfhk742n6hmpr2b2fll6jrw0vs1hrfvms3n7w7vxnkyxg"; + name = "ksmtp-20.12.1.tar.xz"; }; }; ksnakeduel = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ksnakeduel-20.08.3.tar.xz"; - sha256 = "03ydbwknn20gadjpwcw0z8zw777hgj8j10w4gvp2dwpb07rdg1pn"; - name = "ksnakeduel-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ksnakeduel-20.12.1.tar.xz"; + sha256 = "1647m2a918kr762fmvffj2ipamhvcihc8yg8z80b8lwinpspcdfc"; + name = "ksnakeduel-20.12.1.tar.xz"; }; }; kspaceduel = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kspaceduel-20.08.3.tar.xz"; - sha256 = "1ii3lnxd11d3ihl8j1abh9qn9q0qq8ra9hbrwjs5df2kk36bnirj"; - name = "kspaceduel-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kspaceduel-20.12.1.tar.xz"; + sha256 = "17i2saa48xq62j0aca555lqjxf6ry3wkxw5vm5v32g3kwkr10m78"; + name = "kspaceduel-20.12.1.tar.xz"; }; }; ksquares = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ksquares-20.08.3.tar.xz"; - sha256 = "1ch7lbylzb9ngdzvpzqq5f30gkm2l4rzk6iqa8xm53rawr7jjqcy"; - name = "ksquares-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ksquares-20.12.1.tar.xz"; + sha256 = "085bvcx5p13j32017c0vm3zvcr0r0dzcbxpp21mvrp1xzy2dw7v2"; + name = "ksquares-20.12.1.tar.xz"; }; }; ksudoku = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ksudoku-20.08.3.tar.xz"; - sha256 = "0hnqbd3krxi3zwj8p4n9ydhwfwhw8wljhjdfv0llv0nhj1wb89p9"; - name = "ksudoku-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ksudoku-20.12.1.tar.xz"; + sha256 = "0a0i87ddxa75admnxl181dsqmab4cwbb6pncl34z4sppf272z8km"; + name = "ksudoku-20.12.1.tar.xz"; }; }; ksystemlog = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ksystemlog-20.08.3.tar.xz"; - sha256 = "11fc2mn4hkcibpxp7s2gihpp05yix7ws84a0bm6vjiqlidmrk192"; - name = "ksystemlog-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ksystemlog-20.12.1.tar.xz"; + sha256 = "0535s6sq4wccdxv0xw12x3zzjkp0746s3hmlk93sginwq5fixxc0"; + name = "ksystemlog-20.12.1.tar.xz"; }; }; kteatime = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kteatime-20.08.3.tar.xz"; - sha256 = "1vj738s2a7nnrvxi847mdmn1vg79kh9k8gqaflcwnvyxanf6n4f7"; - name = "kteatime-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kteatime-20.12.1.tar.xz"; + sha256 = "0j9c3wy398z61ciyf91hv7l3bxski827di9ib94wyjkwqd6516zx"; + name = "kteatime-20.12.1.tar.xz"; }; }; ktimer = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktimer-20.08.3.tar.xz"; - sha256 = "1rc1z93s24b7p2ixr4xbpg0sj8ls90gzfijwj9f8b0lrwd905ysv"; - name = "ktimer-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktimer-20.12.1.tar.xz"; + sha256 = "0iac06mzszg6g1flbs0mzj8ddnvh6kdgbhakjxl969in4c1frz9w"; + name = "ktimer-20.12.1.tar.xz"; }; }; ktnef = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktnef-20.08.3.tar.xz"; - sha256 = "1lj93sqyi522k91jiyf7d26vx5sgn5njhyaf8plsfz5rj82dw1m4"; - name = "ktnef-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktnef-20.12.1.tar.xz"; + sha256 = "1pq4mabh7glpxl2iwj5rrfwim4x6xfg2vlpx7z0d0n13gh85b4fd"; + name = "ktnef-20.12.1.tar.xz"; + }; + }; + ktorrent = { + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/ktorrent-20.12.1.tar.xz"; + sha256 = "0m43wsz0k87ncvg3zdffsp06nwdrlfnw52fi1ry12z2rnkcm4pwc"; + name = "ktorrent-20.12.1.tar.xz"; }; }; ktouch = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktouch-20.08.3.tar.xz"; - sha256 = "1ssxd7f75866rn5k192bnm016d8674q13ibcgmaxqsmr7wqkyd39"; - name = "ktouch-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktouch-20.12.1.tar.xz"; + sha256 = "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"; + name = "ktouch-20.12.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-accounts-kcm-20.08.3.tar.xz"; - sha256 = "0039svbzx7fphyk6cw4hb8k4h7l6q31pbwvp6pvls450rycz8i8y"; - name = "ktp-accounts-kcm-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-accounts-kcm-20.12.1.tar.xz"; + sha256 = "0440s2rrh03x8h5bp6xywidngrb1pinndsigaj4k4yvz122j2y53"; + name = "ktp-accounts-kcm-20.12.1.tar.xz"; }; }; ktp-approver = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-approver-20.08.3.tar.xz"; - sha256 = "1kqsdw7vkcd0ka98y2r7qz7dp5hsrr2m8k1xlh3gpj7fdxpla2bh"; - name = "ktp-approver-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-approver-20.12.1.tar.xz"; + sha256 = "14ygpqvjhyzryrlinz0i2a6nyn1gnxs0hwx35imiz8hg4sb9402k"; + name = "ktp-approver-20.12.1.tar.xz"; }; }; ktp-auth-handler = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-auth-handler-20.08.3.tar.xz"; - sha256 = "0wbhg458ysipwma8sygimasq71sbrzmx3vwqi51ai8y5hwrx04j4"; - name = "ktp-auth-handler-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-auth-handler-20.12.1.tar.xz"; + sha256 = "1bysipq957kqbl33zj88m1g987b02v25gmh5lpnmrnlqznxw0ws7"; + name = "ktp-auth-handler-20.12.1.tar.xz"; }; }; ktp-call-ui = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-call-ui-20.08.3.tar.xz"; - sha256 = "1fh8bz9kc6f8v28x12xp3vw19swgcq07zyjzhd6qcnwf1bv6gl7i"; - name = "ktp-call-ui-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-call-ui-20.12.1.tar.xz"; + sha256 = "154zgg84ln823al40s5fwxf10k3p73mz4fjn2lyhdqgsx68l08sy"; + name = "ktp-call-ui-20.12.1.tar.xz"; }; }; ktp-common-internals = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-common-internals-20.08.3.tar.xz"; - sha256 = "193yx4g1fwlwysy5scb7m24wqmvwmfyyb9sv7arw7zn5czlg480z"; - name = "ktp-common-internals-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-common-internals-20.12.1.tar.xz"; + sha256 = "1f8l1ywccxga3ff8qvf4ybabkd57apidkx7ky49dfi785kgvym16"; + name = "ktp-common-internals-20.12.1.tar.xz"; }; }; ktp-contact-list = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-list-20.08.3.tar.xz"; - sha256 = "0093z17r1xqlb1zlgxfayrnrkyl8zmnnasfd8i97dx712wmbbxxa"; - name = "ktp-contact-list-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-list-20.12.1.tar.xz"; + sha256 = "122p2xp6wqmvk7mbplgnilsbnk6hfzrgbxpr39n462pkwbmvs44j"; + name = "ktp-contact-list-20.12.1.tar.xz"; }; }; ktp-contact-runner = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-runner-20.08.3.tar.xz"; - sha256 = "063jylnq3gm0s0jh1xs6b591a161sb6gdi840l40mqlhhg7i8x55"; - name = "ktp-contact-runner-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-runner-20.12.1.tar.xz"; + sha256 = "1w8jp1nmjwaaqpim2jfpbv3d7w9asn93qi2ag2d6wx6mcc2q84jb"; + name = "ktp-contact-runner-20.12.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-desktop-applets-20.08.3.tar.xz"; - sha256 = "1i69qzfa455phjnd5ycflyggcbq7ycn2cc7a3ni5195isjzq6r6s"; - name = "ktp-desktop-applets-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-desktop-applets-20.12.1.tar.xz"; + sha256 = "0z3vv7q5kk27fm32bmhffpj6w72mldcdxsq6p3d33zf6rkz2rb74"; + name = "ktp-desktop-applets-20.12.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-filetransfer-handler-20.08.3.tar.xz"; - sha256 = "0a26ziacl3fkd0a0h1579jnwjzjlsz0zymj9k4da4sb60zad5y72"; - name = "ktp-filetransfer-handler-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-filetransfer-handler-20.12.1.tar.xz"; + sha256 = "0b8ha1jxhrdk67mzwrd0ypz99shlfr6sanxbbv0j3xh77sjcqpq3"; + name = "ktp-filetransfer-handler-20.12.1.tar.xz"; }; }; ktp-kded-module = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-kded-module-20.08.3.tar.xz"; - sha256 = "105vh6b7a0v02arksbwxn30slpcg11cpvb7dqmvf041iyr13sqsv"; - name = "ktp-kded-module-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-kded-module-20.12.1.tar.xz"; + sha256 = "1hbb5pj3gaw9sg5rj2rb7a8xqrixfhr040rcdjsln337zyy98iqf"; + name = "ktp-kded-module-20.12.1.tar.xz"; }; }; ktp-send-file = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-send-file-20.08.3.tar.xz"; - sha256 = "08pp3029jplc6rcbav40cgy787gn3jjl312gbgvnwzglxaqvcg4b"; - name = "ktp-send-file-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-send-file-20.12.1.tar.xz"; + sha256 = "1vgfqa062h5yxdsz71h2zz247mzv6mn0zm7dz1v8p4pzns9kscq1"; + name = "ktp-send-file-20.12.1.tar.xz"; }; }; ktp-text-ui = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktp-text-ui-20.08.3.tar.xz"; - sha256 = "1anxl9wa5ndyi9r9w0kpivx8nv1xpx28xjvkdplkc75cc1wl88sw"; - name = "ktp-text-ui-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktp-text-ui-20.12.1.tar.xz"; + sha256 = "13cx2pv4wqmrgbi4sg51fhp418r50ajjhc9yz5mv7ad2gxml5c61"; + name = "ktp-text-ui-20.12.1.tar.xz"; }; }; ktuberling = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/ktuberling-20.08.3.tar.xz"; - sha256 = "0q6ynmn6w5q65a77fq8n9vxqswrimln22b1zfgxmb2i3qwnhkrmz"; - name = "ktuberling-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/ktuberling-20.12.1.tar.xz"; + sha256 = "06la1cvwvpiqjdwv7icdg55dd8pkc587bfwwjdq2fhp2pyh3ws6j"; + name = "ktuberling-20.12.1.tar.xz"; }; }; kturtle = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kturtle-20.08.3.tar.xz"; - sha256 = "0riv76vwvz94zixqhhwkxw8sz2r2xqai39yh9hr31d28q9rza384"; - name = "kturtle-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kturtle-20.12.1.tar.xz"; + sha256 = "12jr4sbchjpvc730cy4bp2cccdsd8vw901dgyq0nar8p0pvg4ybb"; + name = "kturtle-20.12.1.tar.xz"; }; }; kubrick = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kubrick-20.08.3.tar.xz"; - sha256 = "03k73gr33dr3va69vc70fsfcdwkqz70bg87yk2l2j33x8wsgl4wx"; - name = "kubrick-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kubrick-20.12.1.tar.xz"; + sha256 = "1hdkm9vw9wpc8b3mw0yy9cz5ylm0h75zbg51rw4glai48bb3gs8i"; + name = "kubrick-20.12.1.tar.xz"; }; }; kwalletmanager = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kwalletmanager-20.08.3.tar.xz"; - sha256 = "1l07vxl2x3jl8553rbvr3p0k3rc95nmrw4vhxxynl3102xshrg5i"; - name = "kwalletmanager-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kwalletmanager-20.12.1.tar.xz"; + sha256 = "0nsg2xjzz6qvjqpxj1bbzzikvcl1ipqjwwab2kdwg71vlp99ravj"; + name = "kwalletmanager-20.12.1.tar.xz"; }; }; kwave = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kwave-20.08.3.tar.xz"; - sha256 = "0zk8ik03qcc6y0vhpih8sk2jpkxwxalmqmaan2767k9h92grdpc8"; - name = "kwave-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kwave-20.12.1.tar.xz"; + sha256 = "1w5r7di9401dm60p3bkp8qg41pvlz4226szki5s6pmmq89dixdgq"; + name = "kwave-20.12.1.tar.xz"; }; }; kwordquiz = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/kwordquiz-20.08.3.tar.xz"; - sha256 = "1kiqk3xyd0l7kqdxqjqs8mw4drcdbdri9xxi5gcav57ndcinknqb"; - name = "kwordquiz-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/kwordquiz-20.12.1.tar.xz"; + sha256 = "1dvbvfwaja4n2v9binj8pbdjizqz4zp49fiq8b4k5jxygcsgnx2p"; + name = "kwordquiz-20.12.1.tar.xz"; }; }; libgravatar = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libgravatar-20.08.3.tar.xz"; - sha256 = "09dvx2rb1j7q4r0gkbhz0vjk8ya3njqprpjqdhwcq7xwc2j9h0hr"; - name = "libgravatar-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libgravatar-20.12.1.tar.xz"; + sha256 = "12byf7p0fwsfy61gcv112bhq3zczjy5n1dm32x2lrjyis2dh2z9j"; + name = "libgravatar-20.12.1.tar.xz"; }; }; libkcddb = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkcddb-20.08.3.tar.xz"; - sha256 = "0r36hs79hmq0znsds0d04lj7ffs6l2d866kyn1z1fdwr9b3crirg"; - name = "libkcddb-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkcddb-20.12.1.tar.xz"; + sha256 = "07ky4ly72689gb58jxqqzq5bgmb9wslxkqj0ldam6v82ldk8ss7k"; + name = "libkcddb-20.12.1.tar.xz"; }; }; libkcompactdisc = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkcompactdisc-20.08.3.tar.xz"; - sha256 = "1nglk3kbx5czqla3cnpnf1fk71pf2cl9h6rgb40ak1xw4z31d456"; - name = "libkcompactdisc-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkcompactdisc-20.12.1.tar.xz"; + sha256 = "101szps2js8dhxdn913mj9b2z953rp47ikkbrrdjl1fq1i8dh6ib"; + name = "libkcompactdisc-20.12.1.tar.xz"; }; }; libkdcraw = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkdcraw-20.08.3.tar.xz"; - sha256 = "1806i99qsrmixdg5b0hyi8h55fk00q6wxsnrblbwcmsb268jddp7"; - name = "libkdcraw-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkdcraw-20.12.1.tar.xz"; + sha256 = "1vkjyccyax622a3jvqdfnppansabxaxplyk9prn302zqmgvl05h3"; + name = "libkdcraw-20.12.1.tar.xz"; }; }; libkdegames = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkdegames-20.08.3.tar.xz"; - sha256 = "1ccbcwwqb53bgqlr1rq9plpw21mipxp8rsi1f7l0p1jzpw054p08"; - name = "libkdegames-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkdegames-20.12.1.tar.xz"; + sha256 = "1zy44k98xjjydsa35bagf152kfb394wxpdx0c06vcf404jkhk7ng"; + name = "libkdegames-20.12.1.tar.xz"; }; }; libkdepim = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkdepim-20.08.3.tar.xz"; - sha256 = "1v77g02v5sdqprh8psx5xpjgf8v91il60ca59yivm5jvc3hdf3f6"; - name = "libkdepim-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkdepim-20.12.1.tar.xz"; + sha256 = "0kp2xssl1qbl3ziskxl3hhvyp8nc35d2fijk6hl99j3sxpdi2s4f"; + name = "libkdepim-20.12.1.tar.xz"; }; }; libkeduvocdocument = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkeduvocdocument-20.08.3.tar.xz"; - sha256 = "0ghkx6x5sn5fl934ybhl32knwv9zky0n1vkjw2w93lpms45xmw76"; - name = "libkeduvocdocument-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkeduvocdocument-20.12.1.tar.xz"; + sha256 = "0kqnhaabfi91clqg7nlnjcybl5ca0p3ysn5zlwhxz1fcjxm83g4w"; + name = "libkeduvocdocument-20.12.1.tar.xz"; }; }; libkexiv2 = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkexiv2-20.08.3.tar.xz"; - sha256 = "1lh3947w6xgzl2r1wm6m4kd478q6bv89f0c3c38ldv30imfw7rfl"; - name = "libkexiv2-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkexiv2-20.12.1.tar.xz"; + sha256 = "1vylyl3gxk3xais7c640kdnp4s4jwd9y2xxkwmf36ax0dv8wdcv0"; + name = "libkexiv2-20.12.1.tar.xz"; }; }; libkgapi = { - version = "20.08.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkgapi-20.08.3.tar.xz"; - sha256 = "1kmgf9v9rvb67l7aw5xsx7v44l4pz8rl6p09lk26irq7gd4k68la"; - name = "libkgapi-20.08.3.tar.xz"; - }; - }; - libkgeomap = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkgeomap-20.08.3.tar.xz"; - sha256 = "14ipksxnvgk2s1sw7a70153iy9aik9mf4i7k8y3pzdr3l3155ayk"; - name = "libkgeomap-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkgapi-20.12.1.tar.xz"; + sha256 = "0cx8lbzq8ambz2lbslakczzcfmhri4268p7zf7hnf3ymd17a5y8d"; + name = "libkgapi-20.12.1.tar.xz"; }; }; libkipi = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkipi-20.08.3.tar.xz"; - sha256 = "1b5qby7xm926qnzrf1zpb89fwx1a2syhqnznmdjxifj499p1jqjb"; - name = "libkipi-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkipi-20.12.1.tar.xz"; + sha256 = "1ln4f1n9ghiqb9h4lpw6qcwz7wrvm8jlcqn1ingjh9s58zw8wqsg"; + name = "libkipi-20.12.1.tar.xz"; }; }; libkleo = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkleo-20.08.3.tar.xz"; - sha256 = "1d6dal4qnrikg6ma2ird4b2sdivqqkkhamvd3s1srcxppc3aiq79"; - name = "libkleo-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkleo-20.12.1.tar.xz"; + sha256 = "0dq86pg0jchlpsynk0355wwq3pggqkj0mxhyvgi6a0xb2riy2r4a"; + name = "libkleo-20.12.1.tar.xz"; }; }; libkmahjongg = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkmahjongg-20.08.3.tar.xz"; - sha256 = "0xabp1vzbzs52m3bb9nzm1d9md1n4j4pr13izn6nv28ja7477nnm"; - name = "libkmahjongg-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkmahjongg-20.12.1.tar.xz"; + sha256 = "0cq0bcl7hkgj1v7giqzbrvlds2933ji52fg53cakz29fkgxibj3x"; + name = "libkmahjongg-20.12.1.tar.xz"; }; }; libkomparediff2 = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libkomparediff2-20.08.3.tar.xz"; - sha256 = "0nk0jkf0jwaz1yqzzp44c6xyjgw42gclkcvw8w61w1f8sdl40wb8"; - name = "libkomparediff2-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libkomparediff2-20.12.1.tar.xz"; + sha256 = "04klqvhh8zl5lyblpqgm92wycq4r0hh6gx18nqnsgx6lknlrx9y3"; + name = "libkomparediff2-20.12.1.tar.xz"; }; }; libksane = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libksane-20.08.3.tar.xz"; - sha256 = "0d2cnmvk16g1vnx9jd7jvp3bpw07ss54khmhqip8iskkvcfll9j0"; - name = "libksane-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libksane-20.12.1.tar.xz"; + sha256 = "07xsfs0lkh35nj0fy7y1r46nkdmm26nbpsm846v18lh7wflxi36j"; + name = "libksane-20.12.1.tar.xz"; }; }; libksieve = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/libksieve-20.08.3.tar.xz"; - sha256 = "0bhpdqynazssql2iivvpb9l8npa441345gcn59fc0va6barl9sam"; - name = "libksieve-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/libksieve-20.12.1.tar.xz"; + sha256 = "07zgcsdl38fdy5pskp51rj5p7m3pz9szwidyg24mdyzb08k5xpdz"; + name = "libksieve-20.12.1.tar.xz"; + }; + }; + libktorrent = { + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/libktorrent-20.12.1.tar.xz"; + sha256 = "18mcrb064gizqb699cs9bvm918gg06wm6sq33pi87kwki5cniamv"; + name = "libktorrent-20.12.1.tar.xz"; }; }; lokalize = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/lokalize-20.08.3.tar.xz"; - sha256 = "0iab8sd1qh7h0zna7lc3v43z6rcmxba9v4nynhl5miiac4r6ddr8"; - name = "lokalize-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/lokalize-20.12.1.tar.xz"; + sha256 = "0mxzk9s0yrjf8gj70dpl1wbvnrkzc3ncqab2bj3yx0xk05hagjlx"; + name = "lokalize-20.12.1.tar.xz"; }; }; lskat = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/lskat-20.08.3.tar.xz"; - sha256 = "1rcmh592w5gd5b69czfxycypidj74y2d91cw92rccariadz9vnjz"; - name = "lskat-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/lskat-20.12.1.tar.xz"; + sha256 = "0p8n2cgfdxxjbx4jcpqf85h6k36nggj32h982yj3ig5dh1csym5d"; + name = "lskat-20.12.1.tar.xz"; }; }; mailcommon = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/mailcommon-20.08.3.tar.xz"; - sha256 = "0bhs60cz4qcrqkmw2sm6cd2laq8lzj9vcwi8kjqkajsidh342wdv"; - name = "mailcommon-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/mailcommon-20.12.1.tar.xz"; + sha256 = "191d6l314njlj227qhz7qqmkjkz9zm7xnvm9rlfj302san90a338"; + name = "mailcommon-20.12.1.tar.xz"; }; }; mailimporter = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/mailimporter-20.08.3.tar.xz"; - sha256 = "0w6yfgqx0adlkwx32vmb23kl6n50737jiabmad3pnhqw8rv41h80"; - name = "mailimporter-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/mailimporter-20.12.1.tar.xz"; + sha256 = "0jqdckpwlipc4zxxwnvysl44ri19h0hgr37dp36k99sxa3688jxc"; + name = "mailimporter-20.12.1.tar.xz"; }; }; marble = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/marble-20.08.3.tar.xz"; - sha256 = "1xpxgy724z97k063fdk0l3mrl8i6nvnhj35b4987jqji76i92ffb"; - name = "marble-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/marble-20.12.1.tar.xz"; + sha256 = "0w398igxx7pmyd4bj65ppbxfc4fiz4hsjmcffya88dnxxz73djb5"; + name = "marble-20.12.1.tar.xz"; + }; + }; + markdownpart = { + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/markdownpart-20.12.1.tar.xz"; + sha256 = "1389hswbhcssl9ybb605h9i50fv6jajggldkiyfwqxbi7aysghwk"; + name = "markdownpart-20.12.1.tar.xz"; }; }; mbox-importer = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/mbox-importer-20.08.3.tar.xz"; - sha256 = "1qh0f93df228cqlcqdwc7g6im3g0gkfmzir3ccsmb5iv0ygvjl6f"; - name = "mbox-importer-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/mbox-importer-20.12.1.tar.xz"; + sha256 = "1kgbiq933f93sb8m2nqmpp1x6qkqqcm2hcb3ihk5741dcpdmxx9n"; + name = "mbox-importer-20.12.1.tar.xz"; }; }; messagelib = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/messagelib-20.08.3.tar.xz"; - sha256 = "16amni6qrq96h8jr313gc7k9frwr20d4pk9y2i61a1xm2w3xsqd4"; - name = "messagelib-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/messagelib-20.12.1.tar.xz"; + sha256 = "0yjh7s80ksyyi78vxjw4i5f1bmsfziphwm6flgnw18gfzj3pyyy7"; + name = "messagelib-20.12.1.tar.xz"; }; }; minuet = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/minuet-20.08.3.tar.xz"; - sha256 = "1l45g7labnyz0pkwcfhjl5a3ypr7cy3bsshr06ab85364yjwazvi"; - name = "minuet-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/minuet-20.12.1.tar.xz"; + sha256 = "13jlz2m57x379zyv4x5zk2h6jc0qcz1zymkyrzs431bfmhyhdna2"; + name = "minuet-20.12.1.tar.xz"; }; }; okular = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/okular-20.08.3.tar.xz"; - sha256 = "1q59ikcwsfgjc0202daingxv15iarnzba6szdncznzcafd6hhk9z"; - name = "okular-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/okular-20.12.1.tar.xz"; + sha256 = "0gpm7n47yijsjg4yba561j5pbvd98hgvr93w1kvzk851nb87m89c"; + name = "okular-20.12.1.tar.xz"; }; }; palapeli = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/palapeli-20.08.3.tar.xz"; - sha256 = "107z3izfznrq7g5aqb5a7r8a4ibaia90g334d7wwvd7prm7hdgfp"; - name = "palapeli-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/palapeli-20.12.1.tar.xz"; + sha256 = "05d3f0snbg0iz78ggxk7hv1qn3blvpnpclhrhzcw1c5znr7al2xm"; + name = "palapeli-20.12.1.tar.xz"; }; }; parley = { - version = "20.08.3"; + version = "20.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.12.1/src/parley-20.12.1.tar.xz"; + sha256 = "00xc1dv3fj783brfqh3ggvrwv26m840k35vrx2izzq5lqx2g1p5a"; + name = "parley-20.12.1.tar.xz"; + }; + }; + partitionmanager = { + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/parley-20.08.3.tar.xz"; - sha256 = "0wli09zkk5z50y1gzp5wc9k056xjaadlq97j09lf6lqyg6kb56ya"; - name = "parley-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/partitionmanager-20.12.1.tar.xz"; + sha256 = "1zypkah2smmqclni2r8571sd6qd5cbc0915r6gzf800yyccsfb65"; + name = "partitionmanager-20.12.1.tar.xz"; }; }; picmi = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/picmi-20.08.3.tar.xz"; - sha256 = "1lkpazsi9dyb2y9q5bk56d80x7x035rf4hdap25i8qfj3ilykv3w"; - name = "picmi-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/picmi-20.12.1.tar.xz"; + sha256 = "0aiaq99sb57vvz5wjwdwm0jj456nj26qs4m6vwibb1f0f8js4i03"; + name = "picmi-20.12.1.tar.xz"; }; }; pimcommon = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/pimcommon-20.08.3.tar.xz"; - sha256 = "0mpl7li2y5xjzk4hdb85d1x7cz15cicd91c1krlw74q7pbrjinlq"; - name = "pimcommon-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/pimcommon-20.12.1.tar.xz"; + sha256 = "1w5avmvssqnvxl31xrlh1xfns6q386w8ixlzfbzjkz5m95m4wr57"; + name = "pimcommon-20.12.1.tar.xz"; }; }; pim-data-exporter = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/pim-data-exporter-20.08.3.tar.xz"; - sha256 = "0f08c16d3730fbdsbrwlr9w5c4l9xcmd1bdbv5m38h5r2ddlkvzr"; - name = "pim-data-exporter-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/pim-data-exporter-20.12.1.tar.xz"; + sha256 = "0k9lh3llkzx0n5x8q14hkbjjrkczm10kr246bzr1zz8lcv1za1jc"; + name = "pim-data-exporter-20.12.1.tar.xz"; }; }; pim-sieve-editor = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/pim-sieve-editor-20.08.3.tar.xz"; - sha256 = "1falzw2a2v912fdzlyljsw9rcy1whrn9ys9ccrskkpvjn8y444x4"; - name = "pim-sieve-editor-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/pim-sieve-editor-20.12.1.tar.xz"; + sha256 = "0lifarfkpcpdvwmn61gmfd45k5i0dbf3sjrb0z1yaqsq7m158di1"; + name = "pim-sieve-editor-20.12.1.tar.xz"; }; }; poxml = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/poxml-20.08.3.tar.xz"; - sha256 = "0gzg3vbsjrfhs1jg59g7b3gf3b4qajiffkb94njkz8v1f0fadlxp"; - name = "poxml-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/poxml-20.12.1.tar.xz"; + sha256 = "1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk"; + name = "poxml-20.12.1.tar.xz"; }; }; print-manager = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/print-manager-20.08.3.tar.xz"; - sha256 = "18nl9gpmzz4g9fqzyvbh858nxz23b2vyi505qacqvcrz13r0l78z"; - name = "print-manager-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/print-manager-20.12.1.tar.xz"; + sha256 = "1nx442bi41gd64i4j0nc8hx0wdv6ayvnp2wydn4l7sgsf0ms4x6y"; + name = "print-manager-20.12.1.tar.xz"; }; }; rocs = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/rocs-20.08.3.tar.xz"; - sha256 = "0bd9x7kh2s4z79ff9byd3ly7k040c574zwrrgi8sq21yd531hxhj"; - name = "rocs-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/rocs-20.12.1.tar.xz"; + sha256 = "11gg2pmx21wfrw63qv7w8bjzcsxf86j5ripa2dwqfl3355wvi5mb"; + name = "rocs-20.12.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/signon-kwallet-extension-20.08.3.tar.xz"; - sha256 = "1s0syq9aw2q34k1wxrpjqqi12xay1h0vc4s2d8l184hzzg8qq71i"; - name = "signon-kwallet-extension-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/signon-kwallet-extension-20.12.1.tar.xz"; + sha256 = "0m48a5mqmwrjl4wc4m30n5csl7fwp8g70pv0nib0v36lp0424xjb"; + name = "signon-kwallet-extension-20.12.1.tar.xz"; }; }; spectacle = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/spectacle-20.08.3.tar.xz"; - sha256 = "16dwbsk9hik7gmz9s4x78hibz4x9d1fpx8x2i2giry5hwzknfcw4"; - name = "spectacle-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/spectacle-20.12.1.tar.xz"; + sha256 = "04jsm0ipfaccc80qxnhhbfc9fn009cxa7dys89iqfqza6ssvq51l"; + name = "spectacle-20.12.1.tar.xz"; }; }; step = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/step-20.08.3.tar.xz"; - sha256 = "05ljsmgpra1az64yddy8idi46cv3afaf2v4n7d5j81a8vvlz7fj1"; - name = "step-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/step-20.12.1.tar.xz"; + sha256 = "05xj4zv4r82nnz5rzb0rmrps4dagnkw9f5lapil5mi1i1gwqfi2k"; + name = "step-20.12.1.tar.xz"; }; }; svgpart = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/svgpart-20.08.3.tar.xz"; - sha256 = "0wwq576dblqmfknr0qs8kskw7nar6hah95fqicdn97xdy4nvzhc6"; - name = "svgpart-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/svgpart-20.12.1.tar.xz"; + sha256 = "09n0pf5saww8gppmd501i3dfr13yvn4r2rfbdz42zlvcpcpgxdry"; + name = "svgpart-20.12.1.tar.xz"; }; }; sweeper = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/sweeper-20.08.3.tar.xz"; - sha256 = "0i4zvbljdzkj47vh8kizam7vsc9k7mvf8dqd2j6ixr4p0cqvw5a8"; - name = "sweeper-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/sweeper-20.12.1.tar.xz"; + sha256 = "06a9a9vbkfhmlcc927ysa0qnp5qqbl5iywhkgbvyz90nsdaw3jjl"; + name = "sweeper-20.12.1.tar.xz"; }; }; umbrello = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/umbrello-20.08.3.tar.xz"; - sha256 = "1hh5gyggb4f3pjip8dfvx00hi83gj65c92jgzkzahj7p35mkplgl"; - name = "umbrello-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/umbrello-20.12.1.tar.xz"; + sha256 = "07fxxyw5zn1xj05kjr16rkgpj7ms9xvgpj4zlg428037gfa8g9vl"; + name = "umbrello-20.12.1.tar.xz"; }; }; yakuake = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/yakuake-20.08.3.tar.xz"; - sha256 = "05zd2xm5vgrgz0bxbkh1mpiknlqzpzk5jb74lnd5x7wn5b80ngv0"; - name = "yakuake-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/yakuake-20.12.1.tar.xz"; + sha256 = "02pal9xx1wbpw7dimvs2aw1xnyjqlvbjlybkkfhf8x7c6m1r63aa"; + name = "yakuake-20.12.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.08.3"; + version = "20.12.1"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.3/src/zeroconf-ioslave-20.08.3.tar.xz"; - sha256 = "1afga0liiy9n98kb0gmxzbb6ckhdgbrdc4ig1x9pwp98wr1fzmcg"; - name = "zeroconf-ioslave-20.08.3.tar.xz"; + url = "${mirror}/stable/release-service/20.12.1/src/zeroconf-ioslave-20.12.1.tar.xz"; + sha256 = "1lx94qgrqhyva3nv7sgzy0blbdgx3b6m0g0i0psg74qckdh8glas"; + name = "zeroconf-ioslave-20.12.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index f16d6e1573323..c359d606a8592 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { inherit pname; version = "2019-08-10"; - buildInputs = [ swiProlog makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ swiProlog ]; src = fetchFromGitHub { owner = "Attempto"; diff --git a/pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch b/pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch new file mode 100644 index 0000000000000..6aacbcc65bcb1 --- /dev/null +++ b/pkgs/applications/misc/audio/sox/0001-musl-rewind-pipe-workaround.patch @@ -0,0 +1,24 @@ +From e7446c9bcb47674c9d0ee3b5bab129e9b86eb1c9 Mon Sep 17 00:00:00 2001 +From: Walter Franzini <walter.franzini@gmail.com> +Date: Fri, 7 Jun 2019 17:57:11 +0200 +Subject: [PATCH] musl does not support rewind pipe, make it build anyway + +--- + src/formats.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/formats.c b/src/formats.c +index f3efe764..477bf451 100644 +--- a/src/formats.c ++++ b/src/formats.c +@@ -424,7 +424,6 @@ static void UNUSED rewind_pipe(FILE * fp) + /* To fix this #error, either simply remove the #error line and live without + * file-type detection with pipes, or add support for your compiler in the + * lines above. Test with cat monkey.wav | ./sox --info - */ +- #error FIX NEEDED HERE + #define NO_REWIND_PIPE + (void)fp; + #endif +-- +2.19.2 + diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index dd5dbde52868e..946150d2b8812 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { # configure.ac uses pkg-config only to locate libopusfile nativeBuildInputs = optional enableOpusfile pkg-config; + patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; + buildInputs = optional (enableAlsa && stdenv.isLinux) alsaLib ++ optional enableLibao libao ++ diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 6e276d592b0ed..b7e738cfc125f 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; - buildInputs = [ snack tcl tk makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ snack tcl tk ]; installPhase = '' mkdir -p $out/{bin,nix-support,share/wavesurfer/} diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index 4a023849f3903..d50f363798816 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { sha256 = "044nxgd3ic2qr6hgq5nymn3dyf5i4s8mv5z4az6jvwlrjnvbg8cp"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; patchPhase = '' patchShebangs install.sh diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 9921fdc7a797c..039dfe59ff709 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -7,6 +7,7 @@ , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada +, spaceNavSupport ? false, libspnav , makeWrapper , pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL , embree, gmp @@ -56,7 +57,8 @@ stdenv.mkDerivation rec { ]) ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit - ++ optional colladaSupport opencollada; + ++ optional colladaSupport opencollada + ++ optional spaceNavSupport libspnav; postPatch = '' # allow usage of dynamically linked embree diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index f894dc91bd8a8..0adab84830d2d 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -5,7 +5,7 @@ , pkg-config , libxml2 , exiv2 -, imagemagick +, imagemagick6 , version , sha256 , rev }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib libxml2 exiv2 imagemagick ]; + buildInputs = [ glib libxml2 exiv2 imagemagick6 ]; prePatch = '' sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 74dd82a3c6e54..524f898553701 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { sed '1i#include <cmath>' -i src/Transformer/SpectrumCircleTransformer.cpp ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ]; + buildInputs = [ fftw ncurses5 libpulseaudio ]; buildFlags = [ "ENABLE_PULSE=1" ]; diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 630ee3c368308..fafcf3d544040 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, lib, stdenv +{ fetchFromGitHub, lib, stdenv , autoreconfHook, intltool, pkg-config , gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index e3a0046205e04..c47dd972ccfd6 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -27,8 +27,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = [ makeWrapper ]; - nativeBuildInputs = [ xsel clipnotify ]; + nativeBuildInputs = [ makeWrapper xsel clipnotify ]; postFixup = '' sed -i "$out/bin/clipctl" -e 's,clipmenud\$,\.clipmenud-wrapped\$,' diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index f4dafd9e134b0..aa19ce2c53e67 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.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fgXhWouqStfxWs6cFNVxWI1INVYswVUTOuLr09utxpY="; + sha256 = "sha256-++8vTK0OR44Mcdh5g2bJEq7aO+fWySKw0XlSz2KJNio="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 774fcc75b2dd2..68c9019f6edd6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.3.5"; # When updating also update fetchedMavenDeps.sha256 + version = "21.0.0"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-gEE7rndOaXzruWL7TG+QgVkq1+06tIZwyGzU9cFc+oU="; + sha256 = "sha256-it0EcPD7TXSknjVkGv22Nq1D4J32OEncQDy4w9CIPNk="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { maven ]; - buildPhase = "mvn package -Dmaven.repo.local=$out/.m2"; + buildPhase = "mvn package -Dmaven.repo.local=$out/.m2 -P desktop,all-platforms"; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside installPhase = '' @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-jT0Z154rVmafUbb6dqYSl3cUxMuK5MR4HUsprkrgSDw="; + outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE="; }; buildInputs = [ @@ -80,16 +80,30 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + runHook preBuild + + mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 -P desktop,all-platforms + + runHook postBuild ''; installPhase = let productTargetPath = "product/standalone/target/products/org.jkiss.dbeaver.core.product"; + + platformMap = { + aarch64-linux = "aarch64"; + x86_64-darwin = "x86_64"; + x86_64-linux = "x86_64"; + }; + + systemPlatform = platformMap.${stdenv.hostPlatform.system} or (throw "dbeaver not supported on ${stdenv.hostPlatform.system}"); in if stdenv.isDarwin then '' + runHook preInstall + mkdir -p $out/Applications $out/bin - cp -r ${productTargetPath}/macosx/cocoa/x86_64/DBeaver.app $out/Applications + cp -r ${productTargetPath}/macosx/cocoa/${systemPlatform}/DBeaver.app $out/Applications sed -i "/^-vm/d; /bin\/java/d" $out/Applications/DBeaver.app/Contents/Eclipse/dbeaver.ini @@ -98,9 +112,13 @@ stdenv.mkDerivation rec { wrapProgram $out/Applications/DBeaver.app/Contents/MacOS/dbeaver \ --prefix JAVA_HOME : ${jdk.home} \ --prefix PATH : ${jdk}/bin + + runHook postInstall '' else '' + runHook preInstall + mkdir -p $out/ - cp -r ${productTargetPath}/linux/gtk/x86_64/dbeaver $out/dbeaver + cp -r ${productTargetPath}/linux/gtk/${systemPlatform}/dbeaver $out/dbeaver # Patch binaries. interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) @@ -117,6 +135,8 @@ stdenv.mkDerivation rec { mkdir -p $out/share/pixmaps ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm + + runHook postInstall ''; meta = with lib; { @@ -129,7 +149,7 @@ stdenv.mkDerivation rec { Teradata, Firebird, Derby, etc. ''; license = licenses.asl20; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; maintainers = with maintainers; [ jojosch ]; }; } diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 36e2923522de0..649fbe55fae21 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; }; - buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ aspellEnv fortune gnugrep tk tre ]; patches = [ ./dict.patch ]; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index eed07a2356e6b..65e86bb7dbe6a 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,12 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper , pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver +, gtk3, wayland, wayland-protocols , libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false }: stdenv.mkDerivation rec { pname = "dunst"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "dunst-project"; @@ -20,6 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo dbus gdk-pixbuf glib libX11 libXScrnSaver libXinerama libnotify pango xorgproto librsvg libXrandr + gtk3 wayland wayland-protocols ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/gnome-passwordsafe/default.nix b/pkgs/applications/misc/gnome-passwordsafe/default.nix index c6617cc2324ce..34f4aa71a38a8 100644 --- a/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/pkgs/applications/misc/gnome-passwordsafe/default.nix @@ -4,8 +4,8 @@ , pkg-config , gettext , fetchFromGitLab -, python3 -, libhandy_0 +, python3Packages +, libhandy , libpwquality , wrapGAppsHook , gtk3 @@ -15,9 +15,9 @@ , desktop-file-utils , appstream-glib }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gnome-passwordsafe"; - version = "3.99.2"; + version = "5.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "World"; repo = "PasswordSafe"; rev = version; - sha256 = "0pi2l4gwf8paxm858mxrcsk5nr0c0zw5ycax40mghndb6b1qmmhf"; + sha256 = "8EFKLNK7rZlYL2g/7FmaC5r5hcdblsnod/aB8NYiBvY="; }; nativeBuildInputs = [ @@ -44,26 +44,13 @@ python3.pkgs.buildPythonApplication rec { gtk3 glib gdk-pixbuf - libhandy_0 + libhandy ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ pygobject3 construct - - # pykeepass 3.2.1 changed some exception types, and is not backwards compatible. - # Remove override once the MR is merged upstream. - # https://gitlab.gnome.org/World/PasswordSafe/-/merge_requests/79 - (pykeepass.overridePythonAttrs (old: rec { - version = "3.2.0"; - src = fetchPypi { - pname = "pykeepass"; - inherit version; - sha256 = "1ysjn92bixq8wkwhlbhrjj9z0h80qnlnj7ks5478ndkzdw5gxvm1"; - }; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pycryptodome ]; - })) - + pykeepass ] ++ [ libpwquality # using the python bindings ]; diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index eed618a5cbd18..73bc5d068d738 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,20 +1,20 @@ GEM remote: https://rubygems.org/ specs: - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) crass (1.0.6) execjs (2.7.0) - ffi (1.13.1) + ffi (1.14.2) gemojione (4.3.3) json github-markup (3.0.5) - gollum (5.1.2) + gollum (5.2.1) gemojione (~> 4.1) - gollum-lib (~> 5.0) + gollum-lib (~> 5.1) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1.0) - mustache (>= 0.99.5, < 1.0.0) - octicons (~> 8.5) + mustache-sinatra (~> 1.0) + octicons (~> 12.0) rss (~> 0.2.9) sass (~> 3.5) sinatra (~> 2.0) @@ -22,40 +22,44 @@ GEM sprockets (~> 3.7) sprockets-helpers (~> 1.2) therubyrhino (~> 2.1.0) - uglifier (~> 3.2) + uglifier (~> 4.2) useragent (~> 0.16.2) - gollum-lib (5.0.6) + gollum-lib (5.1) gemojione (~> 4.1) github-markup (~> 3.0) gollum-rugged_adapter (~> 1.0) loofah (~> 2.3) nokogiri (~> 1.8) - octicons (~> 8.5) + octicons (~> 12.0) rouge (~> 3.1) twitter-text (= 1.14.7) gollum-rugged_adapter (1.0) mime-types (>= 1.15) rugged (~> 0.99) - json (2.3.1) + json (2.5.1) kramdown (2.3.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - loofah (2.8.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) - mini_portile2 (2.4.0) + mime-types-data (3.2021.0225) + mini_portile2 (2.5.0) multi_json (1.15.0) mustache (0.99.8) + mustache-sinatra (1.0.1) + mustache (<= 0.99.8) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octicons (8.5.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + octicons (12.1.0) nokogiri (>= 1.6.3.1) + racc (1.5.2) rack (2.2.3) rack-protection (2.1.0) rack @@ -63,10 +67,10 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.25.0) + rouge (3.26.0) rss (0.2.9) rexml - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) rugged (0.99.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -95,7 +99,7 @@ GEM tilt (2.0.10) twitter-text (1.14.7) unf (~> 0.1.0) - uglifier (3.2.0) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index fc80a5ddb8aa8..4a365b5a17ed0 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/gollum/gollum"; changelog = "https://github.com/gollum/gollum/blob/v${version}/HISTORY.md"; license = licenses.mit; - maintainers = with maintainers; [ jgillich primeos nicknovitski ]; + maintainers = with maintainers; [ erictapen jgillich nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index d259167856a18..690eba645dc1f 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; crass = { groups = ["default"]; @@ -34,10 +34,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; type = "gem"; }; - version = "1.13.1"; + version = "1.14.2"; }; gemojione = { dependencies = ["json"]; @@ -61,15 +61,15 @@ version = "3.0.5"; }; gollum = { - dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"]; + dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pmvxj7pka7pjpw060a9pfxsci1hmx45hk9hbp5m49xkkiiqf1gx"; + sha256 = "0n89c77amabvv4aq8jq5r6581hqzw79w8khr13w6kvv6iabq1vaz"; type = "gem"; }; - version = "5.1.2"; + version = "5.2.1"; }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02mc1w4hn9kjrgvg0r46x1bd0h8hq7lqs432dgjfn2dw36kchja4"; + sha256 = "0p721ymkf2xcskjgr9308b6g581cbxgvhprj9srqskssxvsfdsln"; type = "gem"; }; - version = "5.0.6"; + version = "5.1"; }; gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -98,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; kramdown = { dependencies = ["rexml"]; @@ -131,10 +131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; + sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck"; type = "gem"; }; - version = "2.8.0"; + version = "2.9.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -152,20 +152,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; + sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; type = "gem"; }; - version = "3.2020.1104"; + version = "3.2021.0225"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; multi_json = { groups = ["default"]; @@ -187,6 +187,17 @@ }; version = "0.99.8"; }; + mustache-sinatra = { + dependencies = ["mustache"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rvdwg1zk3sybpi9hzn6jj0k8rndkq19y7cl0jmqr0g2xx21z7mr"; + type = "gem"; + }; + version = "1.0.1"; + }; mustermann = { dependencies = ["ruby2_keywords"]; groups = ["default"]; @@ -199,15 +210,15 @@ version = "1.1.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; octicons = { dependencies = ["nokogiri"]; @@ -215,10 +226,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fy6shpfmla58dxx3kb2zi1hs7vmdw6pqrksaa8yrva05s4l3y75"; + sha256 = "0kpy7h7pffjqb2xbmld7nwnb2x6rll3yz5ccr7nrqnrk2d3cmpmn"; + type = "gem"; + }; + version = "12.1.0"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; type = "gem"; }; - version = "8.5.0"; + version = "1.5.2"; }; rack = { groups = ["default"]; @@ -277,10 +298,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; type = "gem"; }; - version = "3.25.0"; + version = "3.26.0"; }; rss = { dependencies = ["rexml"]; @@ -298,10 +319,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.4"; }; rugged = { groups = ["default"]; @@ -427,10 +448,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wmqvn4xncw6h3d5gp2a44170zwxfyj3iq4rsjp16zarvzbdmgnz"; + sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; type = "gem"; }; - version = "3.2.0"; + version = "4.2.0"; }; unf = { dependencies = ["unf_ext"]; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 6c3ba132d0b21..22444e22054a0 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/opt diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 9f1431a23409c..5c50ac2453819 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr"; } else throw "Unsupported architecture"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' cp -r ./ $out mkdir $out/oldbin diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 28c7de12c8c87..3828fc654d658 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { dontUnpack = true; - buildInputs = lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ jre ]; installPhase = if stdenv.isDarwin then '' diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 32572ffcdb3bb..6388d005fe551 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -12,7 +12,8 @@ with builtins; buildDotnetPackage rec { sourceRoot = "."; - buildInputs = [ unzip makeWrapper icoutils ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip icoutils ]; patches = [ (substituteAll { diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 60905be3b1b23..33f3c4144b5ac 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.26.8"; + version = "0.26.9"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "0pkhvxcfk70dnmgczyyq585mxrfwqai44ikshs4c1imh92z25llq"; + sha256 = "sha256-d0k8OQZ+ij+dslc3iAQkgy1TyYAL7Bf1xvSH21eTGO8="; }; postPatch = '' diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index c302a4b4a0744..1c87747eaca1d 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -6,7 +6,6 @@ , curl , doxygen , fetchFromGitHub -, fetchpatch , ffmpeg_3 , libmediainfo , libraw diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 12843ffb98c62..75013f0931f4f 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "1.2.0"; + version = "1.3.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-hBzSf3UUW2FUp1jG1sPt7vN1iDybdMox/h6xHVrM7DY="; + sha256 = "sha256-uzWr6wWO6niocJ8yLc1Uu9Wt/FXlCuQrC0RJkgVlphM="; }; meta = with lib; { diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index 64b55cce7a044..69aca239d311c 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/" ''; - buildInputs = [ socat makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ socat ]; meta = with lib; { description = "A mpc-like control interface for mpv"; diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 7b91d245f810e..2bb3d14e1d251 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs"; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 28becefa5b12e..b3e93ce512713 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { cd $out; unzip $src ''; - buildInputs = [unzip makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; installPhase = '' dir=$(echo $out/OpenJUMP-*) diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/applications/misc/projectlibre/default.nix index fd83d74edd541..ceb61d71866c3 100644 --- a/pkgs/applications/misc/projectlibre/default.nix +++ b/pkgs/applications/misc/projectlibre/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq"; }; - buildInputs = [ ant jdk makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jdk ]; buildPhase = '' export ANT_OPTS=-Dbuild.sysclasspath=ignore ${ant}/bin/ant -f openproj_build/build.xml diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 6ae81fca27cf8..954c17097618d 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -14,11 +14,13 @@ let buildInputs = [ qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; + # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 + patches = [ ./qpdfview-qt515-compat.patch ]; in mkDerivation { pname = s.baseName; inherit (s) version; - inherit nativeBuildInputs buildInputs; + inherit nativeBuildInputs buildInputs patches; src = fetchurl { inherit (s) url sha256; }; @@ -40,7 +42,7 @@ mkDerivation { meta = { inherit (s) version; description = "A tabbed document viewer"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; homepage = "https://launchpad.net/qpdfview"; diff --git a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch b/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch new file mode 100644 index 0000000000000..1fbf5ec3f1015 --- /dev/null +++ b/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch @@ -0,0 +1,17 @@ +Fix compatibility with Qt 5.15. + +Patch copied from upstream source repository: + +https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 + +--- a/sources/model.h 2017-04-19 21:01:25 +0000 ++++ b/sources/model.h 2020-06-09 06:24:11 +0000 +@@ -24,6 +24,7 @@ + #define DOCUMENTMODEL_H + + #include <QList> ++#include <QPainterPath> + #include <QtPlugin> + #include <QWidget> + #include <QVector> + diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 6dad2eaf81284..c904c2212604a 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -19,7 +19,7 @@ sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p "$out/lib/SideQuest" "$out/bin" diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/applications/misc/spacenav-cube-example/default.nix new file mode 100644 index 0000000000000..1221db1ad962c --- /dev/null +++ b/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, libspnav, libX11, mesa_glu }: + +stdenv.mkDerivation { + pname = "spacenav-cube-example"; + version = libspnav.version; + + src = libspnav.src; + + sourceRoot = "source/examples/cube"; + + buildInputs = [ libX11 mesa_glu libspnav ]; + + configureFlags = [ "--disable-debug" ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp cube $out/bin/spacenav-cube-example + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://spacenav.sourceforge.net/"; + description = "An example application to test the spacenavd driver"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 2b97d2f0188ba..62a6d4785f120 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gkq19OlX6ci2i5mno77O/v3VfUkv6FRQFcH98qaUuXs="; + sha256 = "sha256-HASFaPqm/A1QQ4nkd2hgeyqWplwE1RTrWA937rJA5Oo="; }; - vendorSha256 = "sha256-ARhWKYh8Wy2UEYGabn6l/kbnJ0nHYTIt4hn9wuVgBkw="; + vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; # used at runtime, but not installed by default postInstall = '' diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 2f0a58b8e4253..0b97110b1dd5e 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -49,7 +49,8 @@ let patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk8 makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index a008b49ba7183..f5dbd0510a32b 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -35,7 +35,8 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - buildInputs = [ ant jdk8 makeWrapper gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jre jdk8 gtk3 gsettings-desktop-schemas ]; postPatch = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index 1804f3c04e89a..b396c578c903f 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index e42d48c8f04b8..bc3e8dfd6dea4 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "ticker"; @@ -6,13 +9,17 @@ buildGoModule rec { src = fetchFromGitHub { owner = "achannarasappa"; - repo = "ticker"; + repo = pname; rev = "v${version}"; sha256 = "sha256-U2TYUB4RHUBPoXe/te+QpXglbVcrT6SItiDrA7ODX6w="; }; vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo="; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}") + ''; + # Tests require internet doCheck = false; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 03ed031be857d..319ba3643da44 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 61ebfb0fcc6ab..71f67baa6c5c9 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 ] ++ lib.optional withMapnik mapnik ++ lib.optional withGeoClue geoclue2 diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 32c1f0eaa64a3..27694174d7037 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; }; - buildInputs = [ tcl tk xlibsWrapper makeWrapper ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ tcl tk xlibsWrapper ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 10034fbe1b1d7..365f6217861b8 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [libX11 makeWrapper libXaw]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [libX11 libXaw]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 60e3bb9fd535d..49f78729a310c 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -4,8 +4,7 @@ symlinkJoin { paths = with zathura_core; [ man dev out ] ++ plugins; - - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = let fishCompletion = "share/fish/vendor_completions.d/zathura.fish"; diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index be3d8295f9915..daead82e48545 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { postInstall = "make PREFIX=$out copy-data"; # Sometimes tests fail when run in parallel - cargoParallelTestThreads = false; + dontUseCargoParallelThreads = true; meta = with lib; { description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a236e50218e2a..2d6d6f47a378c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "89.0.4389.58", - "sha256": "1ppjkilfn84hq55wsb33xswlp1x8v34np5hq2wbh62ny6j8dbvwz", - "sha256bin64": "1k4f380h2rghn81agdw8bkifpb690sr0ykjgbnis3kl68hbkp8a5", + "version": "89.0.4389.69", + "sha256": "09xs18jm1pvzh7qzi1cfb59bvy4qarympxxkcwj49khsxjy0y341", + "sha256bin64": "1w3vr929ssdh4q5zq5qpx7s09md99aam51j4hdslhq1ih9zva275", "deps": { "gn": { "version": "2021-01-07", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "90.0.4421.5", - "sha256": "0605ibr2fr13rmmxs7lw4dh25i9r6ic08ykdr7002m4rp8kxwsw6", - "sha256bin64": "05mlm9l6q1w9rxid7cvaazzbw79wj9fjw6ka7wpr0gz4r3gmazsb", + "version": "90.0.4427.5", + "sha256": "034czg6q84lpycgfqbcg3rrdhja3bp1akvsnyddimwxy83r2cqyg", + "sha256bin64": "0ijvsjfwmssvl14wg9cbp4h2rfdack6f89pmx2fggbnfm26m2vap", "deps": { "gn": { "version": "2021-02-09", diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6b8a3b1c3381b..f1b1b26ae3a2f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -92,7 +92,6 @@ stdenv.mkDerivation { libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib - (lib.getDev alsaLib) atk cairo curl @@ -128,7 +127,6 @@ stdenv.mkDerivation { pango libheimdal libpulseaudio - (lib.getDev libpulseaudio) systemd ffmpeg ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 9b0a9078ee5ac..6517203eeebe5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.9"; + version = "10.0.12"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "Dtlfm/memHSxir5XkUGkJICGEM+tPs//ET4PdVM1HPM="; + sha256 = "0i5g997kgn7n6ji7pxbyvkx33nqfi2s1val680fp5hh1zz31yvfv"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "GZywFEX/5Br+Zu1w6pegoNOTrSIVQNE2LINsa3Vdlxs="; + sha256 = "16915fvvq3d16v1bzclnb52sa6yyaalihk3gv93jcnph9vsz8ags"; }; }; in diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 03d1911333e33..1dd0b408a138c 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -28,7 +28,7 @@ let url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; inherit sha256; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \ diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index f1fb506ee9f38..f1c98e0ed84cb 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "argocd"; - version = "1.8.5"; + version = "1.8.6"; commit = "28aea3dfdede00443b52cc584814d80e8f896200"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-JjxibnGSDTjd0E9L3X2wnl9G713IYBs+O449RdrT19w="; + sha256 = "sha256-kJ3/1owK5T+FbcvjmK2CO+i/KwmVZRSGzF6fCt8J9E8="; }; vendorSha256 = "sha256-rZ/ox180h9scocheYtMmKkoHY2/jH+I++vYX8R0fdlA="; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 4f3dfcfc03f75..659e8ee417015 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,9 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, which, maven, cmake, jre, bash +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, which, maven, cmake, jre, jdk8, bash , coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2 }: let - common = { version, sha256, dependencies-sha256, tomcat, opensslPkg ? openssl }: + maven-jdk8 = maven.override { + jdk = jdk8; + }; + common = { version, sha256, dependencies-sha256, maven, tomcat, opensslPkg ? openssl }: let # compile the hadoop tarball from sources, it requires some patches binary-distributon = stdenv.mkDerivation rec { @@ -131,6 +134,7 @@ in { dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; tomcat = tomcat_6_0_48; opensslPkg = openssl_1_0_2; + maven = maven-jdk8; }; hadoop_2_8 = common { version = "2.8.4"; @@ -138,6 +142,7 @@ in { dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03"; tomcat = tomcat_6_0_48; opensslPkg = openssl_1_0_2; + maven = maven-jdk8; }; hadoop_2_9 = common { version = "2.9.1"; @@ -145,17 +150,20 @@ in { dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x"; tomcat = tomcat_6_0_48; opensslPkg = openssl_1_0_2; + maven = maven-jdk8; }; hadoop_3_0 = common { version = "3.0.3"; sha256 = "1vvkci0kx4b48dg0niifn2d3r4wwq8pb3c5z20wy8pqsqrqhlci5"; dependencies-sha256 = "1kzkna9ywacm2m1cirj9cyip66bgqjhid2xf9rrhq6g10lhr8j9m"; tomcat = null; + maven = maven-jdk8; }; hadoop_3_1 = common { version = "3.1.1"; sha256 = "04hhdbyd4x1hy0fpy537f8mi0864hww97zap29x7dk1smrffwabd"; dependencies-sha256 = "1q63jsxg3d31x0p8hvhpvbly2b07almyzsbhwphbczl3fhlqgiwn"; tomcat = null; + maven = maven-jdk8; }; } diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 6ae59033835c9..99c43aeeee46e 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.3"; - sha256 = "142rwpli8mbyg4vhhybnym34rk9w1ns4ddfhqjr1ygmxb1rlsngi"; + version = "1.0.4"; + sha256 = "0znaxz9mzbqb59p6rwa5h89m344m2ci39jsx8dfh1v5fc17r0fcq"; } diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 071636ec4431d..76230b8e10033 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g"; }; - buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre pythonPackages.python pythonPackages.numpy ] ++ optional RSupport R; untarDir = "${pname}-${version}-bin-without-hadoop"; diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index 928fb351c6a0e..b042f8ff15f35 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { "agent/cli-main" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { rev = version; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 198a05621a528..91b900db34779 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1071,9 +1071,9 @@ "vultr": { "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v1.5.0", - "sha256": "04qy366ignn53bbdj9s3032qr1x7h84q36qzl5ywydlw2va0qbsd", - "version": "1.5.0" + "rev": "v2.1.3", + "sha256": "sha256-fvqkzg3j2TYAMbPc8Ifh35sBe0D76LYH6Ut5Ugdyexg=", + "version": "2.1.3" }, "wavefront": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 59a7039fb2804..4a6e95057a4d1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -117,7 +117,7 @@ let else lib.appendToName "with-plugins" (stdenv.mkDerivation { inherit (terraform) name meta; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = pluginDir + '' mkdir -p $out/bin/ diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 2223b8f549225..6c135439322a1 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitLab , meson @@ -17,18 +18,22 @@ , gst_all_1 }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - hash = "sha256-TeheK14COX1NIrql74eI8Wx4jtpUP1eO5mugT5LzlPY="; + hash = "sha256-Vu8PXdnayrglAFVfO+WZTzk4Qrb/3uqzQIwClnRHto8="; }; - cargoHash = "sha256-Fbj4sabrwpfa0QNEN4l91y/6AuPIKu7QPzYNUO6RtU0="; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-dWumQi/Bk7w2C8zVVExxguWchZU+K2qTC02otsiK9jA="; + }; patches = [ # Post install tries to generate an icon cache & update the @@ -54,7 +59,11 @@ rustPlatform.buildRustPackage rec { # Provides glib-compile-resources to compile gresources glib - ]; + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); buildInputs = [ gtk3 @@ -76,13 +85,6 @@ rustPlatform.buildRustPackage rec { gst-plugins-bad ]); - # Unset default rust phases to use meson & ninja instead - configurePhase = null; - buildPhase = null; - checkPhase = null; - installPhase = null; - installCheckPhase = null; - meta = with lib; { description = "A modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index d0ce431be76bf..1438d61f9995a 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.8.4"; + version = "3.9.0"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-2NC5Y8WxVYrzpuqDzhXXJ16b04Em1HqZaE2VK9tmfYk="; + sha256 = "sha256-pprWJIYAFYSTPhWVCW4dz3GWeAS53Vo8UXiyQ56Mwjo="; }; buildInputs = [ qtwebengine qttools ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { for ownCloud/Nextcloud. ''; homepage = "https://github.com/martinrotter/rssguard"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 17ace3021d870..714ca1c8990f3 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73"; }; - buildInputs = [ makeWrapper pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 748d3c89ae676..e5223c35fa35b 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , cmake , flex @@ -16,9 +17,7 @@ , fetchpatch , coreutils }: -let - preConfigure = (import ./script.nix {inherit coreutils;}); -in + stdenv.mkDerivation rec { pname = "zeek"; version = "3.2.4"; @@ -32,9 +31,6 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ] ++ lib.optionals stdenv.isDarwin [ gettext ]; - #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. - inherit preConfigure; - patches = lib.optionals stdenv.cc.isClang [ # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 (fetchpatch { @@ -51,6 +47,18 @@ stdenv.mkDerivation rec { "-DINSTALL_AUX_TOOLS=true" ]; + postInstall = '' + for file in $out/share/zeek/base/frameworks/notice/actions/pp-alarms.zeek $out/share/zeek/base/frameworks/notice/main.zeek; do + substituteInPlace $file \ + --replace "/bin/rm" "${coreutils}/bin/rm" \ + --replace "/bin/cat" "${coreutils}/bin/cat" + done + + for file in $out/share/zeek/policy/misc/trim-trace-file.zeek $out/share/zeek/base/frameworks/logging/postprocessors/scp.zeek $out/share/zeek/base/frameworks/logging/postprocessors/sftp.zeek; do + substituteInPlace $file --replace "/bin/rm" "${coreutils}/bin/rm" + done + ''; + meta = with lib; { description = "Powerful network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; diff --git a/pkgs/applications/networking/ids/zeek/script.nix b/pkgs/applications/networking/ids/zeek/script.nix deleted file mode 100644 index 4c8bbcf22c032..0000000000000 --- a/pkgs/applications/networking/ids/zeek/script.nix +++ /dev/null @@ -1,69 +0,0 @@ -{coreutils}: -'' - sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/base/frameworks/logging/writers/ascii.zeek - sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/policy/misc/trim-trace-file.zeek - sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/actions/pp-alarms.zeek - sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/main.zeek - - sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek - sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek - sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek - sed -i "1i##! test files-hash" $PWD/scripts/base/files/hash/__load__.zeek - sed -i "1i##! test files-pe" $PWD/scripts/base/files/pe/__load__.zeek - sed -i "1i##! test analyzer" $PWD/scripts/base/frameworks/analyzer/__load__.zeek - sed -i "1i##! test cluster" $PWD/scripts/base/frameworks/cluster/__load__.zeek - sed -i "1i##! test config" $PWD/scripts/base/frameworks/config/__load__.zeek - sed -i "1i##! test contro" $PWD/scripts/base/frameworks/control/__load__.zeek - sed -i "1i##! test files" $PWD/scripts/base/frameworks/files/__load__.zeek - sed -i "1i##! test files-magic" $PWD/scripts/base/frameworks/files/magic/__load__.zeek - sed -i "1i##! test input" $PWD/scripts/base/frameworks/input/__load__.zeek - sed -i "1i##! test intel" $PWD/scripts/base/frameworks/intel/__load__.zeek - sed -i "1i##! test logging" $PWD/scripts/base/frameworks/logging/__load__.zeek - sed -i "1i##! test logging-postprocessors" $PWD/scripts/base/frameworks/logging/postprocessors/__load__.zeek - sed -i "1i##! test netcontrol" $PWD/scripts/base/frameworks/netcontrol/__load__.zeek - sed -i "1i##! test netcontrol-plugins" $PWD/scripts/base/frameworks/netcontrol/plugins/__load__.zeek - sed -i "1i##! test notice" $PWD/scripts/base/frameworks/notice/__load__.zeek - sed -i "1i##! test openflow" $PWD/scripts/base/frameworks/openflow/__load__.zeek - sed -i "1i##! test openflow-plugins" $PWD/scripts/base/frameworks/openflow/plugins/__load__.zeek - sed -i "1i##! test packet-filter" $PWD/scripts/base/frameworks/packet-filter/__load__.zeek - sed -i "1i##! test reporter" $PWD/scripts/base/frameworks/reporter/__load__.zeek - sed -i "1i##! test signatures" $PWD/scripts/base/frameworks/signatures/__load__.zeek - sed -i "1i##! test software" $PWD/scripts/base/frameworks/software/__load__.zeek - sed -i "1i##! test sumstats" $PWD/scripts/base/frameworks/sumstats/__load__.zeek - sed -i "1i##! test sumstats-plugins" $PWD/scripts/base/frameworks/sumstats/plugins/__load__.zeek - sed -i "1i##! test conn" $PWD/scripts/base/protocols/conn/__load__.zeek - sed -i "1i##! test dce-rpc" $PWD/scripts/base/protocols/dce-rpc/__load__.zeek - sed -i "1i##! test dhcp" $PWD/scripts/base/protocols/dhcp/__load__.zeek - sed -i "1i##! test dnp3" $PWD/scripts/base/protocols/dnp3/__load__.zeek - sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek - sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek - sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek - sed -i "1i##! test tunnels" $PWD/scripts/base/protocols/tunnels/__load__.zeek - sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek - sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek - sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek - sed -i "1i##! test modbus" $PWD/scripts/base/protocols/modbus/__load__.zeek - sed -i "1i##! test mqtt" $PWD/scripts/base/protocols/mqtt/__load__.zeek - sed -i "1i##! test mysql" $PWD/scripts/base/protocols/mysql/__load__.zeek - sed -i "1i##! test ntlm" $PWD/scripts/base/protocols/ntlm/__load__.zeek - sed -i "1i##! test ntp" $PWD/scripts/base/protocols/ntp/__load__.zeek - sed -i "1i##! test pop3" $PWD/scripts/base/protocols/pop3/__load__.zeek - sed -i "1i##! test radius" $PWD/scripts/base/protocols/radius/__load__.zeek - sed -i "1i##! test rdp" $PWD/scripts/base/protocols/rdp/__load__.zeek - sed -i "1i##! test rfb" $PWD/scripts/base/protocols/rfb/__load__.zeek - sed -i "1i##! test sip" $PWD/scripts/base/protocols/sip/__load__.zeek - sed -i "1i##! test smb" $PWD/scripts/base/protocols/smb/__load__.zeek - sed -i "1i##! test smtp" $PWD/scripts/base/protocols/smtp/__load__.zeek - sed -i "1i##! test snmp" $PWD/scripts/base/protocols/snmp/__load__.zeek - sed -i "1i##! test socks" $PWD/scripts/base/protocols/socks/__load__.zeek - sed -i "1i##! test ssh" $PWD/scripts/base/protocols/ssh/__load__.zeek - sed -i "1i##! test ssl" $PWD/scripts/base/protocols/ssl/__load__.zeek - sed -i "1i##! test syslog" $PWD/scripts/base/protocols/syslog/__load__.zeek - sed -i "1i##! test xmpp" $PWD/scripts/base/protocols/xmpp/__load__.zeek - sed -i "1i##! test unified2" $PWD/scripts/policy/files/unified2/__load__.zeek - sed -i "1i##! test intel-seen" $PWD/scripts/policy/frameworks/intel/seen/__load__.zeek - sed -i "1i##! test notice" $PWD/scripts/policy/frameworks/notice/__load__.zeek - sed -i "1i##! test barnyard2" $PWD/scripts/policy/integration/barnyard2/__load__.zeek - sed -i "1i##! test collective-intel" $PWD/scripts/policy/integration/collective-intel/__load__.zeek - sed -i "1i##! test detect-traceroute" $PWD/scripts/policy/misc/detect-traceroute/__load__.zeek -'' diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 667e8cdaec45d..0fea57ea9cc7e 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -26,7 +26,8 @@ buildGoModule rec { doCheck = false; - buildInputs = [ makeWrapper olm ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ olm ]; # Upstream issue: https://github.com/tulir/gomuks/issues/260 patches = lib.optional stdenv.isLinux (substituteAll { diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index f3736bfc64f6a..cbbe74481c236 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation { sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' ar x $src diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index e5221d861d363..6d6e70ff26a04 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools, - qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats, - autoPatchelfHook, desktop-file-utils, imagemagick, makeWrapper, - twemoji-color-font, xorg, libsodium, libopus, libGL, zlib, alsaLib }: +{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools +, qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats +, autoPatchelfHook, desktop-file-utils, imagemagick +, twemoji-color-font, xorg, libsodium, libopus, libGL, alsaLib }: mkDerivation rec { pname = "ripcord"; @@ -19,9 +19,9 @@ mkDerivation rec { }; nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ]; - buildInputs = [ libsodium libopus libGL alsaLib ] ++ - [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++ - (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]); + buildInputs = [ libsodium libopus libGL alsaLib ] + ++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] + ++ (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]); fontsConf = makeFontsConf { fontDirectories = [ twemoji-color-font ]; @@ -60,10 +60,8 @@ mkDerivation rec { meta = with lib; { description = "Desktop chat client for Slack and Discord"; homepage = "https://cancel.fm/ripcord/"; - # See: https://cancel.fm/ripcord/shareware-redistribution/ license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ infinisil ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 2c7efe42a88da..566e62ae7f0dd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -23,12 +23,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.6.0"; + version = "2.6.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "18ifmvll0nnmjf8ba6r23ri9i4fggy7k2dqs3qf4f52cklmlfj06"; + sha256 = "0wwb18wnh9sbfc6h7m8lj8qmc2n2p0zmp2977ddif6k2gi6qr1y7"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index bc66d77e2246c..041ec5e7c5bae 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 4389ee153c560..0224edc652fa7 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh"; }; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ dpkg ]; dontUnpack = true; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index b52a81932e4f6..380aad6c32914 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -12,9 +12,7 @@ stdenv.mkDerivation rec { else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; - buildInputs = [ makeWrapper ]; - - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; postPatch = '' patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index bac0048cc28d3..e6332832e3ec9 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl"; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; dontUnpack = true; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index 050082c6f933e..ea3f09b8f4c3d 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -4,7 +4,7 @@ symlinkJoin { name = "evolution-with-plugins"; paths = [ gnome3.evolution-data-server ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' for i in $out/bin/* $out/libexec/**; do diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index da36589aeecbd..2723f34204368 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -10,7 +10,6 @@ , itstool , libayatana-appindicator-gtk3 , perlPackages -, glibcLocales , meson , ninja }: diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index c7a05f37ca80f..3e1d5073f5f7d 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,47 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4, boost, bzip2, libX11 -, fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, bzip2, libX11 +, mkDerivation, qtbase, qttools, qtmultimedia, qtscript +, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "eiskaltdcpp"; - version = "2.2.10"; + version = "2.4.1"; src = fetchFromGitHub { owner = "eiskaltdcpp"; repo = "eiskaltdcpp"; rev = "v${version}"; - sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682"; + sha256 = "0ln8dafa8sni3289g30ndv1wr3ij5lz4abcb2qwcabb79zqxl8hy"; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ] + buildInputs = [ qtbase qttools qtmultimedia qtscript boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext + (perl.withPackages (p: with p; [ + GetoptLong + RpcXML + TermShellUI + ])) ] ++ lib.optional stdenv.isDarwin libiconv; - patches = [ - (fetchpatch { - url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b7b56bd7060b426b1f1bfded392ae6853644e2e.patch"; - sha256 = "1rqjdsvirn3ks9w9qn893fb73mz84xm04wl13fvsvj8p42i5cjas"; - }) - (fetchpatch { - url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/bb9eb364a943fe2a67b3ea52ec6a3f9e911f07dc.patch"; - sha256 = "1hjhf9a9j4z8v24g5qh5mcg3n0540lbn85y7kvxsh3khc5v3cywx"; - }) - (fetchpatch { - url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/ef4426f1f9a8255e335b0862234e6cc28befef5e.patch"; - sha256 = "13j018c499n4b5as2n39ws64yj0cf4fskxbqab309vmnjkirxv6x"; - }) - (fetchpatch { - url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/a9c136c8707280d0eeb66be6b289d9718287c55c.patch"; - sha256 = "0w8v4mbrzk7pmzc475ff96mzzwlh8a0p62kk7p829m5yqdwj4sc9"; - }) - (fetchpatch { - url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b9c502ff5c98856d4f8fdb7ed3c6ef34448bfb7.patch"; - sha256 = "0fjwaq0wd9a164k5ysdjy89hx0ixnxc6q7cvyn1ba28snm0pgxb8"; - }) - ]; - cmakeFlags = [ "-DUSE_ASPELL=ON" - "-DUSE_QT_QML=ON" "-DFREE_SPACE_BAR_C=ON" "-DUSE_MINIUPNP=ON" "-DLOCAL_MINIUPNP=ON" @@ -54,6 +36,11 @@ stdenv.mkDerivation rec { "-DWITH_LUASCRIPTS=ON" ]; + preFixup = '' + substituteInPlace $out/bin/eiskaltdcpp-cli-xmlrpc \ + --replace "/usr/local" "$out" + ''; + meta = with lib; { description = "A cross-platform program that uses the Direct Connect and ADC protocols"; homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp"; diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index 557914439a9cc..fe8743ee1cd1b 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07w6ipyiy8hi88d6yxbbf3vkv26mj7dcz9yr8141hb2ig03v0h0p"; }; - buildInputs = [ makeWrapper jdk ant ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk ant ]; buildPhase = "ant"; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 04f2efd5b070a..0835a29fddef1 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "02zlg5r704zbryx09a5rjjf7q137kj16i9qh25dw9q1y69ri619n"; + sha256 = "sha256-YnrJv2tpG1CT1aaZsn/j3ygPhXhTsfEyB/GcEPCgl/g="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index a9ddf48bae607..f52373f2624db 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -52,7 +52,7 @@ let url = "https://download3.vmware.com/software/view/viewclients/CART21FQ4/VMware-Horizon-Client-Linux-2012-8.1.0-17349998.tar.gz"; sha256 = "0afda1f3116e75a4e7f89990d8ee60ccea5f3bb8a2360652162fa11c795724ce"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir ext $out find ${sysArch} -type f -print0 | xargs -0n1 tar -Cext --strip-components=1 -xf diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 86126e861699b..23bbd19b00e8d 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation (rec { sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y="; }; - buildInputs = [ ocaml makeWrapper ncurses ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ocaml ncurses ]; preBuild = (if enableX11 then '' sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix index 41bc6c64da806..346fd17525788 100644 --- a/pkgs/applications/networking/tsung/default.nix +++ b/pkgs/applications/networking/tsung/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ erlang gnuplot diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/applications/networking/wg-bond/default.nix index 32ffbde400b10..bef44d428627c 100644 --- a/pkgs/applications/networking/wg-bond/default.nix +++ b/pkgs/applications/networking/wg-bond/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1v2az0v6l8mqryvq3898hm7bpvqdd2c4kpv6ck7932jfjyna512k"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/wg-bond --set PATH ${ lib.makeBinPath [ wireguard-tools ] diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix index 683e668157316..f8cd25ad78435 100644 --- a/pkgs/applications/office/docear/default.nix +++ b/pkgs/applications/office/docear/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4"; }; - buildInputs = [ oraclejre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ oraclejre ]; buildPhase = ""; installPhase = '' diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 4614a543694d6..f46d893d89480 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -16,7 +16,8 @@ in stdenv.mkDerivation { sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl"; }; - buildInputs = [ makeWrapper pythonEnv ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonEnv ]; configurePhase = '' # Let's fail at build time if the library we're substituting in doesn't diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index 499078611fcb3..c2578696c688a 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -5,7 +5,7 @@ , callPackage , python3 -, imagemagick7 +, imagemagick , ghostscript , optipng , tesseract @@ -65,7 +65,7 @@ let buildPhase = let # Paperless has explicit runtime checks that expect these binaries to be in PATH - extraBin = lib.makeBinPath [ imagemagick7 ghostscript optipng tesseract unpaper ]; + extraBin = lib.makeBinPath [ imagemagick ghostscript optipng tesseract unpaper ]; in '' ${python.interpreter} -m compileall $srcDir diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix index 89cf2add212c2..744240c921384 100644 --- a/pkgs/applications/office/skanlite/default.nix +++ b/pkgs/applications/office/skanlite/default.nix @@ -3,13 +3,12 @@ libksane }: -let - minorVersion = "2.2"; -in mkDerivation rec { - name = "skanlite-2.2.0"; +mkDerivation rec { + pname = "skanlite"; + version = "2.2.0"; src = fetchurl { - url = "mirror://kde/stable/skanlite/${minorVersion}/${name}.tar.xz"; + url = "mirror://kde/stable/skanlite/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "VP7MOZdUe64XIVr3r0aKIl1IPds3vjBTZzOS3N3VhOQ="; }; @@ -23,8 +22,8 @@ in mkDerivation rec { meta = with lib; { description = "KDE simple image scanning application"; - homepage = "http://www.kde.org/applications/graphics/skanlite/"; - license = licenses.gpl2; + homepage = "https://apps.kde.org/skanlite"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pshendry ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 6c1068d458446..5bbfca23d6de4 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -1,8 +1,7 @@ -{ - lib, - fetchurl, - appimageTools, - libsecret +{ lib +, fetchurl +, appimageTools +, libsecret }: let @@ -37,7 +36,7 @@ in appimageTools.wrapType2 rec { Assign an activity to each side and flip to start tracking your time. The desktop app tell you where every minute of your day is spent. ''; - homepage = https://timeular.com; + homepage = "https://timeular.com"; license = licenses.unfree; maintainers = with maintainers; [ ktor ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 552d28d1e9507..1f084e182afcf 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4"; }; - buildInputs = [ wxGTK makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ wxGTK ]; preConfigure = "cd src"; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index e0f156f06c95f..fad87d44912f6 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook wrapQtAppsHook ]; - meta = { - description = "Office program originally named Kingsoft Office"; - homepage = "http://wps-community.org/"; + meta = with lib; { + description = "Office suite, formerly Kingsoft Office"; + homepage = "https://www.wps.com/"; platforms = [ "x86_64-linux" ]; hydraPlatforms = []; - license = lib.licenses.unfreeRedistributable; - maintainers = with lib.maintainers; [ mlatus th0rgal ]; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ mlatus th0rgal ]; }; buildInputs = with xorg; [ diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 4c7b60c125ccb..de0b9bada53cd 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pappl"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4evyOrPd8zb5y00L8h2t++ayW1S8WQ5P+6MXe6eju68="; + sha256 = "sha256-L4ptgAJAvyTUCVl6YotA8DnlISc9PwZM0WjXyOvxGJg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index cd78b644eb052..e51d181266a48 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, pkg-config, meson, ninja, - git, criterion, wrapGAppsHook, gtk3, libconfig, gnuplot, opencv, - fftwFloat, cfitsio, gsl, exiv2, curl, librtprocess, ffmpeg, - libraw, libtiff, libpng, libjpeg, libheif, ffms +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, wrapGAppsHook +, git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib +, fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg +, libraw, libtiff, libpng, libjpeg, libheif, ffms }: stdenv.mkDerivation rec { pname = "siril"; - version = "0.99.6"; + version = "0.99.8.1"; src = fetchFromGitLab { owner = "free-astro"; repo = pname; rev = version; - sha256 = "06vh8x45gv0gwlnqjwxglf12jmpdaxkiv5sixkqh20420wabx3ha"; + sha256 = "0h3slgpj6zdc0rwmyr9zb0vgf53283hpwb7h26skdswmggsk90i5"; }; nativeBuildInputs = [ @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 cfitsio gsl exiv2 gnuplot curl opencv fftwFloat librtprocess - libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg + gtk3 cfitsio gsl exiv2 gnuplot opencv fftwFloat librtprocess wcslib + libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg json-glib ]; # Necessary because project uses default build dir for flatpaks/snaps @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.siril.org/"; - description = "Astronomical image processing tool"; - license = licenses.gpl3; + description = "Astrophotographic image processing tool"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ hjones2199 ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index 7eb3afd437af7..b42fed8da2819 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -16,7 +16,7 @@ python27Packages.buildPythonApplication rec { sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf"; }); - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ]; # make emapper find diamond & hmmer diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix index 30bc68fb0e874..d602395b87572 100644 --- a/pkgs/applications/science/biology/platypus/default.nix +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -13,7 +13,8 @@ in stdenv.mkDerivation { sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw"; }; - buildInputs = [ htslib python zlib makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ htslib python zlib ]; buildPhase = '' patchShebangs . diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index 32701af8392cc..b48e13ecf003d 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm"; }; - buildInputs = [ unzip jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip jre ]; sourceRoot = "snpEff"; diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index 65a19b83a70ec..2a232d64693d0 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0="; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; phases = [ "installPhase" ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index aa52fee0890d6..32e7e7e5d723f 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.18"; + version = "14.31.24"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0hkc7c08azbw3k91ygwz6r5y4yw6k8l7h4gcq5p71knd5k1fa5jd"; + sha256 = "sha256-86nDeKRXSNKrmYeo1rRLfziLVnmEmdIJRfIv6DFIxcs="; }; patchPhase = '' diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 62600ea90c200..8713abe4bcff4 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -42,6 +42,7 @@ let "8.12.1".sha256 = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; "8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; + "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index a0f81a543f18e..600ae83ff9126 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3"; }; - buildInputs = [ perl polyml z3 makeWrapper ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl polyml z3 ] ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 7749f4fd72dd2..d57db0fd0d708 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.26.0"; + version = "3.27.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "sha256-xCULu6ljfyrA/Idr/BJ+3rLVmQqJZPoo+a7s++u50zU="; + sha256 = "sha256-DSIWuMlweu9dsah5EdVCNQ9ADjYoEZongfw/Yh7/N/A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 520c47d7500bb..fc2c1e5cba4c2 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv"; }; - buildInputs = [ makeWrapper eprover ocaml perl zlib ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ eprover ocaml perl zlib ]; sourceRoot = "leo2/src"; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index dffb66b2fcf5b..8c88f47327e93 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation rec { pname = "satallax"; version = "2.7"; - buildInputs = [ocaml zlib which eprover makeWrapper coq]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ocaml zlib which eprover coq]; src = fetchurl { url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index c4ba334b85ff4..f002b808e0af1 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891"; }; - buildInputs = [ makeWrapper adoptopenjdk-bin ant ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ adoptopenjdk-bin ant ]; buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist"; installPhase = '' diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 1c33d923289f2..da8985818e7b7 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "installPhase" ]; diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index 3528dbd3a6477..d4fdbfd6937c3 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation { phases = [ "buildPhase" "installPhase" ]; - buildInputs = [ why3 makeWrapper ] ++ provers; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ why3 ] ++ provers; buildPhase = '' mkdir -p $out/share/why3/ diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index cb0d668f53652..7fb73419c072c 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0v71x3fph2j3xrnysvkm7zsgnbxisfbdfgxzvzxxfdg59a6l3xid"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index cfef5960bd9c6..e482a071bb438 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -57,9 +57,14 @@ stdenv.mkDerivation rec { mkdir -p $python/lib mv $lib/lib/python* $python/lib/ ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} + '' + optionalString javaBindings '' + mkdir -p $java/share/java + mv com.microsoft.z3.jar $java/share/java + moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java" ''; outputs = [ "out" "lib" "dev" "python" ] + ++ optional javaBindings "java" ++ optional ocamlBindings "ocaml"; meta = with lib; { diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index e41dbb546ea45..34ad499ecb93d 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -12,11 +12,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-4.0.3"; + name = "R-4.0.4"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; - sha256 = "03cypg2qf7v9mq9mr9alz9w5y9m5kdgwbc97bp26pyymg253m609"; + sha256 = "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj"; }; dontUseImakeConfigure = true; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index db6cf2600c360..456ce878e49ee 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' ''; - buildInputs = [ util-linux makeWrapper ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ util-linux ] ++ lib.optionals enableReadline [ readline ncurses ]; makeFlags = [ diff --git a/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch b/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch new file mode 100644 index 0000000000000..374c720791941 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch @@ -0,0 +1,29 @@ +diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py +index 88a33b0349..b3321f0bec 100644 +--- a/src/sage/interfaces/singular.py ++++ b/src/sage/interfaces/singular.py +@@ -495,24 +495,6 @@ class Singular(ExtraTabCompletion, Expect): + """ + Send an interrupt to Singular. If needed, additional + semi-colons are sent until we get back at the prompt. +- +- TESTS: +- +- The following works without restarting Singular:: +- +- sage: a = singular(1) +- sage: _ = singular._expect.sendline('1+') # unfinished input +- sage: try: +- ....: alarm(0.5) +- ....: singular._expect_expr('>') # interrupt this +- ....: except KeyboardInterrupt: +- ....: pass +- Control-C pressed. Interrupting Singular. Please wait a few seconds... +- +- We can still access a:: +- +- sage: 2*a +- 2 + """ + # Work around for Singular bug + # http://www.singular.uni-kl.de:8002/trac/ticket/727 diff --git a/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch b/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch new file mode 100644 index 0000000000000..88cb66506b1d7 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch @@ -0,0 +1,16 @@ +diff --git a/src/sage/repl/rich_output/display_manager.py b/src/sage/repl/rich_output/display_manager.py +index fb21f7a9c9..f39470777d 100644 +--- a/src/sage/repl/rich_output/display_manager.py ++++ b/src/sage/repl/rich_output/display_manager.py +@@ -749,9 +749,9 @@ class DisplayManager(SageObject): + import sage.env + import re + import os +- with open(os.path.join(sage.env.THREEJS_DIR, 'build', 'three.min.js')) as f: ++ with open(os.path.join(sage.env.THREEJS_DIR, 'build', 'three.js')) as f: + text = f.read().replace('\n','') +- version = re.search(r'REVISION="(\d+)"', text).group(1) ++ version = re.search(r"REVISION = '(\d+)'", text).group(1) + return """ + <script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r{0}/build/three.min.js"></script> + <script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r{0}/examples/js/controls/OrbitControls.js"></script> diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b8fb41596607d..ff8e53d4172c0 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -71,6 +71,9 @@ stdenv.mkDerivation rec { # fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052 ./patches/sagespawn-implicit-casting.patch + + # disable pexpect interrupt test (see https://trac.sagemath.org/ticket/30945) + ./patches/disable-pexpect-intermittent-failure.patch ]; # Patches needed because of package updates. We could just pin the versions of @@ -106,6 +109,9 @@ stdenv.mkDerivation rec { # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985) ./patches/sympy-1.7-update.patch + + # workaround until we use sage's fork of threejs, which contains a "version" file + ./patches/dont-grep-threejs-version-from-minified-js.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 179801da379fa..05b95140b1bde 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; # The -Xmx1000M comes suggested from their download page: # http://www.cs.waikato.ac.nz/ml/weka/downloading.html diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index b15eebf8719fe..0d827e2ad1075 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { name = "aliza.rpm"; }; - buildInputs = [ rpmextract makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ rpmextract ]; unpackCmd = "rpmextract $curSrc"; diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index db98e0db34875..3ab7d57f95a34 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [jre makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; installPhase = '' mkdir -pv $out/{share,bin} diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 9a3af78240ee5..858064a8d226e 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4"; }; - postPatch = '' + postPatch = lib.optional (stdenv.hostPlatform.libc == "glibc") '' sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C ''; diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index dd61c3668cc63..e56282b68631b 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { name = "${pname}-${version}.jar"; }; - buildInputs = [ makeWrapper jre gcc valgrind ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre gcc valgrind ]; phases = [ "installPhase" ]; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index b14b874d60cfd..a7dcd0959d33a 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -90,12 +90,7 @@ rustPlatform.buildRustPackage rec { --replace xdg-open ${xdg-utils}/bin/xdg-open ''; - installPhase = '' - runHook preInstall - - install -D $releaseDir/alacritty $out/bin/alacritty - - '' + ( + postInstall = ( if stdenv.isDarwin then '' mkdir $out/Applications cp -r extra/osx/Alacritty.app $out/Applications @@ -126,8 +121,6 @@ rustPlatform.buildRustPackage rec { tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - - runHook postInstall ''; dontPatchELF = true; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index b03acb99530af..5255d40b9ce27 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -40,7 +40,7 @@ let paths = [ rxvt-unicode-unwrapped ] ++ plugins ++ extraDeps; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/urxvt \ diff --git a/pkgs/applications/terminal-emulators/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix index 67c660275f552..87394241ef765 100644 --- a/pkgs/applications/terminal-emulators/terminus/default.nix +++ b/pkgs/applications/terminal-emulators/terminus/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb"; sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb"; }; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ dpkg ]; unpackPhase = '' mkdir pkg dpkg-deb -x $src pkg diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index ae1929565b6ef..af2b5cdc9a3de 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec { sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; checkInputs = [ subversion git breezy ]; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 1ffc065367507..036eef1c9c36f 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -15,7 +15,8 @@ in sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz"; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; phases = "installPhase"; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 5aea15769c0b0..565fe180ba134 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287"; }; - buildInputs = [mercurial.python mercurial makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [mercurial.python mercurial]; installPhase = '' binPath=$out/bin diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index f56ce386e42b4..defad82d5a1c1 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghq"; - version = "1.1.5"; + version = "1.1.7"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "098fik155viylq07az7crzbgswcvhpx0hr68xpvyx0rpri792jbq"; + sha256 = "sha256-kEs844gj1/PW7Kkpn1tvxfruznRIh2pjHCoSWGF1upQ="; }; - vendorSha256 = "0gll132g111vn1hdmdjpkha9rbyppz0qj1ld89gwlk2mqd57jxkd"; + vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI="; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 08875dabd0fe9..f0184c6637771 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602"; }; - nativeBuildInputs = [ libxslt ]; + nativeBuildInputs = [ libxslt makeWrapper ]; - buildInputs = [ openssl makeWrapper ]; + buildInputs = [ openssl ]; patchPhase = '' substituteInPlace commands.cpp \ diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index 942a12e239b9e..7b8b5fed90f44 100644 --- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=$(out)" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # perl provides shasum postInstall = '' diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index 5e5bba3df7281..c67a575172cb9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildPhase = null; diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index 2ecc5d872b88b..1a1811b2f4384 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildPhase = null; diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index 037de14658d6d..ec1c44b96134e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0v0yxydpw6r4awy0hb7sbnh520zsk86ibzh1xjf3983yhsvkfk5v"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index eea7bed011b05..3143d7ef9c3a9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { sha256 = "0hc7yavcp8jmn6b7wngjqhy8kl7f4191sfpik8ycvqghkvvimxj4"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D git-secret $out/bin/git-secret diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 87cb7452c75be..add7bfc5526fd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 3cb214bd8b02f..5d1589446bef0 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -7,6 +7,7 @@ , svnSupport, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? true , nlsSupport ? true +, osxkeychainSupport ? stdenv.isDarwin , guiSupport , withManual ? true , pythonSupport ? true @@ -18,11 +19,12 @@ , gzip # needed at runtime by gitweb.cgi }: +assert osxkeychainSupport -> stdenv.isDarwin; assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.30.0"; + version = "2.30.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -34,7 +36,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"; + sha256 = "0rwlbps9x8kgk2hsm0bvsrkpsk9bnbnz8alknbd7i688jnhai27r"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -64,10 +66,10 @@ stdenv.mkDerivation { --subst-var-by gettext ${gettext} ''; - nativeBuildInputs = [ gettext perlPackages.perl ] + nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; - buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] + buildInputs = [curl openssl zlib expat cpio libiconv] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] @@ -114,7 +116,7 @@ stdenv.mkDerivation { make -C contrib/subtree '' + (lib.optionalString perlSupport '' make -C contrib/diff-highlight - '') + (lib.optionalString stdenv.isDarwin '' + '') + (lib.optionalString osxkeychainSupport '' make -C contrib/credential/osxkeychain '') + (lib.optionalString withLibsecret '' make -C contrib/credential/libsecret @@ -128,7 +130,7 @@ stdenv.mkDerivation { installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; - preInstall = (lib.optionalString stdenv.isDarwin '' + preInstall = (lib.optionalString osxkeychainSupport '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o @@ -247,8 +249,8 @@ stdenv.mkDerivation { notSupported "$out/$prog" done '') - + lib.optionalString stdenv.isDarwin '' - # enable git-credential-osxkeychain by default if darwin + + lib.optionalString osxkeychainSupport '' + # enable git-credential-osxkeychain on darwin if desired (default) mkdir -p $out/etc cat > $out/etc/gitconfig << EOF [credential] diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 08bf5eb6ba078..6572b9b7fc866 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8="; }; - buildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; preBuild = '' makeFlagsArray+=(prefix="$out") diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 26f46066531e4..766cb417b7452 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,12 +2,12 @@ let pname = "radicle-upstream"; - version = "0.1.6"; + version = "0.1.11"; name = "${pname}-${version}"; src = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "1s299rxala6gqj69j5q4d4n5wfdk2zsb4r9qrhml0m79b4f79yar"; + sha256 = "1j0xc9ns3andycbrrzkn6ql6739b1dimzlxq17wwpmqhni9nh673"; }; contents = appimageTools.extractType2 { inherit name src; }; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 69742b6d76036..74f10a1428839 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0ly2vrv6q31n0xhciwb7a1ilr5c6ndyi3bg81yfp4axiypps7l41"; }; - buildInputs = [ ruby makeWrapper ]; + nativeBuildInputs = [ ruby makeWrapper ]; dontBuild = true; diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index aebd488fe305f..3225744abc57c 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam"; }; - buildInputs = [ makeWrapper git openssl coreutils util-linux gnugrep gnused gawk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ git openssl coreutils util-linux gnugrep gnused gawk ]; patches = [ ./helper-scripts_depspathprefix.patch ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index f6250563fc939..f0d4ef664c0a4 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.12.2"; + version = "2.13.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-E0HGianaTNRVJsFh8tb1wdxEARRXzkFG2OHU6op5oQ4="; + sha256 = "sha256-D6gh14XOZ6Fjypfhg9l5ozPhyf6u6M0Wc8HdagdPM/Q="; }; patches = [ ./import-ssl-module.patch ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 7dd8ff43974db..3c66456433ac8 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.5.0"; + version = "7.5.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "1v89aza7iwph7k5phyld5m5856c5wbh8ncgg6lh7558v4xna0x57"; + sha256 = "sha256-7baWXv+SV1LX5p+eH6egp4QfTm1SXK8ITcOEj8yFAXg="; }; dontBuild = true; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index ee6c8201fa3ff..b9c352a4eac44 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -137,6 +137,7 @@ stdenv.mkDerivation { sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb + mv config/puma.rb.example config/puma.rb # Always require lib-files and application.rb through their store # path, not their relative state directory path. This gets rid of # warnings and means we don't have to link back to lib from the diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index fcb954e388437..83e3d7fe1414c 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -1,8 +1,8 @@ diff --git a/config/environments/production.rb b/config/environments/production.rb -index c5cbfcf64c..4d01f6fab8 100644 +index d9b3ee354b0..1eb0507488b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb -@@ -70,10 +70,10 @@ Rails.application.configure do +@@ -69,10 +69,10 @@ config.action_mailer.delivery_method = :sendmail # Defaults to: @@ -11,17 +11,17 @@ index c5cbfcf64c..4d01f6fab8 100644 - # # arguments: '-i -t' - # # } + config.action_mailer.sendmail_settings = { -+ location: '/usr/sbin/sendmail', ++ location: '/run/wrappers/bin/sendmail', + arguments: '-i -t' + } config.action_mailer.perform_deliveries = true config.action_mailer.raise_delivery_errors = true diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index bd696a7f2c..44e3863736 100644 +index 92e7501d49d..4ee5a1127df 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -590,7 +590,7 @@ production: &base +@@ -1168,7 +1168,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: @@ -31,10 +31,10 @@ index bd696a7f2c..44e3863736 100644 ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb -index 0bea8a4f4b..290248547b 100644 +index bbed08f5044..2906e5c44af 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -177,7 +177,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab['user'] +@@ -183,7 +183,7 @@ Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir rescue ArgumentError # no user configured @@ -43,7 +43,7 @@ index 0bea8a4f4b..290248547b 100644 end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? -@@ -507,7 +507,7 @@ Settings.backup['upload']['storage_class'] ||= nil +@@ -751,7 +751,7 @@ # Git # Settings['git'] ||= Settingslogic.new({}) @@ -52,37 +52,94 @@ index 0bea8a4f4b..290248547b 100644 # Important: keep the satellites.path setting until GitLab 9.0 at # least. This setting is fed to 'rm -rf' in +diff --git a/config/puma.rb.example b/config/puma.rb.example +index 9fc354a8fe8..2352ca9b58c 100644 +--- a/config/puma.rb.example ++++ b/config/puma.rb.example +@@ -5,12 +5,8 @@ + # The default is "config.ru". + # + rackup 'config.ru' +-pidfile '/home/git/gitlab/tmp/pids/puma.pid' +-state_path '/home/git/gitlab/tmp/pids/puma.state' +- +-stdout_redirect '/home/git/gitlab/log/puma.stdout.log', +- '/home/git/gitlab/log/puma.stderr.log', +- true ++pidfile ENV['PUMA_PATH'] + '/tmp/pids/puma.pid' ++state_path ENV['PUMA_PATH'] + '/tmp/pids/puma.state' + + # Configure "min" to be the minimum number of threads to use to answer + # requests and "max" the maximum. +@@ -31,12 +27,12 @@ queue_requests false + + # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only + # accepted protocols. +-bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket' ++bind "unix://#{ENV['PUMA_PATH']}/tmp/sockets/gitlab.socket" + + workers 3 + +-require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" +-require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer" ++require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/lifecycle_events" ++require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/puma_worker_killer_initializer" + + on_restart do + # Signal application hooks that we're about to restart +@@ -80,7 +76,7 @@ if defined?(nakayoshi_fork) + end + + # Use json formatter +-require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" ++require_relative ENV['GITLAB_PATH'] + "lib/gitlab/puma_logging/json_formatter" + + json_formatter = Gitlab::PumaLogging::JSONFormatter.new + log_formatter do |str| diff --git a/lib/api/api.rb b/lib/api/api.rb -index e953f3d2ec..3a8d9f076b 100644 +index ada0da28749..8a3f5824008 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb -@@ -2,7 +2,7 @@ module API - class API < Grape::API +@@ -4,7 +4,7 @@ module API + class API < ::API::Base include APIGuard - LOG_FILENAME = Rails.root.join("log", "api_json.log") + LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") - NO_SLASH_URL_PART_REGEX = %r{[^/]+} - PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze + NO_SLASH_URL_PART_REGEX = %r{[^/]+}.freeze + NAMESPACE_OR_PROJECT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze +diff --git a/lib/gitlab/authorized_keys.rb b/lib/gitlab/authorized_keys.rb +index 50cd15b7a10..3ac89e5b8e9 100644 +--- a/lib/gitlab/authorized_keys.rb ++++ b/lib/gitlab/authorized_keys.rb +@@ -157,7 +157,7 @@ def command(id) + raise KeyError, "Invalid ID: #{id.inspect}" + end + +- "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}" ++ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}" + end + + def strip(key) diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb -index a42e312b5d..ccaab9229e 100644 +index 89a4e36a232..ae379ffb27a 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb -@@ -26,7 +26,7 @@ module Gitlab +@@ -37,7 +37,7 @@ def self.build end def self.full_log_path - Rails.root.join("log", file_name) -+ File.join(ENV["GITLAB_LOG_PATH"], file_name) ++ File.join(ENV["GITLAB_LOG_PATH"], file_name) end def self.cache_key diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb -index 7d7400bdab..cb25211d44 100644 +index e0e7084e27e..19fab855b90 100644 --- a/lib/gitlab/uploads_transfer.rb +++ b/lib/gitlab/uploads_transfer.rb -@@ -1,7 +1,7 @@ +@@ -3,7 +3,7 @@ module Gitlab class UploadsTransfer < ProjectTransfer def root_dir @@ -92,10 +149,10 @@ index 7d7400bdab..cb25211d44 100644 end end diff --git a/lib/system_check/app/log_writable_check.rb b/lib/system_check/app/log_writable_check.rb -index 3e0c436d6e..28cefc5514 100644 +index 2c108f0c18d..3a16ff52d01 100644 --- a/lib/system_check/app/log_writable_check.rb +++ b/lib/system_check/app/log_writable_check.rb -@@ -21,7 +21,7 @@ module SystemCheck +@@ -23,7 +23,7 @@ def show_error private def log_path @@ -105,10 +162,10 @@ index 3e0c436d6e..28cefc5514 100644 end end diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb -index 7026d0ba07..c56e1f7ed9 100644 +index 54dff63ab61..882da702f29 100644 --- a/lib/system_check/app/uploads_directory_exists_check.rb +++ b/lib/system_check/app/uploads_directory_exists_check.rb -@@ -4,12 +4,13 @@ module SystemCheck +@@ -6,12 +6,13 @@ class UploadsDirectoryExistsCheck < SystemCheck::BaseCheck set_name 'Uploads directory exists?' def check? @@ -120,15 +177,15 @@ index 7026d0ba07..c56e1f7ed9 100644 + uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads') try_fixing_it( - "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads" -+ "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ++ "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ) for_more_information( - see_installation_guide_section 'GitLab' + see_installation_guide_section('GitLab') diff --git a/lib/system_check/app/uploads_path_permission_check.rb b/lib/system_check/app/uploads_path_permission_check.rb -index 7df6c06025..bb447c16b2 100644 +index 2e1cc687c43..ca69d63bcf6 100644 --- a/lib/system_check/app/uploads_path_permission_check.rb +++ b/lib/system_check/app/uploads_path_permission_check.rb -@@ -25,7 +25,7 @@ module SystemCheck +@@ -27,7 +27,7 @@ def show_error private def rails_uploads_path @@ -138,10 +195,10 @@ index 7df6c06025..bb447c16b2 100644 def uploads_fullpath diff --git a/lib/system_check/app/uploads_path_tmp_permission_check.rb b/lib/system_check/app/uploads_path_tmp_permission_check.rb -index b276a81eac..070e3ebd81 100644 +index 567c7540777..29906b1c132 100644 --- a/lib/system_check/app/uploads_path_tmp_permission_check.rb +++ b/lib/system_check/app/uploads_path_tmp_permission_check.rb -@@ -33,7 +33,7 @@ module SystemCheck +@@ -35,7 +35,7 @@ def upload_path_tmp end def uploads_fullpath @@ -150,14 +207,3 @@ index b276a81eac..070e3ebd81 100644 end end end ---- a/lib/gitlab/authorized_keys.rb -+++ b/lib/gitlab/authorized_keys.rb -@@ -157,7 +157,7 @@ - raise KeyError, "Invalid ID: #{id.inspect}" - end - -- "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}" -+ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}" - end - - def strip(key) diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index 29440724274a0..f499be17f7c80 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -21,7 +21,8 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - buildInputs = [ makeWrapper docutils unzip ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ docutils unzip ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ hg-git dulwich ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index c841482126a13..7c0a96583e702 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -19,7 +19,8 @@ in python3Packages.buildPythonApplication rec { passthru = { inherit python; }; # pass it so that the same version can be used in hg2git - buildInputs = [ makeWrapper docutils unzip ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ docutils unzip ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index d6d55eaa4eb64..56cc2a4ea5a57 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { version = "1.0.2"; pname = "monotone-viz"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 7b01ab21f4959..1ca04a1634a27 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2039"; - sha256 = "0l82408jli7g6nc267bnnnz0zz015lvpwva5fxj53mval32ii4i8"; + buildVersion = "2047"; + sha256 = "03a0whifhx9py25l96xpqhb4p6hi9qmnrk2bxz6gh02sinsp3mia"; } {}; sublime-merge-dev = common { - buildVersion = "2037"; - sha256 = "1s0g18l2msmnn6w7f126andh2dygm9l94fxxhsi64v74mkawqg82"; + buildVersion = "2046"; + sha256 = "04laygxr4vm6mawlfmdn2vj0dwj1swab39znsgb1d6rhysz62kjd"; dev = true; } {}; } diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 1776aab00336d..0312c34bf7027 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -30,7 +30,8 @@ let } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ dpkg ]; phases = [ "unpackPhase" "installPhase" ]; unpackPhase = "dpkg-deb -x ${src} ./"; diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 6718fc1dc36d4..87c8066a976c5 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ lua5 curl quvi_scripts libquvi glib ]; postInstall = '' wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua" ''; diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 3619d4ee5e32e..69f777541a46f 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.3.085"; + version = "2.3.110"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "v${version}"; - sha256 = "bkz64nj6748552ZMRcL/I1lUXGpZjaATUEqv3Kkphck="; + sha256 = "0sdbd2lsc4bvgkwi55arjwbzwmq05abfmv6vsrvz4gsdv8s8wha5"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index 49f5b43bb734c..6501a3990885c 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0br27bq9bpglfdpv63h827bipgvhlh10liyhmhcxls4227kagz72"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 9950537150723..8a7399cf66c04 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-3rougAl0vVH01ulbnfIO2x8OCyofWlvVsvlKjoAD2NE="; + sha256 = "sha256-cli/ipWxZgAeDMBUMuOU3l2mKv4POvOhi7ctbVdU6jc="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index f7bd5a4b06964..52ca54501d75d 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "07wf9yn0f771xkm3x12946x5rp83hxjkd70xgfgy35zvj27wskzm"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index dd1a2da017110..b4b16e2168938 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { postFixup = '' # the .desktop is both invalid and pointless - test -e $out/share/applications/qemu.desktop && rm -f $out/share/applications/qemu.desktop + rm -f $out/share/applications/qemu.desktop # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 3bc2df19d1de2..a51a58d21eebe 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -5,7 +5,6 @@ , openssl , libuuid , coreutils -, go , which , makeWrapper , cryptsetup diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6dd7fd0f953b3..fe19f1f4a3e04 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -103,6 +103,8 @@ in stdenv.mkDerivation { qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; }) ++ [ + # NOTE: the patch for linux 5.11 can be removed when the next version of VirtualBox is released + ./linux-5-11.patch ./qtx11extras.patch ]; diff --git a/pkgs/applications/virtualization/virtualbox/linux-5-11.patch b/pkgs/applications/virtualization/virtualbox/linux-5-11.patch new file mode 100644 index 0000000000000..66b70bf0d97e3 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/linux-5-11.patch @@ -0,0 +1,12 @@ +diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +index 7033b45..c8178a6 100644 +--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +@@ -39,6 +39,7 @@ + #endif + #include <linux/netdevice.h> + #include <linux/etherdevice.h> ++#include <linux/ethtool.h> + #include <linux/rtnetlink.h> + #include <linux/miscdevice.h> + #include <linux/inetdevice.h> diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index b671c1f6fa4dc..b90033e438db7 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Run graphical applications with Docker"; homepage = "https://github.com/mviereck/x11docker"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jD91mZM2 ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix deleted file mode 100644 index 9371844834058..0000000000000 --- a/pkgs/applications/window-managers/bspwm/unstable.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }: - -stdenv.mkDerivation { - name = "bspwm-unstable-2016-09-30"; - - - src = fetchFromGitHub { - owner = "baskerville"; - repo = "bspwm"; - rev = "8664c007e44de162c1597fd7e163635b274fb747"; - sha256 = "0clvpz32z38i8kr10hqlifa661szpfn93c63m2aq2h4dwmr44slz"; - }; - - buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; - - buildPhase = '' - make PREFIX=$out - ''; - - installPhase = '' - make PREFIX=$out install - ''; - - meta = { - description = "A tiling window manager based on binary space partitioning (git version)"; - homepage = "https://github.com/baskerville/bspwm"; - maintainers = [ lib.maintainers.meisternu lib.maintainers.epitrochoid ]; - license = lib.licenses.bsd2; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 9a56f865c3481..52c0a6ae04d1e 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , pkg-config +, libinput , libxcb , libxkbcommon , wayland @@ -15,27 +16,32 @@ stdenv.mkDerivation rec { pname = "dwl"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "QoKaeF5DbSX0xciwc/0VKpubn/001cJjoZ+UzVDX4qE="; + sha256 = "gUaFTkpIQDswEubllMgvxPfCaEYFO7mODzjPyW7XsGQ="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ + libinput libxcb libxkbcommon wayland wayland-protocols wlroots - ] ++ lib.optionals enable-xwayland [ xwayland libX11 ]; + ] ++ lib.optionals enable-xwayland [ + libX11 + xwayland + ]; # Allow users to set their own list of patches inherit patches; + # Last line of config.mk enables XWayland prePatch = lib.optionalString enable-xwayland '' sed -i -e '$ s|^#||' config.mk ''; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index ad45f01915da4..a1151dcf82e65 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,44 +1,42 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, asciidoc +{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc-full , xdotool, xorgserver, xsetroot, xterm, runtimeShell , nixosTests }: -# Doc generation is disabled by default when cross compiling because asciidoc -# dependency is broken when cross compiling for now - -let - cross = stdenv.buildPlatform != stdenv.targetPlatform; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "0r4qaklv97qcq8p0pnz4f2zqg69vfai6c2qi1ydi2kz24xqjf5hy"; + sha256 = "0avfhr68f6fjnafjdcyxcx7dkg38f2nadmhpj971qyqzfq2f6i38"; }; outputs = [ "out" - "doc" # share/doc exists with examples even without generated html documentation - ] ++ lib.optionals (!cross) [ + "doc" "man" ]; cmakeFlags = [ "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" - ] ++ lib.optional cross "-DWITH_DOCUMENTATION=OFF"; + ]; nativeBuildInputs = [ cmake pkg-config - python3 - ] ++ lib.optional (!cross) asciidoc; + ]; + + depsBuildBuild = [ + asciidoc-full + ]; buildInputs = [ libX11 libXext libXinerama libXrandr + libXft + freetype ]; patches = [ @@ -75,6 +73,9 @@ in stdenv.mkDerivation rec { ''; pytestFlagsArray = [ "../tests" ]; + disabledTests = [ + "test_title_different_letters_are_drawn" + ]; passthru = { tests.herbstluftwm = nixosTests.herbstluftwm; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index be7e88a250199..88d035bce6619 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -6,25 +6,26 @@ , dbus , libpulseaudio , notmuch +, openssl , ethtool }: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.14.3"; + version = "0.14.7"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "1k9dgmd4wz9950kr35da31rhph43gmvg8dif7hg1xw41xch6bi60"; + sha256 = "1ndqh4bzwim32n8psgsgdd47xmlb45rhvcwla1wm506byb21nk4c"; }; - cargoSha256 = "0qqkcgl9iz4kxl1a2vv2p7vy7wxn970y28jynf3n7hfp16i3liy2"; + cargoSha256 = "098dzwqwbhcyswm73m880z0w03i7xrq56x79vfyvacw4k27q2zm9"; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ dbus libpulseaudio notmuch ]; + buildInputs = [ dbus libpulseaudio notmuch openssl ]; cargoBuildFlags = [ "--features=notmuch" diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 72170401d7937..04c232a3e89eb 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-j57LHPU3U3ipUGQDrZ8KCuELOVJ3BxhLXsJePOO6rTM="; - buildInputs = [ makeWrapper libX11 libXinerama ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libX11 libXinerama ]; postInstall = '' wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index d75d3cf943a0a..bc905ee84a06a 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -16,10 +16,10 @@ }@args: stdenv.mkDerivation (args // { - name = "php-${pname}-${version}"; + pname = "php-${php.version}-${pname}"; extensionName = pname; - inherit src; + inherit version src; nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; buildInputs = [ php ] ++ peclDeps ++ buildInputs; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 341e2850437c1..c8af8789fccf3 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -451,6 +451,8 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector pic" '' + optionalString (targetPlatform.libc == "newlib") '' hardening_unsupported_flags+=" stackprotector fortify pie pic" + '' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isx86_32) '' + hardening_unsupported_flags+=" stackprotector" '' + optionalString targetPlatform.isNetBSD '' hardening_unsupported_flags+=" stackprotector fortify" '' + optionalString cc.langAda or false '' diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index f34835eaf096b..fcbf5bcabe6d0 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -147,9 +147,15 @@ runCommand # Begin the new site-start.el by loading the original, which sets some # NixOS-specific paths. Paths are searched in the reverse of the order # they are specified in, so user and system profile paths are searched last. + # + # NOTE: Avoid displaying messages early at startup by binding + # inhibit-message to t. This would prevent the Emacs GUI from showing up + # prematurely. The messages would still be logged to the *Messages* + # buffer. rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled cat >"$siteStart" <<EOF - (load-file "$emacs/share/emacs/site-lisp/site-start.el") + (let ((inhibit-message t)) + (load-file "$emacs/share/emacs/site-lisp/site-start.el")) (add-to-list 'load-path "$out/share/emacs/site-lisp") (add-to-list 'exec-path "$out/bin") ${optionalString nativeComp '' diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 4213598b8a31a..bfa6c0d17cd60 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -2,8 +2,10 @@ , lib , buildPackages , cacert -, cargo -, diffutils +, cargoBuildHook +, cargoCheckHook +, cargoInstallHook +, cargoSetupHook , fetchCargoTarball , runCommandNoCC , rustPlatform @@ -37,14 +39,11 @@ , nativeBuildInputs ? [] , cargoUpdateHook ? "" , cargoDepsHook ? "" -, cargoBuildFlags ? [] , buildType ? "release" , meta ? {} -, target ? rust.toRustTargetSpec stdenv.hostPlatform , cargoVendorDir ? null , checkType ? buildType , depsExtraArgs ? {} -, cargoParallelTestThreads ? true # Toggles whether a custom sysroot is created when the target is a .json file. , __internal_dontAddSysroot ? false @@ -75,19 +74,7 @@ let # against the src fixed-output derivation to check consistency. validateCargoDeps = !(cargoHash == "" && cargoSha256 == ""); - # Some cargo builds include build hooks that modify their own vendor - # dependencies. This copies the vendor directory into the build tree and makes - # it writable. If we're using a tarball, the unpackFile hook already handles - # this for us automatically. - setupVendorDir = if cargoVendorDir == null - then ('' - unpackFile "$cargoDeps" - cargoDepsCopy=$(stripHash $cargoDeps) - '') - else '' - cargoDepsCopy="$sourceRoot/${cargoVendorDir}" - ''; - + target = rust.toRustTargetSpec stdenv.hostPlatform; targetIsJSON = lib.hasSuffix ".json" target; useSysroot = targetIsJSON && !__internal_dontAddSysroot; @@ -103,18 +90,6 @@ let originalCargoToml = src + /Cargo.toml; # profile info is later extracted }; - ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; - cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; - ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; - cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - releaseDir = "target/${shortTarget}/${buildType}"; - tmpDir = "${releaseDir}-tmp"; - - # Specify the stdenv's `diff` by abspath to ensure that the user's build - # inputs do not cause us to find the wrong `diff`. - # The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available. - diff = "${diffutils.nativeDrv or diffutils}/bin/diff"; - in # Tests don't currently work for `no_std`, and all custom sysroots are currently built without `std`. @@ -124,11 +99,22 @@ assert useSysroot -> !(args.doCheck or true); stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs useSysroot { RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); } // { - inherit cargoDeps; + inherit buildAndTestSubdir cargoDeps; + + cargoBuildType = buildType; patchRegistryDeps = ./patch-registry-deps; - nativeBuildInputs = nativeBuildInputs ++ [ cacert git cargo rustc ]; + nativeBuildInputs = nativeBuildInputs ++ [ + cacert + git + cargoBuildHook + cargoCheckHook + cargoInstallHook + cargoSetupHook + rustc + ]; + buildInputs = buildInputs ++ lib.optional stdenv.hostPlatform.isMinGW windows.pthreads; patches = cargoPatches ++ patches; @@ -139,147 +125,18 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u postUnpack = '' eval "$cargoDepsHook" - ${setupVendorDir} - - mkdir .cargo - config="$(pwd)/$cargoDepsCopy/.cargo/config"; - if [[ ! -e $config ]]; then - config=${./fetchcargo-default-config.toml}; - fi; - substitute $config .cargo/config \ - --subst-var-by vendor "$(pwd)/$cargoDepsCopy" - - cat >> .cargo/config <<'EOF' - [target."${rust.toRustTarget stdenv.buildPlatform}"] - "linker" = "${ccForBuild}" - ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${shortTarget}"] - "linker" = "${ccForHost}" - ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 - lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' - "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ] - ''} - ''} - EOF - export RUST_LOG=${logLevel} '' + (args.postUnpack or ""); - # After unpacking and applying patches, check that the Cargo.lock matches our - # src package. Note that we do this after the patchPhase, because the - # patchPhase may create the Cargo.lock if upstream has not shipped one. - postPatch = (args.postPatch or "") + lib.optionalString validateCargoDeps '' - cargoDepsLockfile=$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock - srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock - - echo "Validating consistency between $srcLockfile and $cargoDepsLockfile" - if ! ${diff} $srcLockfile $cargoDepsLockfile; then - - # If the diff failed, first double-check that the file exists, so we can - # give a friendlier error msg. - if ! [ -e $srcLockfile ]; then - echo "ERROR: Missing Cargo.lock from src. Expected to find it at: $srcLockfile" - echo "Hint: You can use the cargoPatches attribute to add a Cargo.lock manually to the build." - exit 1 - fi - - if ! [ -e $cargoDepsLockfile ]; then - echo "ERROR: Missing lockfile from cargo vendor. Expected to find it at: $cargoDepsLockfile" - exit 1 - fi - - echo - echo "ERROR: cargoSha256 is out of date" - echo - echo "Cargo.lock is not the same in $cargoDepsCopy" - echo - echo "To fix the issue:" - echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value' - echo "2. Build the derivation and wait for it to fail with a hash mismatch" - echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field" - echo - - exit 1 - fi - '' + '' - unset cargoDepsCopy - ''; - configurePhase = args.configurePhase or '' runHook preConfigure runHook postConfigure ''; - buildPhase = with builtins; args.buildPhase or '' - ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} - runHook preBuild - - ( - set -x - env \ - "CC_${rust.toRustTarget stdenv.buildPlatform}"="${ccForBuild}" \ - "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ - "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ - "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ - cargo build -j $NIX_BUILD_CORES \ - ${lib.optionalString (buildType == "release") "--release"} \ - --target ${target} \ - --frozen ${concatStringsSep " " cargoBuildFlags} - ) - - runHook postBuild - - ${lib.optionalString (buildAndTestSubdir != null) "popd"} - - # This needs to be done after postBuild: packages like `cargo` do a pushd/popd in - # the pre/postBuild-hooks that need to be taken into account before gathering - # all binaries to install. - mkdir -p $tmpDir - cp -r $releaseDir/* $tmpDir/ - bins=$(find $tmpDir \ - -maxdepth 1 \ - -type f \ - -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \)) - ''; - - checkPhase = args.checkPhase or (let - argstr = "${lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen"; - threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; - in '' - ${lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} - runHook preCheck - echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=${threads} ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} - runHook postCheck - ${lib.optionalString (buildAndTestSubdir != null) "popd"} - ''); - doCheck = args.doCheck or true; strictDeps = true; - inherit releaseDir tmpDir; - - installPhase = args.installPhase or '' - runHook preInstall - - # rename the output dir to a architecture independent one - mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${tmpDir}$') - for target in "''${targets[@]}"; do - rm -rf "$target/../../${buildType}" - ln -srf "$target" "$target/../../" - done - mkdir -p $out/bin $out/lib - - xargs -r cp -t $out/bin <<< $bins - find $tmpDir \ - -maxdepth 1 \ - -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \ - -print0 | xargs -r -0 cp -t $out/lib - rmdir --ignore-fail-on-non-empty $out/lib $out/bin - runHook postInstall - ''; - passthru = { inherit cargoDeps; } // (args.passthru or {}); meta = { diff --git a/pkgs/build-support/rust/fetchCargoTarball.nix b/pkgs/build-support/rust/fetchCargoTarball.nix index c30e88d99b833..3b36554e70752 100644 --- a/pkgs/build-support/rust/fetchCargoTarball.nix +++ b/pkgs/build-support/rust/fetchCargoTarball.nix @@ -21,7 +21,7 @@ in , src ? null , srcs ? [] , patches ? [] -, sourceRoot +, sourceRoot ? "" , hash ? "" , sha256 ? "" , cargoUpdateHook ? "" diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh new file mode 100644 index 0000000000000..54f4512d67ca5 --- /dev/null +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -0,0 +1,35 @@ +declare -a cargoBuildFlags + +cargoBuildHook() { + echo "Executing cargoBuildHook" + + runHook preBuild + + if [ ! -z "${buildAndTestSubdir-}" ]; then + pushd "${buildAndTestSubdir}" + fi + + ( + set -x + env \ + "CC_@rustBuildPlatform@=@ccForBuild@" \ + "CXX_@rustBuildPlatform@=@cxxForBuild@" \ + "CC_@rustTargetPlatform@=@ccForHost@" \ + "CXX_@rustTargetPlatform@=@cxxForHost@" \ + cargo build -j $NIX_BUILD_CORES \ + --target @rustTargetPlatformSpec@ \ + --frozen \ + --${cargoBuildType} \ + ${cargoBuildFlags} + ) + + if [ ! -z "${buildAndTestSubdir-}" ]; then + popd + fi + + runHook postBuild + + echo "Finished cargoBuildHook" +} + +buildPhase=cargoBuildHook diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh new file mode 100644 index 0000000000000..8c5b1a13219a3 --- /dev/null +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -0,0 +1,41 @@ +declare -a checkFlags + +cargoCheckHook() { + echo "Executing cargoCheckHook" + + runHook preCheck + + if [[ -n "${buildAndTestSubdir-}" ]]; then + pushd "${buildAndTestSubdir}" + fi + + if [[ -z ${dontUseCargoParallelTests-} ]]; then + threads=$NIX_BUILD_CORES + else + threads=1 + fi + + argstr="--${cargoBuildType} --target @rustTargetPlatformSpec@ --frozen"; + + ( + set -x + cargo test \ + -j $NIX_BUILD_CORES \ + ${argstr} -- \ + --test-threads=${threads} \ + ${checkFlags} \ + ${checkFlagsArray+"${checkFlagsArray[@]}"} + ) + + if [[ -n "${buildAndTestSubdir-}" ]]; then + popd + fi + + echo "Finished cargoCheckHook" + + runHook postCheck +} + +if [ -z "${checkPhase-}" ]; then + checkPhase=cargoCheckHook +fi diff --git a/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/pkgs/build-support/rust/hooks/cargo-install-hook.sh new file mode 100644 index 0000000000000..e6ffa30070632 --- /dev/null +++ b/pkgs/build-support/rust/hooks/cargo-install-hook.sh @@ -0,0 +1,49 @@ +cargoInstallPostBuildHook() { + echo "Executing cargoInstallPostBuildHook" + + releaseDir=target/@shortTarget@/$cargoBuildType + tmpDir="${releaseDir}-tmp"; + + mkdir -p $tmpDir + cp -r ${releaseDir}/* $tmpDir/ + bins=$(find $tmpDir \ + -maxdepth 1 \ + -type f \ + -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \)) + + echo "Finished cargoInstallPostBuildHook" +} + +cargoInstallHook() { + echo "Executing cargoInstallHook" + + runHook preInstall + + # rename the output dir to a architecture independent one + + releaseDir=target/@shortTarget@/$cargoBuildType + tmpDir="${releaseDir}-tmp"; + + mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep "${tmpDir}$") + for target in "${targets[@]}"; do + rm -rf "$target/../../${cargoBuildType}" + ln -srf "$target" "$target/../../" + done + mkdir -p $out/bin $out/lib + + xargs -r cp -t $out/bin <<< $bins + find $tmpDir \ + -maxdepth 1 \ + -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \ + -print0 | xargs -r -0 cp -t $out/lib + rmdir --ignore-fail-on-non-empty $out/lib $out/bin + runHook postInstall + + echo "Finished cargoInstallHook" +} + + +if [ -z "${installPhase-}" ]; then + installPhase=cargoInstallHook + postBuildHooks+=(cargoInstallPostBuildHook) +fi diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh new file mode 100644 index 0000000000000..0fddd30582a14 --- /dev/null +++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -0,0 +1,84 @@ +cargoSetupPostUnpackHook() { + echo "Executing cargoSetupPostUnpackHook" + + # Some cargo builds include build hooks that modify their own vendor + # dependencies. This copies the vendor directory into the build tree and makes + # it writable. If we're using a tarball, the unpackFile hook already handles + # this for us automatically. + if [ -z $cargoVendorDir ]; then + unpackFile "$cargoDeps" + export cargoDepsCopy=$(stripHash $cargoDeps) + else + cargoDepsCopy="$sourceRoot/${cargoRoot:+$cargoRoot/}${cargoVendorDir}" + fi + + if [ ! -d .cargo ]; then + mkdir .cargo + fi + + config="$(pwd)/$cargoDepsCopy/.cargo/config"; + if [[ ! -e $config ]]; then + config=@defaultConfig@ + fi; + + tmp_config=$(mktemp) + substitute $config $tmp_config \ + --subst-var-by vendor "$(pwd)/$cargoDepsCopy" + cat ${tmp_config} >> .cargo/config + + cat >> .cargo/config <<'EOF' + @rustTarget@ +EOF + + echo "Finished cargoSetupPostUnpackHook" +} + +# After unpacking and applying patches, check that the Cargo.lock matches our +# src package. Note that we do this after the patchPhase, because the +# patchPhase may create the Cargo.lock if upstream has not shipped one. +cargoSetupPostPatchHook() { + echo "Executing cargoSetupPostPatchHook" + + cargoDepsLockfile="$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock" + srcLockfile="$NIX_BUILD_TOP/$sourceRoot/${cargoRoot:+$cargoRoot/}/Cargo.lock" + + echo "Validating consistency between $srcLockfile and $cargoDepsLockfile" + if ! @diff@ $srcLockfile $cargoDepsLockfile; then + + # If the diff failed, first double-check that the file exists, so we can + # give a friendlier error msg. + if ! [ -e $srcLockfile ]; then + echo "ERROR: Missing Cargo.lock from src. Expected to find it at: $srcLockfile" + echo "Hint: You can use the cargoPatches attribute to add a Cargo.lock manually to the build." + exit 1 + fi + + if ! [ -e $cargoDepsLockfile ]; then + echo "ERROR: Missing lockfile from cargo vendor. Expected to find it at: $cargoDepsLockfile" + exit 1 + fi + + echo + echo "ERROR: cargoSha256 is out of date" + echo + echo "Cargo.lock is not the same in $cargoDepsCopy" + echo + echo "To fix the issue:" + echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value' + echo "2. Build the derivation and wait for it to fail with a hash mismatch" + echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field" + echo + + exit 1 + fi + + unset cargoDepsCopy + + echo "Finished cargoSetupPostPatchHook" +} + +postUnpackHooks+=(cargoSetupPostUnpackHook) + +if [ -z ${cargoVendorDir-} ]; then + postPatchHooks+=(cargoSetupPostPatchHook) +fi diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix new file mode 100644 index 0000000000000..e8927e2b542f3 --- /dev/null +++ b/pkgs/build-support/rust/hooks/default.nix @@ -0,0 +1,94 @@ +{ buildPackages +, callPackage +, cargo +, diffutils +, lib +, makeSetupHook +, maturin +, rust +, stdenv +, target ? rust.toRustTargetSpec stdenv.hostPlatform +}: + +let + targetIsJSON = lib.hasSuffix ".json" target; + + # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 + # the "${}" is needed to transform the path into a /nix/store path before baseNameOf + shortTarget = if targetIsJSON then + (lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) + else target; + ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; + cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; + ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; + rustBuildPlatform = rust.toRustTarget stdenv.buildPlatform; + rustTargetPlatform = rust.toRustTarget stdenv.hostPlatform; + rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; +in { + cargoBuildHook = callPackage ({ }: + makeSetupHook { + name = "cargo-build-hook.sh"; + deps = [ cargo ]; + substitutions = { + inherit ccForBuild ccForHost cxxForBuild cxxForHost + rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; + }; + } ./cargo-build-hook.sh) {}; + + cargoCheckHook = callPackage ({ }: + makeSetupHook { + name = "cargo-check-hook.sh"; + deps = [ cargo ]; + substitutions = { + inherit rustTargetPlatformSpec; + }; + } ./cargo-check-hook.sh) {}; + + cargoInstallHook = callPackage ({ }: + makeSetupHook { + name = "cargo-install-hook.sh"; + deps = [ ]; + substitutions = { + inherit shortTarget; + }; + } ./cargo-install-hook.sh) {}; + + cargoSetupHook = callPackage ({ }: + makeSetupHook { + name = "cargo-setup-hook.sh"; + deps = [ ]; + substitutions = { + defaultConfig = ../fetchcargo-default-config.toml; + + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + # The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available. + diff = "${diffutils.nativeDrv or diffutils}/bin/diff"; + + # Target platform + rustTarget = '' + [target."${rust.toRustTarget stdenv.buildPlatform}"] + "linker" = "${ccForBuild}" + ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' + [target."${shortTarget}"] + "linker" = "${ccForHost}" + ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 + lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' + "rustflags" = [ "-C", "target-feature=+crt-static", "-C", "link-arg=-lgcc" ] + ''} + ''} + ''; + }; + } ./cargo-setup-hook.sh) {}; + + maturinBuildHook = callPackage ({ }: + makeSetupHook { + name = "maturin-build-hook.sh"; + deps = [ cargo maturin ]; + substitutions = { + inherit ccForBuild ccForHost cxxForBuild cxxForHost + rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; + }; + } ./maturin-build-hook.sh) {}; +} diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh new file mode 100644 index 0000000000000..7e2599d922405 --- /dev/null +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -0,0 +1,39 @@ +maturinBuildHook() { + echo "Executing maturinBuildHook" + + runHook preBuild + + if [ ! -z "${buildAndTestSubdir-}" ]; then + pushd "${buildAndTestSubdir}" + fi + + ( + set -x + env \ + "CC_@rustBuildPlatform@=@ccForBuild@" \ + "CXX_@rustBuildPlatform@=@cxxForBuild@" \ + "CC_@rustTargetPlatform@=@ccForHost@" \ + "CXX_@rustTargetPlatform@=@cxxForHost@" \ + maturin build \ + --cargo-extra-args="-j $NIX_BUILD_CORES --frozen" \ + --target @rustTargetPlatformSpec@ \ + --manylinux off \ + --strip \ + --release \ + ${maturinBuildFlags-} + ) + + runHook postBuild + + if [ ! -z "${buildAndTestSubdir-}" ]; then + popd + fi + + # Move the wheel to dist/ so that regular Python tooling can find it. + mkdir -p dist + mv target/wheels/*.whl dist/ + + echo "Finished maturinBuildHook" +} + +buildPhase=maturinBuildHook diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/build-support/setup-systemd-units.nix index 4fa2f42c39dc8..4c7ee86669f58 100644 --- a/pkgs/build-support/setup-systemd-units.nix +++ b/pkgs/build-support/setup-systemd-units.nix @@ -58,7 +58,7 @@ unitDir=/etc/systemd/system if [ ! -w "$unitDir" ]; then - unitDir=/etc/systemd-mutable/system + unitDir=/nix/var/nix/profiles/default/lib/systemd/system mkdir -p "$unitDir" fi declare -a unitsToStop unitsToStart diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix index ffe5b0b45816a..efe70efe6c44f 100644 --- a/pkgs/build-support/templaterpm/default.nix +++ b/pkgs/build-support/templaterpm/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation { pname = "nix-template-rpm"; version = "0.1"; - buildInputs = [ makeWrapper python toposort rpm ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python toposort rpm ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index 351db6198846a..26c77e8763622 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "common-updater-scripts"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontUnpack = true; diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index a8f38b1a6c6a0..f54df83219166 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.09"; + version = "5.10"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "1whbxim4diyan97y9pz9k4ck16rmjalw5i1m0dg6ycv3pxv386nz"; + sha256 = "sha256-dRAlNboRny8iP2dNhOHc2uvwpf/WObPC5ssKDjR2h2I="; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 95c223f31f88c..ee10c5bd18b7a 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 77c9a7f1d7498..10f8cc67c7e9e 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,26 +1,26 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1w1y543iypvhwx27qswkvhhiwzd3ik2jklapz2g497f3ppj834g4"; - iosevka-aile = "12dybqmcpq83xiw4k9m9fmkhj204sxb9hnqndb212vvgj3vbl0fm"; - iosevka-curly = "09rl8l9jkqhq811h35x15s4gssig0xrzvas154gg5igrdqha5kk8"; - iosevka-curly-slab = "19l13inmnaysz2mp7x4rh4zffa5n8qd3n727j54dd2581g9f0n9c"; - iosevka-etoile = "0flsdjdq0jsfblnazdw82kflzwvjvqaxzsyifgbn4flgjwy46mhm"; - iosevka-slab = "04wg7aklybwrbali53c22fs5xfgacyfkxw20bhnxqbfcsykriz11"; - iosevka-ss01 = "07a6ghjzk8kf266bgqv8khx54cxl2hfkqnjq6n5s3bbahbs3fh4x"; - iosevka-ss02 = "06prf0jigh1xi00lg46qw4kp416psv1xkijdpbvjkmxgmcbnqx2s"; - iosevka-ss03 = "03ga07y7nmcky3dschlk4cjg3lcxjqra6wvsb8q9vc39qz01cnxr"; - iosevka-ss04 = "0d17p18kbh78f4w0pvslh3r0a52d207dyp4njrqxnpzjn2w8w1kg"; - iosevka-ss05 = "1qh1z1kffid718h2mc0f6wygkwkpc1rlj29h2ljigv8kdp4kcik6"; - iosevka-ss06 = "0b6gn7j5qa23qpay08ri6z9jrqkcsb8m67d84bqs419rw0wdhmfr"; - iosevka-ss07 = "0f5bj8vn9frmmhg5b971gav7379xwlg439sm2vi79vjqlp5ls5gy"; - iosevka-ss08 = "0vqhywgly5w2j0nwmspa2ba7rk1n4jsb3lidngnpkpvpkr2w1n7z"; - iosevka-ss09 = "1ysb28qwqjkxissqsiz67l3fj5kflf94baxwjjvqqi67f72kq8m4"; - iosevka-ss10 = "11sdzyplb1bf8blzmj40brdnvy6z6yghvh91k27bf73rgdby7svk"; - iosevka-ss11 = "0jrn998c8jrkjw7sa429kkgpfp897gdbikr0j9sc5b0fyjci0qdx"; - iosevka-ss12 = "1qrnp3s3abxryi2nf8x4m5l7z83iklksr8mgwcxi07cfi8ix87jr"; - iosevka-ss13 = "0hs3m1vc3l54xj4flgyr8m4mklgqlzf3ffcvwlp8i4a5b9cdxczh"; - iosevka-ss14 = "112l7skaplmrn16h8lw5288ivcw1wm7mvilqrmdgswmvyxkpqdzg"; - iosevka-ss15 = "13bbgjmw20d1dr6h8ckc2zaq0bilx494g5p94a2ighdm5d4sbk4y"; - iosevka-ss16 = "180qfpp9ixjznk7srijbj1l2dzshb9wayqgvfmgqhl94fif23bja"; - iosevka-ss17 = "0f1r0zad32mdqgd0ik08q07ni46w6dm93npz633azn3l9ch6hd41"; + iosevka = "0g32pzxij72fjy0ycwzy23dg06ypmxcg24dk4scvhjp9b5ajx79k"; + iosevka-aile = "0yynkwhanza4y593ajn8hkshk46dl9g84qf1shmy21wd3lqr7psx"; + iosevka-curly = "0zd5hh0hr6prn32yd7fibl2wighv9f6p7jwgfrwcizljai44adnx"; + iosevka-curly-slab = "147bzw9lr8f54yh0hv8887sxy4571563mxjcag0dfw8z3rfffw8c"; + iosevka-etoile = "04jjg4vp0fag7xgiqxnql60gyvlpjmgqqj5q4j3rys9nyw3pl0gi"; + iosevka-slab = "10qwardvknnw6l3yiyji9v02450vfj76lvnlszijv78lfm1xp1qk"; + iosevka-ss01 = "12z1yjspzcbzgs224n1dxis4ghybfkzpw4dwr1wzza553kplwz6w"; + iosevka-ss02 = "08vrlzcyqa83mn2155p4h6hsk20jx3sv0yqimxfsyrwcalc63dcq"; + iosevka-ss03 = "0rhp4rdza36hazs20h4bk524xsgx54pxbw69k235km71m9x6ba59"; + iosevka-ss04 = "1ijjcy8z0fbfrw2fjqnmxbi9l6r41sixk72h3vp75gzrkq7dbh86"; + iosevka-ss05 = "06q9wxkyp7iv9pz3xj6d3v8ay82425wcgl9dybr3dfp4mcsdn7zz"; + iosevka-ss06 = "10pdw28dgdk5343rzbbj5mgmagv4ndl2gg4f02kzq0vlv5xh8vj6"; + iosevka-ss07 = "16xym710sq398zi223cjzxpcblc851ypl7v2dzhvskgsasvj4ypr"; + iosevka-ss08 = "14mqs6gi71p544asr1sz48g6q9zl6zj6sadhhcf8gdsnwa475ds2"; + iosevka-ss09 = "049va8vpzjczslirsxklwcpcsiaqrpc2zm9rmnf5qfyf7f1rn4yd"; + iosevka-ss10 = "1g8s9d7vlb2yx5d8cgsxcl5hb38g1f80d3l04lj2gr22lzk0y271"; + iosevka-ss11 = "15j3wfz8ybszp702c8ycv8kwnbdpa07w8kw9njhsfzvb5iw1xx0i"; + iosevka-ss12 = "1k5250sik2yfa5s5dxaqp0s45wfbxh1s1xn06qjj81ywmw9hy6yg"; + iosevka-ss13 = "1ym8mn2qqwys01wrkplx11kajkfi0x5vzn8m234cbzn8drlgh0l5"; + iosevka-ss14 = "0wkc7kwz6bzxxijycm4d4samy83zsghd8lyq0yn6g48rb6kj9fgw"; + iosevka-ss15 = "0j46sr85vcq25n8ia7nk8rgr3rmgr69wwf7pgllllscablacw73k"; + iosevka-ss16 = "017vipi1cmcjglx0x6da6ans1bsr3xlr43n4mv5qj7h50j1dv3l6"; + iosevka-ss17 = "0kbvy54v543znrzb9584mv6h96hfp9fndxb6wg32clqhzm2yh7fw"; } diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 8774913c83ccc..bf2fbe256fa7b 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,11 +1,12 @@ { lib, fetchzip }: let - version = "0.022"; + version = "0.034"; + in fetchzip { name = "JuliaMono-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip"; - sha256 = "sha256-/MVT6n842sSiuPZNYxN3q1vn6yvMvmcTEDyvAd2GikA="; + sha256 = "sha256:0xx3mhzs17baaich67kvwyzqg8h9ga11jrja2i8sxx4861dp1z85"; postFetch = '' mkdir -p $out/share/fonts/truetype @@ -14,9 +15,12 @@ in fetchzip { meta = { description = "A monospaced font for scientific and technical computing"; + longDescription = '' + JuliaMono is a monospaced typeface designed for use in text editing environments that require a wide range of specialist and technical Unicode characters. It was intended as a fun experiment to be presented at the 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t physically happen in Lisbon, but online). + ''; maintainers = with lib.maintainers; [ suhr ]; platforms = with lib.platforms; all; - homepage = "https://juliamono.netlify.app/"; + homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/"; license = lib.licenses.ofl; }; } diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix index caab674393a18..af8a157d491ca 100644 --- a/pkgs/data/misc/nixos-artwork/icons.nix +++ b/pkgs/data/misc/nixos-artwork/icons.nix @@ -1,13 +1,25 @@ -{ stdenv, fetchFromGitHub, imagemagick }: +{ stdenv +, fetchFromGitHub +, imagemagick +}: stdenv.mkDerivation { - name = "nixos-icons-2017-03-16"; - srcs = fetchFromGitHub { + pname = "nixos-icons"; + version = "2021-02-24"; + + src = fetchFromGitHub { owner = "NixOS"; repo = "nixos-artwork"; - rev = "783ca1249fc4cfe523ad4e541f37e2229891bc8b"; - sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a"; + rev = "488c22aad523c709c44169d3e88d34b4691c20dc"; + sha256 = "ZoanCzn4pqGB1fyMzMyGQVT0eIhNdL7ZHJSn1VZWVRs="; }; - makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; - nativeBuildInputs = [ imagemagick ]; + + nativeBuildInputs = [ + imagemagick + ]; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "prefix=" + ]; } diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index f7f139a9ea97d..5297fe056837e 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-01-12"; + version = "2021-02-04"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1h6y89aajygbp1rc3d5dw2vgb64a3hiajlifb4xnzhycc77vjskr"; + sha256 = "sha256-CDym+yqLu7QpqmdUpXAbJTCjQf/r9D1sl7ZdpaWaXFE="; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index c88c1e0f525fa..324ab865b11e5 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -33,14 +33,9 @@ let - icon = fetchurl { - url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/4f041870efa1a6f0799ef4b32bb7be2cafee7a74/logo/nixos.svg"; - sha256 = "0b0dj408c1wxmzy6k0pjwc4bzwq286f1334s3cqqwdwjshxskshk"; - }; - override = substituteAll { src = ./org.gnome.login-screen.gschema.override; - inherit icon; + icon = "${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg"; }; in diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 98d87dc09c857..603aaf1744b72 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -58,6 +58,7 @@ , shared-mime-info , sound-theme-freedesktop , tracker +, tracker-miners , tzdata , udisks2 , upower @@ -75,6 +76,7 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "09i011hf23s2i4wim43vjys7y4y43cxl3kyvrnrwqvqgc5n0144d"; }; + # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html prePatch = (import ../gvc-with-ucm-prePatch.nix { inherit fetchFromGitLab; @@ -100,6 +102,7 @@ stdenv.mkDerivation rec { clutter-gtk colord colord-gtk + epoxy fontconfig gdk-pixbuf glib @@ -121,6 +124,7 @@ stdenv.mkDerivation rec { libgudev libhandy libkrb5 + libnma libpulseaudio libpwquality librsvg @@ -131,13 +135,12 @@ stdenv.mkDerivation rec { modemmanager mutter # schemas for the keybindings networkmanager - libnma polkit samba tracker + tracker-miners # for search locations dialog udisks2 upower - epoxy ]; patches = [ @@ -159,6 +162,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/64686cfee330849945f6ff4dcc43393eb1a6e59c.patch"; sha256 = "4VJU0q6qOtGzd/hmDncckInfEjCkC8+lXmDgxwc4VJU="; }) + # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1173 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/27e1140c9d4ad852b4dc6a132a14cd5532d52997.patch"; + sha256 = "nU3szjKfXpRek8hhsxiCJNgMeDeIRK3QVo82D9R+kL4="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 2b84442620db1..61f8761ce8175 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , gettext , meson @@ -15,9 +16,11 @@ , gnome3 , libhandy , librsvg +, rustc +, cargo }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "gnome-tour"; version = "3.38.0"; @@ -30,6 +33,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ appstream-glib + cargo desktop-file-utils gettext glib # glib-compile-resources @@ -37,6 +41,8 @@ rustPlatform.buildRustPackage rec { ninja pkg-config python3 + rustPlatform.cargoSetupHook + rustc wrapGAppsHook ]; @@ -48,12 +54,6 @@ rustPlatform.buildRustPackage rec { librsvg ]; - # Don't use buildRustPackage phases, only use it for rust deps setup - configurePhase = null; - buildPhase = null; - checkPhase = null; - installPhase = null; - postPatch = '' chmod +x build-aux/meson_post_install.py patchShebangs build-aux/meson_post_install.py diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 8cc68b7556935..8fe232dff7b48 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -1,7 +1,7 @@ { aspell, audiofile , gsmakeDerivation , cups -, fetchurl +, fetchurl, fetchpatch , gmp, gnutls , libffi, binutils-unwrapped , libjpeg, libtiff, libpng, giflib, libungif @@ -33,7 +33,13 @@ gsmakeDerivation { portaudio libiberty ]; - patches = [ ./fixup-paths.patch ]; + patches = [ + ./fixup-paths.patch + (fetchpatch { # for icu68 compatibility, remove with next update(?) + url = "https://github.com/gnustep/libs-base/commit/06fa7792a51cb970e5d010a393cb88eb127830d7.patch"; + sha256 = "150n1sa34av9ywc04j36jvj7ic9x6pgr123rbn2mx5fj76q23852"; + }) + ]; meta = { description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index e945af64d90ca..8356a608c8339 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -1,4 +1,4 @@ -{ gsmakeDerivation, fetchurl, base }: +{ gsmakeDerivation, fetchurl, fetchpatch, base }: let version = "0.28.0"; in @@ -9,7 +9,13 @@ gsmakeDerivation { sha256 = "05wk8kbl75qj0jgawgyv9sp98wsgz5vl1s0d51sads0p0kk2sv8z"; }; buildInputs = [ base ]; - patches = [ ./fixup-all.patch ]; + patches = [ + ./fixup-all.patch + (fetchpatch { # for icu68 compatibility, remove with next update(?) + url = "https://github.com/gnustep/libs-gui/commit/05572b2d01713f5caf07f334f17ab639be8a1cff.patch"; + sha256 = "04z287dk8jf3hdwzk8bpnv49qai2dcdlh824yc9bczq291pjy2xc"; + }) + ]; meta = { description = "A GUI class library of GNUstep"; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index e45d25cfa3421..38fcb8d40b417 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, substituteAll , desktop-file-utils , pkg-config , writeScript diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index 9a923025c94df..fd59b173a732f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }: +{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }: mkXfceDerivation { category = "apps"; diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index b0b4268db6ec6..4e9732ce1c4a6 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ thunar ] ++ thunarPlugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram "$out/bin/thunar" \ diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index de8ae12b8952b..12f487f1784c7 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -102,8 +102,6 @@ lib.makeScope pkgs.newScope (self: with self; { #### PANEL PLUGINS - xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { }; - xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { }; xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix deleted file mode 100644 index e35dc5922d930..0000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: -stdenv.mkDerivation rec { - pname = "vala-panel-appmenu-xfce"; - version = "0.6.94"; - - src = "${fetchFromGitHub { - owner = "rilian-la-te"; - repo = "vala-panel-appmenu"; - rev = version; - fetchSubmodules = true; - - sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p"; - }}/subprojects/appmenu-gtk-module"; - - nativeBuildInputs = [ cmake vala ]; - buildInputs = [ glib gtk2 gtk3 ]; - - configurePhase = '' - cmake . -DGTK3_INCLUDE_GDK= - ''; - installPhase = '' - make DESTDIR=output install - cp -r output/var/empty/* "$out" - ''; - - meta = with lib; { - description = "Port of the Unity GTK Module"; - license = licenses.lgpl3; - maintainers = with maintainers; [ jD91mZM2 ]; - }; -} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix deleted file mode 100644 index d8946c98a385a..0000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkg-config, cmake, vala, libxml2, - glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, - xfce, libwnck3, libdbusmenu, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "xfce4-vala-panel-appmenu-plugin"; - version = "0.7.3"; - - src = fetchFromGitHub { - owner = "rilian-la-te"; - repo = "vala-panel-appmenu"; - rev = version; - fetchSubmodules = true; - - sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw"; - }; - - nativeBuildInputs = [ pkg-config cmake vala libxml2.bin ]; - buildInputs = [ (callPackage ./appmenu-gtk-module.nix {}) - glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy - at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf - libwnck3 libdbusmenu gobject-introspection ]; - - patches = [ - (substituteAll { - src = ./fix-bamf-dependency.patch; - bamf = bamf; - }) - ]; - - cmakeFlags = [ - "-DENABLE_XFCE=ON" - "-DENABLE_BUDGIE=OFF" - "-DENABLE_VALAPANEL=OFF" - "-DENABLE_MATE=OFF" - "-DENABLE_JAYATANA=OFF" - "-DENABLE_APPMENU_GTK_MODULE=OFF" - ]; - - preConfigure = '' - mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake - ''; - - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.gitLister src.meta.homepage; - }; - - meta = with lib; { - description = "Global Menu applet for XFCE4"; - license = licenses.lgpl3; - maintainers = with maintainers; [ jD91mZM2 ]; - broken = true; - }; -} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch deleted file mode 100644 index 1ed86a67f727f..0000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -+++ source/cmake/FindBAMF.cmake 2018-05-11 17:03:44.385917811 +0200 -@@ -80,9 +80,7 @@ - - find_program(BAMF_DAEMON_EXECUTABLE - bamfdaemon -- HINTS ${CMAKE_INSTALL_FULL_LIBDIR} -- ${CMAKE_INSTALL_FULL_LIBEXECDIR} -- ${BAMF_LIBDIR} -+ HINTS "@bamf@/libexec/bamf/" - PATH_SUFFIXES bamf - ) - diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 4c440ab97dbb6..2eff5e553ea75 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -23,6 +23,7 @@ , glib , pango , gdk-pixbuf +, gtk2 , libpng12 , expat , freetype @@ -56,7 +57,7 @@ let gcc.cc.lib gdk-pixbuf glib - gtk3 + gtk2 libpng12 libusb-compat-0_1 pango @@ -240,7 +241,7 @@ stdenv.mkDerivation rec { patchelf --debug \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "${teensy_libpath}" \ - $out/share/arduino/hardware/tools/teensy + $out/share/arduino/hardware/tools/teensy{,_ports,_reboot,_restart,_serialmon} ''} ''; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 0fcad6c333f88..ed8935b00421e 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -4,16 +4,31 @@ sourcePerArch: , lib , fetchurl , autoPatchelfHook +, makeWrapper +# minimum dependencies , alsaLib -, freetype , fontconfig -, zlib -, xorg +, freetype , libffi +, xorg +, zlib +# runtime dependencies +, cups +# runtime dependencies for GTK+ Look and Feel +, gtkSupport ? true +, cairo +, glib +, gtk3 }: let cpuName = stdenv.hostPlatform.parsed.cpu.name; + runtimeDependencies = [ + cups + ] ++ lib.optionals gtkSupport [ + cairo glib gtk3 + ]; + runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; in let result = stdenv.mkDerivation rec { @@ -28,11 +43,19 @@ let result = stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst - xorg.libXi xorg.libXrender stdenv.cc.cc.lib + alsaLib # libasound.so wanted by lib/libjsound.so + fontconfig + freetype + stdenv.cc.cc.lib # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + zlib ] ++ lib.optional stdenv.isAarch32 libffi; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = 1; @@ -57,6 +80,16 @@ let result = stdenv.mkDerivation rec { cat <<EOF >> "$out/nix-support/setup-hook" if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF + + # We cannot use -exec since wrapProgram is a function but not a command. + # + # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it + # breaks building OpenJDK (#114495). + for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do + if patchelf --print-interpreter "$bin" &> /dev/null; then + wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" + fi + done ''; preFixup = '' diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index efc94e4baf487..d062c8605b66b 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; rev = "icedtea-web-${version}"; - sha256 = "sha256-AC6D6n8jLdATXIXrDTHhs2QFnIZNaaZvJyFEqfxCxYQ="; + sha256 = "sha256-meqbFLGwCMpFoOVAfvtriRAS8ZWr374eSN3m0CdC2aM="; }; nativeBuildInputs = [ autoreconfHook pkg-config bc ]; diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 2654cc467fe26..3799f2c921271 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { rev = "15471e75f3d65b93150f414ebcaf59a03054b68d"; }; - buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool - jdk perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gmp which flex bison autoconf automake libtool jdk perl ]; preConfigure = '' cd aldor ; diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix index 4c84ef8c42b00..10cf91579a404 100644 --- a/pkgs/development/compilers/chicken/4/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix @@ -18,7 +18,8 @@ in stdenv.mkDerivation ({ name = "chicken-${name}"; propagatedBuildInputs = buildInputs; - buildInputs = [ makeWrapper chicken ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ chicken ]; CSC_OPTIONS = lib.concatStringsSep " " cscOptions; diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 7102126206ae4..a6d19eaeb137a 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -17,7 +17,8 @@ in stdenv.mkDerivation ({ name = "chicken-${name}"; propagatedBuildInputs = buildInputs; - buildInputs = [ makeWrapper chicken ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ chicken ]; CSC_OPTIONS = lib.concatStringsSep " " cscOptions; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index fc5f478177cb4..2c9999ccdb490 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { ./fuel-dir.patch ]; - buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with xorg; [ git rlwrap curl pkg-config perl libX11 pango cairo gtk2 gdk-pixbuf gtkglext mesa libXmu libXt libICE libSM openssl unzip ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 0b7ac647529dd..5cd0609960dfd 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -9,7 +9,7 @@ # 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that let - version = "2.0.10-2"; + version = "2.0.12"; # as of 2.0.10 a suffix is being added. That may or may not disappear and then # come back, so just leave this here. @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz"; - sha256 = "sha256-ZNViZGjdJKMzKyBfOr0KWBq33hsGCi1X4hhkBmz9Q7c="; + sha256 = "sha256-umzvf4I6LSgWYimYLvySYDnUIxPEDiL+DGd2wT0AFbI="; }; postPatch = '' diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 07b0921ec1841..1502b09cca6a8 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langAda langGo; + inherit version hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index fa7881e398a87..93c9dde61fc34 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -78,7 +78,11 @@ let majorVersion = "6"; ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb"; + sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2"; + }); javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 2ea9033ba63ae..d9b4c639b5abc 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -72,6 +72,10 @@ let majorVersion = "7"; }) ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb"; + sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2"; + }) ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # Obtain latest patch with ../update-mcfgthread-patches.sh diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 4bdec26fd993f..f7ec7b6ee2d9c 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -94,9 +94,6 @@ let # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" - ] ++ lib.optionals (targetPlatform.libc == "musl") [ - # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 - "--disable-libmpx" ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); @@ -147,6 +144,10 @@ let (lib.enableFeature enablePlugin "plugin") ] + # Support -m32 on powerpc64le + ++ lib.optional (targetPlatform.system == "powerpc64le-linux") + "--enable-targets=powerpcle-linux" + # Optional features ++ lib.optional (isl != null) "--with-isl=${isl}" ++ lib.optionals (cloog != null) [ @@ -181,6 +182,9 @@ let # On Illumos/Solaris GNU as is preferred "--with-gnu-as" "--without-gnu-ld" ] + ++ lib.optional (targetPlatform.libc == "musl") + # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 + "--disable-libmpx" ++ lib.optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [ "--disable-libsanitizer" "--disable-symvers" diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 4f724929232d8..5e6621dbe7171 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ujQ7emfGhzpRGeZ6RGZ57hFX4aIflTcwE9IEUMYb/ZI="; + sha256 = "sha256-KAcb+YNfdNc5LJIApuzjXKnPTFOK0C5Jui32nij4O4U="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-/SudEQynLkLl7Y731Uqm9AkEugTCnq4PFFRQcwz+qL8="; + cargoSha256 = "sha256-Hxat6UZziIxHGLPydnnmgzdwtvjaeeqOgD+ZC823uJU="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 3060e6d4e5632..92c1cbdfc18bb 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -150,6 +150,13 @@ stdenv.mkDerivation rec { ./skip-nohup-tests.patch ./go_no_vendor_checks-1_14.patch + # support TZ environment variable starting with colon + (fetchpatch { + name = "tz-support-colon.patch"; + url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch"; + sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f"; + }) + # fix rare TestDontCacheBrokenHTTP2Conn failure (fetchpatch { url = "https://github.com/golang/go/commit/ea1437a8cdf6bb3c2d2447833a5d06dbd75f7ae4.patch"; diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 1326310405657..4432b1fe895d4 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -158,6 +158,13 @@ stdenv.mkDerivation rec { ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch ./go_no_vendor_checks.patch + + # support TZ environment variable starting with colon + (fetchpatch { + name = "tz-support-colon.patch"; + url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch"; + sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f"; + }) ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 (if stdenv.isAarch32 diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix index 96ba9afc2379b..3a8fca2c1a05b 100644 --- a/pkgs/development/compilers/graalvm/community-edition.nix +++ b/pkgs/development/compilers/graalvm/community-edition.nix @@ -1,7 +1,37 @@ -{ lib, stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath, Foundation, openssl }: +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, setJavaClassPath +, makeWrapper +# minimum dependencies +, Foundation +, alsaLib +, fontconfig +, freetype +, glibc +, openssl +, perl +, unzip +, xorg +, zlib +# runtime dependencies +, cups +# runtime dependencies for GTK+ Look and Feel +, gtkSupport ? true +, cairo +, glib +, gtk3 +}: let platform = if stdenv.isDarwin then "darwin-amd64" else "linux-amd64"; + runtimeDependencies = [ + cups + ] ++ lib.optionals gtkSupport [ + cairo glib gtk3 + ]; + runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; common = javaVersion: let javaVersionPlatform = "${javaVersion}-${platform}"; @@ -50,7 +80,27 @@ let url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersionPlatform}-${version}.jar"; }) ]; - nativeBuildInputs = [ unzip perl ]; + + buildInputs = lib.optionals stdenv.isLinux [ + alsaLib # libasound.so wanted by lib/libjsound.so + fontconfig + freetype + openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so + stdenv.cc.cc.lib # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + zlib + ]; + + # Workaround for libssl.so.10 wanted by TruffleRuby + # Resulting TruffleRuby cannot use `openssl` library. + autoPatchelfIgnoreMissingDeps = true; + + nativeBuildInputs = [ unzip perl autoPatchelfHook makeWrapper ]; + unpackPhase = '' unpack_jar() { jar=$1 @@ -136,32 +186,28 @@ let dontStrip = true; - # copy-paste openjdk's preFixup preFixup = '' + # We cannot use -exec since wrapProgram is a function but not a + # command. + # + # jspawnhelper is executed from JVM, so it doesn't need to wrap it, + # and it breaks building OpenJDK (#114495). + for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' -not -name jspawnhelper ); do + if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then + wrapProgram "$bin" \ + --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" + fi + done + + # copy-paste openjdk's preFixup # Set JAVA_HOME automatically. mkdir -p $out/nix-support cat <<EOF > $out/nix-support/setup-hook if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF - ''; - - postFixup = '' - rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64:$out/jre/languages/ruby/lib/cext"; - "11" = "$out/lib/jli:$out/lib/server:$out/lib:$out/languages/ruby/lib/cext"; - }.${javaVersion} - }:${ - lib.makeLibraryPath [ - stdenv.cc.cc.lib # libstdc++.so.6 - zlib # libz.so.1 - ]}" - ${lib.optionalString stdenv.isLinux '' - for f in $(find $out -type f -perm -0100); do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true - patchelf --set-rpath "$rpath" "$f" || true - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi - done - ''} + find "$out" -name libfontmanager.so -exec \ + patchelf --add-needed libfontconfig.so {} \; ''; # $out/bin/native-image needs zlib to build native executables. diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index cd613c1b33be5..2ddc5b3d3a891 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -12,7 +12,8 @@ in stdenv.mkDerivation { }; propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper unzip ] ; + buildInputs = [ unzip ] ; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 3a3e384ad9827..2e03112d827d4 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "0kab4zmkxffg98a3rx95756jlwhxflalin5w05g1anpwxv175xbk"; + src = fetch "clang" "12sm91qx2m79cvj75a9aazf2x8xybjbd593dv6v7rxficpq8i0ha"; inherit clang-tools-extra_src; unpackPhase = '' diff --git a/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix index 091f327550b88..5e9e436768511 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "1z470r8c5aahdwkmflglx998n0i77j8b1c69d7cir1kf27qy6yq8"; + src = fetch pname "0x1j8ngf1zj63wlnns9vlibafq48qcm72p4jpaxkmkb4qw0grwfy"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index ca9ef4382b4b5..e4d9f45c955eb 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -6,7 +6,7 @@ }: let - release_version = "11.0.1"; + release_version = "11.1.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs @@ -17,7 +17,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "1j8n6n4l54k2lrdxh266y1fl4z8vy5dc76wsf0csk5n3ikfi38ic"; + clang-tools-extra_src = fetch "clang-tools-extra" "18n1w1hkv931xzq02b34wglbv6zd6sd0r5kb8piwvag7klj7qw3n"; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix index 7a34977afe242..0bb1ae33acd96 100644 --- a/pkgs/development/compilers/llvm/11/libc++/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "0gaybwkn76vhakvipxslp7pmv2wm7agxkqwk5f5aizhzc9lzdmcz"; + src = fetch "libcxx" "1rgqsqpgi0vkga5d7hy0iyfsqgzfz7q1xy7afdfa1snp1qjks8xv"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/11/libc++abi.nix b/pkgs/development/compilers/llvm/11/libc++abi.nix index 22e4ac4abe4ca..d941044ca6058 100644 --- a/pkgs/development/compilers/llvm/11/libc++abi.nix +++ b/pkgs/development/compilers/llvm/11/libc++abi.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "0gv8pxq95gvsybldj21hdfkmm0r5cn1z7jhd72l231n0lmb70saa"; + src = fetch "libcxxabi" "1azcf31mxw59hb1x17xncnm3dyw90ylh8rqx462lvypqh3nr6c8l"; nativeBuildInputs = [ cmake ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix index 1b5fe0f578805..0c635cabc0a97 100644 --- a/pkgs/development/compilers/llvm/11/libunwind.nix +++ b/pkgs/development/compilers/llvm/11/libunwind.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "0zsixkaiwp007afxlpsf5dc7wfrv8sj9wxzjw6f1r4bjv1rv3cvd"; + src = fetch pname "1vpqs2c358v8fbr1r8jmzkfqk12jllimjcfmgxga127ksq9b37nj"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/11/lld.nix b/pkgs/development/compilers/llvm/11/lld.nix index cead886f49b7a..1a16184a6e71a 100644 --- a/pkgs/development/compilers/llvm/11/lld.nix +++ b/pkgs/development/compilers/llvm/11/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "1dq82dkam8x2niha18v7ckh30zmzyclydzipqkf7h41r3ah0vfk0"; + src = fetch pname "1kk61i7z5bi9i11rzsd2b388d42if1c7a45zkaa4mk0yps67hyh1"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix index fcc73cfdeb6dd..2f54305736ac0 100644 --- a/pkgs/development/compilers/llvm/11/lldb.nix +++ b/pkgs/development/compilers/llvm/11/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "1yzjbsn81l2r3v9js2fxrglkwvz1f2rxyxh6430nydbrs0bqklz8"; + src = fetch pname "1vlyg015dyng43xqb8cg2l6r9ix8klibxsajazbfnckdnh54hwxj"; patches = [ ./lldb-procfs.patch ]; diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix index 868da1a5b2078..cb44643ff78f2 100644 --- a/pkgs/development/compilers/llvm/11/llvm.nix +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "0a5mb65xa5bal8q6cb37xgkqis2bip87fsafgq3wbsva9cjprn6c"; - polly_src = fetch "polly" "1smrqm9s0r2g9h0v0nil6y9wn2ih4l5bddk4dhgn538ngc7cxpq8"; + src = fetch pname "199yq3a214avcbi4kk2q0ajriifkvsr0l2dkx3a666m033ihi1ff"; + polly_src = fetch "polly" "031r23ijhx7v93a5n33m2nc0x9xyqmx0d8xg80z7q971p6qd63sq"; unpackPhase = '' unpackFile $src diff --git a/pkgs/development/compilers/llvm/11/openmp.nix b/pkgs/development/compilers/llvm/11/openmp.nix index 5503a98ae5f64..c99358cd28780 100644 --- a/pkgs/development/compilers/llvm/11/openmp.nix +++ b/pkgs/development/compilers/llvm/11/openmp.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetch +, fetchpatch , cmake , llvm , perl @@ -11,7 +12,16 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "19rcv25y41ww3zlfg0lwprzijl3cn7jgc0v5540jzpp7j0ds45ad"; + src = fetch pname "0bh5cswgpc79awlq8j5i7hp355adaac7s6zaz0zwp6mkflxli1yi"; + + patches = [ + # Fix compilation on aarch64-darwin, remove after the next release. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/7b5254223acbf2ef9cd278070c5a84ab278d7e5f.patch"; + sha256 = "sha256-A+9/IVIoazu68FK5H5CiXcOEYe1Hpp4xTx2mIw7m8Es="; + stripLen = 1; + }) + ]; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index e063c4c09217c..c5e767a46cde4 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "ef093ae81424c4f3fe696eff9aefb5fb66899e11bb17ae0326adfb70d09c1c1f"; }; - buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper - readline ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gcc flex bison texinfo jdk erlang readline ]; patchPhase = '' # Fix calls to programs in /bin diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 8366fd77a47af..b043187e6c1ee 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { TK_LIBRARY = "${tk-8_5}/lib/tk8.5"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir $out diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 27427e75d0039..75b1a0f002039 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -4,10 +4,10 @@ , pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }: let - version = "1.4.2"; + version = "1.4.4"; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - sha256 = "0q8i56343b69f1bh48a8vxkqman9i2kscyj0lf017n3xfy1pb903"; + sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd"; }; meta = with lib; { @@ -156,13 +156,13 @@ let nimble-unwrapped = stdenv.mkDerivation rec { pname = "nimble-unwrapped"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nimble"; rev = "v" + version; - sha256 = "0vx0mdk31n00dr2rhiip6f4x7aa3z3mnblnmwk7f65ixd5hayq6y"; + sha256 = "1idb4r0kjbqv16r6bgmxlr13w2vgq5332hmnc8pjbxiyfwm075x8"; }; nativeBuildInputs = [ nim-unwrapped ]; diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix index c422d2a15a3f3..0662e66e0b6ab 100644 --- a/pkgs/development/compilers/ocaml/4.12.nix +++ b/pkgs/development/compilers/ocaml/4.12.nix @@ -1,9 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "12"; - patch_version = "0-beta1"; - src = fetchTarball { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~beta1.tar.xz"; - sha256 = "1rny74mi0knl8byqg2naw1mgvn22c2zihlwvzbkd56j97flqsxsm"; - }; + patch_version = "0"; + sha256 = "1hxy349jfa2vkfgmxf6pvd9w4z5bmcgsg0fxfdabcghyvjw9vvir"; } diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 18440a718d19d..a24dca373f1ee 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "9"; - build = "11"; + update = "10"; + build = "9"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; @@ -22,7 +22,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7"; + sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw"; }; nativeBuildInputs = [ pkg-config autoconf ]; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 7a6cdf4d70520..41f4befe469fb 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -83,11 +83,9 @@ let result = stdenv.mkDerivation rec { sha256 = sha256.${stdenv.hostPlatform.system}; }; - nativeBuildInputs = [ file ] + nativeBuildInputs = [ file makeWrapper ] ++ lib.optional installjce unzip; - buildInputs = [ makeWrapper ]; - # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = 1; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 741d0ec7d1c35..6d7f05ebdae7e 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.13.8"; + version = "0.14.0"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "058w8w24g7xbdkn5l97jfj9dcg81vkfh3w8112anj982lynk6391"; + sha256 = "0dfnn5ar7zgvgvxcvw5f6vwpkgkwa017y07s7mvdv44zf4hzsj3s"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "01xb9sl6rmg02ypdrv4n0mkzmdr5y9rajcdmg9c3j46q7z6q9mxy"; + sha256 = "1l3i7mxlzb2dkq6ff37rvnaarikxzxj0fg9i2kk26s8pz7vpqgjh"; }; diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 770cc3415f2c0..ce4250f675e9a 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -83,8 +83,8 @@ rec { license = [ licenses.mit licenses.asl20 ]; }; - buildInputs = [ makeWrapper bash ] - ++ lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ] ++ lib.optional stdenv.isDarwin Security; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 4b1f572bebb88..584b1fdbe438e 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -12,7 +12,8 @@ rec { }; buildRustPackage = callPackage ../../../build-support/rust { - inherit rustc cargo fetchCargoTarball; + inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook + fetchCargoTarball rustc; }; rustcSrc = callPackage ./rust-src.nix { @@ -22,4 +23,9 @@ rec { rustLibSrc = callPackage ./rust-lib-src.nix { inherit rustc; }; + + # Hooks + inherit (callPackage ../../../build-support/rust/hooks { + inherit cargo; + }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; } diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index ee860d782580c..aa55866def515 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -2,7 +2,7 @@ , openssh, openssl, pkg-config, cmake, zlib, curl, libiconv , CoreFoundation, Security }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "rls"; inherit (rustPlatform.rust.rustc) src version; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { preBuild = '' # client tests are flaky - rm tests/client.rs + rm ${buildAndTestSubdir}/tests/client.rs ''; # a nightly compiler is required unless we use this cheat code. @@ -28,8 +28,8 @@ rustPlatform.buildRustPackage { # rls-rustc links to rustc_private crates CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ] + nativeBuildInputs = [ pkg-config cmake makeWrapper ]; + buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ] ++ (lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index cb42235bc8e2a..8bdbbadc9d60d 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 93eff278dc09e..a0a5f1a2b22c5 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ jre ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index b173de58049bc..66a634914dfba 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ jre ncurses.dev ] ; - buildInputs = [ makeWrapper ] ; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index 113b22768d9f9..91eb9fc84172d 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "12jn50h5jz0ac1vzld2mb94p1dyc8h0mk0hip2wj5xqk1dbzwxl4"; }; - buildInputs = [ cpio rsync makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cpio rsync ]; unpackPhase = '' ${xar}/bin/xar -xf $src diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 0aee1ca1f3943..218b207f24355 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -40,7 +40,8 @@ buildGoModule rec { ''; subPackages = [ "." ]; - buildInputs = [ llvm clang-unwrapped makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ llvm clang-unwrapped ]; propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ]; postInstall = '' diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index f7e338cf43ff4..8b74f46fd0409 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { sha256 = "0nclr3d8ap0y5cg36i7g4ggdqci6m5q27y9f26b57km8p266kcpy"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # Any packages that depend on the compiler have a transitive # dependency on the Urn runtime support. propagatedBuildInputs = [ urn-rt ]; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 5d891a6d19f37..2356f3cea6501 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.9+3905"; + version = "0.9+3962"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "4e741adda976260f620e5787d6db3cb28e0e35e7"; - sha256 = "0ml4c7vfzmivcc289d12m6ki82qdsg5wj00f2aamcvq1y7l4062x"; + rev = "5d0cc54f5c36dea1d989438426a321b4554257c8"; + sha256 = "1c85kga95lin6rcpr7cf80wr9f1a6irdrld9g23zmqdrxhick8y7"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 2bc90539be1e6..dd1660d9fec77 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -1,7 +1,24 @@ -{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib -, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg -, swingSupport ? true }: +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, unzip +, makeWrapper +, setJavaClassPath +, zulu +# minimum dependencies +, alsaLib +, fontconfig +, freetype +, xorg +# runtime dependencies +, cups +# runtime dependencies for GTK+ Look and Feel +, gtkSupport ? stdenv.isLinux +, cairo +, glib +, gtk3 +}: let version = "8.48.0.53"; @@ -14,14 +31,12 @@ let hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; extension = if stdenv.isDarwin then "zip" else "tar.gz"; - libraries = [ - stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL - xorg.libXxf86vm alsaLib fontconfig freetype pango - gtk2 cairo gdk-pixbuf atk - ] ++ (lib.optionals swingSupport (with xorg; [ - xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp - xorg.libXt xorg.libXrender stdenv.cc.cc - ])); + runtimeDependencies = [ + cups + ] ++ lib.optionals gtkSupport [ + cairo glib gtk3 + ]; + runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; in stdenv.mkDerivation { inherit version openjdk platform hash extension; @@ -33,26 +48,28 @@ in stdenv.mkDerivation { sha256 = hash; }; - buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip; + buildInputs = lib.optionals stdenv.isLinux [ + alsaLib # libasound.so wanted by lib/libjsound.so + fontconfig + freetype + stdenv.cc.cc # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + ]; + + nativeBuildInputs = [ + autoPatchelfHook makeWrapper + ] ++ lib.optionals stdenv.isDarwin [ + unzip + ]; installPhase = '' mkdir -p $out cp -r ./* "$out/" - jrePath="$out/jre" - - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/jli - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/server - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64/xawt - rpath=$rpath''${rpath:+:}$jrePath/lib/amd64 - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - mkdir -p $out/nix-support printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs @@ -60,9 +77,19 @@ in stdenv.mkDerivation { cat <<EOF >> $out/nix-support/setup-hook if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF + '' + lib.optionalString stdenv.isLinux '' + # We cannot use -exec since wrapProgram is a function but not a command. + for bin in $( find "$out" -executable -type f ); do + if patchelf --print-interpreter "$bin" &> /dev/null; then + wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" + fi + done ''; - rpath = lib.strings.makeLibraryPath libraries; + preFixup = '' + find "$out" -name libfontmanager.so -exec \ + patchelf --add-needed libfontconfig.so {} \; + ''; passthru = { home = zulu; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index cbfa9997b8dbf..c7b01877ad54a 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,7 +1,25 @@ -{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib -, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib -, swingSupport ? true }: +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, unzip +, makeWrapper +, setJavaClassPath +, zulu +# minimum dependencies +, alsaLib +, fontconfig +, freetype +, zlib +, xorg +# runtime dependencies +, cups +# runtime dependencies for GTK+ Look and Feel +, gtkSupport ? stdenv.isLinux +, cairo +, glib +, gtk3 +}: let version = "11.41.23"; @@ -14,14 +32,12 @@ let hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; extension = if stdenv.isDarwin then "zip" else "tar.gz"; - libraries = [ - stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL - xorg.libXxf86vm alsaLib fontconfig freetype pango - gtk2 cairo gdk-pixbuf atk zlib - ] ++ (lib.optionals swingSupport (with xorg; [ - xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp - xorg.libXt xorg.libXrender stdenv.cc.cc - ])); + runtimeDependencies = [ + cups + ] ++ lib.optionals gtkSupport [ + cairo glib gtk3 + ]; + runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; in stdenv.mkDerivation { inherit version openjdk platform hash extension; @@ -33,23 +49,29 @@ in stdenv.mkDerivation { sha256 = hash; }; - buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip; + buildInputs = lib.optionals stdenv.isLinux [ + alsaLib # libasound.so wanted by lib/libjsound.so + fontconfig + freetype + stdenv.cc.cc # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + zlib + ]; + + nativeBuildInputs = [ + autoPatchelfHook makeWrapper + ] ++ lib.optionals stdenv.isDarwin [ + unzip + ]; installPhase = '' mkdir -p $out cp -r ./* "$out/" - rpath=$rpath''${rpath:+:}$out/lib/jli - rpath=$rpath''${rpath:+:}$out/lib/server - rpath=$rpath''${rpath:+:}$out/lib - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - mkdir -p $out/nix-support printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs @@ -57,9 +79,20 @@ in stdenv.mkDerivation { cat <<EOF >> $out/nix-support/setup-hook if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF + '' + lib.optionalString stdenv.isLinux '' + # We cannot use -exec since wrapProgram is a function but not a command. + # + # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it + # breaks building OpenJDK (#114495). + for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do + wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" + done ''; - rpath = lib.strings.makeLibraryPath libraries; + preFixup = '' + find "$out" -name libfontmanager.so -exec \ + patchelf --add-needed libfontconfig.so {} \; + ''; passthru = { home = zulu; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2f3ea3a45335d..4b63f03873b88 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1m9jfr5b0qwajwwmvcq02263bmnqgcqvpdr06sdwlfz3sxsjfp8r"; + sha256 = "1lvl6i3ym7dyg215fkmslf3rnk29hz7f21jn91y1mghrhch7hvhl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -212,31 +212,11 @@ self: super: { # base bound digit = doJailbreak super.digit; - # 2020-06-05: HACK: does not pass own build suite - `dontCheck` We should - # generate optparse-applicative completions for the hnix executable. Sadly - # building of the executable has been disabled for ghc < 8.10 in hnix. - # Generating the completions should be activated again, once we default to - # ghc 8.10. - hnix = dontCheck (super.hnix.override { - - # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly. - # https://github.com/haskell-nix/hnix-store/issues/104 - # Until unpin, which may hold off in time due to Stackage maintenence bottleneck - # the 0_4_0_0 is used - hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7 - - }); - - # 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly. - # https://github.com/haskell-nix/hnix-store/issues/104 - # Until unpin, which may hold off in time due to Stackage maintenence bottleneck - # the 0_4_0_0 is used - hnix-store-remote = (super.hnix-store-remote.override { - hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7 - }); + # 2020-06-05: HACK: does not pass own build suite - `dontCheck` + hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix); # https://github.com/haskell-nix/hnix-store/issues/127 - hnix-store-core_0_4_1_0 = addTestToolDepend super.hnix-store-core_0_4_1_0 self.tasty-discover; + hnix-store-core = addTestToolDepend super.hnix-store-core self.tasty-discover; # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -684,8 +664,26 @@ self: super: { ''; }); - # The standard libraries are compiled separately. - idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris); + # * The standard libraries are compiled separately. + # * We need multiple patches from master to fix compilation with + # updated dependencies (haskeline and megaparsec) which can be + # removed when the next idris release (1.3.4 probably) comes + # around. + idris = generateOptparseApplicativeCompletion "idris" + (doJailbreak (dontCheck + (appendPatches super.idris [ + # compatibility with haskeline >= 0.8 + (pkgs.fetchpatch { + url = "https://github.com/idris-lang/Idris-dev/commit/89a87cf666eb8b27190c779e72d0d76eadc1bc14.patch"; + sha256 = "0fv493zlpgjsf57w0sncd4vqfkabfczp3xazjjmqw54m9rsfix35"; + }) + # compatibility with megaparsec >= 0.9 + (pkgs.fetchpatch { + url = "https://github.com/idris-lang/Idris-dev/commit/6ea9bc913877d765048d7cdb7fc5aec60b196fac.patch"; + sha256 = "0yms74d1xdxd1c08dnp45nb1ddzq54n6hqgzxx0r494wy614ir8q"; + }) + ]) + )); # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; @@ -845,8 +843,11 @@ self: super: { # https://github.com/alphaHeavy/protobuf/issues/34 protobuf = dontCheck super.protobuf; - # https://github.com/bos/text-icu/issues/32 - text-icu = dontCheck super.text-icu; + # Is this package still maintained? https://github.com/haskell/text-icu/issues/30 + text-icu = overrideCabal super.text-icu (drv: { + doCheck = false; # https://github.com/bos/text-icu/issues/32 + configureFlags = ["--ghc-option=-DU_DEFINE_FALSE_AND_TRUE=1"]; # https://github.com/haskell/text-icu/issues/49 + }); # aarch64 and armv7l fixes. happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 @@ -968,8 +969,10 @@ self: super: { # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; - # dontCheck: printf double rounding behavior - prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter; + + # The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate. + prettyprinter = dontCheck super.prettyprinter; + brittany = doJailbreak (dontCheck super.brittany); # Outdated upperbound on ghc-exactprint: https://github.com/lspitzner/brittany/issues/342 # Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73 hpc-coveralls = appendPatch super.hpc-coveralls (pkgs.fetchpatch { @@ -1408,16 +1411,8 @@ self: super: { # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests: # https://github.com/haskell/haskell-language-server/issues/610 # https://github.com/haskell/haskell-language-server/issues/611 - haskell-language-server = overrideCabal (dontCheck super.haskell-language-server) { - # 2020-02-19: Override is necessary because of wrong bound on upstream, remove after next hackage update - preConfigure = '' - substituteInPlace haskell-language-server.cabal --replace "hls-explicit-imports-plugin ==0.1.0.1" "hls-explicit-imports-plugin ==0.1.0.0" - ''; - }; + haskell-language-server = dontCheck super.haskell-language-server; - # 2021-02-08: Jailbreaking because of - # https://github.com/haskell/haskell-language-server/issues/1329 - hls-tactics-plugin = doJailbreak super.hls-tactics-plugin; # 2021-02-11: Jailbreaking because of syntax error on bound revision hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin; @@ -1532,7 +1527,7 @@ self: super: { # 2020-12-05: http-client is fixed on too old version essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { - http-client = self.http-client_0_7_5; + http-client = self.http-client_0_7_6; }; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) @@ -1591,4 +1586,27 @@ self: super: { # Overly strict version bounds: https://github.com/Profpatsch/yarn-lock/issues/8 yarn-lock = doJailbreak super.yarn-lock; + + # Dependency to regex-tdfa-text can be removed for later regex-tdfa versions. + # Fix protolude compilation error by applying patch from pull-request. + # Override can be removed for the next release > 0.8.0. + yarn2nix = overrideCabal (super.yarn2nix.override { + regex-tdfa-text = null; + }) (attrs: { + jailbreak = true; + # remove dependency on regex-tdfa-text + # which has been merged into regex-tdfa + postPatch = '' + sed -i '/regex-tdfa-text/d' yarn2nix.cabal + ''; + patches = (attrs.patches or []) ++ [ + # fix a compilation error related to protolude 0.3 + (pkgs.fetchpatch { + url = "https://github.com/Profpatsch/yarn2nix/commit/ca78cf06226819b2e78cb6cdbc157d27afb41532.patch"; + sha256 = "1vkczwzhxilnp87apyb18nycn834y5nbw4yr1kpwlwhrhalvzw61"; + includes = [ "*/ResolveLockfile.hs" ]; + }) + ]; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super 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 60d3f42324647..5e39a8047bd84 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -42,20 +42,13 @@ self: super: { unix = null; xhtml = null; - # The proper 3.2.0.0 release does not compile with ghc-8.10.1, so we take the - # hitherto unreleased next version from the '3.2' branch of the upstream git - # repository for the time being. - cabal-install = assert super.cabal-install.version == "3.2.0.0"; - overrideCabal super.cabal-install (drv: { - postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot"; - version = "3.2.0.0-git"; - editedCabalFile = null; - src = pkgs.fetchgit { - url = "git://github.com/haskell/cabal.git"; - rev = "9bd4cc0591616aeae78e17167338371a2542a475"; - sha256 = "005q1shh7vqgykkp72hhmswmrfpz761x0q0jqfnl3wqim4xd9dg0"; - }; - }); + cabal-install = super.cabal-install.override { + Cabal = super.Cabal_3_4_0_0; + hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; }; + # Usung dontCheck to break test dependency cycles + edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; }); + random = super.random_1_2_0; + }; # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; 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 76f6971917f93..932441f781082 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -43,19 +43,12 @@ self: super: { unix = null; xhtml = null; - # Take the 3.4.x release candidate. - cabal-install = assert super.cabal-install.version == "3.2.0.0"; - overrideCabal (doJailbreak super.cabal-install) (drv: { - postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot"; - version = "cabal-install-3.4.0.0-rc4"; - editedCabalFile = null; - src = pkgs.fetchgit { - url = "git://github.com/haskell/cabal.git"; - rev = "cabal-install-3.4.0.0-rc4"; - sha256 = "049hllk1d8jid9yg70hmcsdgb0n7hm24p39vavllaahfb0qfimrk"; - }; - executableHaskellDepends = drv.executableHaskellDepends ++ [ self.regex-base self.regex-posix ]; - }); + # Build cabal-install with the compiler's native Cabal. + cabal-install = (doJailbreak super.cabal-install).override { + # Use dontCheck to break test dependency cycles + edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; }); + random = super.random_1_2_0; + }; # Jailbreaks & Version Updates async = doJailbreak super.async; @@ -99,10 +92,6 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); - regex-base = appendPatch (doJailbreak super.regex-base) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch"; - sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d"; - }); # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. unordered-containers = dontCheck super.unordered-containers; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e0fde52b01704..05454bd0b8922 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -78,7 +78,7 @@ default-package-overrides: - hls-plugin-api < 0.7.1.0 # for hls 0.9.0 - hls-retrie-plugin < 0.1.1.1 # for hls 0.9.0 - # Stackage Nightly 2021-02-12 + # Stackage Nightly 2021-02-25 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -88,11 +88,11 @@ default-package-overrides: - ad ==4.4.1 - adjunctions ==4.4 - adler32 ==0.1.2.0 - - aeson ==1.5.5.1 + - aeson ==1.5.6.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 - - aeson-combinators ==0.0.4.0 + - aeson-combinators ==0.0.4.1 - aeson-commit ==1.3 - aeson-compat ==0.3.9 - aeson-default ==0.9.1.0 @@ -103,7 +103,7 @@ default-package-overrides: - aeson-picker ==0.1.0.5 - aeson-pretty ==0.8.8 - aeson-qq ==0.8.3 - - aeson-schemas ==1.3.2 + - aeson-schemas ==1.3.3 - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 @@ -213,24 +213,24 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.20.0.1 - - amqp-utils ==0.4.5.0 + - amqp-utils ==0.4.5.1 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - - ap-normalize ==0.1.0.0 - apecs ==0.9.2 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.5 - api-field-json-th ==0.1.0.2 - api-maker ==0.1.0.0 - - app-settings ==0.2.0.12 + - ap-normalize ==0.1.0.0 - appar ==0.1.8 - appendmap ==0.1.5 - - apply-refact ==0.9.0.0 + - apply-refact ==0.9.1.0 - apportionment ==0.0.0.3 - - approximate ==0.3.2 + - approximate ==0.3.4 - approximate-equality ==1.1.0.2 + - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - arbor-postgres ==0.0.5 - arithmoi ==0.11.0.1 @@ -239,12 +239,12 @@ default-package-overrides: - ascii ==1.0.1.4 - ascii-case ==1.0.0.4 - ascii-char ==1.0.0.8 + - asciidiagram ==1.3.3.3 - ascii-group ==1.0.0.4 - ascii-predicates ==1.0.0.4 - ascii-progress ==0.3.3.0 - ascii-superset ==1.0.1.4 - ascii-th ==1.0.0.4 - - asciidiagram ==1.3.3.3 - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -252,7 +252,7 @@ default-package-overrides: - assert-failure ==0.1.2.5 - assoc ==1.0.2 - astro ==0.4.2.1 - - async ==2.2.2 + - async ==2.2.3 - async-extra ==0.2.0.0 - async-pool ==0.9.1 - async-refresh ==0.3.0.0 @@ -272,8 +272,8 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - auto-update ==0.1.6 - autoexporter ==1.1.20 + - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 @@ -281,25 +281,25 @@ default-package-overrides: - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 - - base-orphans ==0.8.4 - - base-prelude ==1.4 - - base-unicode-symbols ==0.2.4.2 - base16 ==0.3.0.1 - base16-bytestring ==0.1.1.7 - - base16-lens ==0.1.3.0 + - base16-lens ==0.1.3.2 - base32 ==0.2.0.0 - - base32-lens ==0.1.0.0 + - base32-lens ==0.1.1.1 - base32string ==0.9.1 - base58-bytestring ==0.1.0 - base58string ==0.10.0 - base64 ==0.4.2.3 - base64-bytestring ==1.1.0.0 - base64-bytestring-type ==1.0.1 - - base64-lens ==0.3.0 + - base64-lens ==0.3.1 - base64-string ==0.2 + - base-compat ==0.11.2 + - base-compat-batteries ==0.11.2 - basement ==0.0.11 + - base-orphans ==0.8.4 + - base-prelude ==1.4 + - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 @@ -312,8 +312,8 @@ default-package-overrides: - bibtex ==0.1.0.6 - bifunctors ==5.5.10 - bimap ==0.4.0 - - bimap-server ==0.1.0.1 - bimaps ==0.1.0.2 + - bimap-server ==0.1.0.1 - bin ==0.1 - binary-conduit ==1.3.1 - binary-ext ==2.0.4 @@ -323,7 +323,7 @@ default-package-overrides: - binary-orphans ==1.0.1 - binary-parser ==0.5.6 - binary-parsers ==0.2.4.0 - - binary-search ==1.0.0.3 + - binary-search ==2.0.0 - binary-shared ==0.8.3 - binary-tagged ==0.3 - bindings-DSL ==1.0.25 @@ -332,10 +332,10 @@ default-package-overrides: - bindings-uname ==0.1 - bins ==0.1.2.0 - bitarray ==0.0.1.1 - - bits ==0.5.2 - - bits-extra ==0.0.2.0 + - bits ==0.5.3 - bitset-word8 ==0.1.1.2 - - bitvec ==1.0.3.0 + - bits-extra ==0.0.2.0 + - bitvec ==1.1.1.0 - bitwise-enum ==1.0.0.3 - blake2 ==0.3.0 - blanks ==0.5.0 @@ -360,8 +360,8 @@ default-package-overrides: - boring ==0.1.3 - both ==0.1.1.1 - bound ==2.0.3 - - bounded-queue ==1.0.0 - BoundedChan ==1.0.3.0 + - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 @@ -379,12 +379,12 @@ default-package-overrides: - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 - - byte-count-reader ==0.10.1.2 - - byte-order ==0.1.2.0 - byteable ==0.1.1 + - byte-count-reader ==0.10.1.2 - bytedump ==1.0 + - byte-order ==0.1.2.0 - byteorder ==1.0.4 - - bytes ==0.17 + - bytes ==0.17.1 - byteset ==0.1.1.0 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.1 @@ -398,7 +398,6 @@ default-package-overrides: - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - c2hs ==0.28.7 - - ca-province-codes ==1.0.0.0 - cabal-appimage ==0.3.0.2 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 @@ -411,12 +410,13 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-stack ==0.2.0 - can-i-haz ==0.3.1.0 + - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - casa-types ==0.0.1 - - case-insensitive ==1.2.1.0 - cased ==0.1.0.0 + - case-insensitive ==1.2.1.0 - cases ==0.1.4 - casing ==0.1.4.1 - cassava ==0.5.2.0 @@ -436,7 +436,7 @@ default-package-overrides: - chan ==0.0.4.1 - ChannelT ==0.0.0.7 - character-cases ==0.1.0.6 - - charset ==0.3.7.1 + - charset ==0.3.8 - charsetdetect-ae ==1.1.0.4 - Chart ==1.9.3 - chaselev-deque ==0.5.0.5 @@ -459,6 +459,7 @@ default-package-overrides: - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - circular ==0.3.1.1 + - citeproc ==0.3.0.7 - clash-ghc ==1.2.5 - clash-lib ==1.2.5 - clash-prelude ==1.2.5 @@ -476,13 +477,13 @@ default-package-overrides: - cmark ==0.6 - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.20 + - cmdargs ==0.10.21 + - codec-beam ==0.2.0 + - codec-rpm ==0.2.2 + - code-page ==0.2.1 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - - code-page ==0.2.1 - - codec-beam ==0.2.0 - - codec-rpm ==0.2.2 - Color ==0.3.0 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 @@ -491,12 +492,15 @@ default-package-overrides: - combinatorial ==0.1.0.1 - comfort-array ==0.4 - comfort-graph ==0.0.3.1 + - commonmark ==0.1.1.4 + - commonmark-extensions ==0.2.0.4 + - commonmark-pandoc ==0.2.0.1 - commutative ==0.0.2 - comonad ==5.0.8 - comonad-extras ==4.0.1 - compactmap ==0.1.4.2.1 - compdata ==0.12.1 - - compensated ==0.8.1 + - compensated ==0.8.3 - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 - composable-associations-aeson ==0.1.0.0 @@ -529,8 +533,8 @@ default-package-overrides: - conferer-aeson ==1.0.0.0 - conferer-hspec ==1.0.0.0 - conferer-warp ==1.0.0.0 - - config-ini ==0.2.4.0 - ConfigFile ==1.1.4 + - config-ini ==0.2.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - configurator-pg ==0.2.5 @@ -538,8 +542,8 @@ default-package-overrides: - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraint-tuples ==0.1.2 - constraints ==0.12 + - constraint-tuples ==0.1.2 - construct ==0.3 - contravariant ==1.5.3 - contravariant-extras ==0.3.5.2 @@ -567,21 +571,22 @@ default-package-overrides: - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 - - crypto-enigma ==0.1.1.6 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 - - crypto-pubkey-types ==0.4.3 - - crypto-random ==0.0.9 - - crypto-random-api ==0.2.0 - cryptocompare ==0.1.2 + - crypto-enigma ==0.1.1.6 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 - cryptohash-sha1 ==0.11.100.1 - cryptohash-sha256 ==0.11.102.0 + - cryptohash-sha512 ==0.11.100.1 - cryptonite ==0.27 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 @@ -618,6 +623,7 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 + - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - data-fix ==0.3.1 @@ -636,7 +642,6 @@ default-package-overrides: - data-reify ==0.6.3 - data-serializer ==0.3.4.1 - data-textual ==0.3.0.3 - - datadog ==0.2.5.0 - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 @@ -645,19 +650,19 @@ default-package-overrides: - debian ==4.0.2 - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - - dec ==0.0.3 + - dec ==0.0.4 - Decimal ==0.5.1 - - declarative ==0.5.3 + - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - - deferred-folds ==0.9.15 + - deferred-folds ==0.9.16 - dejafu ==2.4.0.1 - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 - - derive-topdown ==0.0.2.2 - deriveJsonNoPrefix ==0.1.0.1 - - deriving-aeson ==0.2.6 + - derive-topdown ==0.0.2.2 + - deriving-aeson ==0.2.6.1 - deriving-compat ==0.5.10 - derulo ==1.0.10 - dhall ==1.38.0 @@ -665,17 +670,17 @@ default-package-overrides: - dhall-json ==1.7.5 - dhall-lsp-server ==1.0.13 - dhall-yaml ==1.2.5 - - di-core ==1.0.4 - - di-monad ==1.3.1 - - diagrams-solve ==0.1.2 + - diagrams-solve ==0.1.3 - dialogflow-fulfillment ==0.1.1.3 + - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.3 - - direct-sqlite ==2.3.26 + - di-monad ==1.3.1 - directory-tree ==0.12.1 + - direct-sqlite ==2.3.26 - dirichlet ==0.1.0.2 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -687,8 +692,6 @@ default-package-overrides: - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 - dockerfile ==0.2.0 - doclayout ==0.3 - doctemplates ==0.9 @@ -697,6 +700,8 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-lib ==0.1 - doldol ==0.4.1.2 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 - dot ==0.3 - dotenv ==0.8.0.7 - dotgen ==0.4.3 @@ -717,7 +722,7 @@ default-package-overrides: - Earley ==0.13.0.1 - easy-file ==0.2.2 - Ebnf2ps ==1.0.15 - - echo ==0.1.3 + - echo ==0.1.4 - ecstasy ==0.2.1.0 - ed25519 ==0.0.5.0 - edit-distance ==0.2.2.1 @@ -736,24 +741,24 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.7 + - elm2nix ==0.2.1 - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm2nix ==0.2.1 - - elynx ==0.5.0.1 - - elynx-markov ==0.5.0.1 - - elynx-nexus ==0.5.0.1 - - elynx-seq ==0.5.0.1 - - elynx-tools ==0.5.0.1 - - elynx-tree ==0.5.0.1 + - elynx ==0.5.0.2 + - elynx-markov ==0.5.0.2 + - elynx-nexus ==0.5.0.2 + - elynx-seq ==0.5.0.2 + - elynx-tools ==0.5.0.2 + - elynx-tree ==0.5.0.2 - email-validate ==2.3.2.13 - emojis ==0.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 - - enum-subset-generate ==0.1.0.0 - enummapset ==0.6.0.3 - enumset ==0.0.5 + - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 - envparse ==0.4.1 - envy ==2.1.0.0 @@ -767,33 +772,33 @@ default-package-overrides: - error-or-utils ==0.1.1 - errors ==2.3.0 - errors-ext ==0.4.2 - - ersatz ==0.4.8 - - esqueleto ==3.4.0.1 + - ersatz ==0.4.9 + - esqueleto ==3.4.1.0 - essence-of-live-coding ==0.2.4 - essence-of-live-coding-gloss ==0.2.4 - essence-of-live-coding-pulse ==0.2.4 - essence-of-live-coding-quickcheck ==0.2.4 - etc ==0.4.1.0 - eve ==0.1.9.0 - - event-list ==0.1.2 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 + - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 + - exceptions ==0.10.4 - exception-transformers ==0.4.0.9 - exception-via ==0.1.0.0 - - exceptions ==0.10.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 - exomizer ==1.0.0 - - exp-pairs ==0.2.1.0 - experimenter ==0.1.0.4 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 + - exp-pairs ==0.2.1.0 - express ==0.1.3 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 @@ -808,7 +813,7 @@ default-package-overrides: - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - fast-digits ==0.3.0.0 - - fast-logger ==3.0.2 + - fast-logger ==3.0.3 - fast-math ==1.0.2 - fb ==2.1.1 - feature-flags ==0.1.0.1 @@ -820,10 +825,10 @@ default-package-overrides: - fgl ==5.7.0.3 - file-embed ==0.0.13.0 - file-embed-lzma ==0 - - file-modules ==0.1.2.4 - - file-path-th ==0.1.0.0 - filelock ==0.1.1.5 - filemanip ==0.3.6.3 + - file-modules ==0.1.2.4 + - file-path-th ==0.1.0.0 - filepattern ==0.1.2 - fileplow ==0.1.0.0 - filtrable ==0.1.4.0 @@ -853,11 +858,11 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.2 - focuslist ==0.1.0.2 + - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.5 - - foldable1 ==0.1.0.0 - foldl ==1.4.10 - - folds ==0.7.5 + - folds ==0.7.6 - follow-file ==0.0.3 - FontyFruity ==0.5.3.5 - foreign-store ==0.2 @@ -869,10 +874,10 @@ default-package-overrides: - foundation ==0.0.25 - free ==5.1.5 - free-categories ==0.2.0.2 - - free-vl ==0.1.4 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - freetype2 ==0.2.0 + - free-vl ==0.1.4 - friendly-time ==0.4.1 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 @@ -882,14 +887,14 @@ default-package-overrides: - ftp-client-conduit ==0.5.0.5 - funcmp ==1.9 - function-builder ==0.3.0.1 - - functor-classes-compat ==1 + - functor-classes-compat ==1.0.1 - fusion-plugin ==0.2.2 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - fuzzy-dates ==0.1.1.2 - - fuzzy-time ==0.1.0.0 - fuzzyset ==0.2.0 + - fuzzy-time ==0.1.0.0 - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 @@ -905,9 +910,9 @@ default-package-overrides: - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 - generic-optics ==2.0.0.0 - - generic-random ==1.3.0.1 - GenericPretty ==1.2.2 - - generics-sop ==0.5.1.0 + - generic-random ==1.3.0.1 + - generics-sop ==0.5.1.1 - generics-sop-lens ==0.2.0.1 - geniplate-mirror ==0.7.7 - genvalidity ==0.11.0.0 @@ -939,24 +944,24 @@ default-package-overrides: - ghc-check ==0.5.0.3 - ghc-core ==0.5.6 - ghc-events ==0.15.1 - - ghc-exactprint ==0.6.3.4 + - ghc-exactprint ==0.6.4 + - ghcid ==0.8.7 + - ghci-hexcalc ==0.1.1.0 + - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.10.4.20210206 - ghc-lib-parser ==8.10.4.20210206 - ghc-lib-parser-ex ==8.10.0.19 - ghc-parser ==0.2.2.0 - ghc-paths ==0.1.0.12 - - ghc-prof ==1.4.1.7 + - ghc-prof ==1.4.1.8 - ghc-source-gen ==0.4.0.0 - ghc-syntax-highlighter ==0.0.6.0 - ghc-tcplugins-extra ==0.4.1 - ghc-trace-events ==0.1.2.1 - ghc-typelits-extra ==0.4.2 - ghc-typelits-knownnat ==0.7.5 - - ghc-typelits-natnormalise ==0.7.3 + - ghc-typelits-natnormalise ==0.7.4 - ghc-typelits-presburger ==0.5.2.0 - - ghci-hexcalc ==0.1.1.0 - - ghcid ==0.8.7 - - ghcjs-codemirror ==0.0.0.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 - gi-cairo ==1.0.24 @@ -974,10 +979,9 @@ default-package-overrides: - gi-gtk ==3.0.36 - gi-gtk-hs ==0.3.9 - gi-harfbuzz ==0.0.3 - - gi-pango ==1.0.23 - - gi-xlib ==2.0.9 - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 + - gi-pango ==1.0.23 - githash ==0.1.5.0 - github ==0.26 - github-release ==1.3.6 @@ -986,6 +990,7 @@ default-package-overrides: - github-webhooks ==0.15.0 - gitlab-haskell ==0.2.5 - gitrev ==1.3.1 + - gi-xlib ==2.0.9 - gl ==0.9 - glabrous ==2.0.2 - GLFW-b ==3.3.0.0 @@ -1000,11 +1005,11 @@ default-package-overrides: - gothic ==0.1.5 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - - graph-wrapper ==0.2.6.0 - graphite ==0.10.0.1 - graphql-client ==1.1.0 - graphs ==0.7.1 - graphviz ==2999.20.1.0 + - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - greskell ==1.2.0.1 - greskell-core ==0.1.3.6 @@ -1032,7 +1037,7 @@ default-package-overrides: - HasBigDecimal ==0.1.1 - hasbolt ==0.1.4.4 - hashable ==1.3.0.0 - - hashable-time ==0.2.0.2 + - hashable-time ==0.2.1 - hashids ==1.0.2.4 - hashing ==0.1.0.1 - hashmap ==1.3.3 @@ -1057,7 +1062,7 @@ default-package-overrides: - hasql-pool ==0.5.2 - hasql-queue ==1.2.0.2 - hasql-transaction ==1.0.0.1 - - hasty-hamiltonian ==1.3.3 + - hasty-hamiltonian ==1.3.4 - HaTeX ==3.22.3.0 - HaXml ==1.25.5 - haxr ==3000.11.4.1 @@ -1088,9 +1093,9 @@ default-package-overrides: - hgeometry ==0.11.0.0 - hgeometry-combinatorial ==0.11.0.0 - hgrev ==0.2.6 - - hi-file-parser ==0.1.0.0 - hidapi ==0.1.5 - - hie-bios ==0.7.2 + - hie-bios ==0.7.4 + - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 @@ -1110,7 +1115,6 @@ default-package-overrides: - hmatrix-vector-sized ==0.1.3.0 - hmm-lapack ==0.4 - hmpfr ==0.4.4 - - hnix-store-core ==0.2.0.0 - hnock ==0.4.0 - hoauth2 ==1.16.0 - hocon ==0.1.0.4 @@ -1122,23 +1126,22 @@ default-package-overrides: - hostname-validate ==1.0.0 - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - - hp2pretty ==0.9 + - hp2pretty ==0.10 - hpack ==0.34.4 - hpack-dhall ==0.5.2 - hpc-codecov ==0.2.0.1 - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8 - - hs-bibutils ==6.10.0.0 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - - hs-php-session ==0.0.9.3 - hsass ==0.8.0 + - hs-bibutils ==6.10.0.0 - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 - hsemail ==2.2.1 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.6 - HSlippyMap ==3.0.1 @@ -1172,6 +1175,7 @@ default-package-overrides: - hspec-tables ==0.0.1 - hspec-wai ==0.10.1 - hspec-wai-json ==0.10.1 + - hs-php-session ==0.0.9.3 - hsshellscript ==3.4.5 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1179,12 +1183,13 @@ default-package-overrides: - HsYAML-aeson ==0.2.0.0 - hsyslog ==5.0.2 - htaglib ==1.2.0 - - HTF ==0.14.0.5 + - HTF ==0.14.0.6 - html ==1.0.1.2 - html-conduit ==1.3.2.1 - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 + - http2 ==2.0.5 - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 @@ -1192,18 +1197,17 @@ default-package-overrides: - http-client-overrides ==0.1.1.0 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.1 - - http-conduit ==2.3.7.4 - - http-date ==0.0.10 + - http-conduit ==2.3.8 + - http-date ==0.0.11 - http-directory ==0.1.8 - http-download ==0.2.0.0 + - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-query ==0.1.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.7.2 - http-types ==0.12.3 - - http2 ==2.0.5 - - httpd-shed ==0.4.1.1 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.1.0 - HUnit-approx ==1.1.1.1 @@ -1216,6 +1220,7 @@ default-package-overrides: - hw-conduit-merges ==0.2.1.0 - hw-diagnostics ==0.0.1.0 - hw-dsv ==0.4.1.0 + - hweblib ==0.6.3 - hw-eliasfano ==0.1.2.0 - hw-excess ==0.2.3.0 - hw-fingertree ==0.1.2.0 @@ -1240,7 +1245,6 @@ default-package-overrides: - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hw-xml ==0.5.1.0 - - hweblib ==0.6.3 - hxt ==9.3.1.21 - hxt-charproperties ==9.5.0.0 - hxt-css ==0.1.0.3 @@ -1252,8 +1256,8 @@ default-package-overrides: - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - hyper ==0.2.1.0 - - hyperloglog ==0.4.3 - - hyphenation ==0.8 + - hyperloglog ==0.4.4 + - hyphenation ==0.8.1 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 @@ -1277,7 +1281,7 @@ default-package-overrides: - indexed-traversable ==0.1.1 - infer-license ==0.2.0 - inflections ==0.4.0.6 - - influxdb ==1.9.0 + - influxdb ==1.9.1 - ini ==0.4.1 - inj ==1.0 - inline-c ==0.9.1.4 @@ -1285,19 +1289,19 @@ default-package-overrides: - inline-r ==0.10.4 - inliterate ==0.1.0 - input-parsers ==0.1.0.1 - - insert-ordered-containers ==0.2.3.1 - - inspection-testing ==0.4.2.4 + - insert-ordered-containers ==0.2.4 + - inspection-testing ==0.4.3.0 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.3.1 - integer-roots ==1.0 - integration ==0.2.1 - - intern ==0.9.3 + - intern ==0.9.4 - interpolate ==0.2.1 - interpolatedstring-perl6 ==1.0.2 - interpolation ==0.1.1.1 - interpolator ==1.1.0.2 - IntervalMap ==0.6.1.2 - - intervals ==0.9.1 + - intervals ==0.9.2 - intro ==0.9.0.0 - intset-imperative ==0.1.0.0 - invariant ==0.5.4 @@ -1324,16 +1328,16 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - - it-has ==0.2.0.0 - iterable ==3.0 - - ix-shapable ==0.1.0 + - it-has ==0.2.0.0 - ixset-typed ==0.5 - ixset-typed-binary-instance ==0.1.0.2 - ixset-typed-conversions ==0.1.2.0 - ixset-typed-hashable-instance ==0.1.0.2 + - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jalaali ==1.0.0.0 - - jira-wiki-markup ==1.3.2 + - jira-wiki-markup ==1.3.3 - jose ==0.8.4 - jose-jwt ==0.9.0 - js-chart ==2.9.4.1 @@ -1341,9 +1345,9 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json-feed ==1.0.12 + - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 - - jsonpath ==0.2.0.0 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.4.1 @@ -1351,7 +1355,7 @@ default-package-overrides: - junit-xml ==0.1.0.2 - justified-containers ==0.3.0.0 - jwt ==0.10.0 - - kan-extensions ==5.2.1 + - kan-extensions ==5.2.2 - kanji ==3.4.1 - katip ==0.8.5.0 - katip-logstash ==0.1.0.0 @@ -1376,7 +1380,7 @@ default-package-overrides: - language-bash ==0.9.2 - language-c ==0.8.3 - language-c-quote ==0.12.2.1 - - language-docker ==9.1.2 + - language-docker ==9.1.3 - language-java ==0.2.9 - language-javascript ==0.7.1.0 - language-protobuf ==1.0.1 @@ -1393,14 +1397,14 @@ default-package-overrides: - lawful ==0.1.0.0 - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 - - lca ==0.3.1 + - lca ==0.4 - leancheck ==0.9.3 - leancheck-instances ==0.0.4 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.5 - lens ==4.19.2 - - lens-action ==0.2.4 - - lens-aeson ==1.1 + - lens-action ==0.2.5 + - lens-aeson ==1.1.1 - lens-csv ==0.1.1.0 - lens-datetime ==0.3 - lens-family ==2.0.0 @@ -1409,7 +1413,7 @@ default-package-overrides: - lens-misc ==0.0.2.0 - lens-process ==0.4.0.0 - lens-properties ==4.11.1 - - lens-regex ==0.1.1 + - lens-regex ==0.1.3 - lens-regex-pcre ==1.1.0.0 - lenz ==0.4.2.0 - leveldb-haskell ==0.6.5 @@ -1422,22 +1426,22 @@ default-package-overrides: - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 - - lift-generics ==0.2 - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 + - lift-generics ==0.2 - line ==4.0.1 - - linear ==1.21.4 + - linear ==1.21.5 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 - List ==0.6.2 + - ListLike ==4.7.4 - list-predicate ==0.1.0.1 + - listsafe ==0.1.0.1 - list-singleton ==1.0.0.5 - list-t ==1.0.4 - - ListLike ==4.7.4 - - listsafe ==0.1.0.1 - ListTree ==0.2.3 - little-logger ==0.3.1 - little-rio ==0.2.2 @@ -1449,7 +1453,7 @@ default-package-overrides: - locators ==0.3.0.3 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 - - log-domain ==0.13 + - log-domain ==0.13.1 - logfloat ==0.13.3.3 - logging ==3.0.5 - logging-facade ==0.3.0 @@ -1467,11 +1471,11 @@ default-package-overrides: - lz4-frame-conduit ==0.1.0.1 - lzma ==0.0.0.3 - lzma-conduit ==1.2.1 - - machines ==0.7.1 + - machines ==0.7.2 - magic ==1.1 - magico ==0.0.2.1 - - main-tester ==0.2.0.1 - mainland-pretty ==0.7.0.1 + - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 @@ -1483,9 +1487,9 @@ default-package-overrides: - massiv-persist ==0.1.0.0 - massiv-serialise ==0.1.0.0 - massiv-test ==0.1.6.1 + - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 - - mathexpr ==0.3.0.0 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1497,9 +1501,9 @@ default-package-overrides: - mbox-utility ==0.0.3.1 - mcmc ==0.4.0.0 - mcmc-types ==1.0.3 - - med-module ==0.1.2.1 - medea ==1.2.0 - median-stream ==0.7.0.0 + - med-module ==0.1.2.1 - megaparsec ==9.0.1 - megaparsec-tests ==9.0.1 - membrain ==0.0.0.2 @@ -1525,15 +1529,15 @@ default-package-overrides: - midair ==0.2.0.1 - midi ==0.2.2.2 - mighty-metropolis ==2.0.0 - - mime-mail ==0.5.0 + - mime-mail ==0.5.1 - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 - - min-max-pqueue ==0.1.0.2 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.0 - minio-hs ==1.5.3 - miniutter ==0.5.1.1 + - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 @@ -1543,20 +1547,22 @@ default-package-overrides: - mmark ==0.0.7.2 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.2 - - mmorph ==1.1.4 + - mmorph ==1.1.5 - mnist-idx ==0.1.2.8 - - mock-time ==0.1.0 - mockery ==0.3.5 + - mock-time ==0.1.0 - mod ==0.1.2.1 - model ==0.5 - - modern-uri ==0.3.3.1 + - modern-uri ==0.3.4.0 - modular ==0.1.0.8 - monad-chronicle ==1.0.0.1 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 + - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 + - monadlist ==0.0.2 - monad-logger ==0.3.36 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.1.0.0 @@ -1565,28 +1571,26 @@ default-package-overrides: - monad-memo ==0.5.3 - monad-metrics ==0.2.2.0 - monad-par ==0.3.5 - - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.3 + - monad-par-extras ==0.3.3 - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 + - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - monadic-arrays ==0.2.2 - - monadlist ==0.0.2 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.2 - - monads-tf ==0.1.0.3 - mongoDB ==2.7.0.0 + - monoid-subclasses ==1.0.1 + - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 - - monoid-subclasses ==1.0.1 - - monoid-transformer ==0.0.4 - more-containers ==0.2.2.0 - morpheus-graphql ==0.16.0 - morpheus-graphql-client ==0.16.0 @@ -1599,14 +1603,14 @@ default-package-overrides: - mpi-hs-cereal ==0.1.0.0 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - - multi-containers ==0.1.1 - multiarg ==0.30.0.10 + - multi-containers ==0.1.1 - multimap ==1.2.1 - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur-hash ==0.1.0.9 - murmur3 ==1.0.4 + - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 @@ -1653,21 +1657,22 @@ default-package-overrides: - newtype-generics ==0.6 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 + - nix-derivation ==1.1.1 - nix-paths ==1.0.1 - - no-value ==1.0.0.0 - - non-empty ==0.3.2 - - non-empty-sequence ==0.2.0.4 - - non-negative ==0.1.2 - nonce ==1.0.7 - nondeterminism ==1.4 + - non-empty ==0.3.2 - nonempty-containers ==0.3.4.1 - - nonempty-vector ==0.2.1.0 - nonemptymap ==0.0.6.0 + - non-empty-sequence ==0.2.0.4 + - nonempty-vector ==0.2.1.0 + - non-negative ==0.1.2 - not-gloss ==0.7.7.0 + - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - - nri-env-parser ==0.1.0.3 - - nri-prelude ==0.3.0.0 + - nri-env-parser ==0.1.0.4 + - nri-prelude ==0.4.0.0 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1679,9 +1684,9 @@ default-package-overrides: - nvim-hs ==2.1.0.4 - nvim-hs-contrib ==2.0.0.0 - nvim-hs-ghcid ==2.0.0.0 - - o-clock ==1.2.0.1 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 + - o-clock ==1.2.0.1 - odbc ==0.2.2 - oeis2 ==1.0.4 - ofx ==0.4.4.0 @@ -1694,9 +1699,9 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 - - open-browser ==0.2.1.0 - OpenAL ==1.7.0.5 - openapi3 ==3.0.1.0 + - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.4.0 @@ -1728,6 +1733,8 @@ default-package-overrides: - pager ==0.1.1.0 - pagination ==0.2.1 - pagure-cli ==0.2 + - pandoc ==2.11.4 + - pandoc-plot ==1.0.2.1 - pandoc-types ==1.22 - pantry ==0.5.1.4 - parallel ==3.2.2.0 @@ -1760,10 +1767,10 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.0 - pcg-random ==0.1.3.7 + - pcre2 ==1.1.4 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 - - pcre2 ==1.1.4 - pdfinfo ==1.5.4 - peano ==0.1.0.1 - pem ==0.2.4 @@ -1786,8 +1793,8 @@ default-package-overrides: - persistent-test ==2.0.3.5 - persistent-typed-db ==0.1.0.2 - pg-harness-client ==0.6.0 - - pg-transact ==0.3.1.1 - pgp-wordlist ==0.1.0.3 + - pg-transact ==0.3.1.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 @@ -1795,7 +1802,7 @@ default-package-overrides: - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 - - pipes-bytestring ==2.1.6 + - pipes-bytestring ==2.1.7 - pipes-concurrency ==2.0.12 - pipes-csv ==1.4.3 - pipes-extras ==1.0.15 @@ -1805,9 +1812,9 @@ default-package-overrides: - pipes-network ==0.6.5 - pipes-network-tls ==0.4 - pipes-ordered-zip ==1.1.0 - - pipes-parse ==3.0.8 + - pipes-parse ==3.0.9 - pipes-random ==1.0.0.5 - - pipes-safe ==2.3.2 + - pipes-safe ==2.3.3 - pipes-wai ==3.2.0 - pkcs10 ==0.2.0.0 - pkgtreediff ==0.4 @@ -1826,7 +1833,6 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 - - post-mess-age ==0.2.1.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.12.3.3 - postgresql-libpq ==0.9.4.3 @@ -1835,31 +1841,32 @@ default-package-overrides: - postgresql-simple ==0.6.4 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 + - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.3 - prairie ==0.0.1.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 + - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - - pretty-diff ==0.2.0.3 + - pretty-diff ==0.4.0.2 - pretty-hex ==1.1 - - pretty-relative-time ==0.2.0.0 - - pretty-show ==1.10 - - pretty-simple ==4.0.0.0 - - pretty-sop ==0.2.0.3 - - pretty-terminal ==0.1.0.0 - - prettyclass ==1.0.0.0 - prettyprinter ==1.7.0 - prettyprinter-ansi-terminal ==1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1.1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1.1 + - pretty-relative-time ==0.2.0.0 + - pretty-show ==1.10 + - pretty-simple ==4.0.0.0 + - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 - primes ==0.2.1.0 - primitive ==0.7.1.0 - primitive-addr ==0.1.0.2 - - primitive-extras ==0.8 + - primitive-extras ==0.10.1 - primitive-unaligned ==0.1.1.1 - primitive-unlifted ==0.1.3.0 - print-console-colors ==0.1.0.0 @@ -1869,20 +1876,14 @@ default-package-overrides: - product-profunctors ==0.11.0.2 - profiterole ==0.1 - profunctors ==5.5.2 - - project-template ==0.2.1.0 - projectroot ==0.2.0.1 + - project-template ==0.2.1.0 - prometheus ==2.2.2 - prometheus-client ==1.0.1 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 - - proto-lens ==0.7.0.0 - - proto-lens-optparse ==0.1.1.7 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - proto3-wire ==1.1.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 @@ -1890,6 +1891,12 @@ default-package-overrides: - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 + - proto-lens ==0.7.0.0 + - proto-lens-optparse ==0.1.1.7 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 - protolude ==0.3.0 - proxied ==0.3.1 - psqueues ==0.2.7.2 @@ -1930,44 +1937,45 @@ default-package-overrides: - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.1 - - random-bytestring ==0.1.3.2 + - random-bytestring ==0.1.4 - random-fu ==0.2.7.4 - random-shuffle ==0.0.4 - random-source ==0.3.0.8 - random-tree ==0.6.0.5 - range ==0.3.0.2 - - range-set-list ==0.1.3.1 + - ranged-list ==0.1.0.0 - Ranged-sets ==0.4.0 + - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - rate-limit ==1.4.2 - ratel ==1.0.13 + - rate-limit ==1.4.2 - ratel-wai ==1.1.4 - rattle ==0.2 - - raw-strings-qq ==1.1 + - Rattus ==0.5 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - - rcu ==0.2.4 + - raw-strings-qq ==1.1 + - rcu ==0.2.5 - rdf ==0.1.0.4 - rdtsc ==1.3.0.1 - re2 ==0.3 + - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - readable ==0.3.1 - - reanimate ==1.1.3.2 - - reanimate-svg ==0.13.0.0 + - reanimate ==1.1.3.3 + - reanimate-svg ==0.13.0.1 - rebase ==1.6.1 - - record-dot-preprocessor ==0.2.7 + - record-dot-preprocessor ==0.2.8 - record-hasfield ==1.0 - - record-wrangler ==0.1.1.0 - records-sop ==0.1.0.3 - - recursion-schemes ==5.2.1 + - record-wrangler ==0.1.1.0 + - recursion-schemes ==5.2.2 - reducers ==3.12.3 - - ref-fd ==0.4.0.2 - - ref-tf ==0.4.0.2 - refact ==0.3.0.2 + - ref-fd ==0.4.0.2 - refined ==0.6.2 - reflection ==2.1.6 - reform ==0.2.7.4 @@ -1975,11 +1983,12 @@ default-package-overrides: - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.4 - RefSerialize ==0.4.0 + - ref-tf ==0.4.0.2 - regex ==1.1.0.0 - regex-applicative ==0.3.4 - regex-applicative-text ==0.1.0.1 - - regex-base ==0.94.0.0 - - regex-compat ==0.95.2.0 + - regex-base ==0.94.0.1 + - regex-compat ==0.95.2.1 - regex-compat-tdfa ==0.95.1.4 - regex-pcre ==0.95.0.0 - regex-pcre-builtin ==0.95.1.3.8.43 @@ -2013,6 +2022,7 @@ default-package-overrides: - rev-state ==0.1.2 - rfc1751 ==0.1.3 - rfc5051 ==0.2 + - rhbzquery ==0.4.3 - rhine ==0.7.0 - rhine-gloss ==0.7.0 - rigel-viz ==0.2.0.0 @@ -2032,15 +2042,15 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.6 - safe ==0.3.19 + - safecopy ==0.10.4.1 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 - safe-foldable ==0.1.0.0 + - safeio ==0.0.5.0 - safe-json ==1.1.1.1 - safe-money ==0.9 - - safe-tensor ==0.2.1.0 - - safecopy ==0.10.3.1 - - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 + - safe-tensor ==0.2.1.0 - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.1 @@ -2062,7 +2072,7 @@ default-package-overrides: - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==1.1.0 - - sdl2-ttf ==2.1.1 + - sdl2-ttf ==2.1.2 - search-algorithms ==0.3.1 - secp256k1-haskell ==0.5.0 - securemem ==0.1.10 @@ -2078,8 +2088,8 @@ default-package-overrides: - semigroupoid-extras ==5 - semigroupoids ==5.3.5 - semigroups ==0.19.1 - - semiring-simple ==1.0.0.1 - semirings ==0.6 + - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 @@ -2111,7 +2121,7 @@ default-package-overrides: - servant-swagger-ui ==0.3.4.3.37.2 - servant-swagger-ui-core ==0.3.4 - serverless-haskell ==0.12.5 - - serversession ==1.0.1 + - serversession ==1.0.2 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 - set-cover ==0.1.1 @@ -2125,9 +2135,9 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shell-utility ==0.1 - shellmet ==0.0.3.1 - shelltestrunner ==1.9 + - shell-utility ==0.1 - shelly ==1.9.0 - shikensu ==0.3.11 - shortcut-links ==0.5.1.1 @@ -2157,12 +2167,12 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.10.2 - - skylighting-core ==0.10.2 + - skylighting ==0.10.3 + - skylighting-core ==0.10.3 - slack-api ==0.12 - slack-progressbar ==0.1.0.1 - slist ==0.1.1.0 - - slynx ==0.5.0.1 + - slynx ==0.5.0.2 - smallcheck ==1.2.1 - smash ==0.1.1.0 - smash-aeson ==0.1.0.0 @@ -2190,7 +2200,7 @@ default-package-overrides: - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - speculate ==0.4.2 - - speedy-slice ==0.3.1 + - speedy-slice ==0.3.2 - Spintax ==0.3.5 - splice ==0.6.1.1 - splint ==1.0.1.3 @@ -2198,16 +2208,16 @@ default-package-overrides: - splitmix ==0.1.0.3 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - - sql-words ==0.1.6.4 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.0 + - sql-words ==0.1.6.4 - squeal-postgresql ==0.7.0.1 - squeather ==0.6.0.0 - srcloc ==0.5.1.2 - stache ==2.2.0 - - stack-templatizer ==0.1.0.2 - stackcollapse-ghc ==0.0.1.3 + - stack-templatizer ==0.1.0.2 - stateref ==0.3 - StateVar ==1.2.1 - static-text ==0.2.0.6 @@ -2220,10 +2230,10 @@ default-package-overrides: - stm-containers ==1.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.4 + - stm-hamt ==1.2.0.6 - stm-lifted ==2.5.0.0 - - stm-split ==0.0.2.1 - STMonadTrans ==0.4.5 + - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6 @@ -2244,23 +2254,23 @@ default-package-overrides: - strict-list ==0.1.5 - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 + - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 - - string-interpolate ==0.3.0.2 + - string-interpolate ==0.3.1.0 - string-qq ==0.0.4 - string-random ==0.1.4.0 - - string-transform ==1.1.1 - - stringbuilder ==0.5.1 - stringsearch ==0.3.6.6 + - string-transform ==1.1.1 - stripe-concepts ==1.0.2.4 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 - stripe-http-client ==2.6.2 - stripe-tests ==2.6.2 - strive ==5.0.13 - - structs ==0.1.4 + - structs ==0.1.5 - structured ==0.1 - structured-cli ==2.6.0.0 - subcategories ==0.1.0.0 @@ -2278,10 +2288,10 @@ default-package-overrides: - symmetry-operations-symbols ==0.0.2.1 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 + - systemd ==2.3.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 - - systemd ==2.3.0 - tabular ==0.2.2.8 - taffybar ==3.2.3 - tagchup ==0.4.1.1 @@ -2295,13 +2305,13 @@ default-package-overrides: - tao-example ==1.0.0 - tar ==0.5.1.1 - tar-conduit ==0.3.2 - - tardis ==0.4.1.0 + - tardis ==0.4.3.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.7 - tasty-bench ==0.2.1 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - - tasty-expected-failure ==0.12.2 + - tasty-expected-failure ==0.12.3 - tasty-focus ==1.0.1 - tasty-golden ==2.3.3.2 - tasty-hedgehog ==1.0.1.0 @@ -2348,6 +2358,7 @@ default-package-overrides: - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 + - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 @@ -2358,9 +2369,8 @@ default-package-overrides: - text-show ==3.9 - text-show-instances ==3.8.4 - text-zipper ==0.11 - - textlocal ==0.1.0.5 - - tf-random ==0.5 - tfp ==1.0.1.1 + - tf-random ==0.5 - th-abstraction ==0.4.2.0 - th-bang-compat ==0.0.1.0 - th-compat ==0.1.1 @@ -2368,6 +2378,10 @@ default-package-overrides: - th-data-compat ==0.1.0.0 - th-desugar ==1.11 - th-env ==0.1.0.2 + - these ==1.1.1.1 + - these-lens ==1.0.1.1 + - these-optics ==1.0.1.1 + - these-skinny ==0.7.4 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 @@ -2375,37 +2389,33 @@ default-package-overrides: - th-nowq ==0.1.0.5 - th-orphans ==0.13.11 - th-printf ==0.7 - - th-reify-compat ==0.0.1.5 - - th-reify-many ==0.1.9 - - th-strict-compat ==0.1.0.1 - - th-test-utils ==1.1.0 - - th-utilities ==0.2.4.1 - - these ==1.1.1.1 - - these-lens ==1.0.1.1 - - these-optics ==1.0.1.1 - - these-skinny ==0.7.4 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 - - thread-supervisor ==0.2.0.0 - threads ==0.5.1.6 + - thread-supervisor ==0.2.0.0 - threepenny-gui ==0.9.0.0 + - th-reify-compat ==0.0.1.5 + - th-reify-many ==0.1.9 - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 + - th-strict-compat ==0.1.0.1 + - th-test-utils ==1.1.0 + - th-utilities ==0.2.4.1 - thyme ==0.3.5.5 - - tidal ==1.6.1 + - tidal ==1.7.1 - tile ==0.3.0.0 - time-compat ==1.9.5 + - timeit ==2.0 + - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - - time-units ==1.0.0 - - timeit ==2.0 - - timelens ==0.2.0.2 - - timer-wheel ==0.3.0 - timerep ==2.0.1.0 + - timer-wheel ==0.3.0 + - time-units ==1.0.0 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 @@ -2414,11 +2424,11 @@ default-package-overrides: - tls ==1.5.5 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - - tlynx ==0.5.0.1 + - tlynx ==0.5.0.2 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 - - tomland ==1.3.1.0 + - tomland ==1.3.2.0 - tonalude ==0.1.1.1 - topograph ==1.0.0.1 - torsor ==0.1 @@ -2433,18 +2443,22 @@ default-package-overrides: - traverse-with-class ==1.0.1.0 - tree-diff ==0.1 - tree-fun ==0.8.1.0 - - tree-view ==0.5 - - trifecta ==2.1 + - tree-view ==0.5.1 + - trifecta ==2.1.1 - triplesec ==0.2.2.1 - tsv2csv ==0.1.0.2 - ttc ==0.3.0.0 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 + - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - tuples-homogenous-h98 ==0.1.1.0 - turtle ==1.5.20 + - typecheck-plugin-nat-simple ==0.1.0.2 + - TypeCompose ==0.9.14 + - typed-process ==0.2.6.0 + - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 @@ -2458,14 +2472,10 @@ default-package-overrides: - type-of-html ==1.6.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - type-spec ==0.4.0.0 - - typecheck-plugin-nat-simple ==0.1.0.2 - - TypeCompose ==0.9.14 - - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 - typerep-map ==0.3.3.0 + - type-spec ==0.4.0.0 - tzdata ==0.2.20201021.0 - - ua-parser ==0.7.5.1 + - ua-parser ==0.7.6.0 - uglymemo ==0.1.0.1 - ulid ==0.3.0.0 - unagi-chan ==0.4.1.3 @@ -2518,8 +2528,8 @@ default-package-overrides: - utf8-string ==1.0.2 - util ==0.1.17.1 - utility-ht ==0.0.15 - - uuid ==1.3.13 - - uuid-types ==1.0.3 + - uuid ==1.3.14 + - uuid-types ==1.0.4 - validation ==1.1 - validation-selective ==0.1.0.0 - validity ==0.11.0.0 @@ -2535,7 +2545,7 @@ default-package-overrides: - validity-uuid ==0.1.0.3 - validity-vector ==0.2.0.3 - valor ==0.1.0.0 - - vault ==0.3.1.4 + - vault ==0.3.1.5 - vec ==0.3 - vector ==0.12.2.0 - vector-algorithms ==0.8.0.4 @@ -2550,16 +2560,16 @@ default-package-overrides: - vector-sized ==1.4.3.1 - vector-space ==0.16 - vector-split ==1.0.0.2 - - vector-th-unbox ==0.2.1.7 + - vector-th-unbox ==0.2.1.9 - verbosity ==0.4.0.0 - - versions ==4.0.2 + - versions ==4.0.3 - vformat ==0.14.1.0 - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 - vinyl ==0.13.0 - void ==0.7.3 - - vty ==5.32 + - vty ==5.33 - wai ==3.2.3 - wai-app-static ==3.1.7.2 - wai-conduit ==3.0.0.4 @@ -2604,18 +2614,18 @@ default-package-overrides: - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==0.0.0.5 - - with-location ==0.1.0 - - with-utf8 ==1.0.2.1 - witherable-class ==0 - within ==0.2.0.1 + - with-location ==0.1.0 + - with-utf8 ==1.0.2.2 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 - wl-pprint-text ==1.2.0.1 - - word-trie ==0.3.0 - - word-wrap ==0.4.1 - word24 ==2.0.1 - word8 ==0.1.3 + - word-trie ==0.3.0 + - word-wrap ==0.4.1 - world-peace ==1.0.2.0 - wrap ==0.0.0 - wreq ==0.5.3.3 @@ -2642,6 +2652,7 @@ default-package-overrides: - xml-basic ==0.1.3.1 - xml-conduit ==1.9.0.0 - xml-conduit-writer ==0.1.1.2 + - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 - xml-helpers ==1.0.0 - xml-html-qq ==0.1.0.1 @@ -2651,7 +2662,6 @@ default-package-overrides: - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 - - xmlgen ==0.6.2.2 - xmonad ==0.15 - xmonad-contrib ==0.16 - xmonad-extras ==0.15.3 @@ -2659,7 +2669,6 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.2 - - yes-precure5-command ==5.5.3 - yesod ==1.6.1.0 - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 @@ -2677,6 +2686,7 @@ default-package-overrides: - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 - yesod-websockets ==0.3.0.2 + - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 @@ -2691,10 +2701,10 @@ default-package-overrides: - zio ==0.1.0.2 - zip ==1.7.0 - zip-archive ==0.4.1 - - zip-stream ==0.2.0.1 - zipper-extra ==0.1.3.2 - - zippers ==0.3 - - zlib ==0.6.2.2 + - zippers ==0.3.1 + - zip-stream ==0.2.0.1 + - zlib ==0.6.2.3 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 @@ -2790,14 +2800,12 @@ package-maintainers: - nix-diff maralorn: - reflex-dom - - ghcide - cabal-fmt - shh - - brittany - - hlint - neuron - releaser - taskwarrior + - haskell-language-server sorki: - cayene-lpp - data-stm32 @@ -6915,6 +6923,7 @@ broken-packages: - huzzy - hVOIDP - hw-all + - hw-aws-sqs-conduit - hw-ci-assist - hw-dsv - hw-json @@ -6996,7 +7005,6 @@ broken-packages: - identifiers - idiii - idna2008 - - idris - IDynamic - ieee-utils - iexcloud @@ -9901,9 +9909,12 @@ broken-packages: - servant-zeppelin-server - servant-zeppelin-swagger - server-generic + - serversession - serversession-backend-acid-state - serversession-backend-persistent - serversession-backend-redis + - serversession-frontend-snap + - serversession-frontend-wai - serversession-frontend-yesod - services - ses-html-snaplet diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b4fcf554bbfaf..4ebf5522bd673 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9393,8 +9393,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.14.0.5"; - sha256 = "1hgkymgb8v3f5s7i8nn01iml8mqvah4iyqiqcflj3ffbjb93v1zd"; + version = "0.14.0.6"; + sha256 = "0lm4va3nnb9yli56vfkj7h816k0cnrdjnd3d9x44m706bh3avksq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -9777,8 +9777,8 @@ self: { pname = "HaXml"; version = "1.25.5"; sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb"; - revision = "2"; - editedCabalFile = "0vlczcac2is5dbvkcwbsry1i10pbh1r316n1sq2py35alw7kzp1j"; + revision = "3"; + editedCabalFile = "0n98cigikjiqg2ckgihjw4if35n1jhv0zcqi3qw56b9j02yxdvvz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15016,6 +15016,8 @@ self: { pname = "OneTuple"; version = "0.2.2.1"; sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc"; + revision = "1"; + editedCabalFile = "03mygfz7lv6h0i30bq2grvmahbg9j7a36mc0wls2nr81dv9p19s7"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = lib.licenses.bsd3; @@ -21961,8 +21963,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.6.0.0"; - sha256 = "16wb7hrk6rlxl0sks5nkhl60wxwlxdyjwj9j72g40l5x6qnlvk7d"; + version = "0.6.1.0"; + sha256 = "096zzi2fb6pj310bkihsidwaail9hi78mpfplg4c8skq4157ps6s"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -21983,18 +21985,18 @@ self: { "Z-IO" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hashable - , hspec, hspec-discover, HUnit, microlens, primitive, QuickCheck + , hspec, hspec-discover, HUnit, primitive, QuickCheck , quickcheck-instances, scientific, stm, time, unix-time , unordered-containers, Z-Data, zlib }: mkDerivation { pname = "Z-IO"; - version = "0.6.2.0"; - sha256 = "0d004yi1i45ccqhl4vqw6h4qxav693vas359gs76bz04wdbqgrah"; + version = "0.6.4.0"; + sha256 = "1d651q0xda38652n249swh84kkn2jgw63db01aia00304h9cbcgf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions microlens primitive stm time unix-time + base containers exceptions primitive stm time unix-time unordered-containers Z-Data ]; libraryToolDepends = [ hspec-discover ]; @@ -22017,10 +22019,8 @@ self: { }: mkDerivation { pname = "Z-MessagePack"; - version = "0.1.0.0"; - sha256 = "0ck21z1yqjx4w86h7z4ndj0fkpx7bfxfr9p5ls8687b71wxyzn6z"; - revision = "2"; - editedCabalFile = "14p2w38wrc8m66421wdl7q7fn21vk4b5m2mi2sa79wnaibv43d1n"; + version = "0.3.0.1"; + sha256 = "1xn3by0fkn8w9akldfk2rrfk8ns2r64zxqadrcsgga7nv88q49am"; libraryHaskellDepends = [ base containers deepseq hashable integer-gmp primitive QuickCheck scientific tagged time unordered-containers Z-Data Z-IO @@ -23963,8 +23963,8 @@ self: { pname = "acts"; version = "0.3.1.0"; sha256 = "06bpayfa8vwj8dqlqp71nw2s9iwbffdknkk4hpazd4r1wvhnrg37"; - revision = "2"; - editedCabalFile = "1xc061cj6wxqyr79hdakmc3nnzdh46sj2sd7j9gfrvgmbipl895q"; + revision = "3"; + editedCabalFile = "01vjb8mp9ifbfknnibzc1yhimn5yli2vafpxs6adk0cdjna99g4w"; libraryHaskellDepends = [ base deepseq finitary finite-typelits groups ]; @@ -24381,38 +24381,6 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.5.5.1"; - sha256 = "0iqnzh9xh2vx9viqvs528i24zm9sdpvh8kjbpfxgrca38v6ds5m2"; - libraryHaskellDepends = [ - attoparsec base base-compat-batteries bytestring containers - data-fix deepseq dlist ghc-prim hashable primitive scientific - strict tagged template-haskell text th-abstraction these time - time-compat unordered-containers uuid-types vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers data-fix Diff directory dlist filepath - generic-deriving ghc-prim hashable hashable-time integer-logarithms - QuickCheck quickcheck-instances scientific strict tagged tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - these time time-compat unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = lib.licenses.bsd3; - }) {}; - - "aeson_1_5_6_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat - , base-compat-batteries, base-orphans, base16-bytestring - , bytestring, containers, data-fix, deepseq, Diff, directory, dlist - , filepath, generic-deriving, ghc-prim, hashable, hashable-time - , integer-logarithms, primitive, QuickCheck, quickcheck-instances - , scientific, strict, tagged, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, text, th-abstraction, these - , time, time-compat, unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "aeson"; version = "1.5.6.0"; sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; libraryHaskellDepends = [ @@ -24431,7 +24399,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -24521,26 +24488,6 @@ self: { }) {}; "aeson-combinators" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest, fail - , hspec, scientific, text, time, time-compat, unordered-containers - , utf8-string, uuid-types, vector, void - }: - mkDerivation { - pname = "aeson-combinators"; - version = "0.0.4.0"; - sha256 = "01gsrm6glr2axcls4hxs740z8lxf39cvdhvidf360mnijai4sgl6"; - libraryHaskellDepends = [ - aeson base bytestring containers fail scientific text time - time-compat unordered-containers uuid-types vector void - ]; - testHaskellDepends = [ - aeson base bytestring doctest hspec text utf8-string - ]; - description = "Aeson combinators for dead simple JSON decoding"; - license = lib.licenses.bsd3; - }) {}; - - "aeson-combinators_0_0_4_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, doctest, fail, hspec, scientific, text, time , time-compat, unordered-containers, utf8-string, uuid-types @@ -24562,7 +24509,6 @@ self: { ]; description = "Aeson combinators for dead simple JSON decoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson-commit" = callPackage @@ -24977,8 +24923,8 @@ self: { pname = "aeson-optics"; version = "1.1.0.1"; sha256 = "1pfi84cl7w5bp7dwdhcyi8kchvbfjybqcp0sifqrn70dj2b50mf7"; - revision = "3"; - editedCabalFile = "1hxkahjf6znybqiv622n3syn5pp1a6jdpzq8ryrq9y45yczg82pi"; + revision = "4"; + editedCabalFile = "02g4438a6h2l0brvj1izagrsx9mgs1gqfds98vjzdsmamaqsm8fl"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring optics-core optics-extra scientific text unordered-containers vector @@ -25160,8 +25106,8 @@ self: { }: mkDerivation { pname = "aeson-schemas"; - version = "1.3.2"; - sha256 = "1mchqhpnv7rnhi1lbcsg1pwr5ml2444h3l2yak353s8lr204pg1p"; + version = "1.3.3"; + sha256 = "1dhi4pf8ariqr5g79cnr52rxfi1ywp2sv9sazw51rgv1k4gb3492"; libraryHaskellDepends = [ aeson base first-class-families hashable megaparsec template-haskell text unordered-containers @@ -26521,6 +26467,68 @@ self: { broken = true; }) {}; + "algorithmic-composition-basic" = callPackage + ({ mkDerivation, base, bytestring, directory, foldable-ix + , mmsyn2-array, mmsyn3, mmsyn7l, mmsyn7ukr-common + , phonetic-languages-simplified-base, process + , ukrainian-phonetics-basic-array + }: + mkDerivation { + pname = "algorithmic-composition-basic"; + version = "0.1.1.0"; + sha256 = "0sxgysi596j77j3bfadvk6gcq9k70g0wqrq1mgxh4ypmc145psc1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l + mmsyn7ukr-common phonetic-languages-simplified-base process + ukrainian-phonetics-basic-array + ]; + executableHaskellDepends = [ + base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l + mmsyn7ukr-common 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"; + license = lib.licenses.mit; + }) {}; + + "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 + }: + mkDerivation { + pname = "algorithmic-composition-complex"; + version = "0.1.0.0"; + sha256 = "12spldkdcjidaa95w46z5rvy1nsxn9blzhic8klkgx8jwvynixbl"; + libraryHaskellDepends = [ + algorithmic-composition-basic base bytestring directory foldable-ix + mmsyn2-array mmsyn3 mmsyn7l mmsyn7ukr-common + phonetic-languages-simplified-base process + ukrainian-phonetics-basic-array + ]; + description = "Helps to create more complex experimental music from a file (especially timbre)"; + license = lib.licenses.mit; + }) {}; + + "algorithmic-composition-frequency-shift" = callPackage + ({ mkDerivation, algorithmic-composition-basic, base, directory + , doublezip, mmsyn3, mmsyn7l, process + }: + mkDerivation { + pname = "algorithmic-composition-frequency-shift"; + version = "0.1.0.0"; + sha256 = "0m7pjxczi3w7r3srq76b30xjiqv9w6238xl2hm7s8gwnam8ha7r5"; + libraryHaskellDepends = [ + algorithmic-composition-basic base directory doublezip mmsyn3 + mmsyn7l process + ]; + description = "Helps to create experimental music. Uses SoX inside."; + license = lib.licenses.mit; + }) {}; + "align" = callPackage ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { @@ -29662,26 +29670,6 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.4.5.0"; - sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - amqp base bytestring connection containers data-default-class - directory hinotify magic network process text time tls unix - utf8-string x509-system - ]; - description = "AMQP toolset for the command line"; - license = lib.licenses.gpl3; - }) {}; - - "amqp-utils_0_4_5_1" = callPackage - ({ mkDerivation, amqp, base, bytestring, connection, containers - , data-default-class, directory, hinotify, magic, network, process - , text, time, tls, unix, utf8-string, x509-system - }: - mkDerivation { - pname = "amqp-utils"; version = "0.4.5.1"; sha256 = "15bsp34wqblmds51gvrliqfm4jax3swk7i58ichaliq454cn16ap"; isLibrary = false; @@ -29693,7 +29681,6 @@ self: { ]; description = "AMQP toolset for the command line"; license = lib.licenses.gpl3; - hydraPlatforms = lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -31865,8 +31852,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.9.0.0"; - sha256 = "1w6andxlap50vi2cwdy7x5xp2q1qyd67g4vs860gddcv8nir69qc"; + version = "0.9.1.0"; + sha256 = "1b9ib5ix643aagzsw5vk8d789a784pggsm6qv36bxkcsx89s2bjm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31988,43 +31975,20 @@ self: { }) {}; "approximate" = callPackage - ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal - , comonad, deepseq, directory, doctest, filepath, ghc-prim - , hashable, lens, log-domain, pointed, safecopy, semigroupoids - , semigroups, simple-reflect, vector - }: - mkDerivation { - pname = "approximate"; - version = "0.3.2"; - sha256 = "016i37c5imb0n8gsk7gzyiq8dhkjv0xnn5315kmn6lnrhpfm7yyk"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base binary bytes cereal comonad deepseq ghc-prim hashable lens - log-domain pointed safecopy semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base directory doctest filepath semigroups simple-reflect - ]; - description = "Approximate discrete values and numbers"; - license = lib.licenses.bsd3; - }) {}; - - "approximate_0_3_3" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq , ghc-prim, hashable, lens, log-domain, pointed, safecopy , semigroupoids, semigroups, vector }: mkDerivation { pname = "approximate"; - version = "0.3.3"; - sha256 = "1hvgx5m83zzpy2l0bbs39yvybhsxlq9919hp7wn27n5j0lk7wplk"; + version = "0.3.4"; + sha256 = "06akbrmy66nkgnnk3x87jss9qgv5y9m638rvxy57mfzibf925kbd"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens log-domain pointed safecopy semigroupoids semigroups vector ]; description = "Approximate discrete values and numbers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "approximate-equality" = callPackage @@ -33036,8 +33000,8 @@ self: { }: mkDerivation { pname = "array-chunks"; - version = "0.1.2.0"; - sha256 = "0x2hkc587ki4ncpsdrhby04dr4gxvf0v5qj5kda7kfl2814srixi"; + version = "0.1.3.0"; + sha256 = "0alf0d4ifla7i47pl7xqmrhcwsky56rp4b76qgmh19kji8mfcq5z"; libraryHaskellDepends = [ base primitive run-st ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes tasty tasty-hunit @@ -34193,26 +34157,6 @@ self: { }: mkDerivation { pname = "async"; - version = "2.2.2"; - sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb"; - revision = "1"; - editedCabalFile = "1kg9xmby0wkx31998h2r43yr8bl1aixk6025zqigz9vdhmkc2y51"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base hashable stm ]; - testHaskellDepends = [ - base HUnit stm test-framework test-framework-hunit - ]; - description = "Run IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "async_2_2_3" = callPackage - ({ mkDerivation, base, hashable, HUnit, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; version = "2.2.3"; sha256 = "0p4k6872pj0aykbnc19ilam1h8fgskxlwpyg5qisaivr0fhg6yj6"; isLibrary = true; @@ -34223,7 +34167,6 @@ self: { ]; description = "Run IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "async-ajax" = callPackage @@ -38015,8 +37958,8 @@ self: { pname = "base16"; version = "0.3.0.1"; sha256 = "10id9h9mas4kb4kfiz7hhp2hhwnb9mh92pr327c53jqxi4hazgnd"; - revision = "3"; - editedCabalFile = "15r912hb0l92f2cajpq2b6ky4g5qwfmb502nfv1vrg02a1h25xb6"; + revision = "4"; + editedCabalFile = "05fpdw8qkdg7cfyfsnk5npcxqgjgasd8hi096nh6czj96xn4s1b6"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -38067,18 +38010,15 @@ self: { }) {}; "base16-lens" = callPackage - ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest - , doctest, lens, text, text-short + ({ mkDerivation, base, base16, bytestring, lens, text, text-short }: mkDerivation { pname = "base16-lens"; - version = "0.1.3.0"; - sha256 = "1612v5lj99szshz7vm3mr5p4xxcrga1xxcfm9q9zzpnyd5z5vkn2"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.1.3.2"; + sha256 = "04qz8gm969vlaxsk1j3rlpqph74qjkfr3rkpfkkxrfmxih6cm2fj"; libraryHaskellDepends = [ base base16 bytestring lens text text-short ]; - testHaskellDepends = [ base doctest lens ]; description = "Optics for the Base16 library"; license = lib.licenses.bsd3; }) {}; @@ -38092,8 +38032,8 @@ self: { pname = "base32"; version = "0.2.0.0"; sha256 = "0xvilxcdcvz07f3qpad35whjd35c9ykicip2cdsd54ysxg71mwzm"; - revision = "1"; - editedCabalFile = "0vsc0fq4rihhx4hicfgy1xpfm1bbq4rnwgfs9qzgmwhslffqy2x5"; + revision = "2"; + editedCabalFile = "0chbgkq65mh6nc48a3hywcv7idfqgb3acv4b7gmz8m6szqq4mx95"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -38126,18 +38066,15 @@ self: { }) {}; "base32-lens" = callPackage - ({ mkDerivation, base, base32, bytestring, Cabal, cabal-doctest - , doctest, lens, text + ({ mkDerivation, base, base32, bytestring, lens, text, text-short }: mkDerivation { pname = "base32-lens"; - version = "0.1.0.0"; - sha256 = "0yhaaz5y8cwyjcclmjw0hk31388z233041ycfpwm2a3f0vgpilvn"; - revision = "1"; - editedCabalFile = "1sj9dc2prfhbc3b7bvxmw6wfq0iql6dwvdx928z13rdc4vwj0nv0"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base base32 bytestring lens text ]; - testHaskellDepends = [ base doctest lens ]; + version = "0.1.1.1"; + sha256 = "0wam29m7vz5srrj135wmsbmg9qqhsidnwfhbicy0vmx342ai8bs6"; + libraryHaskellDepends = [ + base base32 bytestring lens text text-short + ]; description = "Optics for the Base32 library"; license = lib.licenses.bsd3; }) {}; @@ -38259,6 +38196,8 @@ self: { pname = "base64"; version = "0.4.2.3"; sha256 = "1hdqswxhgjrg8akl5v99hbm02gkpagsbx4i7fxbzdys1k0bj3gxw"; + revision = "1"; + editedCabalFile = "10s7nw79q385f74x76rh8cy0dxfj7idzrj77ng9x32bf8h7jpa6q"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -38350,8 +38289,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "7"; - editedCabalFile = "1vry5qh9w1adwyfrlx8x2772knwmdvxgq2nfzng7vybll2cqph4c"; + revision = "8"; + editedCabalFile = "196m1ylkl9d03iymld08fhfnfcdydzd824v7ffl67ijmfxcvzcyn"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -38386,16 +38325,15 @@ self: { }) {}; "base64-lens" = callPackage - ({ mkDerivation, base, base64, bytestring, Cabal, cabal-doctest - , doctest, lens, text + ({ mkDerivation, base, base64, bytestring, lens, text, text-short }: mkDerivation { pname = "base64-lens"; - version = "0.3.0"; - sha256 = "0gs3cxmglz0hshi4m94zrlc6fix90cvbdmcv2v4j01zwsdg8gv81"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base base64 bytestring lens text ]; - testHaskellDepends = [ base doctest lens ]; + version = "0.3.1"; + sha256 = "1iszvlc22h7crwqhcafy974l0l1rgxbcjf6lb5yxsvp6q66gzhrn"; + libraryHaskellDepends = [ + base base64 bytestring lens text text-short + ]; description = "Optics for the Base64 library"; license = lib.licenses.bsd3; }) {}; @@ -38901,8 +38839,8 @@ self: { }: mkDerivation { pname = "bcp47"; - version = "0.2.0.1"; - sha256 = "1hrqszdzr15p45wbbnpdkairmqwz8giyb0gn727wgxflh75a84xr"; + version = "0.2.0.3"; + sha256 = "07gz8bflc3klw0370albaff8v9vlgyqgrc5lifl35vs2ia891fhn"; libraryHaskellDepends = [ aeson base containers country generic-arbitrary iso639 megaparsec QuickCheck text @@ -40481,6 +40419,8 @@ self: { pname = "binary-instances"; version = "1.0.1"; sha256 = "0whqjziwqrqslf6byliry84pg47z7vc6yjligpzb8gb5db2gw1h0"; + revision = "1"; + editedCabalFile = "1xw2rl5mk626i54c0azrw5as3avd2cvzxn8l6sg5ymc14c240iwp"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable scientific tagged text text-binary time-compat unordered-containers @@ -40645,8 +40585,8 @@ self: { }: mkDerivation { pname = "binary-search"; - version = "1.0.0.3"; - sha256 = "1ypn2i2c3mxd1zhpj515zf15y9sgz10akbyngg2ymp7ddbs2vqxh"; + version = "2.0.0"; + sha256 = "13dp9wbf58k4rbr9ychf7p0zkrpzykxhh4fws741sk9mcjmrkgv7"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base directory doctest filepath hspec QuickCheck @@ -42739,23 +42679,6 @@ self: { }) {}; "bits" = callPackage - ({ mkDerivation, base, bytes, Cabal, cabal-doctest, doctest, mtl - , transformers - }: - mkDerivation { - pname = "bits"; - version = "0.5.2"; - sha256 = "1q5grjma421qiwjkwvnsakd4hxnf02bavfinky2skfhqvg63hkav"; - revision = "2"; - editedCabalFile = "0zcxzi3afs2vxmm2mc9l65br5qym2ah9q3671f4ckzn0h0hcqw2n"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base bytes mtl transformers ]; - testHaskellDepends = [ base doctest ]; - description = "Various bit twiddling and bitwise serialization primitives"; - license = lib.licenses.bsd3; - }) {}; - - "bits_0_5_3" = callPackage ({ mkDerivation, base, bytes, mtl, transformers }: mkDerivation { pname = "bits"; @@ -42764,7 +42687,6 @@ self: { libraryHaskellDepends = [ base bytes mtl transformers ]; description = "Various bit twiddling and bitwise serialization primitives"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bits-atomic" = callPackage @@ -43021,30 +42943,6 @@ self: { }) {}; "bitvec" = callPackage - ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim, gmp - , integer-gmp, primitive, quickcheck-classes, random, tasty - , tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "bitvec"; - version = "1.0.3.0"; - sha256 = "0s3gdh2rgz9wdnin5h2yhvnr8gy3sgcl9sbb1k4069ap4svrg8hd"; - libraryHaskellDepends = [ - base deepseq ghc-prim integer-gmp primitive vector - ]; - librarySystemDepends = [ gmp ]; - testHaskellDepends = [ - base integer-gmp primitive quickcheck-classes tasty tasty-hunit - tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ - base containers gauge integer-gmp random vector - ]; - description = "Space-efficient bit vectors"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) gmp;}; - - "bitvec_1_1_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , integer-gmp, primitive, quickcheck-classes, random, tasty , tasty-bench, tasty-hunit, tasty-quickcheck, vector @@ -43065,7 +42963,6 @@ self: { ]; description = "Space-efficient bit vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bitwise" = callPackage @@ -43110,6 +43007,31 @@ self: { broken = true; }) {}; + "bitwise-enum_1_0_1_0" = callPackage + ({ mkDerivation, aeson, array, base, deepseq, gauge + , mono-traversable, QuickCheck, test-framework + , test-framework-quickcheck2, vector, wide-word + }: + mkDerivation { + pname = "bitwise-enum"; + version = "1.0.1.0"; + sha256 = "0vmdr8csmxwab7s4nmqdfpqdssivh90fddk94i8wkwj1la867y1z"; + libraryHaskellDepends = [ + aeson array base deepseq mono-traversable vector + ]; + testHaskellDepends = [ + aeson array base deepseq mono-traversable QuickCheck test-framework + test-framework-quickcheck2 vector + ]; + benchmarkHaskellDepends = [ + aeson array base deepseq gauge mono-traversable vector wide-word + ]; + description = "Bitwise operations on bounded enumerations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bitx-bitcoin" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, directory , doctest, exceptions, hspec, http-client, http-client-tls @@ -45794,7 +45716,6 @@ self: { ]; description = "Haskell source code formatter"; license = lib.licenses.agpl3; - maintainers = with lib.maintainers; [ maralorn ]; }) {}; "broadcast-chan" = callPackage @@ -47276,29 +47197,6 @@ self: { }) {}; "bytes" = callPackage - ({ mkDerivation, base, binary, binary-orphans, bytestring, Cabal - , cabal-doctest, cereal, containers, directory, doctest, filepath - , hashable, mtl, scientific, text, time, transformers - , transformers-compat, unordered-containers, void - }: - mkDerivation { - pname = "bytes"; - version = "0.17"; - sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3"; - revision = "5"; - editedCabalFile = "0a089bz9sjnmv3f5w9jsm1b7g60qx8qxqj76lwjj0mslzi9iajk2"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base binary binary-orphans bytestring cereal containers hashable - mtl scientific text time transformers transformers-compat - unordered-containers void - ]; - testHaskellDepends = [ base directory doctest filepath ]; - description = "Sharing code for serialization between binary and cereal"; - license = lib.licenses.bsd3; - }) {}; - - "bytes_0_17_1" = callPackage ({ mkDerivation, base, binary, binary-orphans, bytestring, cereal , containers, hashable, mtl, scientific, text, time, transformers , transformers-compat, unordered-containers, void @@ -47314,7 +47212,6 @@ self: { ]; description = "Sharing code for serialization between binary and cereal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "byteset" = callPackage @@ -47337,8 +47234,8 @@ self: { }: mkDerivation { pname = "byteslice"; - version = "0.2.5.0"; - sha256 = "0sl5jbfni6sx6srlfdpj0cb0pjw38cf3fyxsnaldbap2wfd3ncyr"; + version = "0.2.5.2"; + sha256 = "0nva9w086g6d7g6bjwk4ad14jz8z17m0m9fvzfxv90cx6wkmvph3"; libraryHaskellDepends = [ base bytestring primitive primitive-addr primitive-unlifted run-st tuples vector @@ -48757,23 +48654,22 @@ self: { ({ 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, network-uri, parsec, pretty - , process, random, resolv, stm, tar, text, time, transformers, unix - , zlib + , hashable, HTTP, lukko, mtl, network-uri, parsec, pretty, process + , random, regex-base, regex-posix, resolv, stm, tar, text, time + , transformers, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "3.2.0.0"; - sha256 = "1c0cc256bha97aj7l0lf76l5swlnmwcqppiz8l4cl5xgba4mwmd0"; + version = "3.4.0.0"; + sha256 = "15rylx5pa03jdiwcg1x7zvs6aq3g6phwmi1hz26cl080nczyz00r"; isLibrary = false; isExecutable = true; - setupHaskellDepends = [ base Cabal filepath process ]; executableHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal containers cryptohash-sha256 deepseq directory echo edit-distance - filepath hackage-security hashable HTTP lukko mtl network - network-uri parsec pretty process random resolv stm tar text time - transformers unix zlib + 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 ]; doCheck = false; postInstall = '' @@ -53156,23 +53052,6 @@ self: { }) {}; "charset" = callPackage - ({ mkDerivation, array, base, bytestring, containers, semigroups - , unordered-containers - }: - mkDerivation { - pname = "charset"; - version = "0.3.7.1"; - sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x"; - revision = "2"; - editedCabalFile = "002x3yan7632nqgwk0a7f3wvchgm95pdwqh225va8dnn1lr9pi1z"; - libraryHaskellDepends = [ - array base bytestring containers semigroups unordered-containers - ]; - description = "Fast unicode character sets based on complemented PATRICIA tries"; - license = lib.licenses.bsd3; - }) {}; - - "charset_0_3_8" = callPackage ({ mkDerivation, array, base, bytestring, containers , unordered-containers }: @@ -53185,7 +53064,6 @@ self: { ]; description = "Fast unicode character sets based on complemented PATRICIA tries"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "charsetdetect" = callPackage @@ -57122,23 +57000,6 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.20"; - sha256 = "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base filepath process template-haskell transformers - ]; - description = "Command line argument processing"; - license = lib.licenses.bsd3; - }) {}; - - "cmdargs_0_10_21" = callPackage - ({ mkDerivation, base, filepath, process, template-haskell - , transformers - }: - mkDerivation { - pname = "cmdargs"; version = "0.10.21"; sha256 = "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p"; isLibrary = true; @@ -57148,7 +57009,6 @@ self: { ]; description = "Command line argument processing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cmdargs-browser" = callPackage @@ -59567,37 +59427,14 @@ self: { }) {}; "compensated" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytes, Cabal - , cabal-doctest, cereal, comonad, criterion, deepseq, distributive - , doctest, generic-deriving, hashable, lens, log-domain, safecopy - , semigroupoids, semigroups, simple-reflect, vector - }: - mkDerivation { - pname = "compensated"; - version = "0.8.1"; - sha256 = "1qr5nsg6fb6ib2wp29c1y05zdbydsng0sfg2k75qsh0avb2cgw7z"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bifunctors binary bytes cereal comonad deepseq distributive - hashable lens log-domain safecopy semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base doctest generic-deriving semigroups simple-reflect - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Compensated floating-point arithmetic"; - license = lib.licenses.bsd3; - }) {}; - - "compensated_0_8_2" = callPackage ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad , criterion, deepseq, distributive, hashable, lens, log-domain , safecopy, semigroupoids, semigroups, vector }: mkDerivation { pname = "compensated"; - version = "0.8.2"; - sha256 = "0mqy5c5wh4m3l78fbd20vnllpsn383q07kxl6j62iakcyhr1264p"; + version = "0.8.3"; + sha256 = "0xigi4pcw581d8kjbhdjkksyz9bgcgvq0j17br9z1x6a3hw1m39a"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive hashable lens log-domain safecopy semigroupoids semigroups vector @@ -59605,7 +59442,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Compensated floating-point arithmetic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "competition" = callPackage @@ -62202,16 +62038,15 @@ self: { }) {}; "connections" = callPackage - ({ mkDerivation, base, containers, finite-typelits, hedgehog - , transformers, universe-base - }: + ({ mkDerivation, base, containers, doctest, hedgehog }: mkDerivation { pname = "connections"; - version = "0.1.0"; - sha256 = "0lnskpdfgxjbkqlg82i1gxz8dsns36szyw1mv45nlq7jqspfspgp"; - libraryHaskellDepends = [ - base containers finite-typelits transformers universe-base - ]; + version = "0.2.0"; + sha256 = "1hvfqdjcj4mp2iyx0596710z4f8fm0jlgp819xf2s90rz1b360ya"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base doctest ]; testHaskellDepends = [ base hedgehog ]; description = "Orders, Galois connections, and lattices"; license = lib.licenses.bsd3; @@ -70970,7 +70805,7 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_2_18" = callPackage + "dbus_1_2_19" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -70979,8 +70814,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.18"; - sha256 = "15ggmggzgzf0xmj80rj14dyk83vra6yzm5pm92psnc4spn213p73"; + version = "1.2.19"; + sha256 = "1wcwh8c27v8vs7jaqzp3032wzx14v4mn7r2qhxhb77cppimrjqpg"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -71768,10 +71603,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dec"; - version = "0.0.3"; - sha256 = "1y8bvlm2371dq2v0jv1srki98nbhbz091wh0g2x58wz78h971f6r"; - revision = "2"; - editedCabalFile = "1v5f5yby0cld1ziqqgkcx8b50qkpviplspm82a6wl7lw28cjm0hs"; + version = "0.0.4"; + sha256 = "0yslffafmqfkvhcw2arpc53hfmn1788z85ss9lxnbclr29lbvzgc"; libraryHaskellDepends = [ base ]; description = "Decidable propositions"; license = lib.licenses.bsd3; @@ -71846,8 +71679,8 @@ self: { }: mkDerivation { pname = "declarative"; - version = "0.5.3"; - sha256 = "021rhdhj2sji316mkm1fw679w7xb9n51x9pslmj21427q127ycw3"; + version = "0.5.4"; + sha256 = "10dwdzl4gbxwvb068kz8kiprk18bwl79pkyhyyrmfzawf8zp3pha"; libraryHaskellDepends = [ base hasty-hamiltonian kan-extensions lens mcmc-types mighty-metropolis mwc-probability pipes primitive speedy-slice @@ -72110,28 +71943,6 @@ self: { }: mkDerivation { pname = "deferred-folds"; - version = "0.9.15"; - sha256 = "0jijnjy6x6f86dmlhiaj9gl13zbwzaz4gpb8svzdwwws48bwwyqr"; - libraryHaskellDepends = [ - base bytestring containers foldl hashable primitive text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Abstractions over deferred folds"; - license = lib.licenses.mit; - }) {}; - - "deferred-folds_0_9_16" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "deferred-folds"; version = "0.9.16"; sha256 = "0727pknxn5vib9ri7h39d6gbqxgczqcfdmqaqj9i0lv6wbwn5ar1"; libraryHaskellDepends = [ @@ -72144,7 +71955,6 @@ self: { ]; description = "Abstractions over deferred folds"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "definitive-base" = callPackage @@ -73113,8 +72923,8 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.2.6"; - sha256 = "0x9sv8r0ziy14zk6lcgzgxbmx9mrlngc0r1bqg6gkgxhswmjc2jq"; + version = "0.2.6.1"; + sha256 = "014f3jsaiwqkz2l0jap8shwq3rdn1hq14ahmq0hm3l4c98vznjra"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -74776,22 +74586,6 @@ self: { }: mkDerivation { pname = "diagrams-solve"; - version = "0.1.2"; - sha256 = "1qzycw3aj4107dqpgir3ak7pnja3a6i4ax15gd2q2fjzmp4p3z24"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base deepseq tasty tasty-hunit tasty-quickcheck - ]; - description = "Pure Haskell solver routines used by diagrams"; - license = lib.licenses.bsd3; - }) {}; - - "diagrams-solve_0_1_3" = callPackage - ({ mkDerivation, base, deepseq, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "diagrams-solve"; version = "0.1.3"; sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17"; libraryHaskellDepends = [ base ]; @@ -74800,7 +74594,6 @@ self: { ]; description = "Pure Haskell solver routines used by diagrams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-svg" = callPackage @@ -75991,6 +75784,8 @@ self: { pname = "directory"; version = "1.3.6.1"; sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi"; + revision = "1"; + editedCabalFile = "1rf2w9gx0vy74mgsf5q1y82bhm5ngb9mi0i2v2h6ss9gscyvgb7j"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -77532,8 +77327,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "9"; - editedCabalFile = "09qgsqzjnkr5d2lwdz86q3zrikd5hacd62hvvfdqy39kh5wrqn4y"; + revision = "10"; + editedCabalFile = "0k9h3d93ivjykdpblkdcxyv1aybbjq6m5laqjh7bdv6nrdr5va2c"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -78967,6 +78762,17 @@ self: { license = "GPL"; }) {}; + "doublezip" = callPackage + ({ mkDerivation, base, foldable-ix }: + mkDerivation { + pname = "doublezip"; + version = "0.1.0.0"; + sha256 = "0bf9jb688kj5f0cjb2ma6744aj2hkslkpc96frljm73h6pyqvwz6"; + libraryHaskellDepends = [ base foldable-ix ]; + description = "Some special functions to work with lists (with zip)"; + license = lib.licenses.mit; + }) {}; + "doublify-toolkit" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79390,14 +79196,16 @@ self: { }) {}; "drama" = callPackage - ({ mkDerivation, base, criterion, ki, transformers, unagi-chan }: + ({ mkDerivation, base, ki, transformers, unagi-chan }: mkDerivation { pname = "drama"; - version = "0.1.0.1"; - sha256 = "0ssmw1yci4369hvpdc5f4ng6s4m7m2lgn9sp6jbgj90izwg0px8w"; + version = "0.3.0.0"; + sha256 = "17smzrvpaah2lcc2467dd61lns53q4n0bf0pl9glsv04j9kv2nl9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base ki transformers unagi-chan ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Simple actor library for Haskell"; + executableHaskellDepends = [ base ]; + description = "Actor library for Haskell"; license = lib.licenses.bsd3; }) {}; @@ -79840,8 +79648,8 @@ self: { }: mkDerivation { pname = "dtab"; - version = "1.1.1.1"; - sha256 = "1pxhvnm5vvgfxwm42s3w3i5nk0lx75xgsr1c487hkswip48fiyd6"; + version = "1.2"; + sha256 = "1mkk1jdw04294hljz3jxiz8403jq7srx6nalyjn1kj09yvws3d05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81257,21 +81065,6 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "echo"; - version = "0.1.3"; - sha256 = "1vw5ykpwhr39wc0hhcgq3r8dh59zq6ib4zxbz1qd2wl21wqhfkvh"; - revision = "1"; - editedCabalFile = "0br8wfiybcw5hand4imiw0i5hacdmrax1dv8g95f35gazffbx42l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base process ]; - description = "A cross-platform, cross-console way to handle echoing terminal input"; - license = lib.licenses.bsd3; - }) {}; - - "echo_0_1_4" = callPackage - ({ mkDerivation, base, process }: - mkDerivation { - pname = "echo"; version = "0.1.4"; sha256 = "0hqfdd4kvpp59cjjv790bkf72yqr9xjfqlbjcrdsc9a8j3r1pzn9"; isLibrary = true; @@ -81279,7 +81072,6 @@ self: { libraryHaskellDepends = [ base process ]; description = "A cross-platform, cross-console way to handle echoing terminal input"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ecma262" = callPackage @@ -83139,25 +82931,6 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.5.0.1"; - sha256 = "1rglf080hx4c8nai07ghh2wf6j79x9hfx2mjzbqc588y0rpj7kmj"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring elynx-tools optparse-applicative slynx tlynx - ]; - description = "Validate and (optionally) redo ELynx analyses"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "elynx_0_5_0_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, elynx-tools - , optparse-applicative, slynx, tlynx - }: - mkDerivation { - pname = "elynx"; version = "0.5.0.2"; sha256 = "1hky4amw78ciblr6alcxp79dshsc5wqswp16hbqdry132xps9dw3"; isLibrary = false; @@ -83174,28 +82947,6 @@ self: { "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration - , math-functions, mwc-random, parallel, primitive, statistics - , vector - }: - mkDerivation { - pname = "elynx-markov"; - version = "0.5.0.1"; - sha256 = "0m24kzayvhc2mhhk2glpw82kmdbgk38vl2d0xdkkdnnbqag8mbqa"; - libraryHaskellDepends = [ - async attoparsec base bytestring containers elynx-seq hmatrix - integration math-functions mwc-random parallel primitive statistics - vector - ]; - testHaskellDepends = [ - base containers elynx-tools hmatrix hspec mwc-random vector - ]; - description = "Simulate molecular sequences along trees"; - license = lib.licenses.gpl3Plus; - }) {}; - - "elynx-markov_0_5_0_2" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, containers - , elynx-seq, elynx-tools, hmatrix, hspec, integration , math-functions, mwc-random, primitive, statistics, vector }: mkDerivation { @@ -83212,32 +82963,18 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Simulate molecular sequences along trees"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; }) {}; "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.5.0.1"; - sha256 = "0jh5j4f8awallrjbgrgdjl6jdzk2lswr28xjryqdapwf4licfkk2"; - libraryHaskellDepends = [ attoparsec base bytestring ]; - testHaskellDepends = [ base hspec ]; - description = "Import and export Nexus files"; - license = lib.licenses.gpl3Plus; - }) {}; - - "elynx-nexus_0_5_0_2" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec }: - mkDerivation { - pname = "elynx-nexus"; version = "0.5.0.2"; sha256 = "1y7ndj216w58s85bfgp4vg7zi1asj6br68k000hy4a8cchjprlp9"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; }) {}; "elynx-seq" = callPackage @@ -83247,26 +82984,6 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.5.0.1"; - sha256 = "0b5jih0jgcf0rbcbwj18l269wbgf31i9125gx3rz6w7ydapmr7wr"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers matrices mwc-random - parallel primitive vector vector-th-unbox word8 - ]; - testHaskellDepends = [ - base bytestring elynx-tools hspec matrices vector - ]; - description = "Handle molecular sequences"; - license = lib.licenses.gpl3Plus; - }) {}; - - "elynx-seq_0_5_0_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , elynx-tools, hspec, matrices, mwc-random, parallel, primitive - , vector, vector-th-unbox, word8 - }: - mkDerivation { - pname = "elynx-seq"; version = "0.5.0.2"; sha256 = "11nl8gw05gvd6j7dflqzi21kixmm0jalpqv9x9f6bb7qwdv1xak2"; libraryHaskellDepends = [ @@ -83278,7 +82995,6 @@ self: { ]; description = "Handle molecular sequences"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; }) {}; "elynx-tools" = callPackage @@ -83290,28 +83006,6 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.5.0.1"; - sha256 = "0lq5jv9dwyi0plkx1n270dan8nfxac9q7rhcdq95mzhgar8daink"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring - cryptohash-sha256 deepseq directory fast-logger hmatrix - monad-control monad-logger mwc-random optparse-applicative - primitive template-haskell text time transformers transformers-base - vector zlib - ]; - description = "Tools for ELynx"; - license = lib.licenses.gpl3Plus; - }) {}; - - "elynx-tools_0_5_0_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, cryptohash-sha256, deepseq, directory, fast-logger - , hmatrix, monad-control, monad-logger, mwc-random - , optparse-applicative, primitive, template-haskell, text, time - , transformers, transformers-base, vector, zlib - }: - mkDerivation { - pname = "elynx-tools"; version = "0.5.0.2"; sha256 = "1q62f0b0fk6g2a4w5bbbpldv0awk7cn2q544xcxplanpr3fmaj8v"; libraryHaskellDepends = [ @@ -83323,7 +83017,6 @@ self: { ]; description = "Tools for ELynx"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; }) {}; "elynx-tree" = callPackage @@ -83334,33 +83027,6 @@ self: { }: mkDerivation { pname = "elynx-tree"; - version = "0.5.0.1"; - sha256 = "1pzam7qg7qihim50iyxw2fsy58xakzjvzskaa4vhzg9cghmjjva8"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring comonad containers deepseq - double-conversion elynx-nexus math-functions mwc-random parallel - primitive statistics - ]; - testHaskellDepends = [ - attoparsec base bytestring containers elynx-tools hspec QuickCheck - ]; - benchmarkHaskellDepends = [ - base criterion elynx-tools microlens mwc-random parallel - ]; - description = "Handle phylogenetic trees"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "elynx-tree_0_5_0_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad - , containers, criterion, deepseq, double-conversion, elynx-nexus - , elynx-tools, hspec, math-functions, microlens, mwc-random - , parallel, primitive, QuickCheck, statistics - }: - mkDerivation { - pname = "elynx-tree"; version = "0.5.0.2"; sha256 = "1ywqbc80hq4dprzrrq9gyi7h2624i2mgpd43pv045dldh7dqhygn"; libraryHaskellDepends = [ @@ -85159,34 +84825,6 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, data-default, directory, doctest, fail - , filepath, lens, mtl, parsec, process, semigroups, temporary - , transformers, unordered-containers - }: - mkDerivation { - pname = "ersatz"; - version = "0.4.8"; - sha256 = "1gddf8zhavxri80f3nnd29ff6k7n03ggcah4qglknci7h94z7v8c"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers data-default lens mtl - process semigroups temporary transformers unordered-containers - ]; - executableHaskellDepends = [ - array base containers fail lens mtl parsec semigroups - ]; - testHaskellDepends = [ array base directory doctest filepath ]; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "ersatz_0_4_9" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers , data-default, fail, lens, mtl, parsec, process, semigroups , temporary, transformers, unordered-containers @@ -85423,8 +85061,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.4.0.1"; - sha256 = "1vq8yfrixgqps8g6wvfgr9n42zmwj1jybiq3sbrgfj318n6dm5mc"; + version = "3.4.1.0"; + sha256 = "1nm2xdl6an140gl5cw6ij7s6i6v2xfp98m8dwbwzns75nrgmsb73"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -87949,8 +87587,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.8.1"; - sha256 = "189svxwh54zzczrrirlnfyqmv2f12h8qxw9rqq47mn55ch40xnw3"; + version = "0.8.2"; + sha256 = "133yid7snb48n4rn15p6nsk2h1shbiw647d5fvapn3lnsb4ymqgv"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq ghc-prim hashable incremental membership monad-skeleton prettyprinter @@ -88910,28 +88548,6 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.0.2"; - sha256 = "0ilbjz09vw35jzfvkiqjy6zjbci2l60wcyjzfysrbxzk24qxmb5z"; - revision = "1"; - editedCabalFile = "1w8nsnjnpaxz8hm66gmh18msmc9hsafpladwy4ihvydb421fqpq2"; - libraryHaskellDepends = [ - array auto-update base bytestring directory easy-file filepath text - unix-compat unix-time - ]; - testHaskellDepends = [ base bytestring directory hspec ]; - testToolDepends = [ hspec-discover ]; - description = "A fast logging system"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sternenseemann ]; - }) {}; - - "fast-logger_3_0_3" = callPackage - ({ mkDerivation, array, auto-update, base, bytestring, directory - , easy-file, filepath, hspec, hspec-discover, text, unix-compat - , unix-time - }: - mkDerivation { - pname = "fast-logger"; version = "3.0.3"; sha256 = "0s7hsbii1km7dqkxa27v2fw553wqx6x00204s6iapv2k20ra0qsp"; libraryHaskellDepends = [ @@ -88942,7 +88558,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; @@ -93713,6 +93328,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "foldl_1_4_11" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, doctest, hashable, mwc-random + , primitive, profunctors, semigroupoids, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "foldl"; + version = "1.4.11"; + sha256 = "05i87pqldk1xfpx66nh1lhn75x3g7s8kvhf9k9yll33a6ggawwxl"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable + mwc-random primitive profunctors semigroupoids text transformers + unordered-containers vector + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "foldl-exceptions" = callPackage ({ mkDerivation, base, doctest, foldl, safe-exceptions }: mkDerivation { @@ -93828,31 +93465,6 @@ self: { }) {}; "folds" = callPackage - ({ mkDerivation, adjunctions, base, bifunctors, bytestring, Cabal - , cabal-doctest, comonad, constraints, contravariant, data-reify - , deepseq, directory, distributive, doctest, filepath, lens, mtl - , pointed, profunctors, reflection, semigroupoids, semigroups - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "folds"; - version = "0.7.5"; - sha256 = "17a8xggx17m59hiwd2lxd2379sw4xblgyv1pk9g5h93w3m8wgq1r"; - configureFlags = [ "-f-test-hlint" ]; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - adjunctions base bifunctors comonad constraints contravariant - data-reify distributive lens mtl pointed profunctors reflection - semigroupoids transformers unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring deepseq directory doctest filepath mtl semigroups - ]; - description = "Beautiful Folding"; - license = lib.licenses.bsd3; - }) {}; - - "folds_0_7_6" = callPackage ({ mkDerivation, adjunctions, base, bifunctors, comonad , constraints, contravariant, data-reify, distributive, lens, mtl , pointed, profunctors, reflection, semigroupoids, transformers @@ -93870,7 +93482,6 @@ self: { ]; description = "Beautiful Folding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "folds-common" = callPackage @@ -94727,6 +94338,8 @@ self: { pname = "fourmolu"; version = "0.3.0.0"; sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms"; + revision = "1"; + editedCabalFile = "1n3avdmjqkd2910lhb5spxvjgzb7icln82pcrz3cmkfmjwxnirsc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -96830,23 +96443,6 @@ self: { }: mkDerivation { pname = "functor-classes-compat"; - version = "1"; - sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "7"; - editedCabalFile = "0dagdnlb3wfrli6adpy4fjlgdc982pjgwcnq2sb7p3zm86ngi07v"; - libraryHaskellDepends = [ - base containers hashable unordered-containers vector - ]; - description = "Data.Functor.Classes instances for core packages"; - license = lib.licenses.bsd3; - }) {}; - - "functor-classes-compat_1_0_1" = callPackage - ({ mkDerivation, base, containers, hashable, unordered-containers - , vector - }: - mkDerivation { - pname = "functor-classes-compat"; version = "1.0.1"; sha256 = "0p6kwj1yimis0rg2gihwkgxkjj1psxy38hxa94gz5pd638314hi3"; libraryHaskellDepends = [ @@ -96854,7 +96450,6 @@ self: { ]; description = "Data.Functor.Classes instances for core packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "functor-combinators" = callPackage @@ -98620,33 +98215,33 @@ self: { }) {}; "gemini-router" = callPackage - ({ mkDerivation, base, gemini-server, network-uri, transformers }: + ({ mkDerivation, base, gemini-server, HsOpenSSL, network-uri + , transformers + }: mkDerivation { pname = "gemini-router"; - version = "0.1.0.0"; - sha256 = "1k1fa4vi93ijj8yf1sfjgmy5kibs0z77z994pvzs1bm8sx73h8kr"; - revision = "1"; - editedCabalFile = "1pb52h8md6g422y5rj7nyy1mkgxccggfal27i42c3qsn8x9frrpz"; + version = "0.1.1.0"; + sha256 = "19aq9ri0ixkg0d5g4ickda75dvpq340lwkdxn0ndcbkis9xrvkv9"; libraryHaskellDepends = [ - base gemini-server network-uri transformers + base gemini-server HsOpenSSL network-uri transformers ]; description = "A simple Happstack-style Gemini router"; license = lib.licenses.bsd3; }) {}; "gemini-server" = callPackage - ({ mkDerivation, base, bytestring, hslogger, network, network-run - , network-uri, text, utf8-string + ({ mkDerivation, base, bytestring, hslogger, HsOpenSSL, network + , network-run, network-uri, text, utf8-string }: mkDerivation { pname = "gemini-server"; - version = "0.1.0.0"; - sha256 = "0m98dc66469gbnsra8sp0clrlbyzn817vnd7aini576g5gv4sxr5"; + version = "0.2.0.0"; + sha256 = "06sqy3c04s3cjx6p9rzfi23cq34bjs1wbigczcc66i6ahf4x1hz2"; revision = "1"; - editedCabalFile = "091wv6ar78dhhz1y6rknslxc2wh020b50n38928abl0a939gwvh9"; + editedCabalFile = "0zw9svhk5wmi56vqmw7630nqhp816xph9ldgc8l3jzspziz350fx"; libraryHaskellDepends = [ - base bytestring hslogger network network-run network-uri text - utf8-string + base bytestring hslogger HsOpenSSL network network-run network-uri + text utf8-string ]; description = "A lightweight server for the Gemini protocol"; license = lib.licenses.bsd3; @@ -99506,10 +99101,8 @@ self: { }: mkDerivation { pname = "generics-sop"; - version = "0.5.1.0"; - sha256 = "0g0z0k5bnw3whfj3qswzhadrhg85jfn491s30cgai0ijfjm5gipa"; - revision = "1"; - editedCabalFile = "1m61bb6k96ybsrc3hpxn0fdspq9mbkyfklx7vfnd55mava4ahzp2"; + version = "0.5.1.1"; + sha256 = "1n65wjdbb9fswa43ys5k6c746c905877lw5ij33y66iabj5w7dw1"; libraryHaskellDepends = [ base ghc-prim sop-core template-haskell th-abstraction ]; @@ -99527,6 +99120,8 @@ self: { pname = "generics-sop-lens"; version = "0.2.0.1"; sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks"; + revision = "1"; + editedCabalFile = "1y9v2imcrm8wyagv2d91x7zvdf358iz7460gqakhg9bgifjaylh1"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = lib.licenses.bsd3; @@ -100700,6 +100295,8 @@ self: { pname = "ghc-byteorder"; version = "4.11.0.0.10"; sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; + revision = "1"; + editedCabalFile = "1qwx6569079a8viq2plkpc1wlqdz8syys6hvx68m051a7zvdwzyl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; doHaddock = false; @@ -100988,8 +100585,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.6.3.4"; - sha256 = "0x3z9zlghcd22v6hidby72w6g11xl6cbwyskzcjlv0235csr5v98"; + version = "0.6.4"; + sha256 = "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101417,8 +101014,8 @@ self: { pname = "ghc-paths"; version = "0.1.0.12"; sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf"; - revision = "1"; - editedCabalFile = "1gb4hn87a78j1c2y1adi81y03irzkaxywscjkphfajsxc7f0ydw5"; + revision = "2"; + editedCabalFile = "07f81larq1ddxq2m2vyq05sdhfmz0whf2c3i5cdq57pkhijxppxg"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; @@ -101495,8 +101092,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.7"; - sha256 = "0js799sf957xlki8f7jgwj803iygi35j4bp4p4hh8gzj4icvcqfz"; + version = "1.4.1.8"; + sha256 = "02k6il0a6cdr5dvf5x6gpjyn9vzn43kahqdsq5lzjvw5c6l0462p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101810,6 +101407,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-trace-events_0_1_2_2" = callPackage + ({ mkDerivation, base, bytestring, tasty-bench, text }: + mkDerivation { + pname = "ghc-trace-events"; + version = "0.1.2.2"; + sha256 = "18vhv99lrfjx6bxww77qxg7gwqmvpylvlrq1bji0hd6mcxxdjn69"; + libraryHaskellDepends = [ base bytestring text ]; + benchmarkHaskellDepends = [ base bytestring tasty-bench ]; + description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-extra" = callPackage ({ mkDerivation, base, containers, ghc, ghc-prim , ghc-tcplugins-extra, ghc-typelits-knownnat @@ -101859,22 +101469,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.3"; - sha256 = "14lynjsmiml19wma9fk2bbhfz43wzbbyvrxp8xpch2lkh5zkfkny"; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra integer-gmp transformers - ]; - testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-natnormalise_0_7_4" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra - , integer-gmp, tasty, tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; version = "0.7.4"; sha256 = "0d8wwb1i6jj11cylf2n42r08hfygv9gwy89xyxp4kdclyw9mfwrp"; libraryHaskellDepends = [ @@ -101883,7 +101477,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-presburger" = callPackage @@ -102214,7 +101807,6 @@ self: { description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ maralorn ]; broken = true; }) {shake-bench = null;}; @@ -102280,7 +101872,6 @@ self: { description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ maralorn ]; broken = true; }) {shake-bench = null;}; @@ -103220,8 +102811,8 @@ self: { }: mkDerivation { pname = "gi-gtk-declarative"; - version = "0.6.3"; - sha256 = "1cxh1r7ylj6d13nyjxdkvgp7h6fqzbi4zndl95lykki129jhfwkk"; + version = "0.7.0"; + sha256 = "0j6yk2qr88yrxs8vdwcqv6jzisjl0x1j932ssim8ay98z4r6y8gg"; libraryHaskellDepends = [ base containers data-default-class gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading mtl text @@ -103241,17 +102832,20 @@ self: { "gi-gtk-declarative-app-simple" = callPackage ({ mkDerivation, async, base, gi-gdk, gi-glib, gi-gobject, gi-gtk , gi-gtk-declarative, haskell-gi, haskell-gi-base - , haskell-gi-overloading, pipes, pipes-concurrency, text + , haskell-gi-overloading, hspec, pipes, pipes-concurrency, text }: mkDerivation { pname = "gi-gtk-declarative-app-simple"; - version = "0.6.3"; - sha256 = "1dyz6sfj352lacs3bk4lxbv9dmlpqp27kzl9vz8bq4321d5nfav9"; + version = "0.7.0"; + sha256 = "0ygp70yfj530czfw6an3yp9y883q4lwky45rxdslyf1ifk8dn6rf"; libraryHaskellDepends = [ async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative haskell-gi haskell-gi-base haskell-gi-overloading pipes pipes-concurrency text ]; + testHaskellDepends = [ + async base gi-gtk gi-gtk-declarative hspec pipes + ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; @@ -104002,8 +103596,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210127"; - sha256 = "1hsmaw70lfza1g5j6b9zbwqkkr374m18p7qb4nl952pj42a46vv3"; + version = "8.20210223"; + sha256 = "07wxf44pdh9d1pxqympgyfbkk8vk0pqbgxma0mkadlkdr6c9z832"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -115871,8 +115465,8 @@ self: { }: mkDerivation { pname = "hanspell"; - version = "0.2.2.0"; - sha256 = "06351wg5y9840nj1ysraa78bixk25vjn64g6fnj3d0zs2qyxd6ca"; + version = "0.2.3.0"; + sha256 = "1n692i4d92g25j31v7iyp7w3135hxcdm5p18zki8mmx6x1pg244a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117202,8 +116796,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.5.0.0"; - sha256 = "1lic3s5z3rq2m3hpf9626k8k3a8vrx267afavzvzcngkfdl3bfap"; + version = "0.5.0.1"; + sha256 = "08j3bi6a04pkkf99ghw2h7z1bdisby0d3hyqv559a1pxwpbi7k22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117500,19 +117094,6 @@ self: { }) {}; "hashable-time" = callPackage - ({ mkDerivation, base, hashable, time }: - mkDerivation { - pname = "hashable-time"; - version = "0.2.0.2"; - sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs"; - revision = "3"; - editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk"; - libraryHaskellDepends = [ base hashable time ]; - description = "Hashable instances for Data.Time"; - license = lib.licenses.bsd3; - }) {}; - - "hashable-time_0_2_1" = callPackage ({ mkDerivation, base, hashable, time, time-compat }: mkDerivation { pname = "hashable-time"; @@ -117521,7 +117102,6 @@ self: { libraryHaskellDepends = [ base hashable time time-compat ]; description = "Hashable instances for Data.Time"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hashabler" = callPackage @@ -118752,6 +118332,7 @@ self: { testToolDepends = [ ghcide ]; description = "LSP server for GHC"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "haskell-lexer" = callPackage @@ -120901,26 +120482,26 @@ self: { }) {}; "haskoin-core" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring - , cereal, conduit, containers, cryptonite, deepseq, entropy - , hashable, hspec, hspec-discover, HUnit, lens, lens-aeson, memory - , mtl, murmur3, network, QuickCheck, safe, scientific + ({ mkDerivation, aeson, array, base, base16, binary, bytes + , bytestring, cereal, conduit, containers, cryptonite, deepseq + , entropy, hashable, hspec, hspec-discover, HUnit, lens, lens-aeson + , memory, mtl, murmur3, network, QuickCheck, safe, scientific , secp256k1-haskell, split, string-conversions, text, time , transformers, unordered-containers, vector }: mkDerivation { pname = "haskoin-core"; - version = "0.19.0"; - sha256 = "0yyrka8hr6jsl7w59j3xmnvzq4gnwz4gybjar2zq1g096shdpk7c"; + version = "0.20.0"; + sha256 = "10pdpg75r2gch32p3mkiz82qip9rwkc5lrq0zxy13pqrmxdy162k"; libraryHaskellDepends = [ - aeson array base base16-bytestring bytestring cereal conduit + aeson array base base16 binary bytes bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl murmur3 network QuickCheck safe scientific secp256k1-haskell split string-conversions text time transformers unordered-containers vector ]; testHaskellDepends = [ - aeson array base base16-bytestring bytestring cereal conduit + aeson array base base16 binary bytes bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec HUnit lens lens-aeson memory mtl murmur3 network QuickCheck safe scientific secp256k1-haskell split string-conversions text time transformers @@ -121041,45 +120622,46 @@ self: { }) {}; "haskoin-store" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring - , cereal, conduit, containers, data-default, deepseq, ekg-core - , ekg-statsd, filepath, foldl, hashable, haskoin-core, haskoin-node - , haskoin-store-data, hedis, hspec, hspec-discover, http-types - , lens, monad-control, monad-logger, mtl, network, nqe + ({ mkDerivation, aeson, aeson-pretty, base, base16, base64, bytes + , bytestring, cereal, conduit, containers, data-default, deepseq + , ekg-core, ekg-statsd, filepath, foldl, hashable, haskoin-core + , haskoin-node, haskoin-store-data, hedis, hspec, hspec-discover + , http-types, lens, monad-control, monad-logger, mtl, network, nqe , optparse-applicative, QuickCheck, random, rocksdb-haskell-jprupp , rocksdb-query, scotty, stm, string-conversions, text, time , transformers, unliftio, unordered-containers, wai, warp, wreq }: mkDerivation { pname = "haskoin-store"; - version = "0.46.6"; - sha256 = "13qqq08bh1a07zvd5rkfgyvh2ln0261q2hybjkjigw05mhrblf5c"; + version = "0.47.3"; + sha256 = "0z3rhxfnk1985lmfzajipkzajya2vrfh0p5c66kk03vysvssjzpi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring cereal conduit containers - data-default deepseq ekg-core ekg-statsd foldl hashable + aeson aeson-pretty base base16 bytes bytestring cereal conduit + containers data-default deepseq ekg-core ekg-statsd foldl hashable haskoin-core haskoin-node haskoin-store-data hedis http-types lens monad-control monad-logger mtl network nqe random rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions text time transformers unliftio unordered-containers wai warp wreq ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring cereal conduit containers - data-default deepseq ekg-core ekg-statsd filepath foldl hashable - haskoin-core haskoin-node haskoin-store-data hedis http-types lens - monad-control monad-logger mtl network nqe optparse-applicative - random rocksdb-haskell-jprupp rocksdb-query scotty stm - string-conversions text time transformers unliftio + aeson aeson-pretty base base16 bytes bytestring cereal conduit + containers data-default deepseq ekg-core ekg-statsd filepath foldl + hashable haskoin-core haskoin-node haskoin-store-data hedis + http-types lens monad-control monad-logger mtl network nqe + optparse-applicative random rocksdb-haskell-jprupp rocksdb-query + scotty stm string-conversions text time transformers unliftio unordered-containers wai warp wreq ]; testHaskellDepends = [ - aeson aeson-pretty base base64 bytestring cereal conduit containers - data-default deepseq ekg-core ekg-statsd foldl hashable - haskoin-core haskoin-node haskoin-store-data hedis hspec http-types - lens monad-control monad-logger mtl network nqe QuickCheck random - rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions - text time transformers unliftio unordered-containers wai warp wreq + aeson aeson-pretty base base16 base64 bytes bytestring cereal + conduit containers data-default deepseq ekg-core ekg-statsd foldl + hashable haskoin-core haskoin-node haskoin-store-data hedis hspec + http-types lens monad-control monad-logger mtl network nqe + QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty stm + string-conversions text time transformers unliftio + unordered-containers wai warp wreq ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -121089,25 +120671,26 @@ self: { }) {}; "haskoin-store-data" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, containers - , data-default, deepseq, hashable, haskoin-core, hspec + ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal + , containers, data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network , QuickCheck, scotty, string-conversions, text , unordered-containers, wreq }: mkDerivation { pname = "haskoin-store-data"; - version = "0.46.6"; - sha256 = "0a71gg790ix0z1q99m7cri4bpql222yprmj0vnvmacprnbihw77n"; + version = "0.47.3"; + sha256 = "0i7jf832q2lv8h82sf4y3a81j8y4ipw653q32jfnxhjjbnfxccly"; libraryHaskellDepends = [ - aeson base bytestring cereal containers data-default deepseq - hashable haskoin-core http-client http-types lens mtl network - scotty string-conversions text unordered-containers wreq + aeson base binary bytes bytestring cereal containers data-default + deepseq hashable haskoin-core http-client http-types lens mtl + network scotty string-conversions text unordered-containers wreq ]; testHaskellDepends = [ - aeson base bytestring cereal containers data-default deepseq - hashable haskoin-core hspec http-client http-types lens mtl network - QuickCheck scotty string-conversions text unordered-containers wreq + aeson base binary bytes bytestring cereal containers data-default + deepseq hashable haskoin-core hspec http-client http-types lens mtl + network QuickCheck scotty string-conversions text + unordered-containers wreq ]; testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; @@ -122609,8 +122192,8 @@ self: { }: mkDerivation { pname = "hasty-hamiltonian"; - version = "1.3.3"; - sha256 = "11x0daijylcxg0zf55bcwac6dy6lmmz9f4zf7a44qp9dsgfv753a"; + version = "1.3.4"; + sha256 = "0qvqh5d213lq02qq25s1a6z783836h5gi5zra99pprblpdffaazq"; libraryHaskellDepends = [ base kan-extensions lens mcmc-types mwc-probability pipes primitive transformers @@ -127405,44 +126988,14 @@ self: { ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq , directory, extra, file-embed, filepath, ghc, hslogger - , hspec-expectations, process, tasty, tasty-expected-failure - , tasty-hunit, temporary, text, time, transformers, unix-compat - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hie-bios"; - version = "0.7.2"; - sha256 = "0cff9kf4qnfkfzvxhxi0hh54x013g5sg0xcw0vpsarc3a91p7da8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit conduit-extra - containers cryptohash-sha1 deepseq directory extra file-embed - filepath ghc hslogger process temporary text time transformers - unix-compat unordered-containers vector yaml - ]; - executableHaskellDepends = [ base directory filepath ghc ]; - testHaskellDepends = [ - base directory extra filepath ghc hspec-expectations tasty - tasty-expected-failure tasty-hunit temporary text - unordered-containers yaml - ]; - description = "Set up a GHC API session"; - license = lib.licenses.bsd3; - }) {}; - - "hie-bios_0_7_3" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, conduit-extra, containers, cryptohash-sha1, deepseq - , directory, extra, file-embed, filepath, ghc, hslogger , hspec-expectations, optparse-applicative, process, tasty , tasty-expected-failure, tasty-hunit, temporary, text, time , transformers, unix-compat, unordered-containers, vector, yaml }: mkDerivation { pname = "hie-bios"; - version = "0.7.3"; - sha256 = "0njgxy8dx43smqk4wv3zg0c8a7llbgnz4fbil9dw53yx2xncgapi"; + version = "0.7.4"; + sha256 = "05ad47ll6vxi7say4f7zf13npcjpqbwb42pqs2bmxslif6rl9sdh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127461,7 +127014,6 @@ self: { ]; description = "Set up a GHC API session"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hie-compat" = callPackage @@ -129050,8 +128602,8 @@ self: { pname = "hkd"; version = "0.1"; sha256 = "1xz0i8lkh0rp55b0s7npkzqgyz9pf1bwq9b66cwbg073r9sz41wa"; - revision = "1"; - editedCabalFile = "09inakgqdwqifha2whvjfx6imx642zfinw8faxgjiv55ncm04zhr"; + revision = "2"; + editedCabalFile = "19z00b29z095fp9jxp0n7k1dgm980j9i94aysqd0mm1yjvxvn1k5"; libraryHaskellDepends = [ base some ]; testHaskellDepends = [ base some ]; description = "\"higher-kinded data\""; @@ -129700,7 +129252,6 @@ self: { executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ maralorn ]; }) {}; "hlint-test" = callPackage @@ -130836,6 +130387,8 @@ self: { pname = "hnix"; version = "0.12.0.1"; sha256 = "013jlmzzr5fcvl0w9rrvhsg8jikg0hbc8z57yzxgz109x7hrnjzc"; + revision = "1"; + editedCabalFile = "136lwfb5hjwdbfik5c5dw1nhsmy8v410czmjn4i242s8jv5wm9yb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -130874,34 +130427,6 @@ self: { }) {}; "hnix-store-core" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring, binary - , bytestring, containers, cryptohash-md5, cryptohash-sha1 - , cryptohash-sha256, directory, filepath, hashable, mtl, process - , regex-base, regex-tdfa, saltine, tasty, tasty-discover - , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time - , unix, unordered-containers, vector - }: - mkDerivation { - pname = "hnix-store-core"; - version = "0.2.0.0"; - sha256 = "1gy808dzaq2jjy1xdhf3vjxzprlzn9mmbxc554sa03v8f9hc0r7h"; - libraryHaskellDepends = [ - base base16-bytestring binary bytestring containers cryptohash-md5 - cryptohash-sha1 cryptohash-sha256 directory filepath hashable mtl - regex-base regex-tdfa saltine text time unix unordered-containers - vector - ]; - testHaskellDepends = [ - base base64-bytestring binary bytestring containers directory - process tasty tasty-discover tasty-hspec tasty-hunit - tasty-quickcheck temporary text - ]; - testToolDepends = [ tasty-discover ]; - description = "Core effects for interacting with the Nix store"; - license = lib.licenses.asl20; - }) {}; - - "hnix-store-core_0_4_1_0" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256 @@ -130928,7 +130453,6 @@ self: { ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hnix-store-remote" = callPackage @@ -132764,24 +132288,6 @@ self: { }: mkDerivation { pname = "hp2pretty"; - version = "0.9"; - sha256 = "0libwl8kl6yhingvbrmw1b8l5yiq6wn07asvkwbnh9l6mnh8pz2n"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array attoparsec base containers filepath floatshow mtl - optparse-applicative semigroups text - ]; - description = "generate pretty graphs from heap profiles"; - license = lib.licenses.bsd3; - }) {}; - - "hp2pretty_0_10" = callPackage - ({ mkDerivation, array, attoparsec, base, containers, filepath - , floatshow, mtl, optparse-applicative, semigroups, text - }: - mkDerivation { - pname = "hp2pretty"; version = "0.10"; sha256 = "1irm8mvcib39r8imdx7y7jisp162i0rwk8w3irs2j746c8vhyv12"; isLibrary = false; @@ -132792,7 +132298,6 @@ self: { ]; description = "generate pretty graphs from heap profiles"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpack" = callPackage @@ -137152,8 +136657,8 @@ self: { }: mkDerivation { pname = "hspec-dirstream"; - version = "1.0.0.2"; - sha256 = "1df6rjgwj6rw78dh1ihswk7sgh72c8aqnaaj4r9k0gjq30hkdlfr"; + version = "1.0.0.3"; + sha256 = "1wzz718rw3nfzjgkigy5si7n6igjs5h8z8xsj1vhcivly4adzrrw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base dirstream filepath hspec hspec-core pipes pipes-safe @@ -139293,10 +138798,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "2.1.0.3"; - sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x"; - revision = "3"; - editedCabalFile = "074r8wr9xar40ybm6wqg2s0k32kiapbjm8k3djp4lz6gjxyw7nc8"; + version = "2.1.0.4"; + sha256 = "08pka0z97b461bf45nvh9gymbvbwhn2dh70dy7x22xmzrigxnxw1"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -139467,6 +138970,8 @@ self: { pname = "http-api-data"; version = "0.4.3"; sha256 = "171bw2a44pg50d3y77gw2y9vmx72laky7hnn5hw6r93pnjmlf9yz"; + revision = "1"; + editedCabalFile = "0vy4glhjc036m2lmkc1ls0s48pcxga2qqc1jbpj4139v9j8h158m"; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring containers cookie hashable http-types tagged text time-compat @@ -139523,7 +139028,7 @@ self: { license = lib.licenses.mit; }) {}; - "http-client_0_7_5" = callPackage + "http-client_0_7_6" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -139532,8 +139037,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.5"; - sha256 = "11p4szyrdl0ck2iixdrq2dcjz9dlv4pd36ymkipmq7c28l1cvy7k"; + version = "0.7.6"; + sha256 = "1458mq5kh5fjlkhk9cgaz6sc6533l2nm4r2jz80diy8qc6bpiwrk"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -139834,8 +139339,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.3.7.4"; - sha256 = "1mbaasmxx90gzfirwn8lmjpwj34gf1dk9y3m9mm88rzmy3s6czbb"; + version = "2.3.8"; + sha256 = "1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra http-client http-client-tls http-types mtl resourcet transformers unliftio-core @@ -139905,8 +139410,8 @@ self: { }: mkDerivation { pname = "http-date"; - version = "0.0.10"; - sha256 = "1g3b895894mrscnm32x3a2nax3xvsp8aji11f0qd44xh7kz249zs"; + version = "0.0.11"; + sha256 = "1lzlrj2flcnz3k5kfhf11nk5n8m6kcya0lkwrsnzxgfr3an27y9j"; libraryHaskellDepends = [ array attoparsec base bytestring time ]; testHaskellDepends = [ base bytestring doctest hspec old-locale time @@ -141643,6 +141148,24 @@ self: { broken = true; }) {}; + "hw-aws-sqs-conduit" = callPackage + ({ mkDerivation, amazonka, amazonka-sqs, base, conduit, lens, mtl + , text + }: + mkDerivation { + pname = "hw-aws-sqs-conduit"; + version = "0.1.0.0"; + sha256 = "112nf8yqpb0cl4vb7h21r0nf13hz5419vkk2z5235db75ap6bbcc"; + libraryHaskellDepends = [ + amazonka amazonka-sqs base conduit lens mtl text + ]; + testHaskellDepends = [ base ]; + description = "AWS SQS conduit"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hw-balancedparens" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, generic-lens, hedgehog, hspec @@ -142379,6 +141902,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "hw-playground-linear" = callPackage + ({ mkDerivation, base, hedgehog, hmatrix, hmatrix-csv, hspec + , hspec-discover, hw-hspec-hedgehog, text + }: + mkDerivation { + pname = "hw-playground-linear"; + version = "0.1.0.0"; + sha256 = "039bkjgwa14v9qjmblipv4qd19lg3y2qn78khv0rbqka1haxnhn9"; + libraryHaskellDepends = [ base hmatrix hmatrix-csv text ]; + testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + testToolDepends = [ hspec-discover ]; + description = "Primitive functions and data types"; + license = lib.licenses.bsd3; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec @@ -143761,31 +143299,6 @@ self: { }) {}; "hyperloglog" = callPackage - ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal - , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory - , distributive, doctest, filepath, generic-deriving, hashable, lens - , reflection, semigroupoids, semigroups, simple-reflect, siphash - , tagged, vector - }: - mkDerivation { - pname = "hyperloglog"; - version = "0.4.3"; - sha256 = "0r1zrhl81hm0sb9my32xyng0xdl2yzh1pdw2bqabzccrhyjk1fwd"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - approximate base binary bits bytes cereal cereal-vector comonad - deepseq distributive hashable lens reflection semigroupoids - semigroups siphash tagged vector - ]; - testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect - ]; - description = "An approximate streaming (constant space) unique object counter"; - license = lib.licenses.bsd3; - }) {}; - - "hyperloglog_0_4_4" = callPackage ({ mkDerivation, approximate, base, binary, bits, bytes, cereal , cereal-vector, comonad, deepseq, distributive, hashable, lens , reflection, semigroupoids, semigroups, siphash, tagged, vector @@ -143801,7 +143314,6 @@ self: { ]; description = "An approximate streaming (constant space) unique object counter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hyperloglogplus" = callPackage @@ -143851,28 +143363,6 @@ self: { }) {}; "hyphenation" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers - , doctest, text, unordered-containers, zlib - }: - mkDerivation { - pname = "hyphenation"; - version = "0.8"; - sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii"; - revision = "3"; - editedCabalFile = "0krjvrk5hzcs101b5h95ai51wwq1fj04q1ryn63j1qmj22jpn4ki"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring containers text unordered-containers zlib - ]; - testHaskellDepends = [ - base containers doctest unordered-containers - ]; - description = "Configurable Knuth-Liang hyphenation"; - license = lib.licenses.bsd2; - }) {}; - - "hyphenation_0_8_1" = callPackage ({ mkDerivation, base, bytestring, containers, text , unordered-containers, zlib }: @@ -143886,7 +143376,6 @@ self: { ]; description = "Configurable Knuth-Liang hyphenation"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "hypher" = callPackage @@ -144726,8 +144215,6 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -146871,8 +146358,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.9.0"; - sha256 = "1d580f2j71x0iww0q2mg47jbhjsd83yarrnnmcp9f2bx7cix174v"; + version = "1.9.1"; + sha256 = "1g8lj56xi61g0vfindiz4lmnypjh2bzp2nm92dmh2d4mlfhrh78y"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -146885,7 +146372,7 @@ self: { base containers doctest lens raw-strings-qq tasty tasty-hunit template-haskell time vector ]; - description = "Haskell client library for InfluxDB"; + description = "InfluxDB client library for Haskell"; license = lib.licenses.bsd3; }) {}; @@ -147241,19 +146728,19 @@ self: { }) {aether = null;}; "insert-ordered-containers" = callPackage - ({ mkDerivation, aeson, base, base-compat, hashable, lens - , optics-core, optics-extra, QuickCheck, semigroupoids, semigroups - , tasty, tasty-quickcheck, text, transformers, unordered-containers + ({ mkDerivation, aeson, base, base-compat, hashable + , indexed-traversable, lens, optics-core, optics-extra, QuickCheck + , semigroupoids, semigroups, tasty, tasty-quickcheck, text + , transformers, unordered-containers }: mkDerivation { pname = "insert-ordered-containers"; - version = "0.2.3.1"; - sha256 = "020a56280mxjk9k97q2m1424m73m1sf1ccl0wm0ci9msyw2g51za"; - revision = "1"; - editedCabalFile = "1s90flzj3039s50r6hx7mqihf8lvarcqb6zps7m12x543gahfcq0"; + version = "0.2.4"; + sha256 = "174maygil2mffjz2ssqawlmv36413m65zp3ng67hzij4dh8piz7x"; libraryHaskellDepends = [ - aeson base base-compat hashable lens optics-core optics-extra - semigroupoids semigroups text transformers unordered-containers + aeson base base-compat hashable indexed-traversable lens + optics-core optics-extra semigroupoids semigroups text transformers + unordered-containers ]; testHaskellDepends = [ aeson base base-compat hashable lens QuickCheck semigroupoids @@ -147300,22 +146787,6 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.4.2.4"; - sha256 = "11nz8j56l3h7sn927mcsms9af9rpqkmxc0c0vf9mln567wpb75h3"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_3_0" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; version = "0.4.3.0"; sha256 = "1pba3br5vd11svk9fpg5s977q55qlvhlf95nd5ay79bwdjm10hj3"; libraryHaskellDepends = [ @@ -147324,7 +146795,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -147883,23 +147353,6 @@ self: { }: mkDerivation { pname = "intern"; - version = "0.9.3"; - sha256 = "1pbk804kq5p25ixrihhpfgy0fwj8i6cybxlhk42krzni7ad7gx4k"; - revision = "1"; - editedCabalFile = "1cjlmvg55nn9fd1f0jfmgy1rjys7gna3x3qknnpcmndq6vzg1mrl"; - libraryHaskellDepends = [ - array base bytestring hashable text unordered-containers - ]; - description = "Efficient hash-consing for arbitrary data types"; - license = lib.licenses.bsd3; - }) {}; - - "intern_0_9_4" = callPackage - ({ mkDerivation, array, base, bytestring, hashable, text - , unordered-containers - }: - mkDerivation { - pname = "intern"; version = "0.9.4"; sha256 = "00c74apc2ap1pjxmzk1c975zzqrc94p69l7v1fvfakv87mbrg8j0"; libraryHaskellDepends = [ @@ -147907,7 +147360,6 @@ self: { ]; description = "Efficient hash-consing for arbitrary data types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "internetmarke" = callPackage @@ -148225,26 +147677,6 @@ self: { }) {}; "intervals" = callPackage - ({ mkDerivation, array, base, Cabal, cabal-doctest, directory - , distributive, doctest, filepath, ghc-prim, QuickCheck - , template-haskell - }: - mkDerivation { - pname = "intervals"; - version = "0.9.1"; - sha256 = "1s9pj2dah94smq769q4annxv2grdx376wvhzl4rsq85kjppf5a6z"; - revision = "2"; - editedCabalFile = "1nrpc95wwifnlk7p9nw6xgcc74zw1k6krhvll7rr18ddjgfgv07x"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ array base distributive ghc-prim ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - description = "Interval Arithmetic"; - license = lib.licenses.bsd3; - }) {}; - - "intervals_0_9_2" = callPackage ({ mkDerivation, array, base, distributive, ghc-prim, QuickCheck }: mkDerivation { pname = "intervals"; @@ -148254,7 +147686,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Interval Arithmetic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "intmap-graph" = callPackage @@ -148442,6 +147873,32 @@ self: { license = lib.licenses.bsd2; }) {}; + "inventory" = callPackage + ({ mkDerivation, appendmap, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit + }: + mkDerivation { + pname = "inventory"; + version = "0.1.0.0"; + sha256 = "0nflfrs9qb2bfkpi07r2a5k6lkyyspvfqz18pfvqa2rkpfcqw9bd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + appendmap base bytestring containers directory filepath ghc + ghc-paths mtl + ]; + executableHaskellDepends = [ + appendmap base bytestring containers directory filepath ghc + ghc-paths mtl + ]; + testHaskellDepends = [ + appendmap base bytestring containers directory filepath ghc + ghc-paths mtl tasty tasty-hunit + ]; + description = "Project statistics and definition analysis"; + license = lib.licenses.bsd3; + }) {}; + "invert" = callPackage ({ mkDerivation, base, containers, criterion, generic-deriving , hashable, unordered-containers, vector @@ -151317,21 +150774,6 @@ self: { ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.3.2"; - sha256 = "16vcy9gn6qrzvr99l26az4yi2dy9xngcb1wmj86yl7bmk1hcq3wc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl parsec text ]; - executableHaskellDepends = [ base text ]; - testHaskellDepends = [ base parsec tasty tasty-hunit text ]; - description = "Handle Jira wiki markup"; - license = lib.licenses.mit; - }) {}; - - "jira-wiki-markup_1_3_3" = callPackage - ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: - mkDerivation { - pname = "jira-wiki-markup"; version = "1.3.3"; sha256 = "0sgm9x2bdwazhj598aix2xyshjy6cvai4sgq5zz8gxv2l6prfbr7"; isLibrary = true; @@ -151341,7 +150783,6 @@ self: { testHaskellDepends = [ base parsec tasty tasty-hunit text ]; description = "Handle Jira wiki markup"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jmacro" = callPackage @@ -153784,24 +153225,6 @@ self: { }: mkDerivation { pname = "kan-extensions"; - version = "5.2.1"; - sha256 = "114zs8j81ich4178qvvlnpch09dvbv1mm1g7xf2g78f77gh9ia7a"; - libraryHaskellDepends = [ - adjunctions array base comonad containers contravariant - distributive free invariant mtl profunctors semigroupoids tagged - transformers transformers-compat - ]; - description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; - license = lib.licenses.bsd3; - }) {}; - - "kan-extensions_5_2_2" = callPackage - ({ mkDerivation, adjunctions, array, base, comonad, containers - , contravariant, distributive, free, invariant, mtl, profunctors - , semigroupoids, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "kan-extensions"; version = "5.2.2"; sha256 = "184qhhjd24i15mcs4lq8fdb86pdg3g5nxhx1x41prigrmi6cxwrv"; libraryHaskellDepends = [ @@ -153811,7 +153234,6 @@ self: { ]; description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "kangaroo" = callPackage @@ -157736,27 +157158,6 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "9.1.2"; - sha256 = "014rb5jf650fhsmc02v4xc60w7v1261ri1w9ig6dw0xjdgxalvbs"; - libraryHaskellDepends = [ - base bytestring containers data-default-class megaparsec - prettyprinter split text time - ]; - testHaskellDepends = [ - base bytestring containers data-default-class hspec HUnit - megaparsec prettyprinter QuickCheck split text time - ]; - description = "Dockerfile parser, pretty-printer and embedded DSL"; - license = lib.licenses.gpl3; - }) {}; - - "language-docker_9_1_3" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text - , time - }: - mkDerivation { - pname = "language-docker"; version = "9.1.3"; sha256 = "00nr8fb981rkjzy2xhppvg9avsi377ww28d50rldm5wh7ax9s3w2"; libraryHaskellDepends = [ @@ -157769,7 +157170,6 @@ self: { ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = lib.licenses.gpl3; - hydraPlatforms = lib.platforms.none; }) {}; "language-dockerfile" = callPackage @@ -159125,8 +158525,8 @@ self: { pname = "lattices"; version = "2.0.2"; sha256 = "108rhpax72j6xdl0yqdmg7n32l1j805861f3q9wd3jh8nc67avix"; - revision = "2"; - editedCabalFile = "122mrj3b15jv1bjmzc8k37dkc2gy05hg550gia09n7j7n76v0h7i"; + revision = "3"; + editedCabalFile = "1n1sv7477v88ibcwb5rh4p1r9r4hj0jj7s0vh6r0y2w4hbhpslvr"; libraryHaskellDepends = [ base base-compat containers deepseq hashable integer-logarithms QuickCheck semigroupoids tagged transformers universe-base @@ -159591,19 +158991,6 @@ self: { }) {}; "lca" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: - mkDerivation { - pname = "lca"; - version = "0.3.1"; - sha256 = "0kj3zsmzckczp51w70x1aqayk2fay4vcqwz8j6sdv0hdw1d093ca"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "O(log n) persistent online lowest common ancestor search without preprocessing"; - license = lib.licenses.bsd3; - }) {}; - - "lca_0_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "lca"; @@ -159612,7 +158999,6 @@ self: { libraryHaskellDepends = [ base ]; description = "O(log n) persistent online lowest common ancestor search without preprocessing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lcs" = callPackage @@ -160268,7 +159654,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "lens_5" = callPackage + "lens_5_0_1" = callPackage ({ mkDerivation, array, assoc, base, base-compat, base-orphans , bifunctors, bytestring, call-stack, comonad, containers , contravariant, criterion, deepseq, distributive, exceptions @@ -160282,8 +159668,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "5"; - sha256 = "06nvmg9aan4s4ldq3c2a4z15r29hsxyvbjid2yvskmlw5pvwpncy"; + version = "5.0.1"; + sha256 = "0gzwx4b758phm51hz5i4bbkbvjw1ka7qj04zd9l9sh9n6s9ksm7c"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -160319,25 +159705,6 @@ self: { }) {}; "lens-action" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant - , directory, doctest, filepath, lens, mtl, profunctors - , semigroupoids, semigroups, transformers - }: - mkDerivation { - pname = "lens-action"; - version = "0.2.4"; - sha256 = "06yg4ds0d4cfs3zl1fhc8865i5w6pwqhx9bxngfa8f9974mdiid3"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base comonad contravariant lens mtl profunctors semigroupoids - semigroups transformers - ]; - testHaskellDepends = [ base directory doctest filepath ]; - description = "Monadic Getters and Folds"; - license = lib.licenses.bsd3; - }) {}; - - "lens-action_0_2_5" = callPackage ({ mkDerivation, base, comonad, contravariant, lens, mtl , profunctors, semigroupoids, transformers }: @@ -160351,33 +159718,9 @@ self: { ]; description = "Monadic Getters and Folds"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, doctest, generic-deriving, lens, scientific - , semigroups, simple-reflect, text, unordered-containers, vector - }: - mkDerivation { - pname = "lens-aeson"; - version = "1.1"; - sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p"; - revision = "4"; - editedCabalFile = "1wgk0nd0fxgdbqb6mkslj3gyrs9vdxpb83hvj2n2dcswg3ahwdsy"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring lens scientific text - unordered-containers vector - ]; - testHaskellDepends = [ - base doctest generic-deriving semigroups simple-reflect - ]; - description = "Law-abiding lenses for aeson"; - license = lib.licenses.mit; - }) {}; - - "lens-aeson_1_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, lens , scientific, text, unordered-containers, vector }: @@ -160391,7 +159734,6 @@ self: { ]; description = "Law-abiding lenses for aeson"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lens-core" = callPackage @@ -160613,8 +159955,8 @@ self: { }: mkDerivation { pname = "lens-regex"; - version = "0.1.1"; - sha256 = "0c673v6k6y7dng6qmi4jbh3jlx803mg5g1911bz54r785fm6p50d"; + version = "0.1.3"; + sha256 = "11zgdk46skj3g0436vilcgg4wvclixh07xjwqfcsfhffn0vn3mz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162423,6 +161765,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "lifted-async_0_10_1_3" = callPackage + ({ mkDerivation, async, base, constraints, deepseq, HUnit + , lifted-base, monad-control, mtl, tasty, tasty-bench + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.1.3"; + sha256 = "1hml672j8sqxhklxif3nwr8v59a596wwwbllq0zvvmlxcjdzlh7k"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -162904,32 +162268,6 @@ self: { "linear" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes , bytestring, cereal, containers, deepseq, distributive, ghc-prim - , hashable, HUnit, lens, random, reflection, semigroupoids - , semigroups, simple-reflect, tagged, template-haskell - , test-framework, test-framework-hunit, transformers - , transformers-compat, unordered-containers, vector, void - }: - mkDerivation { - pname = "linear"; - version = "1.21.4"; - sha256 = "019dsw4xqcmz8g0hanc3xsl0k1pqzxkhp9jz1sf12mqsgs6jj0zr"; - libraryHaskellDepends = [ - adjunctions base base-orphans binary bytes cereal containers - deepseq distributive ghc-prim hashable lens random reflection - semigroupoids semigroups tagged template-haskell transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base binary bytestring deepseq HUnit reflection simple-reflect - test-framework test-framework-hunit vector - ]; - description = "Linear Algebra"; - license = lib.licenses.bsd3; - }) {}; - - "linear_1_21_5" = callPackage - ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, cereal, containers, deepseq, distributive, ghc-prim , hashable, HUnit, indexed-traversable, lens, random, reflection , semigroupoids, semigroups, simple-reflect, tagged , template-haskell, test-framework, test-framework-hunit @@ -162952,7 +162290,6 @@ self: { ]; description = "Linear Algebra"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -163543,6 +162880,17 @@ self: { broken = true; }) {blkid = null;}; + "linux-capabilities" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "linux-capabilities"; + version = "0.1.0.0"; + sha256 = "033mnbxg9bzi3cc4js22gpi96g5yslv6sksxdsgab5k075gad85k"; + libraryHaskellDepends = [ base ]; + description = "Linux capabilities Haskell data type"; + license = lib.licenses.asl20; + }) {}; + "linux-cgroup" = callPackage ({ mkDerivation, base, filepath }: mkDerivation { @@ -165650,29 +164998,6 @@ self: { }) {}; "log-domain" = callPackage - ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal - , comonad, deepseq, distributive, doctest, generic-deriving - , hashable, semigroupoids, semigroups, simple-reflect, vector - }: - mkDerivation { - pname = "log-domain"; - version = "0.13"; - sha256 = "0isl8rs0k5088sxapfh351sff3lh7r1qkgwz8lmai3gvqasb3avv"; - revision = "3"; - editedCabalFile = "10ajmxkjbbkdrkasgfd5hhjcbggrylrg00m1lafac53v97hqpyp1"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base binary bytes cereal comonad deepseq distributive hashable - semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base doctest generic-deriving semigroups simple-reflect - ]; - description = "Log-domain arithmetic"; - license = lib.licenses.bsd3; - }) {}; - - "log-domain_0_13_1" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq , distributive, hashable, semigroupoids, semigroups, vector }: @@ -165686,7 +165011,6 @@ self: { ]; description = "Log-domain arithmetic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "log-effect" = callPackage @@ -166760,18 +166084,18 @@ self: { }) {}; "lorentz" = callPackage - ({ mkDerivation, aeson-pretty, base, bimap, bytestring, constraints - , containers, data-default, first-class-families, fmt, interpolate - , lens, morley, morley-prelude, mtl, named, optparse-applicative - , singletons, template-haskell, text, text-manipulate - , unordered-containers, vinyl, with-utf8 + ({ mkDerivation, aeson-pretty, base-noprelude, bimap, bytestring + , constraints, containers, data-default, first-class-families, fmt + , interpolate, lens, morley, morley-prelude, mtl, named + , optparse-applicative, singletons, template-haskell, text + , text-manipulate, unordered-containers, vinyl, with-utf8 }: mkDerivation { pname = "lorentz"; - version = "0.9.1"; - sha256 = "1f4rf4q6gfiz55qlfpkzk19nq6fw92ri3a1smyv4r55i50jr07rm"; + version = "0.10.0"; + sha256 = "15kgnw8f52i30xxw1q6mxlyhkpfpq5hyjsvfklg334iqr5w0nby2"; libraryHaskellDepends = [ - aeson-pretty base bimap bytestring constraints containers + aeson-pretty base-noprelude bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley morley-prelude mtl named optparse-applicative singletons template-haskell text text-manipulate unordered-containers vinyl @@ -167599,6 +166923,8 @@ self: { pname = "lukko"; version = "0.1.1.3"; sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8"; + revision = "1"; + editedCabalFile = "0mmq1q82mrbayiij0p8wdnkf0j8drmq1iibg8kn4cak3nrn9pd1d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -168242,32 +167568,6 @@ self: { }) {}; "machines" = callPackage - ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad - , conduit, containers, criterion, distributive, doctest, mtl, pipes - , pointed, profunctors, semigroupoids, semigroups, streaming - , transformers, transformers-compat, void - }: - mkDerivation { - pname = "machines"; - version = "0.7.1"; - sha256 = "0ayajyzaczdazfsmamlm5vap43x2mdm4w8v5970y1xlxh4rb3bs1"; - revision = "1"; - editedCabalFile = "1cp850vwzn213n0k9s5i62889a1wvmyi05jw6kmazaczcbcs7jsq"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - adjunctions base comonad containers distributive mtl pointed - profunctors semigroupoids semigroups transformers - transformers-compat void - ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ - base conduit criterion mtl pipes streaming - ]; - description = "Networked stream transducers"; - license = lib.licenses.bsd3; - }) {}; - - "machines_0_7_2" = callPackage ({ mkDerivation, adjunctions, base, comonad, conduit, containers , criterion, distributive, mtl, pipes, pointed, profunctors , semigroupoids, semigroups, streaming, transformers @@ -168287,7 +167587,6 @@ self: { ]; description = "Networked stream transducers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "machines-amazonka" = callPackage @@ -168672,8 +167971,8 @@ self: { }: mkDerivation { pname = "magic-wormhole"; - version = "0.3.3"; - sha256 = "1wsm7y05k8byxizkmkyl7bciyz6f3jwxiwqc0gvsqi31kkqajxqn"; + version = "0.3.4"; + sha256 = "1i9010zp1w34kfgx5xgd23hjmb0v8h3y3riiw2ripvjxqgikbky4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -172146,8 +171445,8 @@ self: { }: mkDerivation { pname = "membership"; - version = "0"; - sha256 = "0hdy0yv64gcwja2kr6akfms21jgq6lqhzbxap603nhiwvf7n8ayv"; + version = "0.0.1"; + sha256 = "07b40i1fvkix9x60nqp6nmlchjkcj3jhp7xpq583fpssqm79x14m"; libraryHaskellDepends = [ base constraints deepseq hashable prettyprinter template-haskell th-lift @@ -172961,8 +172260,8 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, rio, transformers }: mkDerivation { pname = "method"; - version = "0.2.0.0"; - sha256 = "0vgh0ri5r1jsfax5qafvkqqnkywk4qayaw54dwhh5i3p1n5cqkqa"; + version = "0.3.0.0"; + sha256 = "1a5i9sd5zz5kjpjpar3r5ak61x8fz5rrbb1iak1r2dcwlyk6rq25"; libraryHaskellDepends = [ base rio transformers ]; testHaskellDepends = [ base hspec rio transformers ]; testToolDepends = [ hspec-discover ]; @@ -174135,8 +173434,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.5.0"; - sha256 = "0vs302vbdf8y58nxky0m2w7cbqs4laljk969sfnbxl8zq7k3ic0h"; + version = "0.5.1"; + sha256 = "1s1wp8v1xlvw3r4qk1lv9zpm99ihka7a785zjl6i3fq1maqq955g"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -174574,8 +173873,8 @@ self: { ({ mkDerivation, async, base }: mkDerivation { pname = "minisat"; - version = "0.1.2"; - sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd"; + version = "0.1.3"; + sha256 = "172l1zn3ls0s55llnp4z1kgf388bs5vq4a8qys2x7dqk9zmgpbqb"; libraryHaskellDepends = [ async base ]; description = "A Haskell bundle of the Minisat SAT solver"; license = lib.licenses.bsd3; @@ -175326,21 +174625,6 @@ self: { ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; - version = "1.1.4"; - sha256 = "1hxyyh0x58kjdsyf1kj2kibjxzk2d9rcabv2y9vrpb59w85lqanz"; - revision = "1"; - editedCabalFile = "0xvwjcfpy6243wiwgyckmwc1nbw31y32n3hrrswdjw21znz894yl"; - libraryHaskellDepends = [ - base mtl transformers transformers-compat - ]; - description = "Monad morphisms"; - license = lib.licenses.bsd3; - }) {}; - - "mmorph_1_1_5" = callPackage - ({ mkDerivation, base, mtl, transformers, transformers-compat }: - mkDerivation { - pname = "mmorph"; version = "1.1.5"; sha256 = "0bq9m3hlfax1826gg5yhih79x33rvfx59wdh8yf43azd7l74bys6"; libraryHaskellDepends = [ @@ -175348,7 +174632,6 @@ self: { ]; description = "Monad morphisms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mmsyn2" = callPackage @@ -175713,6 +174996,8 @@ self: { pname = "mod"; version = "0.1.2.1"; sha256 = "0fjcjk9jxwc2d1fm3kzamh9gi3lwnl2g6kz3z2hd43dszkay1mn1"; + revision = "1"; + editedCabalFile = "012slncmwh9i4fh31mdxn5xnpl9l309swrm5vlnibrxj3pxhmrxv"; libraryHaskellDepends = [ base deepseq integer-gmp primitive semirings vector ]; @@ -175783,32 +175068,6 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.3.1"; - sha256 = "0h4ssb4wy4ac6vd5jcbvp0r2fr1jmyc60hg56s7ym50bbymj5wp3"; - libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text - ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh - ]; - description = "Modern library for working with URIs"; - license = lib.licenses.bsd3; - }) {}; - - "modern-uri_0_3_4_0" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hspec, hspec-discover - , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck - , reflection, tagged, template-haskell, text, weigh - }: - mkDerivation { - pname = "modern-uri"; version = "0.3.4.0"; sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk"; libraryHaskellDepends = [ @@ -175825,7 +175084,6 @@ self: { ]; description = "Modern library for working with URIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -176277,6 +175535,8 @@ self: { pname = "monad-chronicle"; version = "1.0.0.1"; sha256 = "1p9w9f5sw4adxxrgfba0vxs5kdhl82ibnwfqal7nrrhp3v86imbg"; + revision = "1"; + editedCabalFile = "097f5wvzx10i9zgx4gn7wm81z7dfyhj9lx8jyy4n90j0adpbjryq"; libraryHaskellDepends = [ base data-default-class mtl semigroupoids these transformers transformers-compat @@ -178405,37 +177665,45 @@ self: { }) {morfeusz = null;}; "morley" = callPackage - ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base - , base58-bytestring, binary, bytestring, constraints, containers - , cryptonite, data-default, first-class-families, fmt - , generic-deriving, gitrev, haskeline, hex-text, interpolate, lens - , megaparsec, memory, morley-prelude, mtl, named - , optparse-applicative, parser-combinators, scientific, semigroups - , show-type, singletons, syb, template-haskell, text - , text-manipulate, th-lift, th-lift-instances, time, timerep + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude + , base58-bytestring, binary, bytestring, Cabal, constraints + , containers, cryptonite, data-default, doctest, elliptic-curve + , first-class-families, fmt, galois-field, generic-deriving, gitrev + , haskeline, hex-text, interpolate, lens, megaparsec, memory + , MonadRandom, morley-prelude, mtl, named, optparse-applicative + , pairing, parser-combinators, process, scientific, semigroups + , show-type, singletons, syb, tasty-discover, template-haskell + , text, text-manipulate, th-lift, th-lift-instances, time, timerep , uncaught-exception, unordered-containers, vector, vinyl , with-utf8, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.12.0"; - sha256 = "0cfmcrasf2cfirsa6xb1aznj75bwnzmiy9irirk1i9p2bx4aqy5m"; + version = "1.13.0"; + sha256 = "1jbjmri2k7z5fh96i0yx28wpcp0l3fchkk3iwvq0vdwcrb78bndb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-casing aeson-pretty base base58-bytestring binary - bytestring constraints containers cryptonite data-default - first-class-families fmt generic-deriving gitrev hex-text - interpolate lens megaparsec memory morley-prelude mtl named - optparse-applicative parser-combinators scientific semigroups - show-type singletons syb template-haskell text text-manipulate - th-lift th-lift-instances time timerep uncaught-exception - unordered-containers vector vinyl with-utf8 wl-pprint-text + aeson aeson-casing aeson-pretty base-noprelude base58-bytestring + binary bytestring constraints containers cryptonite data-default + elliptic-curve first-class-families fmt galois-field + generic-deriving gitrev hex-text interpolate lens megaparsec memory + MonadRandom morley-prelude mtl named optparse-applicative pairing + parser-combinators scientific semigroups show-type singletons syb + template-haskell text text-manipulate th-lift th-lift-instances + time timerep uncaught-exception unordered-containers vector vinyl + with-utf8 wl-pprint-text ]; executableHaskellDepends = [ - aeson base bytestring data-default fmt haskeline megaparsec - morley-prelude named optparse-applicative text vinyl with-utf8 + aeson base-noprelude bytestring data-default fmt haskeline + megaparsec morley-prelude named optparse-applicative text vinyl + with-utf8 + ]; + testHaskellDepends = [ + base-noprelude bytestring Cabal doctest morley-prelude + optparse-applicative process ]; + testToolDepends = [ tasty-discover ]; description = "Developer tools for the Michelson Language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -178536,6 +177804,60 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql_0_17_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , morpheus-graphql-app, morpheus-graphql-core + , morpheus-graphql-subscriptions, mtl, relude, tasty, tasty-hunit + , template-haskell, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.17.0"; + sha256 = "0k9nlik5qi1ff4m731da5wlaadx024irgn2v1hyz2bv9n1q28cqs"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-core mtl relude template-haskell text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-core morpheus-graphql-subscriptions mtl relude + tasty tasty-hunit template-haskell text transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "morpheus-graphql-app" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-core, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-app"; + version = "0.17.0"; + sha256 = "0l3brvcv7ang83yiv1bdg4v8hvajq4cbq2dr28q1j39a4r85f9xz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec + morpheus-graphql-core mtl relude scientific template-haskell text + th-lift-instances transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-core mtl relude scientific tasty tasty-hunit + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = lib.licenses.mit; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -178581,6 +177903,30 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-client_0_17_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-core, mtl, relude, tasty, tasty-hunit + , template-haskell, text, transformers, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-client"; + version = "0.17.0"; + sha256 = "1djgxy59s98na1s182p5a06qjhw8n862zka96wwp8ckyx2jpjkq3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-core mtl relude + template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-core mtl relude + tasty tasty-hunit template-haskell text transformers + unordered-containers + ]; + description = "Morpheus GraphQL Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-core" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hashable , megaparsec, mtl, relude, scientific, tasty, tasty-hunit @@ -178606,6 +177952,32 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_17_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, mtl, relude, scientific, tasty, tasty-hunit + , template-haskell, text, th-lift-instances, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.17.0"; + sha256 = "0rj4g05365hp5c9b5y0v0v7s73jw3gkq3g0z3m6xrpxi3j2gp0p8"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec mtl relude + scientific template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec mtl + relude scientific tasty tasty-hunit template-haskell text + th-lift-instances transformers unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-subscriptions" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , morpheus-graphql-core, mtl, relude, tasty, tasty-hunit, text @@ -178629,6 +178001,31 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-subscriptions_0_17_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-app, morpheus-graphql-core, mtl, relude, tasty + , tasty-hunit, text, transformers, unliftio-core + , unordered-containers, uuid, websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.17.0"; + sha256 = "14bpnzxxiid5582z5fi8nwb8rrhm7lgxscgkjxw34ng41wyv6686"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-app morpheus-graphql-core + mtl relude text transformers unliftio-core unordered-containers + uuid websockets + ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-app + morpheus-graphql-core mtl relude tasty tasty-hunit text + transformers unliftio-core unordered-containers uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -185413,8 +184810,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-types-icmp"; - version = "1.0.0.2"; - sha256 = "1s449djcr78k8ywzypmc62d7lysm245ih60z4wi6p0kmyv1qcj75"; + version = "1.0.1"; + sha256 = "0wf2rg4alw4alalvjdcd85k6sjhcpdqacblbn76r5kmy2pqfrqfs"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Types for representing ICMP and ICMPv6 messages"; @@ -186069,8 +185466,10 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.6.1.1"; - sha256 = "1gqns0ifrmjd1013jfa9c03xwdmqicdvazjc9kkxyzw4mpjgjils"; + version = "0.6.2.0"; + sha256 = "01r6b7xsgn2dd42jh3xnvds21sccq5lchyiikk5v1vr055dddmpm"; + revision = "1"; + editedCabalFile = "0sab8vs3zycm4ykcayrynvd0rmyar9bmvd8b60dq1fzmnbmzzgg9"; libraryHaskellDepends = [ aeson array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types network @@ -186560,21 +185959,26 @@ self: { }) {}; "nix-tree" = callPackage - ({ mkDerivation, aeson, async, base, brick, bytestring, containers - , deepseq, directory, filepath, hashable, hrfsize, lens, parallel + ({ mkDerivation, aeson, base, brick, bytestring, containers + , deepseq, directory, filepath, hashable, hedgehog, hrfsize , protolude, text, transformers, typed-process , unordered-containers, vty }: mkDerivation { pname = "nix-tree"; - version = "0.1.3.1"; - sha256 = "1rihvfvfsrkgvq87bli9gzpbv1ny93n21cf31bid1b3g3cwadffp"; + version = "0.1.4"; + sha256 = "1hbb4p6yz8c7c49yxqvzmiq9knpsm958pk9vbj12jii3ihdf0pl6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson async base brick bytestring containers deepseq directory - filepath hashable hrfsize lens parallel protolude text transformers - typed-process unordered-containers vty + aeson base brick bytestring containers deepseq directory filepath + hashable hrfsize protolude text transformers typed-process + unordered-containers vty + ]; + testHaskellDepends = [ + aeson base brick bytestring containers deepseq directory filepath + hashable hedgehog hrfsize protolude text transformers typed-process + unordered-containers vty ]; description = "Interactively browse a Nix store paths dependencies"; license = lib.licenses.bsd3; @@ -187788,8 +187192,8 @@ self: { }: mkDerivation { pname = "nri-env-parser"; - version = "0.1.0.3"; - sha256 = "0335bpjqvkazfjx2k0dm460hzdwcwz1rn82x0nvf441njjqz6846"; + version = "0.1.0.4"; + sha256 = "01s2346rdccnqrymxb947kx68jqdyh29v3s2mq3c707pvmxlhw4y"; libraryHaskellDepends = [ base modern-uri network-uri nri-prelude text ]; @@ -187798,54 +187202,29 @@ self: { }) {}; "nri-prelude" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, auto-update, base - , bytestring, containers, directory, exceptions, filepath, hedgehog - , junit-xml, pretty-diff, pretty-show, safe-exceptions - , terminal-size, text, time, vector - }: - mkDerivation { - pname = "nri-prelude"; - version = "0.3.0.0"; - sha256 = "1dijid038rvviz063ncviq1mw20hsk02gidcf68vzy99d16kn5c9"; - libraryHaskellDepends = [ - aeson ansi-terminal async auto-update base bytestring containers - directory exceptions filepath hedgehog junit-xml pretty-diff - pretty-show safe-exceptions terminal-size text time vector - ]; - testHaskellDepends = [ - aeson ansi-terminal async auto-update base bytestring containers - directory exceptions filepath hedgehog junit-xml pretty-diff - pretty-show safe-exceptions terminal-size text time vector - ]; - description = "A Prelude inspired by the Elm programming language"; - license = lib.licenses.bsd3; - }) {}; - - "nri-prelude_0_3_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async , auto-update, base, bytestring, containers, directory, exceptions - , filepath, hedgehog, junit-xml, pretty-diff, pretty-show + , filepath, ghc, hedgehog, junit-xml, pretty-diff, pretty-show , safe-exceptions, terminal-size, text, time, vector }: mkDerivation { pname = "nri-prelude"; - version = "0.3.1.0"; - sha256 = "0dg94blhrrnzh00kgjz5bclcwzx87ky2210nxx8902xx54x928vc"; + version = "0.4.0.0"; + sha256 = "032j7wy9wjjv0pbn1g16vdj15j03brkkwa3ssjv7g0v61hjaq4z7"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async auto-update base bytestring - containers directory exceptions filepath hedgehog junit-xml + containers directory exceptions filepath ghc hedgehog junit-xml pretty-diff pretty-show safe-exceptions terminal-size text time vector ]; testHaskellDepends = [ aeson aeson-pretty ansi-terminal async auto-update base bytestring - containers directory exceptions filepath hedgehog junit-xml + containers directory exceptions filepath ghc hedgehog junit-xml pretty-diff pretty-show safe-exceptions terminal-size text time vector ]; description = "A Prelude inspired by the Elm programming language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nsis" = callPackage @@ -189916,6 +189295,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "one-liner_2_0" = callPackage + ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit + , linear-base, profunctors, tagged, transformers + }: + mkDerivation { + pname = "one-liner"; + version = "2.0"; + sha256 = "0al9wavxx23xbalqw0cdlhq01kx8kyhg33fipwmn5617z3ddir6v"; + libraryHaskellDepends = [ + base bifunctors contravariant ghc-prim linear-base profunctors + tagged transformers + ]; + testHaskellDepends = [ base contravariant HUnit ]; + description = "Constraint-based generics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "one-liner-instances" = callPackage ({ mkDerivation, base, one-liner, random }: mkDerivation { @@ -190442,6 +189839,8 @@ self: { pname = "openapi3"; version = "3.0.1.0"; sha256 = "03icxn4zbk6yasj6wca7qdg5cac5fadr4qcxyn4gblkffmqkb5lc"; + revision = "1"; + editedCabalFile = "017mikhl12iyrgn40mmis3m05bfjxmg9y09nsk7i8xfjzkqcnly0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -191527,6 +190926,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "optics_0_4" = callPackage + ({ mkDerivation, array, base, bytestring, containers, criterion + , indexed-profunctors, inspection-testing, lens, mtl, optics-core + , optics-extra, optics-th, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "optics"; + version = "0.4"; + sha256 = "18hdfmay7v2qsbq0ylzrfk3hrgax8bzs65bdmjrmck4is8vbs6h5"; + libraryHaskellDepends = [ + array base containers mtl optics-core optics-extra optics-th + transformers + ]; + testHaskellDepends = [ + base containers indexed-profunctors inspection-testing mtl + optics-core QuickCheck random tasty tasty-hunit tasty-quickcheck + template-haskell + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion lens transformers + unordered-containers vector + ]; + description = "Optics as an abstract interface"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optics-core" = callPackage ({ mkDerivation, array, base, containers, indexed-profunctors , transformers @@ -191542,6 +190970,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "optics-core_0_4" = callPackage + ({ mkDerivation, array, base, containers, indexed-profunctors + , indexed-traversable, transformers + }: + mkDerivation { + pname = "optics-core"; + version = "0.4"; + sha256 = "1kyxdfzha4xjym96yahrwhpbzqracks2di2lx1x34sjcn165rxry"; + libraryHaskellDepends = [ + array base containers indexed-profunctors indexed-traversable + transformers + ]; + description = "Optics as an abstract interface: core definitions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optics-extra" = callPackage ({ mkDerivation, array, base, bytestring, containers, hashable , indexed-profunctors, mtl, optics-core, text, transformers @@ -191551,8 +190996,8 @@ self: { pname = "optics-extra"; version = "0.3"; sha256 = "15vnznmi4h9xrrp7dk6fqgz9cwlqlmdr2h4nx1n5q6hi2ic1bmm4"; - revision = "1"; - editedCabalFile = "0bizzsgmq7b337wpraavgss7r0c5vp2n2gwl8h4xa0qxx0d1wm1p"; + revision = "2"; + editedCabalFile = "13x3mavf2bi25ns03b93b5ghhkyivwxf6idn0wqs9fdiih1xvhv8"; libraryHaskellDepends = [ array base bytestring containers hashable indexed-profunctors mtl optics-core text transformers unordered-containers vector @@ -191561,6 +191006,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "optics-extra_0_4" = callPackage + ({ mkDerivation, array, base, bytestring, containers, hashable + , indexed-profunctors, indexed-traversable-instances, mtl + , optics-core, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "optics-extra"; + version = "0.4"; + sha256 = "1ynhyw22rwvvh5yglybmb6skhpgqk4gh9w2w4dh8kb7myzcwfj1s"; + libraryHaskellDepends = [ + array base bytestring containers hashable indexed-profunctors + indexed-traversable-instances mtl optics-core text transformers + unordered-containers vector + ]; + description = "Extra utilities and instances for optics-core"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optics-th" = callPackage ({ mkDerivation, base, containers, mtl, optics-core, tagged , template-haskell, th-abstraction, transformers @@ -191580,6 +191044,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "optics-th_0_4" = callPackage + ({ mkDerivation, base, containers, mtl, optics-core, tagged + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "optics-th"; + version = "0.4"; + sha256 = "1qddzwhzlhhp1902irswjj18aa5ziavn4klhy7najxjwndilb55y"; + libraryHaskellDepends = [ + base containers mtl optics-core template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base optics-core tagged ]; + description = "Optics construction using TemplateHaskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optics-vl" = callPackage ({ mkDerivation, base, indexed-profunctors, optics-core , profunctors @@ -191588,6 +191070,8 @@ self: { pname = "optics-vl"; version = "0.2.1"; sha256 = "1xrkak0cn2imgqr641wzysgynykyj438m3ywgdm9h14k17inv55v"; + revision = "1"; + editedCabalFile = "0ba6fk4djs3gm305km8c870h76mg8q1dyy899cll0scc6l9jgbyc"; libraryHaskellDepends = [ base indexed-profunctors optics-core profunctors ]; @@ -194025,8 +193509,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.6"; - sha256 = "12slj2jy688k4ndngwmjjkdvl2ryljv3siwal874pdficx0dffxg"; + version = "0.3.7"; + sha256 = "0laqf7mfzdpdbg583l3mr25qxdqryq1cd1141gl713d5m9s1b4fs"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -200803,22 +200287,6 @@ self: { }: mkDerivation { pname = "pipes-bytestring"; - version = "2.1.6"; - sha256 = "061wcb48mdq694zhwb5xh423ss6f7cccxahc05cifrzkh033gp5i"; - libraryHaskellDepends = [ - base bytestring pipes pipes-group pipes-parse stringsearch - transformers - ]; - description = "ByteString support for pipes"; - license = lib.licenses.bsd3; - }) {}; - - "pipes-bytestring_2_1_7" = callPackage - ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse - , stringsearch, transformers - }: - mkDerivation { - pname = "pipes-bytestring"; version = "2.1.7"; sha256 = "0ch7145pv4f56601ysdj5gqqwsh5ag2zh34ydswg62fqi8z8cxvc"; libraryHaskellDepends = [ @@ -200827,7 +200295,6 @@ self: { ]; description = "ByteString support for pipes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pipes-bzip" = callPackage @@ -201440,6 +200907,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes-ordered-zip_1_2_1" = callPackage + ({ mkDerivation, base, foldl, hspec, pipes, pipes-safe }: + mkDerivation { + pname = "pipes-ordered-zip"; + version = "1.2.1"; + sha256 = "0jgqnx5jdra5v0r7v564zzd96jfv42lbkdxgk1k7ip8gcikb1zdm"; + libraryHaskellDepends = [ base pipes pipes-safe ]; + testHaskellDepends = [ base foldl hspec pipes pipes-safe ]; + description = "merge two ordered Producers into a new Producer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-p2p" = callPackage ({ mkDerivation, async, base, binary, bytestring, errors , exceptions, mtl, network, network-simple-sockaddr, pipes @@ -201483,23 +200963,11 @@ self: { ({ mkDerivation, base, pipes, transformers }: mkDerivation { pname = "pipes-parse"; - version = "3.0.8"; - sha256 = "1a87q6l610rhxr23qfzzzif3zpfjhw3mg5gfcyjwqac25hdq73yj"; - libraryHaskellDepends = [ base pipes transformers ]; - description = "Parsing infrastructure for the pipes ecosystem"; - license = lib.licenses.bsd3; - }) {}; - - "pipes-parse_3_0_9" = callPackage - ({ mkDerivation, base, pipes, transformers }: - mkDerivation { - pname = "pipes-parse"; version = "3.0.9"; sha256 = "05cd0j1avkzmryf3869hfpvd9xmzbpz4kc65srswx36n06dkz5x3"; libraryHaskellDepends = [ base pipes transformers ]; description = "Parsing infrastructure for the pipes ecosystem"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pipes-postgresql-simple" = callPackage @@ -201600,22 +201068,6 @@ self: { }: mkDerivation { pname = "pipes-safe"; - version = "2.3.2"; - sha256 = "10m6f52nahxwnl2zvgnbilllcvd3lpi0dxl3j6fk20lryjzmhyqc"; - libraryHaskellDepends = [ - base containers exceptions monad-control mtl pipes primitive - transformers transformers-base - ]; - description = "Safety for the pipes ecosystem"; - license = lib.licenses.bsd3; - }) {}; - - "pipes-safe_2_3_3" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control, mtl - , pipes, primitive, transformers, transformers-base - }: - mkDerivation { - pname = "pipes-safe"; version = "2.3.3"; sha256 = "19gp93x5m1bnq240bj3v33pglf9r5gzji39fsjcazji837czghab"; libraryHaskellDepends = [ @@ -201624,7 +201076,6 @@ self: { ]; description = "Safety for the pipes ecosystem"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pipes-shell" = callPackage @@ -201888,15 +201339,17 @@ self: { }) {}; "pixel-printer" = callPackage - ({ mkDerivation, base, JuicyPixels, lens }: + ({ mkDerivation, base, JuicyPixels, lens, optparse-applicative }: mkDerivation { pname = "pixel-printer"; - version = "0.1.0"; - sha256 = "1cx485lvd5z6895jv1iiq93kspch78w9m730ggw6nvf0rimvazyy"; + version = "0.1.1"; + sha256 = "179r8715rmd7njan4jl0g3jy0w0xq420nmkw9arvp50my8ag610f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base JuicyPixels lens ]; - executableHaskellDepends = [ base JuicyPixels ]; + executableHaskellDepends = [ + base JuicyPixels optparse-applicative + ]; testHaskellDepends = [ base ]; description = "A program for turning pixel art into 3D prints"; license = lib.licenses.gpl3; @@ -203529,8 +202982,8 @@ self: { pname = "polyparse"; version = "1.13"; sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; - revision = "1"; - editedCabalFile = "09jcn26py3lkjn3lvxgry86bad8xb8cwl3avxymqmf7b181krfb8"; + revision = "2"; + editedCabalFile = "1n5q6w7x46cvcq7j1pg9jx9h72vcsc5di35rbkmwgjw6pq4w4gfl"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; @@ -203751,8 +203204,8 @@ self: { }: mkDerivation { pname = "polysemy-mocks"; - version = "0.1.0.0"; - sha256 = "04cgajjrlbiqij54k6agm1p6h4hv5lldb9f9yrzbwm0v69d02bs7"; + version = "0.1.0.1"; + sha256 = "0jd8x47mdx9fyn65ra0y1m05myf2m2bhz3ykg1i3818ixwd93xvl"; libraryHaskellDepends = [ base polysemy template-haskell ]; testHaskellDepends = [ base hspec polysemy ]; testToolDepends = [ hspec-discover ]; @@ -205138,6 +204591,8 @@ self: { pname = "postgresql-libpq"; version = "0.9.4.3"; sha256 = "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3"; + revision = "1"; + editedCabalFile = "1clivf13z15w954a0kcfkv8yc0d8kx61b68x2hk7a9236ck7l2m2"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; @@ -205359,6 +204814,8 @@ self: { pname = "postgresql-simple"; version = "0.6.4"; sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; + revision = "1"; + editedCabalFile = "017qfhml58psv72qnyb2hg6r8jl1mj8jmr2q5p3hgd0lcsxiq0qi"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -206994,8 +206451,8 @@ self: { }: mkDerivation { pname = "pretty-diff"; - version = "0.2.0.3"; - sha256 = "1pnq05zw7zyfikga8y27pkya4wrf0m3mrksmzi8l7jp9qdhkyia1"; + version = "0.4.0.2"; + sha256 = "0wa70is5pmad4f0spj5hmi56y290k1xizs4zwlrgry65r8c1qgns"; libraryHaskellDepends = [ base data-default Diff text ]; testHaskellDepends = [ base data-default Diff tasty tasty-hunit tasty-test-reporter text @@ -207004,14 +206461,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "pretty-diff_0_4_0_0" = callPackage + "pretty-diff_0_4_0_3" = callPackage ({ mkDerivation, base, data-default, Diff, tasty, tasty-hunit , tasty-test-reporter, text }: mkDerivation { pname = "pretty-diff"; - version = "0.4.0.0"; - sha256 = "10fsa49pd0d5rvl0093x2hrcbv44hq7xc9d2x369ygd6q7pxkbnz"; + version = "0.4.0.3"; + sha256 = "0qzsq9dm95f6yjryl2675rbyx178zxl562x0y9i1py2rx4k8z7gl"; libraryHaskellDepends = [ base data-default Diff text ]; testHaskellDepends = [ base data-default Diff tasty tasty-hunit tasty-test-reporter text @@ -207706,32 +207163,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.8"; - sha256 = "0g3b7b842wbdh7hqr6ikvycdwk1n3in9dq5yb09g744ydpmvg24r"; - libraryHaskellDepends = [ - base bytestring cereal deferred-folds focus foldl list-t primitive - primitive-unlifted profunctors vector - ]; - testHaskellDepends = [ - cereal deferred-folds focus primitive QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - ]; - description = "Extras for the \"primitive\" library"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "primitive-extras_0_9" = callPackage - ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus - , foldl, list-t, primitive, primitive-unlifted, profunctors - , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, vector - }: - mkDerivation { - pname = "primitive-extras"; - version = "0.9"; - sha256 = "04sb2q5r5z1sdj976p8p6hgx360agwxjqmcrgr8vcgyfgzphizfr"; + version = "0.10.1"; + sha256 = "0ddnn94qqkx021marpi2j03sil15422scq0df6dmlc6q0qyyivyc"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -212238,10 +211671,8 @@ self: { }: mkDerivation { pname = "quantification"; - version = "0.5.1"; - sha256 = "1abr0rb3q13klrz6199gpl4d07s5y8j56i8gvpy8nqgyi7awznx9"; - revision = "1"; - editedCabalFile = "1q18l6wv57d0386p75ykkcpc18cdnzpbxdxbr5bdx02wj5v4vq8f"; + version = "0.5.2"; + sha256 = "0ngy44xlbxhq8gzvp9fs71pchzqgy2bpqqfm3wna666c1034srxf"; libraryHaskellDepends = [ aeson base binary containers ghc-prim hashable path-pieces text unordered-containers vector @@ -214442,23 +213873,6 @@ self: { }: mkDerivation { pname = "random-bytestring"; - version = "0.1.3.2"; - sha256 = "16mjdb1sy7ppfbj5hshjpyrly6mklzvxip8vrqcvsfm869pkzayw"; - libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; - benchmarkHaskellDepends = [ - async base bytestring criterion cryptonite entropy ghc-prim - mwc-random pcg-random primitive random - ]; - description = "Efficient generation of random bytestrings"; - license = lib.licenses.mit; - }) {}; - - "random-bytestring_0_1_4" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, cryptonite - , entropy, ghc-prim, mwc-random, pcg-random, primitive, random - }: - mkDerivation { - pname = "random-bytestring"; version = "0.1.4"; sha256 = "0f4n41gqxxggadysvx3vg2iq89z7i7692ccrfmiajq73lbp6y34j"; libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; @@ -214468,7 +213882,6 @@ self: { ]; description = "Efficient generation of random bytestrings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "random-class" = callPackage @@ -214839,6 +214252,19 @@ self: { broken = true; }) {}; + "ranged-list" = callPackage + ({ mkDerivation, base, doctest, typecheck-plugin-nat-simple }: + mkDerivation { + pname = "ranged-list"; + version = "0.1.0.0"; + sha256 = "0v0a80g17r8dap28gm83wnk32m3snlmw1r51vvwfb74a4q3613w8"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base typecheck-plugin-nat-simple ]; + testHaskellDepends = [ base doctest typecheck-plugin-nat-simple ]; + description = "The list like structure whose length or range of length can be specified"; + license = lib.licenses.bsd3; + }) {}; + "rangemin" = callPackage ({ mkDerivation, base, containers, primitive, vector }: mkDerivation { @@ -215669,34 +215095,6 @@ self: { }) {}; "rcu" = callPackage - ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest - , containers, criterion, deepseq, doctest, fail, ghc-prim - , optparse-applicative, parallel, primitive, rdtsc, time - , transformers - }: - mkDerivation { - pname = "rcu"; - version = "0.2.4"; - sha256 = "1zl6gl6b9x2ppxzrvb356216f7gi1kpwxsqb0w220f86wyzf9gbr"; - revision = "2"; - editedCabalFile = "1lblpsgprk26nplfzxkclvj6gsaim1b97njvrq564crryn6hn2wz"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - atomic-primops base fail ghc-prim parallel primitive transformers - ]; - executableHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base doctest parallel ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq ghc-prim optparse-applicative - primitive rdtsc time transformers - ]; - description = "Read-Copy-Update for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "rcu_0_2_5" = callPackage ({ mkDerivation, atomic-primops, base, containers, criterion , deepseq, fail, ghc-prim, optparse-applicative, parallel , primitive, rdtsc, time, transformers @@ -215717,7 +215115,6 @@ self: { ]; description = "Read-Copy-Update for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rdf" = callPackage @@ -216530,8 +215927,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "1.1.3.2"; - sha256 = "006fj47pm7lqs4haq0i0nmz6syqx3v07qgnh4vjqlyqixk22cyy5"; + version = "1.1.3.3"; + sha256 = "1d348fpfzfqi3vm8qzdxbbdrx62awxx0hrnj3vw1szp41an6ya30"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring @@ -216564,8 +215961,8 @@ self: { }: mkDerivation { pname = "reanimate-svg"; - version = "0.13.0.0"; - sha256 = "0fl3rb993zihwm9vyg615x4k17rrqimjfpc7k06mb5dlgkd39f7v"; + version = "0.13.0.1"; + sha256 = "1h31r0lrslxqfayh06955p1kv35g42g3drmqp4miydk6zibyn091"; libraryHaskellDepends = [ attoparsec base bytestring containers double-conversion hashable JuicyPixels lens linear mtl scientific text transformers vector xml @@ -216749,8 +216146,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.7"; - sha256 = "1ma1rc962z2qr7xwxh03bkbcmn9dsqizrjv699wbc82fzfzn5hrr"; + version = "0.2.8"; + sha256 = "0ln7kw1f0l56ivzh77s1k1xa3nha3a4hs3bpmdi9apj21ffr5cb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -216941,8 +216338,8 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.2.1"; - sha256 = "0yx7pj25p6h8qjsgxbjsxaz23ar21wyxr8wqpmsn61pk8mahwggl"; + version = "5.2.2"; + sha256 = "02p1blgxd0nyzrgqw8ghm2a680f2a05rn1nrqqcjyh1whksl2g3x"; libraryHaskellDepends = [ base base-orphans comonad containers data-fix free template-haskell th-abstraction transformers @@ -218580,10 +217977,8 @@ self: { ({ mkDerivation, array, base, bytestring, containers, mtl, text }: mkDerivation { pname = "regex-base"; - version = "0.94.0.0"; - sha256 = "055rlq67xnbqv43fgrlw6d7s8nhyavahrp6blihwjmqizksq47y4"; - revision = "1"; - editedCabalFile = "13lnky4ps9as73jqrwz4aqn5sfyrcz2zj2ng52xzz512fv59baj4"; + version = "0.94.0.1"; + sha256 = "1ngdmmrxs1rhvib052c6shfa40yad82jylylikz327r0zxpxkcbi"; libraryHaskellDepends = [ array base bytestring containers mtl text ]; @@ -218595,12 +217990,10 @@ self: { ({ mkDerivation, array, base, regex-base, regex-posix }: mkDerivation { pname = "regex-compat"; - version = "0.95.2.0"; - sha256 = "01l44zrfpqb4k1rrzd1j18hn6922xhrl9h7s0hjfs363dx3hxj8z"; - revision = "1"; - editedCabalFile = "1d2k9zj51rhy695vlx6cfcmik6a0yyk5kl6aza7nqsqc6zwhidif"; + version = "0.95.2.1"; + sha256 = "0ivrdrcphrz3g6nr5wbsmfiv8i82caw0kf6z5qlmlq7xf9n3hywg"; libraryHaskellDepends = [ array base regex-base regex-posix ]; - description = "Replaces/Enhances \"Text.Regex\""; + description = "Replaces/enhances \"Text.Regex\""; license = lib.licenses.bsd3; }) {}; @@ -218781,8 +218174,8 @@ self: { pname = "regex-pcre"; version = "0.95.0.0"; sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n"; - revision = "1"; - editedCabalFile = "1s5jdwvymc9hxdfa23x5amnv2kkcsm2p119f38df2vjdxfvjfiq4"; + revision = "2"; + editedCabalFile = "0bvpy3rswyawv23s14nbxvgz5761s61g0shcj7p032i95iq7dj6d"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -218848,8 +218241,8 @@ self: { pname = "regex-posix"; version = "0.96.0.0"; sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5"; - revision = "1"; - editedCabalFile = "1cy39n1928wv55i7k4wm7zd3xijk7p54kbrxxlfzfvgax5k163b9"; + revision = "2"; + editedCabalFile = "10al5qljh6pc46581nkhrs0rjn8w05pp6jb4v55lgfr17ac0z1xx"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -218896,8 +218289,8 @@ self: { pname = "regex-tdfa"; version = "1.3.1.0"; sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm"; - revision = "1"; - editedCabalFile = "1fhi4g2p29qnnfyb211n62g97qrw3gz1kahca7rlz43all93ihdy"; + revision = "2"; + editedCabalFile = "1hvcqdywwlcpia7qss7ikr9bq0lvkk8z0mjgaylaqpzlgh00z3gb"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -225480,8 +224873,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.10.3.1"; - sha256 = "0y2jpykad7inzndw4azb2wdp4zp3smjax95sdcxycw5x88rxdra1"; + version = "0.10.4.1"; + sha256 = "1p8kbf9js67zl2wr6y0605acy54xlpsih1zqkdy21cywz1kannbp"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -225754,8 +225147,8 @@ self: { pname = "salak"; version = "0.3.6"; sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3"; - revision = "3"; - editedCabalFile = "0cdp6gy3r92vhpmq2i7yg4xxmnj95dyfvaf8gm05v6wl8l6rihfy"; + revision = "4"; + editedCabalFile = "07q9a24ry6h6r3m1av0dxz39dzmyjhlcrw1ww5jprqcf3xxjxhdz"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions filepath hashable heaps megaparsec mtl scientific text time @@ -227346,8 +226739,8 @@ self: { }: mkDerivation { pname = "scientific-notation"; - version = "0.1.2.0"; - sha256 = "19yfg032ppiy70y28fbildxp4h6y4krs9ayh7a8sdbxibpqb82cx"; + version = "0.1.3.0"; + sha256 = "1sdqyf3538n2yz29p2b4jvafa9vlgmr3aqn2x4hifmjx0176xm03"; libraryHaskellDepends = [ base bytebuild bytesmith natural-arithmetic ]; @@ -228342,16 +227735,17 @@ self: { "sdl2-ttf" = callPackage ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf - , template-haskell, text, transformers + , template-haskell, text, th-abstraction, transformers }: mkDerivation { pname = "sdl2-ttf"; - version = "2.1.1"; - sha256 = "1iyqm1i5k8j4948gvr59rgalqwsdkishs52kp85ncvb6cpylw3qn"; + version = "2.1.2"; + sha256 = "0jg3dg4g876shbcxlgcjwfd0g76ih3xh8f1hc79qxg6j48khxbpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring sdl2 template-haskell text transformers + base bytestring sdl2 template-haskell text th-abstraction + transformers ]; libraryPkgconfigDepends = [ SDL2 SDL2_ttf ]; description = "Bindings to SDL2_ttf"; @@ -228381,6 +227775,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "sdp-binary" = callPackage + ({ mkDerivation, base, binary, sdp }: + mkDerivation { + pname = "sdp-binary"; + version = "0.2"; + sha256 = "09wripyza10b7cy1w00j2vna1hmld1ijrd081faz88brkahzhdgq"; + libraryHaskellDepends = [ base binary sdp ]; + description = "Binary instances for SDP"; + license = lib.licenses.bsd3; + }) {}; + "sdp-deepseq" = callPackage ({ mkDerivation, base, deepseq, sdp }: mkDerivation { @@ -228403,6 +227808,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "sdp-io" = callPackage + ({ mkDerivation, base, fmr, sdp }: + mkDerivation { + pname = "sdp-io"; + version = "0.2"; + sha256 = "06rrfsxzfi3vbjsm1d4cm2f4x7035y0zhp869f3bjasf2r4mzsp4"; + libraryHaskellDepends = [ base fmr sdp ]; + description = "SDP IO extension"; + license = lib.licenses.bsd3; + }) {}; + "sdp-quickcheck" = callPackage ({ mkDerivation, base, criterion, ghc-prim, QuickCheck, sdp , sdp-deepseq, test-framework, test-framework-quickcheck2 @@ -228422,6 +227838,57 @@ self: { license = lib.licenses.bsd3; }) {}; + "sdp4bytestring" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-instances + , sdp, sdp-io, sdp-quickcheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "sdp4bytestring"; + version = "0.2"; + sha256 = "119r7rhrsbv3c5dlwq5lf6lpjdybr5vl9lnvffcl6dvh8bym4g86"; + revision = "1"; + editedCabalFile = "1kwi2y9l7mnq5m9kr8731fjy50mz32qp1i966m9wg5bd9kximaga"; + libraryHaskellDepends = [ base bytestring sdp sdp-io ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances sdp sdp-io + sdp-quickcheck test-framework test-framework-quickcheck2 + ]; + description = "SDP wrapper for ByteString"; + license = lib.licenses.bsd3; + }) {}; + + "sdp4text" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-instances, sdp + , sdp-io, sdp-quickcheck, test-framework + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "sdp4text"; + version = "0.2"; + sha256 = "12gq2rjddl2q4y045jixcar6v6s73qmqy4j30d22nvdyyqdjrxc8"; + libraryHaskellDepends = [ base sdp sdp-io text ]; + testHaskellDepends = [ + base QuickCheck quickcheck-instances sdp sdp-io sdp-quickcheck + test-framework test-framework-quickcheck2 text + ]; + description = "SDP wrapper for Text"; + license = lib.licenses.bsd3; + }) {}; + + "sdp4unordered" = callPackage + ({ mkDerivation, base, sdp, sdp-hashable, unordered-containers }: + mkDerivation { + pname = "sdp4unordered"; + version = "0.2"; + sha256 = "0y24ia2p2wsrdk05nikip369fzjh6b3jk59nss4xn4823p15vwsv"; + libraryHaskellDepends = [ + base sdp sdp-hashable unordered-containers + ]; + description = "SDP classes for unordered containers"; + license = lib.licenses.bsd3; + }) {}; + "sdp4vector" = callPackage ({ mkDerivation, base, QuickCheck, quickcheck-instances, sdp , sdp-quickcheck, test-framework, test-framework-quickcheck2 @@ -229189,6 +228656,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "semialign_1_2" = callPackage + ({ mkDerivation, base, containers, hashable, indexed-traversable + , indexed-traversable-instances, semigroupoids, tagged, these + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "semialign"; + version = "1.2"; + sha256 = "04dcyj69g7bm1sydxk89vin9mh2pmm0pqf0cm9v981i98xp6xxdj"; + libraryHaskellDepends = [ + base containers hashable indexed-traversable + indexed-traversable-instances semigroupoids tagged these + transformers unordered-containers vector + ]; + description = "Align and Zip type-classes from the common Semialign ancestor"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "semialign-extras" = callPackage ({ mkDerivation, base, doctest, lens, QuickCheck, semialign , semialign-indexed, these, witherable @@ -229227,6 +228713,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "semialign-indexed_1_2" = callPackage + ({ mkDerivation, base, lens, semialign }: + mkDerivation { + pname = "semialign-indexed"; + version = "1.2"; + sha256 = "16f0y3j85zlq2f8z45z085dizvbx4ihppp1ww3swh5daj0zf3kzy"; + libraryHaskellDepends = [ base lens semialign ]; + doHaddock = false; + description = "SemialignWithIndex, i.e. izipWith and ialignWith"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "semialign-optics" = callPackage ({ mkDerivation, base, containers, hashable, optics-extra , semialign, these, unordered-containers, vector @@ -229245,6 +228744,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "semialign-optics_1_2" = callPackage + ({ mkDerivation, base, optics-core, semialign }: + mkDerivation { + pname = "semialign-optics"; + version = "1.2"; + sha256 = "04vh689mmnb5q77v6ifhg7xf7m2qh5x4i4804rm4biw78130xqr1"; + libraryHaskellDepends = [ base optics-core semialign ]; + doHaddock = false; + description = "SemialignWithIndex, i.e. izipWith and ialignWith"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "semibounded-lattices" = callPackage ({ mkDerivation, base, containers, lattices }: mkDerivation { @@ -229851,6 +229363,30 @@ self: { license = lib.licenses.gpl3; }) {}; + "sequence-formats_1_6_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, errors + , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers + , vector + }: + mkDerivation { + pname = "sequence-formats"; + version = "1.6.0"; + sha256 = "1vy2wwzpnqd2c0ma3jm46gx3w3al0j61ncr22bcahsb1nrgmg0dq"; + libraryHaskellDepends = [ + attoparsec base bytestring containers errors exceptions foldl + lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe + transformers vector + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec pipes pipes-safe tasty + tasty-hunit transformers vector + ]; + description = "A package with basic parsing utilities for several Bioinformatic data formats"; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sequenceTools" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec , lens-family, optparse-applicative, pipes, pipes-group @@ -231673,6 +231209,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.1"; sha256 = "1cyzyljmdfr3gigdszcpj1i7l698fnxpc9hr83mzspm6qcmbqmgf"; + revision = "1"; + editedCabalFile = "0j2b3zv5qk5xfi17jwwn456pqpf27aqgy6fmbyqvn8df83rcij5j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -231768,14 +231306,14 @@ self: { "servant-polysemy" = callPackage ({ mkDerivation, base, deepseq, http-client, http-client-tls, lens - , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant-client - , servant-server, servant-swagger, servant-swagger-ui, swagger2 - , text, wai, warp + , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant + , servant-client, servant-server, servant-swagger + , servant-swagger-ui, swagger2, text, wai, warp }: mkDerivation { pname = "servant-polysemy"; - version = "0.1.1"; - sha256 = "074c1x51am3ffl9lzhq090h8a6xd9gjf154mhp51glb4m4f6kr15"; + version = "0.1.2"; + sha256 = "05qk2kl90lqszwhi1yqnj63zkx3qvd6jbaxsxjw68k7ppsjvnyks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231784,7 +231322,7 @@ self: { ]; executableHaskellDepends = [ base deepseq http-client http-client-tls lens mtl polysemy - polysemy-plugin polysemy-zoo servant-client servant-server + polysemy-plugin polysemy-zoo servant servant-client servant-server servant-swagger servant-swagger-ui swagger2 text wai warp ]; description = "Utilities for using servant in a polysemy stack"; @@ -232869,30 +232407,6 @@ self: { "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces - , QuickCheck, text, time, transformers, unordered-containers - }: - mkDerivation { - pname = "serversession"; - version = "1.0.1"; - sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz"; - revision = "2"; - editedCabalFile = "0i5faxzxgvpfylmrr175f8l4asyh4phncc90jkfag53gnspcv028"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring data-default hashable nonce - path-pieces text time transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base base64-bytestring bytestring containers data-default - hspec nonce path-pieces QuickCheck text time transformers - unordered-containers - ]; - description = "Secure, modular server-side sessions"; - license = lib.licenses.mit; - }) {}; - - "serversession_1_0_2" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , containers, data-default, hashable, hspec, nonce, path-pieces , persistent-test, QuickCheck, text, time, transformers , unordered-containers }: @@ -232913,6 +232427,7 @@ self: { description = "Secure, modular server-side sessions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "serversession-backend-acid-state" = callPackage @@ -233003,6 +232518,8 @@ self: { ]; description = "Snap bindings for serversession"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "serversession-frontend-wai" = callPackage @@ -233020,6 +232537,8 @@ self: { ]; description = "wai-session bindings for serversession"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "serversession-frontend-yesod" = callPackage @@ -236935,8 +236454,8 @@ self: { pname = "singleton-bool"; version = "0.1.5"; sha256 = "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0"; - revision = "2"; - editedCabalFile = "118j0h29nqg2acqbzif2ffqnanjbwnqmv2kch9z7xiwqkz6iq8an"; + revision = "3"; + editedCabalFile = "11rhzpy4xiry39bbxzwrqff75f0f4g7z0vkr3v9l8rv3w40jlf7x"; libraryHaskellDepends = [ base dec ]; description = "Type level booleans"; license = lib.licenses.bsd3; @@ -237615,8 +237134,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.10.2"; - sha256 = "1f60fnr8d8a28fr785hjzaaakss1ncn0998sz740xb76wp6q7pqd"; + version = "0.10.3"; + sha256 = "0bhy0y3d8czv2m92snbqqh5b8xywf74xwc1qml98vy6im0s545ad"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -237641,8 +237160,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10.2"; - sha256 = "1igqskmcbhk7b3fv1a1fxvfc4s3mc2sf96q90bf5iipy0h3f2zbg"; + version = "0.10.3"; + sha256 = "00avd17l2fqvss2cnndmina3vp809x784gdyaf1bwmkcsfnl8d3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238193,30 +237712,6 @@ self: { }) {}; "slynx" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, containers - , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix - , monad-logger, mwc-random, optparse-applicative, statistics, text - , transformers, vector - }: - mkDerivation { - pname = "slynx"; - version = "0.5.0.1"; - sha256 = "013ck07xgna42a5vlk6a323z3x1jrggbjw7jr2ww8mpgvpw2wp8r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async attoparsec base bytestring containers elynx-markov elynx-seq - elynx-tools elynx-tree hmatrix monad-logger mwc-random - optparse-applicative statistics text transformers vector - ]; - executableHaskellDepends = [ base ]; - description = "Handle molecular sequences"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "slynx_0_5_0_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix , monad-logger, mwc-random, optparse-applicative, statistics, text @@ -240967,6 +240462,24 @@ self: { broken = true; }) {}; + "sockets-and-pipes" = callPackage + ({ mkDerivation, aeson, ascii, async, base, blaze-html, bytestring + , containers, network, safe-exceptions, stm, text, time + }: + mkDerivation { + pname = "sockets-and-pipes"; + version = "0.1"; + sha256 = "02xc2kddcz93d9yqdchml0yh9gypcx64315baj766adgf8np42nv"; + revision = "4"; + editedCabalFile = "1lv2zpyblqryr59ii3zvwi5f06vxsgnla1xa14rardhncs36fa8r"; + libraryHaskellDepends = [ + aeson ascii async base blaze-html bytestring containers network + safe-exceptions stm text time + ]; + description = "Support for the Sockets and Pipes book"; + license = lib.licenses.asl20; + }) {}; + "socketson" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , crypto-api, data-default, DRBG, either, errors, http-types @@ -242187,8 +241700,8 @@ self: { }: mkDerivation { pname = "speedy-slice"; - version = "0.3.1"; - sha256 = "0i139wp2c75q8a5q018z7ps1ghbqjkkd8nh6z6xfp0rqywq2bsnr"; + version = "0.3.2"; + sha256 = "1bmy0hrrqgwbqsk1ckbmzy1hhcwlcjsclcskrdmzfq5afvq9kq3z"; libraryHaskellDepends = [ base kan-extensions lens mcmc-types mwc-probability pipes primitive transformers @@ -242501,6 +242014,8 @@ self: { pname = "split"; version = "0.2.3.4"; sha256 = "0ahzdjcxw5wywr3w4msspia99k6fkckddam1m5506h4z9h8fa7r7"; + revision = "1"; + editedCabalFile = "06pmlvyrz4rr7rsrghpyrdypprphm9522rvnz4l3i8333n4pb304"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Combinator library for splitting lists"; @@ -244568,6 +244083,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "staged-gg" = callPackage + ({ mkDerivation, base, containers, generic-deriving + , template-haskell, th-abstraction, th-lift + }: + mkDerivation { + pname = "staged-gg"; + version = "0.1"; + sha256 = "1apajw5ig7sax31i2zf842isnhk74x65hv9k8k3f6dhdxxg2dha4"; + libraryHaskellDepends = [ + base containers generic-deriving template-haskell th-abstraction + th-lift + ]; + description = "GHC.Generics style staged generics"; + license = lib.licenses.bsd3; + }) {}; + "stagen" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring , data-default, directory, feed, filemanip, json-feed, lucid @@ -245592,8 +245123,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; - revision = "4"; - editedCabalFile = "0zxjrsa54g65p7kf5mfpjb897d1add2dfp5dm4xfs5321rs31knv"; + revision = "5"; + editedCabalFile = "03xg6n7dyz73y3llbbahnlh46xfy2iq29s1jwjp22qxd4z6xndsa"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -245858,36 +245389,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.4"; - sha256 = "0hlzi1zg58mgnb77982hkssm86ds66fs5nf1g2hcjjbjawchx3mj"; - libraryHaskellDepends = [ - base deferred-folds focus hashable list-t primitive - primitive-extras transformers - ]; - testHaskellDepends = [ - deferred-folds focus QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - async criterion focus free list-t mwc-random mwc-random-monad - rebase - ]; - description = "STM-specialised Hash Array Mapped Trie"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "stm-hamt_1_2_0_5" = callPackage - ({ mkDerivation, async, base, criterion, deferred-folds, focus - , free, hashable, list-t, mwc-random, mwc-random-monad, primitive - , primitive-extras, QuickCheck, quickcheck-instances, rebase - , rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers - }: - mkDerivation { - pname = "stm-hamt"; - version = "1.2.0.5"; - sha256 = "09hz5v2ldinyl6brrl87f46wg16y9d1fnwb5v8s17ph00sb95lgg"; + version = "1.2.0.6"; + sha256 = "15jqj31h9ff4g2k3sq35nm122sy0hqapxf4fm5vlkfh33zdn28di"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -247588,8 +247091,8 @@ self: { ({ mkDerivation, base, lens, strict }: mkDerivation { pname = "strict-lens"; - version = "0.4.0.1"; - sha256 = "0hwrbrjhgkh83474mci3ipg8nqims7b18w7i6xajz3xxq3cik5vn"; + version = "0.4.0.2"; + sha256 = "1dsgr53q0sdivrxc7jmbqjd65hav9zwjqc8zfbyybkr1ww17bhf5"; libraryHaskellDepends = [ base lens strict ]; description = "Lenses for types in strict package"; license = lib.licenses.bsd3; @@ -247618,6 +247121,8 @@ self: { pname = "strict-optics"; version = "0.4.0.1"; sha256 = "1x4p2fksljd9xfy4mxdz5pxcskxz2qg2ma28d6y4j2v4728r0x8a"; + revision = "1"; + editedCabalFile = "1rlkslqkicw7zzmy88kvbnlcyyx2afm3vs8y51gazz1bs0b73p0f"; libraryHaskellDepends = [ base optics-core strict ]; description = "Optics for types in strict package"; license = lib.licenses.bsd3; @@ -247803,36 +247308,6 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.3.0.2"; - sha256 = "1dkw4q2fxnr7gnish45lryxwrmdy93ffa1010qdnjlnz5m3dxbyl"; - revision = "1"; - editedCabalFile = "1rwylfxa821260mxfsr6l6grcyz7gxk18mvjijfhg5sm53v4c1ka"; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta split - template-haskell text text-conversions utf8-string - ]; - testHaskellDepends = [ - base bytestring hspec hspec-core QuickCheck quickcheck-instances - quickcheck-text quickcheck-unicode template-haskell text - unordered-containers - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq formatting interpolate - neat-interpolation QuickCheck text - ]; - description = "Haskell string/text/bytestring interpolation that just works"; - license = lib.licenses.bsd3; - }) {}; - - "string-interpolate_0_3_1_0" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, formatting - , haskell-src-exts, haskell-src-meta, hspec, hspec-core - , interpolate, neat-interpolation, QuickCheck, quickcheck-instances - , quickcheck-text, quickcheck-unicode, split, template-haskell - , text, text-conversions, unordered-containers, utf8-string - }: - mkDerivation { - pname = "string-interpolate"; version = "0.3.1.0"; sha256 = "0hyrcndhwd06phlmykyz7bklj5gnj4amcn11ckfvw0iws3sksl8d"; libraryHaskellDepends = [ @@ -247850,7 +247325,6 @@ self: { ]; description = "Haskell string/text/bytestring interpolation that just works"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "string-isos" = callPackage @@ -248408,28 +247882,6 @@ self: { }) {}; "structs" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory - , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , th-abstraction - }: - mkDerivation { - pname = "structs"; - version = "0.1.4"; - sha256 = "0sjrih706bpibd1ygfjz76gabampffwqvn0hnvmxa9b9vzwdgqzr"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base deepseq ghc-prim primitive template-haskell th-abstraction - ]; - testHaskellDepends = [ - base directory doctest filepath parallel primitive QuickCheck tasty - tasty-hunit tasty-quickcheck - ]; - description = "Strict GC'd imperative object-oriented programming with cheap pointers"; - license = lib.licenses.bsd3; - }) {}; - - "structs_0_1_5" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, template-haskell , th-abstraction @@ -248446,7 +247898,6 @@ self: { ]; description = "Strict GC'd imperative object-oriented programming with cheap pointers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "structural-induction" = callPackage @@ -249113,8 +248564,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "successors"; - version = "0.1.0.1"; - sha256 = "1m5flnn2rswc3380dccnfnhmyjp1dqr23dljd0515jxawbgjkzmg"; + version = "0.1.0.2"; + sha256 = "0q6sfxxzc0ws1iky79iyx7sf7l3jqdwxz9ngsi11km1bp7rd8ycw"; libraryHaskellDepends = [ base ]; description = "An applicative functor to manage successors"; license = lib.licenses.mit; @@ -250274,11 +249725,12 @@ self: { "swisstable" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, hashtables , primitive, QuickCheck, tasty, tasty-discover, tasty-hunit, vector + , weigh }: mkDerivation { pname = "swisstable"; - version = "0.1.0.2"; - sha256 = "0zffsavnxnwhzxgbwpqg38gnjywgfdk60hbg0wvpggk1zaw0ylr1"; + version = "0.1.0.3"; + sha256 = "1d1vk1j8r2lwxkx2l4l1fmm8z9ascp7hq52al7qjn4bir177b92q"; libraryHaskellDepends = [ base hashable primitive vector ]; testHaskellDepends = [ base hashable primitive QuickCheck tasty tasty-discover tasty-hunit @@ -250287,7 +249739,7 @@ self: { testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base criterion deepseq hashable hashtables primitive QuickCheck - vector + vector weigh ]; description = "SwissTable hash map"; license = lib.licenses.bsd3; @@ -252952,8 +252404,8 @@ self: { pname = "tar"; version = "0.5.1.1"; sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; - revision = "2"; - editedCabalFile = "131f369a2vjzr26r7f2c2p534xvyw0s7cvgvih2ck56lqha58wbs"; + revision = "3"; + editedCabalFile = "0qjhii1lhvqav3pnm6z5ly40d9gwp7p3y4g7k26bhxgy31bx1pll"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -253027,11 +252479,10 @@ self: { ({ mkDerivation, base, mmorph, mtl }: mkDerivation { pname = "tardis"; - version = "0.4.1.0"; - sha256 = "1nd54pff1n6ds5jqa98qrby06d3ziw2rhb3j5lvw4mahsynsnwp6"; - revision = "1"; - editedCabalFile = "1wp6vp90g19hv8r2l83ava7qxf0933gb7ni2zgyfa66vlvxvhibv"; + version = "0.4.3.0"; + sha256 = "1ffmpdvnmr1s3rh3kpqqscsbz2rq4s7k8nfc93zw9m4mchg37waw"; libraryHaskellDepends = [ base mmorph mtl ]; + testHaskellDepends = [ base ]; description = "Bidirectional state monad transformer"; license = lib.licenses.bsd3; }) {}; @@ -253361,6 +252812,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_2_2" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.2.2"; + sha256 = "0x6kg8n778nysv3b7j31bnh62h5srid35nhmvr76bzba4qdgx258"; + libraryHaskellDepends = [ base containers deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { @@ -253404,22 +252867,6 @@ self: { }: mkDerivation { pname = "tasty-expected-failure"; - version = "0.12.2"; - sha256 = "0i97y723vi2f5z94ripli8jfzqk540w80cfab3prylbm9j3s7rb7"; - libraryHaskellDepends = [ base tagged tasty unbounded-delays ]; - testHaskellDepends = [ - base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit - ]; - description = "Mark tasty tests as failure expected"; - license = lib.licenses.mit; - }) {}; - - "tasty-expected-failure_0_12_3" = callPackage - ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden - , tasty-hedgehog, tasty-hunit, unbounded-delays - }: - mkDerivation { - pname = "tasty-expected-failure"; version = "0.12.3"; sha256 = "0zlgxs24d54byfhvwdg85xk1572zpjs71bjlxxrxcvralrfcq1yb"; libraryHaskellDepends = [ base tagged tasty unbounded-delays ]; @@ -253428,7 +252875,6 @@ self: { ]; description = "Mark tasty tests as failure expected"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-fail-fast" = callPackage @@ -258542,6 +257988,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "these-lens_1_0_1_2" = callPackage + ({ mkDerivation, base, lens, these }: + mkDerivation { + pname = "these-lens"; + version = "1.0.1.2"; + sha256 = "1v3kj7j4bkywbmdbblwqs5gsj5s23d59sb3s27jf3bwdzf9d21p6"; + libraryHaskellDepends = [ base lens these ]; + description = "Lenses for These"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "these-optics" = callPackage ({ mkDerivation, base, optics-core, these }: mkDerivation { @@ -258553,6 +258011,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "these-optics_1_0_1_2" = callPackage + ({ mkDerivation, base, optics-core, these }: + mkDerivation { + pname = "these-optics"; + version = "1.0.1.2"; + sha256 = "06jxv320a8f94zjjsqrh072vz2dkzhwgcmpbdy1prgvypiynm4zd"; + libraryHaskellDepends = [ base optics-core these ]; + description = "Optics for These"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "these-skinny" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -259275,28 +258745,30 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.6.1"; - sha256 = "13n9s0s04bddl16xq86anz7a9fqcm7j3xfqn5y1mni5j1h7hn2k2"; + version = "1.7.1"; + sha256 = "0fksrydrmjph3ghggijr9hq3xa5wfnqgzm4qxiqravsj70s9m2n4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc network parsec primitive random text transformers vector ]; - testHaskellDepends = [ base containers deepseq microspec parsec ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = lib.licenses.gpl3; }) {}; - "tidal_1_7_1" = callPackage + "tidal_1_7_2" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, network, parsec , primitive, random, text, transformers, vector, weigh }: mkDerivation { pname = "tidal"; - version = "1.7.1"; - sha256 = "0fksrydrmjph3ghggijr9hq3xa5wfnqgzm4qxiqravsj70s9m2n4"; + version = "1.7.2"; + sha256 = "15shxaazxik1bawgak16xhlvk708kv9al6i3518b3m3iap9sbw9p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -260949,30 +260421,6 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.5.0.1"; - sha256 = "0prqnbq75jrixx845z3hbqajfc63vgsdfdgrsxw0g29rx0x4hw2i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring comonad containers elynx-tools - elynx-tree gnuplot lifted-async monad-logger mwc-random - optparse-applicative parallel statistics text transformers vector - ]; - executableHaskellDepends = [ base ]; - description = "Handle phylogenetic trees"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "tlynx_0_5_0_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad - , containers, elynx-tools, elynx-tree, gnuplot, lifted-async - , monad-logger, mwc-random, optparse-applicative, parallel - , statistics, text, transformers, vector - }: - mkDerivation { - pname = "tlynx"; version = "0.5.0.2"; sha256 = "1d28xk346h92imp6lnmy0g9mql8nd1zna1mnfs6mqhf38l8sm0k4"; isLibrary = true; @@ -261528,37 +260976,6 @@ self: { }: mkDerivation { pname = "tomland"; - version = "1.3.1.0"; - sha256 = "17909a8aapbrsa0yb642ij80k64dg2dam1v3rsvc3rm07ik61x42"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers deepseq hashable megaparsec mtl - parser-combinators text time transformers unordered-containers - validation-selective - ]; - executableHaskellDepends = [ - base bytestring containers hashable text time unordered-containers - ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ - base bytestring containers directory hashable hedgehog hspec - hspec-golden hspec-hedgehog hspec-megaparsec megaparsec text time - unordered-containers - ]; - description = "Bidirectional TOML serialization"; - license = lib.licenses.mpl20; - }) {}; - - "tomland_1_3_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , hashable, hedgehog, hspec, hspec-golden, hspec-hedgehog - , hspec-megaparsec, markdown-unlit, megaparsec, mtl - , parser-combinators, text, time, transformers - , unordered-containers, validation-selective - }: - mkDerivation { - pname = "tomland"; version = "1.3.2.0"; sha256 = "0yj39mh4z3v3jqri38s3ylrglv657g3m7gqr2rz8ydlvx2draknc"; isLibrary = true; @@ -261579,7 +260996,6 @@ self: { ]; description = "Bidirectional TOML serialization"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "tomlcheck" = callPackage @@ -261743,45 +261159,44 @@ self: { }) {}; "too-many-cells" = callPackage - ({ mkDerivation, aeson, base, birch-beer, bytestring, cassava - , colour, containers, deepseq, diagrams, diagrams-cairo - , diagrams-graphviz, diagrams-lib, differential, directory - , diversity, fgl, filepath, find-clumpiness, foldl, graphviz + ({ mkDerivation, aeson, async, async-pool, attoparsec, base + , birch-beer, bytestring, cassava, colour, containers, deepseq + , diagrams, diagrams-cairo, diagrams-graphviz, diagrams-lib + , differential, directory, diversity, fgl, filepath + , find-clumpiness, foldl, graphviz, hashable , hierarchical-clustering, hierarchical-spectral-clustering - , hmatrix, inline-r, lens, managed, matrix-market-attoparsec - , modularity, mtl, optparse-generic, palette, parallel, plots, safe - , scientific, sparse-linear-algebra, spectral-clustering, split - , statistics, streaming, streaming-bytestring, streaming-cassava - , streaming-utils, streaming-with, SVGFonts, temporary - , terminal-progress-bar, text, text-show, transformers, vector - , vector-algorithms, zlib + , hmatrix, hmatrix-svdlibc, inline-r, IntervalMap, lens, managed + , matrix-market-attoparsec, modularity, mtl, mwc-random + , optparse-generic, palette, parallel, plots, process, resourcet + , safe, scientific, sparse-linear-algebra, spectral-clustering + , split, statistics, stm, streaming, streaming-bytestring + , streaming-cassava, streaming-commons, streaming-utils + , streaming-with, SVGFonts, system-filepath, temporary + , terminal-progress-bar, text, text-show, transformers, turtle + , unordered-containers, vector, vector-algorithms, zlib }: mkDerivation { pname = "too-many-cells"; - version = "0.2.2.2"; - sha256 = "091hqg4wxki8v7xkrzmnh1hpm81pif936pbmrzvr5p84sbbyyj91"; + version = "2.1.0.1"; + sha256 = "0clrkr7kxcky6l1gwnbznz013svn7254n8fkkb7mgvn93h94anky"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base birch-beer bytestring cassava colour containers deepseq - diagrams diagrams-cairo diagrams-graphviz diagrams-lib differential - directory diversity fgl filepath find-clumpiness foldl graphviz + aeson async async-pool attoparsec base birch-beer bytestring + cassava colour containers deepseq diagrams diagrams-cairo + diagrams-graphviz diagrams-lib differential directory diversity fgl + filepath find-clumpiness foldl graphviz hashable hierarchical-clustering hierarchical-spectral-clustering hmatrix - inline-r lens managed matrix-market-attoparsec modularity mtl - palette parallel plots safe scientific sparse-linear-algebra split - statistics streaming streaming-bytestring streaming-cassava - streaming-with SVGFonts temporary text text-show vector - vector-algorithms zlib - ]; - executableHaskellDepends = [ - aeson base birch-beer bytestring cassava colour containers - diagrams-cairo diagrams-lib directory fgl filepath find-clumpiness - graphviz hierarchical-spectral-clustering inline-r lens - matrix-market-attoparsec modularity mtl optparse-generic palette - plots spectral-clustering streaming streaming-bytestring - streaming-utils terminal-progress-bar text text-show transformers - vector + hmatrix-svdlibc inline-r IntervalMap lens managed + matrix-market-attoparsec modularity mtl mwc-random optparse-generic + palette parallel plots process resourcet safe scientific + sparse-linear-algebra spectral-clustering split statistics stm + streaming streaming-bytestring streaming-cassava streaming-commons + streaming-utils streaming-with SVGFonts system-filepath temporary + terminal-progress-bar text text-show transformers turtle + unordered-containers vector vector-algorithms zlib ]; + executableHaskellDepends = [ base optparse-generic ]; description = "Cluster single cells and analyze cell clade relationships"; license = lib.licenses.gpl3; hydraPlatforms = lib.platforms.none; @@ -261896,6 +261311,8 @@ self: { pname = "topograph"; version = "1.0.0.1"; sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; + revision = "1"; + editedCabalFile = "1cbpm16jk8x8xy0r3v8zdmwrdgxlp6zww03rmzbz0031hddpywrk"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -263345,8 +262762,8 @@ self: { pname = "tree-diff"; version = "0.1"; sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3"; - revision = "5"; - editedCabalFile = "1b60x9cgp7hn42hc97q866ybhg5hx3sp45j6gngpbwryg29r2p4h"; + revision = "6"; + editedCabalFile = "1wqfac660m9ggv6r85a7y29mk947hki9iydy124vdwcqzichja0d"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers hashable parsec parsers pretty @@ -263564,10 +262981,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "tree-view"; - version = "0.5"; - sha256 = "1aywcaq9b48ap04g8i5rirz447kfmwxnswqigmycbgvqdbglc01d"; - revision = "1"; - editedCabalFile = "0f4sls511c4axp92r07yk0b4h9wvlbk5345643q4gvy1adxwdyw5"; + version = "0.5.1"; + sha256 = "1ya3m1qi83pn74wzffvbzj7wn6n5zny4yzzzf7wlfqszl96jhn2g"; libraryHaskellDepends = [ base containers mtl ]; description = "Render trees as foldable HTML and Unicode art"; license = lib.licenses.bsd3; @@ -263902,33 +263317,6 @@ self: { "trifecta" = callPackage ({ mkDerivation, ansi-terminal, array, base, blaze-builder - , blaze-html, blaze-markup, bytestring, Cabal, cabal-doctest - , charset, comonad, containers, deepseq, doctest, fingertree - , ghc-prim, hashable, lens, mtl, parsers, prettyprinter - , prettyprinter-ansi-terminal, profunctors, QuickCheck, reducers - , semigroups, transformers, unordered-containers, utf8-string - }: - mkDerivation { - pname = "trifecta"; - version = "2.1"; - sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs"; - revision = "4"; - editedCabalFile = "0frzfh7xmaypbxcmszjvzbakz52p0fx79jg6ng0ygaaj62inv4ss"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal array base blaze-builder blaze-html blaze-markup - bytestring charset comonad containers deepseq fingertree ghc-prim - hashable lens mtl parsers prettyprinter prettyprinter-ansi-terminal - profunctors reducers semigroups transformers unordered-containers - utf8-string - ]; - testHaskellDepends = [ base doctest parsers QuickCheck ]; - description = "A modern parser combinator library with convenient diagnostics"; - license = lib.licenses.bsd3; - }) {}; - - "trifecta_2_1_1" = callPackage - ({ mkDerivation, ansi-terminal, array, base, blaze-builder , blaze-html, blaze-markup, bytestring, charset, comonad , containers, deepseq, fingertree, ghc-prim, hashable , indexed-traversable, lens, mtl, parsers, prettyprinter @@ -263949,7 +263337,6 @@ self: { testHaskellDepends = [ base parsers QuickCheck ]; description = "A modern parser combinator library with convenient diagnostics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "trigger" = callPackage @@ -264971,16 +264358,17 @@ self: { }) {}; "twee" = callPackage - ({ mkDerivation, base, containers, jukebox, pretty, split, twee-lib + ({ mkDerivation, ansi-terminal, base, containers, jukebox, pretty + , split, symbol, twee-lib }: mkDerivation { pname = "twee"; - version = "2.2"; - sha256 = "0wmjmgkf5piwqzrk08ij7mc3s82gpg7j5x4bk96njj06gm4lc38v"; + version = "2.3"; + sha256 = "1fg8khaa5zkfyh2jawh2m7jyy3a4kbd755qa09gwg9b7y9wijamr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base containers jukebox pretty split twee-lib + ansi-terminal base containers jukebox pretty split symbol twee-lib ]; description = "An equational theorem prover"; license = lib.licenses.bsd3; @@ -264990,14 +264378,15 @@ self: { "twee-lib" = callPackage ({ mkDerivation, base, containers, dlist, ghc-prim, pretty - , primitive, transformers, vector + , primitive, random, transformers, uglymemo, vector }: mkDerivation { pname = "twee-lib"; - version = "2.2"; - sha256 = "0v99hhnxpzi5581s4bfxhbpnmvlbqnrrr3pdkfvicz2b146mhhgr"; + version = "2.3"; + sha256 = "1ba98apscp1f4k9917an27aqymnr8gj8pkwj7g2ci02fh7dan9b9"; libraryHaskellDepends = [ - base containers dlist ghc-prim pretty primitive transformers vector + base containers dlist ghc-prim pretty primitive random transformers + uglymemo vector ]; description = "An equational theorem prover"; license = lib.licenses.bsd3; @@ -265535,8 +264924,8 @@ self: { }: mkDerivation { pname = "twitter-types-lens"; - version = "0.10.0"; - sha256 = "1x9w68mr6r6354in9l4vmawk5symvfh2qlhjn2gd30m8b1mzbrjg"; + version = "0.10.1"; + sha256 = "07znqqb4lhhzlzvi1nl3m13cnskfakq4pnn52wpn554igxymgvsd"; libraryHaskellDepends = [ base lens template-haskell text time twitter-types ]; @@ -266728,17 +266117,15 @@ self: { }) {}; "typelevel-rewrite-rules" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , term-rewriting, transformers, vinyl + ({ mkDerivation, base, containers, ghc, ghc-prim, term-rewriting + , transformers, vinyl }: mkDerivation { pname = "typelevel-rewrite-rules"; - version = "0.1"; - sha256 = "1gm3xbsi90dgppwhhhlmq1rwwnx9bxhm7zv9x4yr0952fwxrm8x8"; - revision = "1"; - editedCabalFile = "0wgryhys24671j46s58prbh7agrlxdcbains6qv37kp6xly726nj"; + version = "1.0"; + sha256 = "0by8zl16dzq0srdmr7p3hwdp1966gbdmzqp9h2548sj767r0ncmy"; libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra term-rewriting transformers + base containers ghc ghc-prim term-rewriting transformers ]; testHaskellDepends = [ base ghc-prim vinyl ]; description = "Solve type equalities using custom type-level rewrite rules"; @@ -267185,31 +266572,6 @@ self: { }: mkDerivation { pname = "ua-parser"; - version = "0.7.5.1"; - sha256 = "091lks0jpp0m4wg56i03ih3n0n7kvs2fm511vcnypmwskflkkk0z"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring data-default file-embed pcre-light text yaml - ]; - testHaskellDepends = [ - aeson base bytestring data-default file-embed filepath HUnit - pcre-light tasty tasty-hunit tasty-quickcheck text yaml - ]; - benchmarkHaskellDepends = [ - aeson base bytestring criterion data-default deepseq file-embed - filepath pcre-light text yaml - ]; - description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; - license = lib.licenses.bsd3; - }) {}; - - "ua-parser_0_7_6_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, criterion, data-default - , deepseq, file-embed, filepath, HUnit, pcre-light, tasty - , tasty-hunit, tasty-quickcheck, text, yaml - }: - mkDerivation { - pname = "ua-parser"; version = "0.7.6.0"; sha256 = "0sakvmmf6p2ca0dbkwqdj5cv93gp78srw0zc4f1skcgndkmxwk6l"; enableSeparateDataOutput = true; @@ -267226,7 +266588,6 @@ self: { ]; description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "uacpid" = callPackage @@ -268047,10 +267408,8 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "1.0"; - sha256 = "0ilzv4ks76f9fx12ilsam0v232fm2mvvsz6s50p0nllldwgkgm6a"; - revision = "2"; - editedCabalFile = "0lnqjgh8nyq6w94swn0m7syl0bx6a2ml7s9sqp449inpdb8f8jaj"; + version = "1.0.1"; + sha256 = "1h1zps55adzhfsfq1bgwc235qywpad9z7rfqid81l4405pi5zw83"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -268371,8 +267730,8 @@ self: { ({ mkDerivation, base, containers, logict, mtl }: mkDerivation { pname = "unification-fd"; - version = "0.10.0.1"; - sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v"; + version = "0.11.1"; + sha256 = "0xvc3xa0yhxjxd1nf6d1cnixlbjaz2ww08hg1vldsf6c1h4lvs05"; libraryHaskellDepends = [ base containers logict mtl ]; description = "Simple generic unification algorithms"; license = lib.licenses.bsd3; @@ -269007,6 +268366,8 @@ self: { pname = "universe-instances-extended"; version = "1.1.2"; sha256 = "1yg3cacr56kk0r8vnqxa9cm1awb727qkysnhc7rn4h9pfb10a7sn"; + revision = "1"; + editedCabalFile = "017adjf6wbw56a81l69vd0gzhlvi6n1wplh85smq7l9m98wsh4wy"; libraryHaskellDepends = [ adjunctions base comonad containers universe-base ]; @@ -269236,6 +268597,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-recursive" = callPackage + ({ mkDerivation, base, bytestring, criterion, dir-traverse, hspec + , unix + }: + mkDerivation { + pname = "unix-recursive"; + version = "0.1.0.0"; + sha256 = "151ap7b3nzlaz2pfl144z4azfvxdw6l8zrn500nzl58hqr9n7awl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ base bytestring hspec unix ]; + benchmarkHaskellDepends = [ base criterion dir-traverse ]; + description = "Fast and flexible primitives for recursive file system IO on Posix systems"; + license = lib.licenses.bsd3; + }) {}; + "unix-simple" = callPackage ({ mkDerivation, base, bytestring, zenhack-prelude }: mkDerivation { @@ -271213,33 +270591,6 @@ self: { }) {}; "uuid" = callPackage - ({ mkDerivation, base, binary, bytestring, criterion - , cryptohash-md5, cryptohash-sha1, entropy, HUnit - , mersenne-random-pure64, network-info, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, text, time, uuid-types - }: - mkDerivation { - pname = "uuid"; - version = "1.3.13"; - sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z"; - revision = "6"; - editedCabalFile = "06w8i9hi9ha84nmj6fcj44apzv61m3ryc0a1yxxqq5n8vznk2iya"; - libraryHaskellDepends = [ - base binary bytestring cryptohash-md5 cryptohash-sha1 entropy - network-info random text time uuid-types - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck random tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base criterion mersenne-random-pure64 random - ]; - description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; - license = lib.licenses.bsd3; - }) {}; - - "uuid_1_3_14" = callPackage ({ mkDerivation, base, binary, bytestring, cryptohash-md5 , cryptohash-sha1, entropy, network-info, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, text, time, uuid-types @@ -271258,7 +270609,6 @@ self: { ]; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "uuid-aeson" = callPackage @@ -271356,30 +270706,6 @@ self: { }) {}; "uuid-types" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, hashable, HUnit, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "uuid-types"; - version = "1.0.3"; - sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj"; - revision = "4"; - editedCabalFile = "0ipwfd5y8021ygpadjjhchw5irm0x27dlv1k2hf4znza5v7hadcn"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable random text - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq random - ]; - description = "Type definitions for Universally Unique Identifiers"; - license = lib.licenses.bsd3; - }) {}; - - "uuid-types_1_0_4" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder , hashable, QuickCheck, random, tasty, tasty-hunit , tasty-quickcheck, text @@ -271397,7 +270723,6 @@ self: { ]; description = "Type definitions for Universally Unique Identifiers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "uulib" = callPackage @@ -271417,8 +270742,8 @@ self: { }: mkDerivation { pname = "uusi"; - version = "0.3.1.0"; - sha256 = "14n2n62lcaxfljxxdk6pw14liksfa77jj8zby5magdnsx2jzkb5i"; + version = "0.4.0.0"; + sha256 = "03spazp0lpd2impvg9i6fdd32v3fzycgqr95ry2jwvaxijqhfic9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal microlens microlens-th text ]; @@ -271428,7 +270753,7 @@ self: { testHaskellDepends = [ base Cabal HUnit microlens microlens-th text ]; - description = "Tweak dependencies in .cabal files"; + description = "Tweak .cabal files"; license = lib.licenses.mit; }) {}; @@ -272154,21 +271479,6 @@ self: { }) {}; "vault" = callPackage - ({ mkDerivation, base, containers, hashable, semigroups - , unordered-containers - }: - mkDerivation { - pname = "vault"; - version = "0.3.1.4"; - sha256 = "0na31n56p6713az0vfhdrv53n03bb3yrnyszf3vxsjlgvrax472v"; - libraryHaskellDepends = [ - base containers hashable semigroups unordered-containers - ]; - description = "a persistent store for values of arbitrary types"; - license = lib.licenses.bsd3; - }) {}; - - "vault_0_3_1_5" = callPackage ({ mkDerivation, base, containers, hashable, unordered-containers }: mkDerivation { @@ -272180,7 +271490,6 @@ self: { ]; description = "a persistent store for values of arbitrary types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vault-tool" = callPackage @@ -273051,10 +272360,8 @@ self: { ({ mkDerivation, base, data-default, template-haskell, vector }: mkDerivation { pname = "vector-th-unbox"; - version = "0.2.1.7"; - sha256 = "0q8dqnbv1c2gi7jjdhqj14abj1vik23ki6lq4iz2sz18yc7q69fi"; - revision = "1"; - editedCabalFile = "11qhhir9cdy3x7pd0z0xk8vi4nzr9fn9q3ggwbhhc43jglngw1x7"; + version = "0.2.1.9"; + sha256 = "0jbzm31d91kxn8m0h6iplj54h756q6f4zzdrnb2w7rzz5zskgqyl"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -273342,8 +272649,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "4.0.2"; - sha256 = "1m7nyjqd0cyxnli5f7rbk1wrh6h7dk65i67k6xp787npf7hi6gdf"; + version = "4.0.3"; + sha256 = "0rp62aih4blpahymqlkrfzywdqb1mkhy6f021vp74ljknpch4scf"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators text ]; @@ -274366,8 +273673,10 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.32"; - sha256 = "0ydbifik7xilb33phglpjkgf6r8vifipyyq0wb6111azzj7dmszs"; + version = "5.33"; + sha256 = "0qsx4lwlkp6mwyr7rm1r9dg5ic1lc1awqgyag0nj1qgj2gnv6nc9"; + revision = "1"; + editedCabalFile = "1in66nd2xkb6mxxzazny900pz1xj83iqsql42c0rwk72chnnb8cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -278842,8 +278151,8 @@ self: { pname = "windns"; version = "0.1.0.1"; sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8"; - revision = "1"; - editedCabalFile = "17d44pzi4q5yvrygimdrwdrabz62s1ylw918w28sxgcvj64ir22g"; + revision = "2"; + editedCabalFile = "129amxjf05b6vi9ln8ijxry062av8bmv3wnng0jis71fyw8ldr0p"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library"; @@ -279063,30 +278372,6 @@ self: { }: mkDerivation { pname = "with-utf8"; - version = "1.0.2.1"; - sha256 = "13zifhmhpdfwifw9bwyn9w5a29iph7h59jx13r0wiw5ry0g7qbif"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base safe-exceptions text ]; - executableHaskellDepends = [ - base directory filepath process safe-exceptions text th-env - ]; - testHaskellDepends = [ - base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog - tasty-hunit temporary text unix - ]; - testToolDepends = [ tasty-discover ]; - description = "Get your IO right on the first try"; - license = lib.licenses.mpl20; - }) {}; - - "with-utf8_1_0_2_2" = callPackage - ({ mkDerivation, base, deepseq, directory, filepath, hedgehog - , HUnit, process, safe-exceptions, tasty, tasty-discover - , tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix - }: - mkDerivation { - pname = "with-utf8"; version = "1.0.2.2"; sha256 = "04ymb90yli9sbdl750yh0nvpn6crnrb2axhx8hrswz5g86cabcmq"; isLibrary = true; @@ -279102,7 +278387,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Get your IO right on the first try"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "withdependencies" = callPackage @@ -281758,6 +281042,36 @@ self: { broken = true; }) {}; + "xlsx_0_8_3" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search + , bytestring, conduit, containers, criterion, data-default, deepseq + , Diff, errors, extra, filepath, groom, lens, mtl, network-uri + , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xeno + , xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.8.3"; + sha256 = "11g6bfir21wgafnkzzx26r6mz8m39isaz2yqw92k5ymdb1qhs95q"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary-search bytestring conduit + containers data-default deepseq errors extra filepath lens mtl + network-uri old-locale safe text time transformers vector xeno + xml-conduit zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck text time vector + xml-conduit + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Simple and incomplete Excel file parser/writer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "xlsx-tabular" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx @@ -283459,6 +282773,23 @@ self: { broken = true; }) {}; + "yahoo-prices" = callPackage + ({ mkDerivation, base, bytestring, cassava, hspec, lens, QuickCheck + , time, vector, wreq + }: + mkDerivation { + pname = "yahoo-prices"; + version = "0.1.0.2"; + sha256 = "1zyrj6rq75blzh1v9ja2bbyfaf3c2a6648lcmflmxmd45350ah9f"; + libraryHaskellDepends = [ + base bytestring cassava lens time vector wreq + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck time ]; + doHaddock = false; + description = "A wrapper around Yahoo API for downloading market data"; + license = lib.licenses.mit; + }) {}; + "yahoo-web-search" = callPackage ({ mkDerivation, base, HTTP, network, xml }: mkDerivation { @@ -286018,6 +285349,32 @@ self: { broken = true; }) {}; + "yesod-page-cursor_2_0_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations-lifted, http-link-header, http-types, lens + , lens-aeson, monad-logger, mtl, network-uri, persistent + , persistent-sqlite, persistent-template, scientific, text, time + , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-page-cursor"; + version = "2.0.0.4"; + sha256 = "1zckyjg3k8xi6lx1xgyh50d6v7hydv12c1j36w48xy296nsjwvv9"; + libraryHaskellDepends = [ + aeson base bytestring containers http-link-header network-uri text + unliftio yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-lifted + http-link-header http-types lens lens-aeson monad-logger mtl + persistent persistent-sqlite persistent-template scientific text + time unliftio unliftio-core wai-extra yesod yesod-core yesod-test + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yesod-paginate" = callPackage ({ mkDerivation, base, template-haskell, yesod }: mkDerivation { @@ -288536,8 +287893,8 @@ self: { pname = "zinza"; version = "0.2"; sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "1"; - editedCabalFile = "0pgrfx4vnc3m6rlmg5qj4skarq5y0ijz3swf3fyy57310lvifr0q"; + revision = "2"; + editedCabalFile = "17q1as97cazj2nkwdi31kkgaa3wrxpc8phdj6f9wr4jibbm3jyp6"; libraryHaskellDepends = [ base containers parsec text transformers ]; @@ -288676,6 +288033,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "zip-stream_0_2_1_0" = callPackage + ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit + , conduit-extra, digest, directory, exceptions, filepath, mtl + , primitive, resourcet, text, time, transformers, transformers-base + , zlib + }: + mkDerivation { + pname = "zip-stream"; + version = "0.2.1.0"; + sha256 = "0fx8kj0ijm3555grhdns7agmi084584fh1v0mvkm4x696h1zzvli"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary binary-conduit bytestring conduit conduit-extra digest + exceptions mtl primitive resourcet text time transformers-base zlib + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra directory filepath resourcet + text time transformers + ]; + description = "ZIP archive streaming using conduits"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "zipedit" = callPackage ({ mkDerivation, base, directory, mtl, process }: mkDerivation { @@ -288735,26 +288117,6 @@ self: { }) {}; "zippers" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest - , fail, lens, profunctors, semigroupoids, semigroups - }: - mkDerivation { - pname = "zippers"; - version = "0.3"; - sha256 = "0hrsgk8sh9g3438kl79131s6vjydhivgya04yxv3h70m7pky1dpm"; - revision = "2"; - editedCabalFile = "131rmvifqf3dcvh9lnpjnm28ss7nzra1n2qnxa1fypnx1zmmljva"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base fail lens profunctors semigroupoids semigroups - ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ base criterion lens ]; - description = "Traversal based zippers"; - license = lib.licenses.bsd3; - }) {}; - - "zippers_0_3_1" = callPackage ({ mkDerivation, base, criterion, fail, indexed-traversable, lens , profunctors, semigroupoids, semigroups }: @@ -288769,7 +288131,6 @@ self: { benchmarkHaskellDepends = [ base criterion lens ]; description = "Traversal based zippers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "zippo" = callPackage @@ -288835,8 +288196,8 @@ self: { }: mkDerivation { pname = "zlib"; - version = "0.6.2.2"; - sha256 = "1fii0qfc60lfp93vwb78p2fv3jjyklgdhw4ms262z6cysq6qkd84"; + version = "0.6.2.3"; + sha256 = "125wbayk8ifp0gp8cb52afck2ziwvqfrjzbmwmy52g6bz7fnnzw0"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 96c884ab602e7..92531eacd20d9 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0nd63i924ifh39cba1hd4sbi6vh1cb73v97nrn4bf8rrjh3k8pdi"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' make install PREFIX="$out" diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index d38fb8279f0b3..db6554874af55 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -1,17 +1,19 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - version = "6.30"; +stdenv.mkDerivation rec { + version = "6.31"; pname = "clips"; src = fetchurl { - url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z"; - sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy"; + url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${ + builtins.replaceStrings [ "." ] [ "" ] version + }.tar.gz"; + sha256 = "165k0z7dsv04q432sanmw0jxmxwf56cnhsdfw5ffjqxd3lzkjnv6"; }; - buildPhase = '' - make -C core -f ../makefiles/makefile.gcc - ''; + makeFlags = [ "-C" "core" ]; installPhase = '' + runHook preInstall install -D -t $out/bin core/clips + runHook postInstall ''; meta = with lib; { description = "A Tool for Building Expert Systems"; @@ -23,7 +25,7 @@ stdenv.mkDerivation { easier to implement and maintain than an algorithmic solution. ''; license = licenses.publicDomain; - maintainers = [maintainers.league]; + maintainers = [ maintainers.league ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 774e83311b11d..43b8fb4c6c4c2 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -17,36 +17,71 @@ stdenv.mkDerivation rec { dontUnpack = true; - LC_ALL = "en_US.UTF-8"; nativeBuildInputs = [ graalvm11-ce glibcLocales ]; + LC_ALL = "en_US.UTF-8"; + BABASHKA_JAR = src; + BABASHKA_BINARY = "bb"; + BABASHKA_XMX = "-J-Xmx4500m"; + buildPhase = '' - native-image \ - -jar ${src} \ - -H:Name=bb \ - ${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''} \ - -H:+ReportExceptionStackTraces \ - -J-Dclojure.spec.skip-macros=true \ - -J-Dclojure.compiler.direct-linking=true \ - "-H:IncludeResources=BABASHKA_VERSION" \ - "-H:IncludeResources=SCI_VERSION" \ - -H:ReflectionConfigurationFiles=${reflectionJson} \ - --initialize-at-build-time \ - -H:Log=registerResource: \ - -H:EnableURLProtocols=http,https \ - --enable-all-security-services \ - -H:+JNI \ - --verbose \ - --no-fallback \ - --no-server \ - --report-unsupported-elements-at-runtime \ - "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \ - "-J-Xmx4500m" + runHook preBuild + + # https://github.com/babashka/babashka/blob/77daea7362d8e2562c89c315b1fbcefde6fa56a5/script/compile + args=("-jar" "$BABASHKA_JAR" + "-H:Name=$BABASHKA_BINARY" + "${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''}" + "-H:+ReportExceptionStackTraces" + "-J-Dclojure.spec.skip-macros=true" + "-J-Dclojure.compiler.direct-linking=true" + "-H:IncludeResources=BABASHKA_VERSION" + "-H:IncludeResources=SCI_VERSION" + "-H:ReflectionConfigurationFiles=${reflectionJson}" + "--initialize-at-build-time" + # "-H:+PrintAnalysisCallTree" + # "-H:+DashboardAll" + # "-H:DashboardDump=reports/dump" + # "-H:+DashboardPretty" + # "-H:+DashboardJson" + "-H:Log=registerResource:" + "-H:EnableURLProtocols=http,https,jar" + "--enable-all-security-services" + "-H:+JNI" + "--verbose" + "--no-fallback" + "--no-server" + "--report-unsupported-elements-at-runtime" + "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" + "--native-image-info" + "--verbose" + "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.AudioFileReader" + "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiFileReader" + "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.MixerProvider" + "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.FormatConversionProvider" + "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.AudioFileWriter" + "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiDeviceProvider" + "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.SoundbankReader" + "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiFileWriter" + "$BABASHKA_XMX") + + native-image ''${args[@]} + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp bb $out/bin/bb + + runHook postInstall + ''; + + installCheckPhase = '' + $out/bin/bb --version | grep '${version}' + $out/bin/bb '(+ 1 2)' | grep '3' + $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]' ''; meta = with lib; { diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 57da5e862e994..baf83c647767f 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = "installPhase"; diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index aaf368017ffb7..0e4beaa8508f0 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -20,7 +20,8 @@ in inherit src version; - buildInputs = [ erlang makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ erlang ]; LANG = "C.UTF-8"; LC_TYPE = "C.UTF-8"; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 0e3a0a46afdec..114bc13f5d8ae 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr"; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; installPhase = '' mkdir -p $out diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index f792471c0619e..4d8771b93ebc4 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,14 +6,14 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.14.0"; + version = "9.2.15.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "1dg0fz9b8m1k0sypvpxnf4xjqwc0pyy35xw4rsg4a7pha4jkprrj"; + sha256 = "sha256-no5dc8QtHa2KeVptw5vYfoj8iGP3bgZeQJnDLQhSBbA="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -pv $out/docs diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 61cc8f9cd0f56..38b599d339e7b 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "142285hd9mx0nx5zw0jvkpqkb4kbhgyyy52p5bj061ya8bg5jizy"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontUnpack = true; diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index 8eb70c6289457..fee53b716daef 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -1,4 +1,4 @@ -{ stdenv, octave, buildEnv +{ lib, stdenv, octave, buildEnv , makeWrapper, texinfo , octavePackages , wrapOctave @@ -48,7 +48,7 @@ in buildEnv { createOctavePackagesPath $out ${octave} - for path in ${stdenv.lib.concatStringsSep " " packages}; do + for path in ${lib.concatStringsSep " " packages}; do if [ -e $path/*.tar.gz ]; then $out/bin/octave-cli --eval "pkg local_list $out/.octave_packages; \ pkg prefix $out/${octave.octPkgsPath} $out/${octave.octPkgsPath}; \ @@ -61,7 +61,7 @@ in buildEnv { # To point to the new local_list in $out addPkgLocalList $out ${octave} - wrapOctavePrograms "${stdenv.lib.concatStringsSep " " packages}" + wrapOctavePrograms "${lib.concatStringsSep " " packages}" '' + postBuild; inherit (octave) meta; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 75fe1bac8cb46..66e0b284fc0df 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -168,11 +168,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "4c55233ae95a6aef4d93291fe8ad12709b11e575"; # Jan 21, 2021 + crossVersion = "1.3.5"; # Jan 24, 2021 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "04bxn43ir7b4c2bb1z1l71l93hrysjv00h879nm70m99q6vxq2hc"; + sha256 = "1sa2f8s1hc604g5y98w6m6y5q43s9jiyrpnp4b34zkfx1qs3w6l4"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -200,8 +200,8 @@ in { perl532 = common { perl = pkgs.perl532; buildPerl = buildPackages.perl532; - version = "5.32.0"; - sha256 = "1d6001cjnpxfv79000bx00vmv2nvdz7wrnyas451j908y7hirszg"; + version = "5.32.1"; + sha256 = "0b7brakq9xs4vavhg391as50nbhzryc7fy5i65r81bnq3j897dh3"; }; # the latest Devel version diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 191d589aa90ca..659157e24c4a4 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -5,7 +5,7 @@ let generic = - { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper + { callPackage, lib, stdenv, nixosTests, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool , pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, system-sendmail, valgrind, xcbuild @@ -97,7 +97,7 @@ let (enabledExtensions ++ (getDepsRecursively enabledExtensions))); extNames = map getExtName enabledExtensions; - extraInit = writeText "php.ini" '' + extraInit = writeText "php-extra-init-${version}.ini" '' ${lib.concatStringsSep "\n" (lib.textClosureList extensionTexts extNames)} ${extraConfig} @@ -112,7 +112,8 @@ let withExtensions = mkWithExtensions allArgs allExtensionFunctions; phpIni = "${phpWithExtensions}/lib/php.ini"; unwrapped = php; - tests = nixosTests.php; + # Select the right php tests for the php version + tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; inherit (php-packages) extensions buildPecl; packages = php-packages.tools; meta = php.meta // { @@ -121,7 +122,7 @@ let }; paths = [ php ]; postBuild = '' - cp ${extraInit} $out/lib/php.ini + ln -s ${extraInit} $out/lib/php.ini wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 341797fa3f4c3..623eefec4162f 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { url = "https://www.software-lab.de/${pname}-${version}.tgz"; sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2"; }; - buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [openssl] ++ optional stdenv.is64bit jdk; patchPhase = '' sed -i "s/which java/command -v java/g" mkAsm diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 19e6c93378f70..863df66899b14 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256="0px6x5ivcdbbp2pz5n1r1cwg1syadklhjw8piqhl63n91i4r7iyb"; }; - buildInputs = [ bison flex makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bison flex ]; propagatedBuildInputs = [ llvm gmp mpfr readline ]; NIX_LDFLAGS = "-lLLVMJIT"; diff --git a/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch b/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch new file mode 100644 index 0000000000000..6c0ae468461f2 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-3177.patch @@ -0,0 +1,181 @@ +From fab838b2ee7cfb9037c24f0f18dfe01aa379b3f7 Mon Sep 17 00:00:00 2001 +From: Benjamin Peterson <benjamin@python.org> +Date: Mon, 18 Jan 2021 15:11:46 -0600 +Subject: [3.6] closes bpo-42938: Replace snprintf with Python unicode + formatting in ctypes param reprs. (GH-24250) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7) + +Co-authored-by: Benjamin Peterson <benjamin@python.org> +Rebased for Python 2.7 by Michał Górny <mgorny@gentoo.org> +--- + Lib/ctypes/test/test_parameters.py | 43 +++++++++++++++++++ + .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst | 2 + + Modules/_ctypes/callproc.c | 49 +++++++++++----------- + 3 files changed, 69 insertions(+), 25 deletions(-) + create mode 100644 Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst + +diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py +index 23c1b6e225..3456882ccb 100644 +--- a/Lib/ctypes/test/test_parameters.py ++++ b/Lib/ctypes/test/test_parameters.py +@@ -206,6 +206,49 @@ class SimpleTypesTestCase(unittest.TestCase): + with self.assertRaises(ZeroDivisionError): + WorseStruct().__setstate__({}, b'foo') + ++ def test_parameter_repr(self): ++ from ctypes import ( ++ c_bool, ++ c_char, ++ c_wchar, ++ c_byte, ++ c_ubyte, ++ c_short, ++ c_ushort, ++ c_int, ++ c_uint, ++ c_long, ++ c_ulong, ++ c_longlong, ++ c_ulonglong, ++ c_float, ++ c_double, ++ c_longdouble, ++ c_char_p, ++ c_wchar_p, ++ c_void_p, ++ ) ++ self.assertRegexpMatches(repr(c_bool.from_param(True)), r"^<cparam '\?' at 0x[A-Fa-f0-9]+>$") ++ self.assertEqual(repr(c_char.from_param('a')), "<cparam 'c' (a)>") ++ self.assertRegexpMatches(repr(c_wchar.from_param('a')), r"^<cparam 'u' at 0x[A-Fa-f0-9]+>$") ++ self.assertEqual(repr(c_byte.from_param(98)), "<cparam 'b' (98)>") ++ self.assertEqual(repr(c_ubyte.from_param(98)), "<cparam 'B' (98)>") ++ self.assertEqual(repr(c_short.from_param(511)), "<cparam 'h' (511)>") ++ self.assertEqual(repr(c_ushort.from_param(511)), "<cparam 'H' (511)>") ++ self.assertRegexpMatches(repr(c_int.from_param(20000)), r"^<cparam '[li]' \(20000\)>$") ++ self.assertRegexpMatches(repr(c_uint.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$") ++ self.assertRegexpMatches(repr(c_long.from_param(20000)), r"^<cparam '[li]' \(20000\)>$") ++ self.assertRegexpMatches(repr(c_ulong.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$") ++ self.assertRegexpMatches(repr(c_longlong.from_param(20000)), r"^<cparam '[liq]' \(20000\)>$") ++ self.assertRegexpMatches(repr(c_ulonglong.from_param(20000)), r"^<cparam '[LIQ]' \(20000\)>$") ++ self.assertEqual(repr(c_float.from_param(1.5)), "<cparam 'f' (1.5)>") ++ self.assertEqual(repr(c_double.from_param(1.5)), "<cparam 'd' (1.5)>") ++ self.assertEqual(repr(c_double.from_param(1e300)), "<cparam 'd' (1e+300)>") ++ self.assertRegexpMatches(repr(c_longdouble.from_param(1.5)), r"^<cparam ('d' \(1.5\)|'g' at 0x[A-Fa-f0-9]+)>$") ++ self.assertRegexpMatches(repr(c_char_p.from_param(b'hihi')), "^<cparam 'z' \(0x[A-Fa-f0-9]+\)>$") ++ self.assertRegexpMatches(repr(c_wchar_p.from_param('hihi')), "^<cparam 'Z' \(0x[A-Fa-f0-9]+\)>$") ++ self.assertRegexpMatches(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' \(0x0*12\)>$") ++ + ################################################################ + + if __name__ == '__main__': +diff --git a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst +new file mode 100644 +index 0000000000..7df65a156f +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst +@@ -0,0 +1,2 @@ ++Avoid static buffers when computing the repr of :class:`ctypes.c_double` and ++:class:`ctypes.c_longdouble` values. +diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c +index 066fefc0cc..421addf353 100644 +--- a/Modules/_ctypes/callproc.c ++++ b/Modules/_ctypes/callproc.c +@@ -460,50 +460,51 @@ PyCArg_dealloc(PyCArgObject *self) + static PyObject * + PyCArg_repr(PyCArgObject *self) + { +- char buffer[256]; + switch(self->tag) { + case 'b': + case 'B': +- sprintf(buffer, "<cparam '%c' (%d)>", ++ return PyString_FromFormat("<cparam '%c' (%d)>", + self->tag, self->value.b); +- break; + case 'h': + case 'H': +- sprintf(buffer, "<cparam '%c' (%d)>", ++ return PyString_FromFormat("<cparam '%c' (%d)>", + self->tag, self->value.h); +- break; + case 'i': + case 'I': +- sprintf(buffer, "<cparam '%c' (%d)>", ++ return PyString_FromFormat("<cparam '%c' (%d)>", + self->tag, self->value.i); +- break; + case 'l': + case 'L': +- sprintf(buffer, "<cparam '%c' (%ld)>", ++ return PyString_FromFormat("<cparam '%c' (%ld)>", + self->tag, self->value.l); +- break; + + #ifdef HAVE_LONG_LONG + case 'q': + case 'Q': +- sprintf(buffer, ++ return PyString_FromFormat( + "<cparam '%c' (%" PY_FORMAT_LONG_LONG "d)>", + self->tag, self->value.q); +- break; + #endif + case 'd': +- sprintf(buffer, "<cparam '%c' (%f)>", +- self->tag, self->value.d); +- break; +- case 'f': +- sprintf(buffer, "<cparam '%c' (%f)>", +- self->tag, self->value.f); +- break; +- ++ case 'f': { ++ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d); ++ if (f == NULL) { ++ return NULL; ++ } ++ PyObject *r = PyObject_Repr(f); ++ if (r == NULL) { ++ Py_DECREF(f); ++ return NULL; ++ } ++ PyObject *result = PyString_FromFormat( ++ "<cparam '%c' (%s)>", self->tag, PyString_AsString(r)); ++ Py_DECREF(r); ++ Py_DECREF(f); ++ return result; ++ } + case 'c': +- sprintf(buffer, "<cparam '%c' (%c)>", ++ return PyString_FromFormat("<cparam '%c' (%c)>", + self->tag, self->value.c); +- break; + + /* Hm, are these 'z' and 'Z' codes useful at all? + Shouldn't they be replaced by the functionality of c_string +@@ -512,16 +513,14 @@ PyCArg_repr(PyCArgObject *self) + case 'z': + case 'Z': + case 'P': +- sprintf(buffer, "<cparam '%c' (%p)>", ++ return PyString_FromFormat("<cparam '%c' (%p)>", + self->tag, self->value.p); + break; + + default: +- sprintf(buffer, "<cparam '%c' at %p>", ++ return PyString_FromFormat("<cparam '%c' at %p>", + self->tag, self); +- break; + } +- return PyString_FromString(buffer); + } + + static PyMemberDef PyCArgType_members[] = { +-- +cgit v1.2.3 + diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 85af394e3f65f..37d43e33d8e51 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -103,6 +103,9 @@ let # Patch is likely to go away in the next release (if there is any) ./CVE-2019-20907.patch + + ./CVE-2021-3177.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/interpreters/python/cpython/3.7/find_library.patch b/pkgs/development/interpreters/python/cpython/3.6/find_library.patch index 97fb66662d030..97fb66662d030 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/find_library.patch +++ b/pkgs/development/interpreters/python/cpython/3.6/find_library.patch diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch index a1f9d68eb1663..4324fc5ea61fc 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch @@ -1,18 +1,18 @@ -From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 +From ba458f33f335b217d078fdce56e9c6f9f93adb49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> Date: Mon, 28 Aug 2017 09:24:06 +0200 Subject: [PATCH] Don't use ldconfig --- - Lib/ctypes/util.py | 70 ++---------------------------------------------------- - 1 file changed, 2 insertions(+), 68 deletions(-) + Lib/ctypes/util.py | 78 ++-------------------------------------------- + 1 file changed, 2 insertions(+), 76 deletions(-) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 5e8b31a854..7b45ce6c15 100644 +index 0c2510e..79635a8 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -94,46 +94,7 @@ elif os.name == "posix": - import re, tempfile +@@ -100,54 +100,7 @@ elif os.name == "posix": + return thefile.read(4) == elf_header def _findLib_gcc(name): - # Run GCC's linker with the -t (aka --trace) option and examine the @@ -51,15 +51,23 @@ index 5e8b31a854..7b45ce6c15 100644 - # Raised if the file was already removed, which is the normal - # behaviour of GCC if linking fails - pass -- res = re.search(expr, trace) +- res = re.findall(expr, trace) - if not res: - return None -- return os.fsdecode(res.group(0)) +- +- for file in res: +- # Check if the given file is an elf file: gcc can report +- # some files that are linker scripts and not actual +- # shared objects. See bpo-41976 for more details +- if not _is_elf(file): +- continue +- return os.fsdecode(file) +- + return None - if sys.platform == "sunos5": -@@ -255,34 +216,7 @@ elif os.name == "posix": + # use /usr/ccs/bin/dump on solaris +@@ -268,34 +221,7 @@ elif os.name == "posix": else: def _findSoname_ldconfig(name): @@ -96,5 +104,5 @@ index 5e8b31a854..7b45ce6c15 100644 def _findLib_ld(name): # See issue #9998 for why this is needed -- -2.15.0 +2.30.0 diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 7bc6084f61ddf..1ae8d19ac58e6 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -222,9 +222,9 @@ in with passthru; stdenv.mkDerivation { else ./3.7/fix-finding-headers-when-cross-compiling.patch ) - ] ++ optionals (isPy36 || isPy37) [ + ] ++ optionals (isPy36) [ # Backport a fix for ctypes.util.find_library. - ./3.7/find_library.patch + ./3.6/find_library.patch ]; postPatch = '' diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index d6030a4bf1d7e..c212e37a484b5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -128,10 +128,10 @@ in { sourceVersion = { major = "3"; minor = "6"; - patch = "12"; + patch = "13"; suffix = ""; }; - sha256 = "cJU6m11okdkuZdGEw1EhJqFYFL7hXh7/LdzOBDNOmpk="; + sha256 = "pHpDpTq7QihqLBGWU0P/VnEbnmTo0RvyxnAaT7jOGg8="; inherit (darwin) configd; inherit passthruFun; }; @@ -141,10 +141,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "9"; + patch = "10"; suffix = ""; }; - sha256 = "008v6g1jkrjrdmiqlgjlq6msbbj848bvkws6ppwva1ahn03k14li"; + sha256 = "+NgudXLIbsnVXIYnquUEAST9IgOvQAw4PIIbmAMG7ms="; inherit (darwin) configd; inherit passthruFun; }; @@ -154,10 +154,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "7"; + patch = "8"; suffix = ""; }; - sha256 = "sha256-3cwd8Wu1uHqkLsXSCluQLy0IjKommyjgFZD5enmOxQo="; + sha256 = "fGZCSf935EPW6g5M8OWH6ukYyjxI0IHRkV/iofG8xcw="; inherit (darwin) configd; inherit passthruFun; }; @@ -167,10 +167,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "1"; + patch = "2"; suffix = ""; }; - sha256 = "1zq3k4ymify5ig739zyvx9s2ainvchxb1zpy139z74krr653y74r"; + sha256 = "PCA0xU+BFEj1FmaNzgnSQAigcWw6eU3YY5tTiMveJH0="; inherit (darwin) configd; inherit passthruFun; }; @@ -181,9 +181,9 @@ in { major = "3"; minor = "10"; patch = "0"; - suffix = "a4"; + suffix = "a5"; }; - sha256 = "sha256-McHBl7IZuOH96je/izkxur0Edirn+igVkQU/pbek73M="; + sha256 = "BBjlfnA24hnx5rYwOyHnEfZM/Q/dsIlNjxnzev/8XU0="; inherit (darwin) configd; inherit passthruFun; }; @@ -191,6 +191,7 @@ in { # Minimal versions of Python (built without optional dependencies) python3Minimal = (python38.override { self = python3Minimal; + pythonAttr = "python3Minimal"; # strip down that python version as much as possible openssl = null; readline = null; diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index 85811a374755d..eb45205ff731f 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -2,7 +2,7 @@ echo "Sourcing pytest-check-hook" declare -ar disabledTests -declare -ar disabledTestFiles +declare -ar disabledTestPaths function _concatSep { local result @@ -37,12 +37,12 @@ function pytestCheckPhase() { disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}") args+=" -k \""$disabledTestsString"\"" fi - for file in ${disabledTestFiles[@]}; do - if [ ! -f "$file" ]; then - echo "Disabled test file \"$file\" does not exist. Aborting" + for path in ${disabledTestPaths[@]}; do + if [ ! -e "$path" ]; then + echo "Disabled tests path \"$path\" does not exist. Aborting" exit 1 fi - args+=" --ignore=\"$file\"" + args+=" --ignore=\"$path\"" done args+=" ${pytestFlagsArray[@]}" eval "@pythonCheckInterpreter@ $args" diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 5eccebf024520..42e82cd3a51be 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto="; }; - buildInputs = [ rakudo makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ rakudo ]; installPhase = '' mkdir -p "$out" diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index cd2b74db05207..8b49a743b4a90 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6"; }; - buildInputs = [ makeWrapper jdk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk ]; dontUnpack = true; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix deleted file mode 100644 index 39a4108e041d3..0000000000000 --- a/pkgs/development/interpreters/rebol/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }: - -stdenv.mkDerivation rec { - pname = "rebol-nightly"; - version = "3-alpha"; - src = fetchFromGitHub { - rev = "bd45d0de512ff5953e098301c3d610f6024515d6"; - owner = "earl"; - repo = "r3"; - sha256 = "0pirn6936rxi894xxdvj7xdwlwmmxq2wz36jyjnj26667v2n543c"; - }; - - r3 = fetchurl { - url = "http://rebolsource.net/downloads/experimental/r3-linux-x64-gbf237fc"; - sha256 = "0cm86kn4lcbvyy6pqg67x53y0wz353y0vg7pfqv65agxj1ynxnrx"; - name = "r3"; - }; - - buildInputs = [ glibc libX11 libXt perl ]; - - configurePhase = '' - cp ${r3} make/r3-make - chmod 777 make/r3-make - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./make/r3-make - cd make - perl -pi -e 's#-m32##g' makefile - perl -pi -e 's#sudo .*#echo#g' makefile - make prep - ''; - buildPhase = '' - make - mkdir -p $out/bin - cp r3 $out/bin - ''; - - meta = with lib; { - description = "Relative expression based object language, a language where code is data"; - maintainers = with maintainers; [ vrthra ]; - platforms = [ "x86_64-linux" ]; - license = licenses.asl20; - homepage = "http://www.rebol.com/"; - }; -} diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index 81ebcedf7bc05..e04069f6aecc1 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -15,7 +15,7 @@ , rustc , rust-cbindgen , yasm -, llvmPackages +, llvmPackages_11 , nspr }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 cargo - llvmPackages.llvm # for llvm-objdump + llvmPackages_11.llvm # for llvm-objdump perl pkg-config python3 diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix index d76ceb3421de4..37a7fee8a859e 100644 --- a/pkgs/development/interpreters/tcl/8.6.nix +++ b/pkgs/development/interpreters/tcl/8.6.nix @@ -2,10 +2,10 @@ callPackage ./generic.nix (args // rec { release = "8.6"; - version = "${release}.9"; + version = "${release}.11"; src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; - sha256 = "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d"; + sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c"; }; }) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 60ce4d89f19cd..91e13ed32cd9e 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # using the [makefile](https://github.com/wasmerio/wasmer/blob/master/Makefile). # Enabling cranelift as this used to be the old default. At least one backend is # needed for the run subcommand to work. - cargoBuildFlags = [ "--features 'backend-cranelift'" ]; + cargoBuildFlags = [ "--features" "backend-cranelift" ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 2cb9ab001c29b..79f73879e6b91 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -1,12 +1,17 @@ -{ lib, pkgs, mavenbuild, fetchMaven }: +{ lib, pkgs, mavenbuild, fetchMaven, maven, jdk8 }: with pkgs.javaPackages; let poms = import (../poms.nix) { inherit fetchMaven; }; collections = import (../collections.nix) { inherit pkgs; }; + mavenbuild-jdk8 = mavenbuild.override { + maven = maven.override { + jdk = jdk8; + }; + }; in rec { - junitGen = { mavenDeps, sha512, version }: mavenbuild { + junitGen = { mavenDeps, sha512, version }: mavenbuild-jdk8 { inherit mavenDeps sha512 version; name = "junit-${version}"; diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index eac127b6dccc7..96d0031270b8e 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -1,11 +1,21 @@ -{ lib, pkgs, mavenbuild }: +{ lib +, pkgs +, mavenbuild +, maven +, jdk8 +}: with pkgs.javaPackages; let poms = import ../poms.nix { inherit fetchMaven; }; + mavenbuild-jdk8 = mavenbuild.override { + maven = maven.override { + jdk = jdk8; + }; + }; in rec { - mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild { + mavenHelloRec = { mavenDeps, mavenbuild, sha512, version, skipTests ? true, quiet ? true }: mavenbuild { inherit mavenDeps sha512 version skipTests quiet; name = "maven-hello-${version}"; @@ -31,6 +41,7 @@ in rec { mavenDeps = []; sha512 = "3kv5z1i02wfb0l5x3phbsk3qb3wky05sqn4v3y4cx56slqfp9z8j76vnh8v45ydgskwl2vs9xjx6ai8991mzb5ikvl3vdgmrj1j17p2"; version = "1.0"; + mavenbuild = mavenbuild-jdk8; }; mavenHello_1_1 = mavenHelloRec { @@ -39,5 +50,6 @@ in rec { version = "1.1"; skipTests = false; quiet = false; + mavenbuild = mavenbuild-jdk8; }; } diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 208c74981dcb4..8a8ab23d495eb 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q1.3"; + version = "2021.Q1.4"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "x9VzPALIlgE3eIKY4/qbFg5w+zd2W/jbqFXgJfpvLP4="; + sha256 = "mA7YalgcfjfYdmKPk8L4mfDJWn0rimPDoDB9/S3pyNM="; }; buildInputs = [ diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index fe67cf04e6027..6094c0b8f467e 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.2.1"; + version = "10.2.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-fY500kh2mvI/yJTYu4jwXjIxeTPL5NqPPFa+j4mp/MQ="; + sha256 = "sha256-lClfxi7MQ3PlqWx7Yrkj/XGoHzFaqVl7KCqv2FWelDU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 79f09f48464f0..f074287ab1638 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.10"; + version = "0.24.12"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi"; + sha256 = "sha256-JqN3kIkMnB+DggO0f1sjIDNP6SwCpNJuu+Jmnb12kGE="; }; patches = [ ./lilv-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 45caf0b36c509..616ad5b0c8925 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lv2"; - version = "1.18.0"; + version = "1.18.2"; src = fetchurl { url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2"; - sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh"; + sha256 = "sha256-TokfvHRMBYVb6136gugisUkX3Wbpj4K4Iw29HHqy4F4="; }; nativeBuildInputs = [ pkg-config wafHook ]; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 937eef2d0d99b..36315aa867806 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "aws-c-common"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A="; }; + patches = [ + # Remove once https://github.com/awslabs/aws-c-common/pull/764 is merged + (fetchpatch { + url = "https://github.com/awslabs/aws-c-common/commit/4f85fb3e398d4e4d320d3559235267b26cbc9531.patch"; + sha256 = "1jg3mz507w4kwgmg57kvz419gvw47pd9rkjr6jhsmvardmyyskap"; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/bashup-events/generic.nix b/pkgs/development/libraries/bashup-events/generic.nix index 78ef4c2f33699..fd4e2cfe9f5f2 100644 --- a/pkgs/development/libraries/bashup-events/generic.nix +++ b/pkgs/development/libraries/bashup-events/generic.nix @@ -1,8 +1,6 @@ { # general lib -, callPackage -, runCommand , resholvePackage , bash , shellcheck @@ -46,7 +44,9 @@ resholvePackage rec { inherit src; installPhase = '' + runHook preInstall install -Dt $out/bin bashup.events + runHook postInstall ''; inherit doCheck; @@ -54,9 +54,11 @@ resholvePackage rec { # check based on https://github.com/bashup/events/blob/master/.dkrc checkPhase = '' + runHook preCheck SHELLCHECK_OPTS='-e SC2016,SC2145' ${shellcheck}/bin/shellcheck ./bashup.events ${bash}/bin/bash -n ./bashup.events ${bash}/bin/bash ./bashup.events + runHook postCheck ''; solutions = { @@ -70,7 +72,11 @@ resholvePackage rec { inherit doInstallCheck; installCheckInputs = [ bash ]; - installCheckPhase = installCheck "${bash}/bin/bash"; + installCheckPhase = '' + runHook preInstallCheck + ${installCheck "${bash}/bin/bash"} + runHook postInstallCheck + ''; meta = with lib; { inherit branch; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index dd72b7eb41dfe..700fe4f468604 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.21"; + version = "4.4.24"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; + sha256 = "sha256-RfjD+E8FLFNBkwpOohNAKDINHAhSNEkeVArqtjfn2i0="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 0402af92b3b39..fe553cb37b9ed 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nasm, which +{ lib, stdenv, fetchFromGitHub , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !enableStatic }: @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { substituteInPlace GNUmakefile \ --replace "AR = libtool" "AR = ar" \ --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" + + # See https://github.com/weidai11/cryptopp/issues/1011 + substituteInPlace GNUmakefile \ + --replace "ZOPT = -O0" "ZOPT =" + ''; + + preConfigure = '' + sh TestScripts/configure.sh ''; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index fa7d70d521318..096910b238bb0 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -2,6 +2,7 @@ , guiSupport ? false, libX11 # see http://dlib.net/compile.html +, sse4Support ? stdenv.hostPlatform.sse4_1Support , avxSupport ? stdenv.hostPlatform.avxSupport , cudaSupport ? true }: @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" + "-DUSE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 4709441a1011e..a8697207ed1ae 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -14,7 +14,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20190909"; # upgrade might break the sage interface + version = "20210223"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "JohnCremona"; repo = pname; rev = "v${version}"; - sha256 = "0y1vdi4120gdw56gg2dn3wh625yr9wpyk3wpbsd25w4lv83qq5da"; + sha256 = "sha256-xnSw5cdg4PLa0GT/blCYDz/IG5aj+HG2NHSlyCiH9g0="; }; buildInputs = [ pari diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 24927fe853bae..a80c317b06eef 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib }: +{ lib, stdenv, fetchFromGitHub, alsaLib, fetchpatch }: stdenv.mkDerivation rec { pname = "flite"; @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isLinux [ alsaLib ]; + # https://github.com/festvox/flite/pull/60. + # Replaces `ar` with `$(AR)` in config/common_make_rules. + # Improves cross-compilation compatibility. + patches = [ + (fetchpatch { + url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch"; + sha256 = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8="; + }) + ]; + configureFlags = [ "--enable-shared" ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index f96707b549f74..19b03eb620ceb 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.9.0"; + pname = "geos"; + version = "3.9.1"; src = fetchurl { - url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "sha256-vYCCzxL0XydjAZPHi9taPLqEe4HnKyAmg1bCpPwGUmk="; + url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + sha256 = "sha256-fmMFB9ysncB1ZdJJom8GoVyfWwxS3SkSmg49OB1+OCo="; }; enableParallelBuilding = true; @@ -18,6 +19,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; }; } diff --git a/pkgs/development/libraries/glibc/2.32-35.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz index f77e490ebf54b..36aaf51cce9c8 100644 --- a/pkgs/development/libraries/glibc/2.32-35.patch.gz +++ b/pkgs/development/libraries/glibc/2.32-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 54882ba671857..8bf78300739e1 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-35"; + patchSuffix = "-37"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -63,10 +63,10 @@ stdenv.mkDerivation ({ and using git or something would complicate bootstrapping. Fortunately it's not too big. $ git checkout origin/release/2.32/master; git describe - glibc-2.32-35-g082798622d - $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-35.patch.gz + glibc-2.32-37-g760e1d2878 + $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-master.patch.gz */ - ./2.32-35.patch.gz + ./2.32-master.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 74b94e68f5643..a08997ea2cdbe 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl }: let - rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79"; + rev = "6faca61810d335c7837f320733fe8e15a1431fc2"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "sha256-TSLpYIDGSp1flqCBi2Sgg9IWDV5bcO+Hn2Menv3R6KU="; + sha256 = "06wkkhpbx9slmknr2g7mcd8x3zsdhnmmay25l31h3rkdp1wkq7kx"; }; configSub = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "sha256-DkCGDN/DE3phQ1GO/Ua5ZPPtp0Ya93PnW3yfSK8EV9s="; + sha256 = "1qkph8cqanmgy3s4a18bm1a4vk62i8pf8cy5pc1hkpqwn4g6l0di"; }; in stdenv.mkDerivation { pname = "gnu-config"; - version = "2020-05-04"; + version = "2021-01-25"; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index b3615893b5329..3f31a3f6db3fc 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.7.2"; + version = "2.7.4"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm"; + sha256 = "sha256-uMkniDNBQ2mxDmeM7K/YQtZ3Avh9RVXYe7XsUErGas8="; }; postPatch = '' diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix index 34c3d26c55ec0..4ae1772327511 100644 --- a/pkgs/development/libraries/hunspell/wrapper.nix +++ b/pkgs/development/libraries/hunspell/wrapper.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { name = (appendToName "with-dicts" hunspell).name; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath} ''; diff --git a/pkgs/development/libraries/icu/68.nix b/pkgs/development/libraries/icu/68.nix new file mode 100644 index 0000000000000..5aeba0f2628c7 --- /dev/null +++ b/pkgs/development/libraries/icu/68.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "68.2"; + sha256 = "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7"; +} diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index ddf95ead249ab..5519a1fb76657 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; outputs = [ "out" "bin" ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index a820d947b7f89..ed086dac90fba 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,23 +1,47 @@ -{ lib, stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext -, gobject-introspection, fixDarwinDylibNames, gnome3 +{ lib +, stdenv +, fetchurl +, glib +, meson +, ninja +, pkg-config +, gettext +, gobject-introspection +, fixDarwinDylibNames +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gnome3 }: -let +stdenv.mkDerivation rec { pname = "json-glib"; - version = "1.4.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.6.2"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"; }; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gobject-introspection + glib + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; - outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ + glib + ]; doCheck = true; @@ -30,8 +54,8 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; homepage = "https://wiki.gnome.org/Projects/JsonGlib"; - license = licenses.lgpl2; - maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 129b578519896..66bdcc03b9665 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { - name = "lcms2-2.11"; + name = "lcms2-2.12"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "0bkpf315925lhmd9i4mzjnkq5dh255r1lms0c0vzzkfpwk4bjjfw"; + sha256 = "sha256-GGY5hehkEARVrD5QdiXEOMNxA1TYXly7fNQEPhH+EPU="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 8a9c80a61754b..61d87211e0a5c 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { - sha256 = "1mhj29n40z7bvn1ns61wf8812ikm2mpc0d5ip0ha920z0anzqhwr"; + sha256 = "sha256-7e9D9Q3CAm+2+0vl81djSZwKrQRXc5UxcbJVMt91/vU="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index edbc61957c04e..5483909689d24 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "2.0.1"; + version = "2.0.2"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "1vakwmcwvmmrdw7460m8hzq96y71lxqix8b2g07c6s12br0rrdhl"; + sha256 = "0f3i983s9yvh9zc6mpy1ck5sjcg9l09lpw9v4md3mv8gbih9f0z0"; }; patches = [ ./outputs.patch ]; diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index ef9823130f431..186e8c42f4ba1 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk"; }; - prePatch = '' - substituteInPlace configure.ac \ - --replace "codegendir pygtk-2.0" "codegendir pygobject-2.0" - ''; - nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ]; buildInputs = diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 7c458bae19ce1..b8e71c2dfd3f3 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation { pname = "libbap"; - version = "master-2019-11-15"; + version = "master-2020-11-25"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "1a30dd3e1df18c432a83a7038b555662d6982ae3"; - sha256 = "140gmak2kymh3r0fagb6ms66lmvwhhqj8pcd3qxc1p4ar330fwrh"; + rev = "3193cb31e1b1f2455406ea0c819dad9dfa2ba10d"; + sha256 = "0m4spva3z6fgbwlg4zq53l5p227dic893q2qq65pvzxyf7k7nmil"; }; nativeBuildInputs = [ autoreconfHook which ]; diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 11a65006422fb..584ea93293ef4 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libblockdev"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "1gzwlwdv0jyb3lh2n016limy2ngfdsa05x7jvg9llf2ls672nq89"; + sha256 = "sha256-eHUHTogKoNrnwwSo6JaI7NMxVt9JeMqfWyhR62bDMuQ="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index a84f010b9e675..7ce8d6e7f83a0 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.4"; + version = "2.5"; in stdenv.mkDerivation rec { pname = "libbytesize"; inherit version; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "1kq0hnw2yxjdmcrwvgp0x4j1arkka23k8vp2l6nqcw9lc15x18fp"; + sha256 = "sha256-F8Ur8gtNYp4PYfBQ9sDJGBgW7KohJYNEU9SI2SbNuvM="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 087c928b79ce7..b987c3dbb25ac 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: +{ lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { name = "libcdr-0.1.6"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81"; }; + patches = [ + # Fix build with icu 68 + # Remove in next release + (fetchpatch { + name = "libcdr-fix-icu-68"; + url = "https://cgit.freedesktop.org/libreoffice/libcdr/patch/?id=bf3e7f3bbc414d4341cf1420c99293debf1bd894"; + sha256 = "0cgra10p8ibgwn8y5q31jrpan317qj0ribzjs4jq0bwavjq92w2k"; + }) + ]; + buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index f4e2df36d9179..257673b1a96d2 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation rec { pname = "libdatrie"; version = "2019-12-20"; + outputs = [ "bin" "out" "lib" "dev" ]; + src = fetchFromGitHub { owner = "tlwg"; repo = "libdatrie"; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 994f010252fdc..c26ccc347f9aa 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,18 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +}: stdenv.mkDerivation rec { - name = "libdmtx-0.7.4"; + pname = "libdmtx"; + version = "0.7.5"; - src = fetchurl { - url = "mirror://sourceforge/libdmtx/${name}.tar.bz2"; - sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; + src = fetchFromGitHub { + owner = "dmtx"; + repo = "libdmtx"; + rev = "v${version}"; + sha256 = "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = { description = "An open source software for reading and writing Data Matrix barcodes"; - homepage = "http://libdmtx.org"; + homepage = "https://github.com/dmtx/libdmtx"; + changelog = "https://github.com/dmtx/libdmtx/blob/v${version}/ChangeLog"; platforms = lib.platforms.all; maintainers = [ ]; license = lib.licenses.bsd2; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index e575624f81529..b4ba311165a2c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "-Dtegra=true" "-Detnaviv=true" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"; + ]; meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/drm"; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index daae6984ab25d..33b3f0b32e1d7 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0jidjv78lay8kl3yigwhx9fii908sk7gn9nfd2ny12ql5ipc48im"; + sha256 = "sha256-Y/TqFImFihCQgOC0C9Q+TgkDoeEuqIjVgduMSVdHwtA="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch b/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch new file mode 100644 index 0000000000000..134c64441d366 --- /dev/null +++ b/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch @@ -0,0 +1,44 @@ +--- Makefile.orig ++++ Makefile +@@ -23,24 +23,25 @@ + # SUCH DAMAGE. + # + # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $ ++# ++# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04 + +-LIB= execinfo ++CC=cc ++AR=ar ++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -c ++EXECINFO_LDFLAGS=$(LDFLAGS) + +-SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h ++all: static dynamic + +-INCS= execinfo.h ++static: ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c ++ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o + +-SHLIB_MAJOR= 1 +-SHLIB_MINOR= 0 ++dynamic: ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So ++ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So + +-NOPROFILE= yes +- +-DPADD= ${LIBM} +-LDADD= -lm +- +-#WARNS?= 4 +- +-#stacktraverse.c: gen.py +-# ./gen.py > stacktraverse.c +- +-.include <bsd.lib.mk> ++clean: ++ rm -rf *.o *.So *.a *.so diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index f3f89209707a6..36f956e777242 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -23,14 +23,11 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; }) - (fetchpatch { - name = "30-linux-makefile.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; - sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf"; - }) + ./30-linux-makefile.patch ]; makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; + hardeningEnable = [ "stackprotector" ]; buildFlags = lib.optional enableStatic "static" diff --git a/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch index 84ee18084c297..7dfad4978005c 100644 --- a/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch +++ b/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch @@ -1,25 +1,13 @@ -From f974fe07de9e6820bb1de50b31e480296d1d97b7 Mon Sep 17 00:00:00 2001 -From: Christian Kampka <christian@kampka.net> -Date: Wed, 25 Nov 2020 20:09:50 +0100 -Subject: [PATCH] Remove unsupported clang flags - ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/src/Makefile b/src/Makefile -index f13a6bb..b305150 100644 +index 2af4804..bcff809 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -69,7 +69,7 @@ PREFIX ?= /usr/local +@@ -80,7 +80,7 @@ PREFIX ?= /usr/local LIBDIRNAME ?= /lib/faketime PLATFORM ?=$(shell uname) --CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) -+CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) +-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ++CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ifeq ($(PLATFORM),SunOS) CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 endif --- -2.28.0 - diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index f3f7313accbbe..979ba7eea539f 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -2,6 +2,7 @@ , fetchFromGitLab , pkg-config , meson +, python3 , ninja , gusb , pixman @@ -10,13 +11,13 @@ , gobject-introspection , coreutils , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.5"; + version = "1.90.7"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "1wfwka2ik4hbb5wk5dp533040sqygwswg91c3v5fvpmmixh5qx9j"; + sha256 = "sha256-g/yczzCZEzUKV2uFl1MAPL1H/R2QJSwxgppI2ftt9QI="; }; nativeBuildInputs = [ @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { meson ninja gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 gobject-introspection ]; @@ -44,16 +45,29 @@ stdenv.mkDerivation rec { nss ]; - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; + checkInputs = [ + python3 + ]; mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" + # Include virtual drivers for fprintd tests + "-Ddrivers=all" ]; + doCheck = true; + + postPatch = '' + patchShebangs \ + tests/test-runner.sh \ + tests/unittest_inspector.py \ + tests/virtual-image.py + ''; + meta = with lib; { homepage = "https://fprint.freedesktop.org/"; description = "A library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix index 69b7bdc7d1e19..a666a7db5233d 100644 --- a/pkgs/development/libraries/libfyaml/default.nix +++ b/pkgs/development/libraries/libfyaml/default.nix @@ -1,15 +1,21 @@ -{ lib, stdenv, fetchurl, gnum4 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "libfyaml"; - version = "0.5.7"; + version = "0.6"; - src = fetchurl { - url = "https://github.com/pantoniou/libfyaml/releases/download/v${version}/libfyaml-${version}.tar.gz"; - sha256 = "143m30f006jsvhikk9nc050hxzqi8xg0sbd88kjrgfpyncdz689j"; + src = fetchFromGitHub { + owner = "pantoniou"; + repo = pname; + rev = "v${version}"; + sha256 = "0b1wnalh49rbjykw4bj5k3y1d9yr8k6f0im221bl1gyrwlgw7hp5"; }; - nativeBuildInputs = [ gnum4 ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + postPatch = '' + echo ${version} > .tarball-version + ''; meta = with lib; { homepage = "https://github.com/pantoniou/libfyaml"; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 74098f7e003dd..80cd5bc13cc3b 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap -, buildPackages +, buildPackages, fetchpatch }: assert enableCapabilities -> stdenv.isLinux; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1nb50bgzp83q6r5cz4v40y1mcbhpqwqyxlay87xp1lrbkf5pm9n5"; }; + patches = [ + # fix build on 32bit musl + (fetchpatch { + name = "fix_building_with_disable-asm_on_x86.patch"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=af23ab5c5482d625ff52e60606cf044e2b0106c8"; + sha256 = "1m8apm8wra6fk89ggha4d0bba5absihm38zvb2khklqh9q5hj9jw"; + }) + ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; @@ -27,6 +36,8 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin gettext ++ lib.optional enableCapabilities libcap; + strictDeps = true; + configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157 diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 88ba7dacc22f1..31a9579a8928e 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,11 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkg-config, libX11, libXext, xorgproto, addOpenGLRunpath }: +{ stdenv, lib, fetchFromGitLab +, autoreconfHook, pkg-config, python3, addOpenGLRunpath +, libX11, libXext, xorgproto +}: stdenv.mkDerivation rec { pname = "libglvnd"; version = "1.3.2"; - src = fetchFromGitHub { - owner = "NVIDIA"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz"; @@ -31,8 +35,11 @@ stdenv.mkDerivation rec { "-Wno-error=array-bounds" ] ++ lib.optional stdenv.cc.isClang "-Wno-error"); - # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 - configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; + configureFlags = [] + # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-tls" + # Remove when aarch64-darwin asm support is upstream: https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/216 + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-asm"; outputs = [ "out" "dev" ]; @@ -47,8 +54,17 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The GL Vendor-Neutral Dispatch library"; - homepage = "https://github.com/NVIDIA/libglvnd"; - license = licenses.bsd2; + longDescription = '' + libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API + calls between multiple vendors. It allows multiple drivers from different + vendors to coexist on the same filesystem, and determines which vendor to + dispatch each API call to at runtime. + Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES. + ''; + inherit (src.meta) homepage; + # https://gitlab.freedesktop.org/glvnd/libglvnd#libglvnd: + license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ]; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index b0872b9da1e45..71dfca5e64309 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, dav1d, rav1e, libde265, x265, libpng, libjpeg, libaom }: stdenv.mkDerivation rec { pname = "libheif"; - version = "1.9.1"; + version = "1.11.0"; outputs = [ "bin" "out" "dev" "man" ]; @@ -11,21 +11,19 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz"; + sha256 = "sha256-xT0sfYPp5atYXnVpP8TYu2TC9/Z/ClyEP1OTSfcw1gw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libde265 x265 libpng libjpeg libaom ]; - # TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config + buildInputs = [ dav1d rav1e libde265 x265 libpng libjpeg libaom ]; enableParallelBuilding = true; meta = { homepage = "http://www.libheif.org/"; description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ gebner ]; }; - } diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 7f5e739a99cd0..fa396e9665063 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildPackages , cmake , glib @@ -22,7 +21,7 @@ assert introspectionSupport -> gobject-introspection != null && vala != null; stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.8"; + version = "3.0.9"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "0pkh74bfrgp1slv8wsv7lbmal2m7qkixwm5llpmfwaiv14njlp68"; + sha256 = "sha256-efdiGktLGITaQ6VinnfYG52fMhO0Av+JKROt2kTvS1U="; }; nativeBuildInputs = [ @@ -68,19 +67,13 @@ stdenv.mkDerivation rec { "-DGOBJECT_INTROSPECTION=True" "-DICAL_GLIB_VAPI=True" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DIMPORT_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/GlibSrcGenerator.cmake" + "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake" ]; patches = [ # Will appear in 3.1.0 # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch - # Export src-generator binary for use while cross-compiling - # https://github.com/libical/libical/pull/439 - (fetchpatch { - url = "https://github.com/libical/libical/commit/1197d84b63dce179b55a6293cfd6d0523607baf1.patch"; - sha256 = "18i1khnwmw488s7g5a1kf05sladf8dbyhfc69mbcf6dkc4nnc3dg"; - }) ]; # Using install check so we do not have to manually set diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 2426dfebe8a28..f2d4e00d1aad6 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, nasm +, openjdk +, enableJava ? false # whether to build the java wrapper , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -26,11 +28,18 @@ stdenv.mkDerivation rec { moveToOutput include/transupp.h $dev_private ''; - nativeBuildInputs = [ cmake nasm ]; + nativeBuildInputs = [ + cmake + nasm + ] ++ lib.optionals enableJava [ + openjdk + ]; cmakeFlags = [ "-DENABLE_STATIC=${if enableStatic then "1" else "0"}" "-DENABLE_SHARED=${if enableShared then "1" else "0"}" + ] ++ lib.optionals enableJava [ + "-DWITH_JAVA=1" ]; doInstallCheck = true; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 850c7aa1df0c0..9695b221cb97f 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.24.4"; + version = "1.24.6"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "11djb1d8w9ms07aklfm3pskjw9rnff4p4n3snanschv22zk8wj6x"; + sha256 = "sha256-dgRlyqoczWmcFCkOl5HaRW1TAN0R6/TBSGFRAz6HXf0="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix new file mode 100644 index 0000000000000..6ad0435a84e04 --- /dev/null +++ b/pkgs/development/libraries/libnbd/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchurl +, bash-completion +, pkg-config +, perl +, libxml2 +, fuse +, gnutls +}: + +stdenv.mkDerivation rec { + pname = "libnbd"; + version = "1.7.2"; + + src = fetchurl { + url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; + hash = "sha256-+xC4wDEeWi3RteF04C/qjMmjM+lmhtrtXZZyM1UUli4="; + }; + + nativeBuildInputs = [ + bash-completion + pkg-config + perl + ]; + buildInputs = [ + fuse + gnutls + libxml2 + ]; + + installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ]; + + meta = with lib; { + homepage = "https://gitlab.com/nbdkit/libnbd"; + description = "Network Block Device client library in userspace"; + longDescription = '' + NBD — Network Block Device — is a protocol for accessing Block Devices + (hard disks and disk-like things) over a Network. This is the NBD client + library in userspace, a simple library for writing NBD clients. + + The key features are: + - Synchronous API for ease of use. + - Asynchronous API for writing non-blocking, multithreaded clients. You + can mix both APIs freely. + - High performance. + - Minimal dependencies for the basic library. + - Well-documented, stable API. + - Bindings in several programming languages. + - Shell (nbdsh) for command line and scripting. + ''; + license = with licenses; lgpl21Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} +# TODO: NBD URI support apparently is not enabled +# TODO: package the 1.6-stable version too +# TODO: git version needs ocaml +# TODO: bindings for go, ocaml and python + diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 10197bd8db093..f46a20394646f 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.9.15"; + version = "0.10.0"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "1jx56ma351p8af8dvavygjwf6ipa7qbgq7bpdsymwj27apdnixfy"; + sha256 = "sha256-gdLh5ZUciN4FCJwTCaJSKJ5RjXgNDXnDOUWkyTZwf2c="; }; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 1cbfe44ef4e50..572b5710fa9a3 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -1,16 +1,16 @@ {lib, stdenv, fetchurl, protobuf}: stdenv.mkDerivation { - name = "libosmpbf-1.3.3"; + name = "libosmpbf-1.5.0"; src = fetchurl { - url = "https://github.com/scrosby/OSM-binary/archive/v1.3.3.tar.gz"; - sha256 = "a109f338ce6a8438a8faae4627cd08599d0403b8977c185499de5c17b92d0798"; + url = "https://github.com/scrosby/OSM-binary/archive/v1.5.0.tar.gz"; + sha256 = "sha256-Kr8xJnKXk3MsM4B2OZnMNl5Rv/2jaaAIITh5o82QR2w="; }; buildInputs = [ protobuf ]; - sourceRoot = "OSM-binary-1.3.3/src"; + sourceRoot = "OSM-binary-1.5.0/src"; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 0b30bf6c2b0d2..c04d4a001a17b 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "libpcap"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3"; + sha256 = "sha256-jRK0JiPu7+6HLxI70NyF1TWwDfTULoZfmTxA97/JKx4="; }; nativeBuildInputs = [ flex bison ] @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { linux = "linux"; darwin = "bpf"; }.${stdenv.hostPlatform.parsed.kernel.name}) + ] ++ optionals stdenv.isDarwin [ + "--disable-universal" ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "ac_cv_linux_vers=2" ]; - prePatch = optionalString stdenv.isDarwin '' - substituteInPlace configure --replace " -arch i386" "" - ''; - postInstall = '' if [ "$dontDisableStatic" -ne "1" ]; then rm -f $out/lib/libpcap.a diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 7bd3fa97029a0..42d8cbf285963 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.8"; + version = "1.26.10"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-73bclasKBjIaG9Jeh1SJy6Esn2YRl0ygE1zwZ7sgyWA="; + sha256 = "sha256-fABD8GyHXlzx3jwMlMzH9bBYYry82eT7DV0UJ30dq1k="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index d67342eebc115..b7724d27a060a 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -63,11 +63,6 @@ let }; in { - libressl_3_0 = generic { - version = "3.0.2"; - sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz"; - }; - libressl_3_1 = generic { version = "3.1.4"; sha256 = "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21"; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 20cb80b1ff852..4189ba9c6fae4 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libsigsegv-2.12"; + name = "libsigsegv-2.13"; src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; - sha256 = "1dlhqf4igzpqayms25lkhycjq1ccavisx8cnb3y4zapbkqsszq9s"; + sha256 = "sha256-vnjuQXawX3x1/wMpjYSHTbkPS2ydVQPw2hIms6PEgRk="; }; patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index db2cd044592b5..64ae1713fd451 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; + hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector"; + + # FIXME: the hardeingDisable attr above does not seems effective, so + # the need to disable stackprotector via configureFlags + configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp"; doCheck = true; diff --git a/pkgs/development/libraries/libspnav/configure-socket-path.patch b/pkgs/development/libraries/libspnav/configure-socket-path.patch new file mode 100644 index 0000000000000..2c315067f41fb --- /dev/null +++ b/pkgs/development/libraries/libspnav/configure-socket-path.patch @@ -0,0 +1,47 @@ +diff --git a/spnav.c b/spnav.c +index f9e10f8..27149f7 100644 +--- a/spnav.c ++++ b/spnav.c +@@ -36,7 +36,7 @@ OF SUCH DAMAGE. + #include <sys/select.h> + #include "spnav.h" + +-#define SPNAV_SOCK_PATH "/var/run/spnav.sock" ++#define DEFAULT_SPNAV_SOCK_PATH "/run/spnav.sock" + + #ifdef USE_X11 + #include <X11/Xlib.h> +@@ -70,6 +70,24 @@ static struct event_node *ev_queue, *ev_queue_tail; + /* AF_UNIX socket used for alternative communication with daemon */ + static int sock = -1; + ++static char *spath = NULL; ++ ++static char *socket_path() ++{ ++ char *xdg_runtime_dir; ++ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) { ++ if ( spath == NULL ) { ++ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1); ++ if ( spath != NULL ) { ++ sprintf(spath, sizeof(spath), "%s/spnav.sock", xdg_runtime_dir); ++ } ++ } ++ if(access(spath, F_OK)){ ++ return spath; ++ } ++ } ++ return DEFAULT_SPNAV_SOCK_PATH; ++} + + int spnav_open(void) + { +@@ -92,7 +110,7 @@ int spnav_open(void) + + memset(&addr, 0, sizeof addr); + addr.sun_family = AF_UNIX; +- strncpy(addr.sun_path, SPNAV_SOCK_PATH, sizeof(addr.sun_path)); ++ strncpy(addr.sun_path, socket_path(), sizeof(addr.sun_path)); + + + if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) { diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/development/libraries/libspnav/default.nix new file mode 100644 index 0000000000000..9bd0a67041b12 --- /dev/null +++ b/pkgs/development/libraries/libspnav/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, libX11}: + +stdenv.mkDerivation rec { + version = "0.2.3"; + pname = "libspnav"; + + src = fetchFromGitHub { + owner = "FreeSpacenav"; + repo = "libspnav"; + rev = "${pname}-${version}"; + sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba"; + }; + + buildInputs = [ libX11 ]; + + patches = [ + # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock + # to allow for a user service + ./configure-socket-path.patch + ]; + + configureFlags = [ "--disable-debug"]; + + preInstall = '' + mkdir -p $out/{lib,include} + ''; + + meta = with lib; { + homepage = "http://spacenav.sourceforge.net/"; + description = "Device driver and SDK for 3Dconnexion 3D input devices"; + longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index ad00906bb8cc3..97745813ef260 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -4,12 +4,16 @@ stdenv.mkDerivation rec { pname = "libthai"; version = "0.1.28"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "https://github.com/tlwg/libthai/releases/download/v${version}/libthai-${version}.tar.xz"; sha256 = "04g93bgxrcnay9fglpq2lj9nr7x1xh06i60m7haip8as9dxs3q7z"; }; - nativeBuildInputs = [ installShellFiles pkg-config ]; + strictDeps = true; + + nativeBuildInputs = [ installShellFiles (lib.getBin libdatrie) pkg-config ]; buildInputs = [ libdatrie ]; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index d69c8d670c4a5..69410cf2b9864 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl @@ -22,6 +23,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ (fetchpatch { + # https://bugs.archlinux.org/task/69121 + url = "https://github.com/libusb/libusb/commit/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch"; + sha256 = "1dbahikcbwkjhyvks7wbp7fy2bf7nca48vg5z0zqvqzjb9y595cq"; + excludes = [ "libusb/version_nano.h" ]; + }) ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = lib.optional enableUdev udev ++ diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a4447ed337893..6b1a0120e49eb 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,19 +1,20 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.40.0"; + version = "1.41.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1hd0x6i80ca3j0c3a7laygzab5qkgxjkz692jwzrsinsfhvbq0pg"; + sha256 = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI="; }; postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent + "tcp_connect_timeout" # tries to reach out to 8.8.8.8 "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix new file mode 100644 index 0000000000000..4df5bde228713 --- /dev/null +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl }: + +stdenv.mkDerivation rec { + pname = "libxcrypt"; + version = "4.4.18"; + + src = fetchFromGitHub { + owner = "besser82"; + repo = "libxcrypt"; + rev = "v${version}"; + sha256 = "4015bf1b3a2aab31da5a544424be36c1a0f0ffc1eaa219c0e7b048e4cdcbbfe1"; + }; + + preConfigure = '' + patchShebangs autogen.sh + ./autogen.sh + ''; + + nativeBuildInputs = [ autoconf automake libtool pkg-config perl ]; + + doCheck = true; + + meta = with lib; { + description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others"; + homepage = "https://github.com/besser82/libxcrypt/"; + platforms = platforms.all; + maintainers = with maintainers; [ dottedmag ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 3a16b5202c47f..e6996a53c8327 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "4.4.0"; + version = "4.4.21"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z"; + sha256 = "sha256-3whr2KSAULRe3McgOtJlA3NEPF8NO6YHp+4vqeMPT5I="; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 3cda9ff3006dc..6cdc24770d4b8 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.4.13"; + version = "4.4.24"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0w84v1ajhyysr41qaj7x4njwdak84cc10lq33hl8lq68a52fc2vw"; + sha256 = "sha256-wAWcSvsLRzscpx9YAnBcsoYuy+77yJrU3+cNbRu0i7U="; }; patches = [ diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 5e02a9fd5222b..43f63d91a618d 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake libtool glib readline makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ autoconf automake libtool glib readline ]; preConfigure = '' substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index 7b9bffb9bc95a..09169019a1284 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -1,9 +1,9 @@ -{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, +{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, readline, fetchFromGitHub, lib, multimediaSupport ? true }: let - version = "2.1.0"; + version = "2.1.5"; in stdenv.mkDerivation { pname = "notcurses"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config pandoc ]; - buildInputs = [ libunistring ncurses ] + buildInputs = [ libunistring ncurses readline ] ++ lib.optional multimediaSupport ffmpeg; cmakeFlags = @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "0jvngg40c1sqf85kqy6ya0vflpxsj7j4g6cw609992rifaghxiny"; + sha256 = "02x9a0z7mbgry2wsfai1l3jwb2zpcg4gq6a2w5d920ap2fixzy8b"; }; meta = { diff --git a/pkgs/development/libraries/nuspell/wrapper.nix b/pkgs/development/libraries/nuspell/wrapper.nix index 4386542ff20e5..ab09931579c78 100644 --- a/pkgs/development/libraries/nuspell/wrapper.nix +++ b/pkgs/development/libraries/nuspell/wrapper.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { name = (appendToName "with-dicts" nuspell).name; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${searchPath} ''; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index a71b2a61910ee..44a0e017a2ab5 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: +{ lib, stdenv, fetchurl, openssl, db, groff, libtool +, withCyrusSasl ? true +, cyrus_sasl +}: stdenv.mkDerivation rec { pname = "openldap"; @@ -37,8 +40,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-yielding_select=yes" "ac_cv_func_memcmp_working=yes" - ] ++ lib.optional (openssl == null) "--without-tls" - ++ lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" + ] ++ lib.optional (!withCyrusSasl) "--without-cyrus-sasl" ++ lib.optional stdenv.isFreeBSD "--with-pic"; postBuild = '' @@ -54,19 +56,21 @@ stdenv.mkDerivation rec { "moduledir=$(out)/lib/modules" ]; - # 1. Fixup broken libtool - # 2. Libraries left in the build location confuse `patchelf --shrink-rpath` + # 1. Libraries left in the build location confuse `patchelf --shrink-rpath` # Delete these to let patchelf discover the right path instead. # FIXME: that one can be removed when https://github.com/NixOS/patchelf/pull/98 # is in Nixpkgs patchelf. + # 2. Fixup broken libtool for openssl and cyrus_sasl (if it is not disabled) preFixup = '' - sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \ - -e 's,-lssl,-L${openssl.out}/lib -lssl,' \ - -i $out/lib/libldap.la -i $out/lib/libldap_r.la - - rm -rf $out/var + rm -r $out/var rm -r libraries/*/.libs rm -r contrib/slapd-modules/passwd/*/.libs + for f in $out/lib/libldap.la $out/lib/libldap_r.la; do + substituteInPlace "$f" --replace '-lssl' '-L${openssl.out}/lib -lssl' + '' + lib.optionalString withCyrusSasl '' + substituteInPlace "$f" --replace '-lsasl2' '-L${cyrus_sasl.out}/lib -lsasl2' + '' + '' + done ''; postInstall = '' diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 8eeff3de94352..da7e9c755a03e 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "openscenegraph"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "openscenegraph"; repo = "OpenSceneGraph"; rev = "OpenSceneGraph-${version}"; - sha256 = "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785"; + sha256 = "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1"; }; nativeBuildInputs = [ pkg-config cmake doxygen ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index ce4374be33126..2edf02e738f30 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -160,8 +160,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1i"; - sha256 = "0hjj1phcwkz69lx1lrvr9grhpl4y529mwqycqc1hdla1zqsnmgp8"; + version = "1.1.1j"; + sha256 = "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 196cac4bcafca..d9d26d0b53789 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "4.4.9"; + version = "4.4.24"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0igiw863gnf9f626v0igg1pj3fv4anvlvlk6xx3bk2zdi52a9kcc"; + sha256 = "sha256-jM2kRInti7lG72bSTbdVZLshb3gvgm2EccnZNwzi8UU="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index d3f6bcb747476..0a7e9b4d948ed 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "herwig"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "11m6xvardnk0i8x8b3dpwg4c4ncq0xmlfg2n5r5qmh6544pz7zyl"; + sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k"; }; nativeBuildInputs = [ autoconf automake libtool ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-purpose particle physics event generator"; homepage = "https://herwig.hepforge.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index d5a272955f40f..ed92889b5b214 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "thepeg"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "13x5gssv22mpa2w6i0vaalwcr57170vh3b4xrw8mrm3abqhwgav3"; + sha256 = "0gif4vb9lw2px2qdywqm7x0frbv0h5gq9lq36c50f2hv77a5bgwp"; }; buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Toolkit for High Energy Physics Event Generation"; homepage = "https://herwig.hepforge.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index b72d9070ce26b..63e893ea69ff9 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -99,6 +99,7 @@ let sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) ./qtwebkit.patch + ./qtwebkit-icu68.patch ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch new file mode 100644 index 0000000000000..73463d7567a3a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch @@ -0,0 +1,170 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: +Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' + ucnv_setFallback(m_converterICU, TRUE); + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: +In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: +Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 3563a1991c1cc..45cf6209ea08a 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -112,6 +112,7 @@ let sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) ./qtwebkit.patch + ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch new file mode 100644 index 0000000000000..73463d7567a3a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch @@ -0,0 +1,170 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: +Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' + ucnv_setFallback(m_converterICU, TRUE); + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: +In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: +Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index e72335f1d2418..fdb68d89bc35a 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -95,6 +95,7 @@ let sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) ./qtwebkit.patch + ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch new file mode 100644 index 0000000000000..73463d7567a3a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch @@ -0,0 +1,170 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: +Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' + ucnv_setFallback(m_converterICU, TRUE); + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: +In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: +Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index b649b1d9c1136..e5657bcb3c300 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh"; }; - buildInputs = [ ant jdk python makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jdk python ]; buildPhase = "ant dist"; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index a42941cbb6897..7a9818bce97d3 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-VCGR0Q8FcoDLr+CFTk/OLMI4zs87K/IdZS1ANmkeb4s="; + sha256 = "sha256-EoNzxwuLiYi6sMhyqD/x+ku6BKA+i5og4XsUy2JBN0U="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix new file mode 100644 index 0000000000000..35e48140fdd35 --- /dev/null +++ b/pkgs/development/libraries/rinutils/default.nix @@ -0,0 +1,21 @@ +{ + stdenv, lib, fetchurl, + cmake, perl, +}: + +stdenv.mkDerivation rec { + pname = "rinutils"; + version = "0.8.0"; + + meta = with lib; { + homepage = "https://github.com/shlomif/rinutils"; + license = licenses.mit; + }; + + src = fetchurl { + url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "1q09aihm5m42xiq2prpa9mf0srwiirzgzblkp5nl74i7zg6pg5hx"; + }; + + nativeBuildInputs = [ cmake perl ]; +} diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index b423e557a56e5..7e43fc7f5c321 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -8,7 +8,7 @@ let src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701h00"; + sha256 = "0jgzaawf6vn15qyi15b6dlq80sk2gaiwfikingldx5mhjrwj7pfx"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 6d8a334ce3fb0..a0a1ac0360e8c 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "06pfq5wa8d25i9bdjkp4xhms5101dsrbg82riz7rz1a0a32pqxgj"; }; + postPatch = '' + substituteInPlace install-sh \ + --replace "stripprog=" "stripprog=\$STRIP # " + ''; + meta = { homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 4265948c1950b..8ef209fe80511 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -2,13 +2,10 @@ , runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv , zimg, libass, python3, libiconv , ApplicationServices -, ocrSupport ? false, tesseract ? null -, imwriSupport? true, imagemagick7 ? null +, ocrSupport ? false, tesseract +, imwriSupport ? true, imagemagick }: -assert ocrSupport -> tesseract != null; -assert imwriSupport -> imagemagick7 != null; - with lib; stdenv.mkDerivation rec { @@ -32,7 +29,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: with ps; [ sphinx cython ])) ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ++ optional ocrSupport tesseract - ++ optional imwriSupport imagemagick7; + ++ optional imwriSupport imagemagick; configureFlags = [ (optionalString (!ocrSupport) "--disable-ocr") diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 9bf91da6cd906..5e9a990d14ed2 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -155,6 +155,9 @@ stdenv.mkDerivation rec { "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" + # ensure backward compatibility with the latest version of icu: + # http://linuxfromscratch.org/blfs/view/svn/x/webkitgtk.html + "-DCMAKE_CXX_FLAGS=-DU_DEFINE_FALSE_AND_TRUE=1" ] ++ optionals stdenv.isDarwin [ "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" "-DENABLE_GTKDOC=OFF" diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 7db33ab1c9ed3..4635a80152de6 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -11,24 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1aa51j0xnhi49izc8djya68l70jkjv25559pgybfb9sa4fa4gz97"; }; - # almost same as Debian but for now using --enable-all instead of --enable-distro to ensure options.h gets installed - configureFlags = [ "--enable-all" "--enable-pkcs11" "--enable-tls13" "--enable-base64encode" ]; + # almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed + configureFlags = [ "--enable-all" "--enable-reproducible-build" "--enable-pkcs11" "--enable-tls13" "--enable-base64encode" ]; outputs = [ "out" "dev" "doc" "lib" ]; nativeBuildInputs = [ autoreconfHook ]; - postPatch = '' - # fix recursive cycle: - # build flags (including location of header files) are exposed in the - # public API of wolfssl, causing lib to depend on dev - substituteInPlace configure.ac \ - --replace '#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"' ' ' - substituteInPlace configure.ac \ - --replace '#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"' ' ' - ''; - - postInstall = '' # fix recursive cycle: # wolfssl-config points to dev, dev propagates bin diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index a3c35d123b6a1..b37dfbdd70773 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.3"; + version = "4.3.4"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd"; + sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; }; nativeBuildInputs = [ cmake asciidoc pkg-config ]; diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix index 86bcba5707590..6a1d9c77b5a0c 100644 --- a/pkgs/development/misc/resholve/deps.nix +++ b/pkgs/development/misc/resholve/deps.nix @@ -60,13 +60,13 @@ rec { # resholve's primary dependency is this developer build of the oil shell. oildev = python27Packages.buildPythonPackage rec { pname = "oildev-unstable"; - version = "2020-03-31"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "oilshell"; repo = "oil"; - rev = "ea80cdad7ae1152a25bd2a30b87fe3c2ad32394a"; - sha256 = "0pxn0f8qbdman4gppx93zwml7s5byqfw560n079v68qjgzh2brq2"; + rev = "11c6bd3ca0e126862c7a1f938c8510779837affa"; + hash = "sha256-UTQywtx+Dn1/qx5uocqgGn7oFYW4R5DbuiRNF8t/BzY="; /* It's not critical to drop most of these; the primary target is diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index e8b4ed2cfb258..9b1cc921cd02e 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -11,12 +11,12 @@ , doCheck ? true }: let - version = "0.4.2"; + version = "0.5.0"; rSrc = fetchFromGitHub { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0="; + hash = "sha256-dscmT0ss1buP56QzQtfs2HANr9oWWMxCS+fwBIKBxv4="; }; deps = callPackage ./deps.nix { /* @@ -29,6 +29,9 @@ let "${rSrc}/0002-add_MANIFEST_in.patch" "${rSrc}/0003-fix_codegen_shebang.patch" "${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch" + "${rSrc}/0005_revert_libc_locale.patch" + "${rSrc}/0006_disable_failing_libc_tests.patch" + "${rSrc}/0007_restore_root_init_py.patch" ]; }; in diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 5602f598e9d6b..1aa81132c2603 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; - buildInputs = [ makeWrapper which xdg-utils ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which xdg-utils ]; unpackPhase = '' mkdir -p phony-home $out/share/applications diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index f471dc977b3da..601cac372c8c4 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 0742247893c3d..52257bfd4611e 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index 965a385ac56c7..78044752b54cf 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6fa9a907f22e4..b8af4a775bf2c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,22 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1102.1" = { + "@angular-devkit/architect-0.1102.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1102.1"; + version = "0.1102.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.1.tgz"; - sha512 = "s7CxUANGssLYL0KNdNUjXKjtzPjxnAMW9s7H/wzYuFqXVq/DbHvIMAEQW4x7XD5sD8zTqcVR8QAL6ZVSYHppVw=="; - }; - }; - "@angular-devkit/core-11.1.0" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.1.0.tgz"; - sha512 = "O2oIcqpQKGvYJH88d/NCgLYZGc9laA1eo2d1s0FH1Udu4c2L+bAsviQqtTKNmzyaqODHrlkt+eKx7uakdwWtnQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.2.tgz"; + sha512 = "FE7DeT13elqDlELF23QqvEFnT2BkxeC5t31/QW85IN/OR5Tf/q7XEpj7giJXyzKFQ60M3ZzbznZyRz0EqtfaBQ=="; }; }; "@angular-devkit/core-11.2.0" = { @@ -49,22 +40,13 @@ let sha512 = "qqYEH8m/bwpngoLDMFuth8ykvoHxQ3aHHnAWfRXz9NXydwSfathG0VSYCctB126sK39JKIn+xq16CQAExxNu+Q=="; }; }; - "@angular-devkit/core-11.2.1" = { + "@angular-devkit/core-11.2.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "11.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz"; - sha512 = "CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg=="; - }; - }; - "@angular-devkit/schematics-11.1.0" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "11.1.0"; + version = "11.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.1.0.tgz"; - sha512 = "6qfR5w1jyk8MC+5Tfimz+Czsq3WlsVoB57dpxSZfhGGsv1Vxc8Q41y5f3BrAyEqHYjcH7NtaoLQoJjtra5KaAg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.2.tgz"; + sha512 = "LUDO1AdIjereiMh0j5p9xJcdr9ifhbWCPxlZqfu5wHzUfhCx9gO2Lvjp6rZXQ3OedXg5IZUnyxHlzkszQOsgiw=="; }; }; "@angular-devkit/schematics-11.2.0" = { @@ -76,13 +58,13 @@ let sha512 = "sMDacACJbA4pykiqgJf/RdW0damcf4mDqErGgEqs/bGG+SBUb8+wgt4cQnUwwVX5V2nMdvv7f0A84rgR6I3G2w=="; }; }; - "@angular-devkit/schematics-11.2.1" = { + "@angular-devkit/schematics-11.2.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "11.2.1"; + version = "11.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.1.tgz"; - sha512 = "y2tzJq+MMwLdQ6Li+AxjozI51miN5CjK9x9jtFHi+njqJr595WTNQi39RjyHxAue1VFMr8gu1VBnKGKJ1J3vNA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.2.tgz"; + sha512 = "6bIxMwafz/+lwdtcshwOuFfhxTMU4RLma1uxBS34DXupMauPGl0IIXAy5cK9dXPlHLxuGsjeBiOM6eq033RLgw=="; }; }; "@angular-devkit/schematics-cli-0.1102.0" = { @@ -346,22 +328,22 @@ let sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; }; }; - "@babel/compat-data-7.12.13" = { + "@babel/compat-data-7.13.8" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.13.tgz"; - sha512 = "U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz"; + sha512 = "EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog=="; }; }; - "@babel/core-7.12.17" = { + "@babel/core-7.13.8" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.17"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.17.tgz"; - sha512 = "V3CuX1aBywbJvV2yzJScRxeiiw0v2KZZYYE3giywxzFJL13RiyPjaaDwhDnxmgFTTS7FgvM2ijr4QmKNIu0AtQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz"; + sha512 = "oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg=="; }; }; "@babel/core-7.9.0" = { @@ -382,13 +364,13 @@ let sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; }; }; - "@babel/generator-7.12.17" = { + "@babel/generator-7.13.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.17"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.17.tgz"; - sha512 = "DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz"; + sha512 = "zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw=="; }; }; "@babel/helper-annotate-as-pure-7.12.13" = { @@ -409,22 +391,22 @@ let sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; }; }; - "@babel/helper-compilation-targets-7.12.17" = { + "@babel/helper-compilation-targets-7.13.8" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.12.17"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.17.tgz"; - sha512 = "5EkibqLVYOuZ89BSg2lv+GG8feywLuvMXNYgf0Im4MssE0mFWPztSpJbildNnUgw0bLI2EsIN4MpSHC2iUJkQA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz"; + sha512 = "pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A=="; }; }; - "@babel/helper-create-class-features-plugin-7.12.17" = { + "@babel/helper-create-class-features-plugin-7.13.8" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.12.17"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.17.tgz"; - sha512 = "I/nurmTxIxHV0M+rIpfQBF1oN342+yvl2kwZUrQuOClMamHF1w5tknfZubgNOLRoA73SzBFAdFcpb4M9HwOeWQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz"; + sha512 = "qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w=="; }; }; "@babel/helper-create-regexp-features-plugin-7.12.17" = { @@ -436,13 +418,22 @@ let sha512 = "p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg=="; }; }; - "@babel/helper-explode-assignable-expression-7.12.13" = { + "@babel/helper-define-polyfill-provider-0.1.4" = { + name = "_at_babel_slash_helper-define-polyfill-provider"; + packageName = "@babel/helper-define-polyfill-provider"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.4.tgz"; + sha512 = "K5V2GaQZ1gpB+FTXM4AFVG2p1zzhm67n9wrQCJYNzvuLzQybhJyftW7qeDd2uUxPDNdl5Rkon1rOAeUeNDZ28Q=="; + }; + }; + "@babel/helper-explode-assignable-expression-7.13.0" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz"; - sha512 = "5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; + sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA=="; }; }; "@babel/helper-function-name-7.12.13" = { @@ -463,22 +454,22 @@ let sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; }; }; - "@babel/helper-hoist-variables-7.12.13" = { + "@babel/helper-hoist-variables-7.13.0" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz"; - sha512 = "KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz"; + sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.17" = { + "@babel/helper-member-expression-to-functions-7.13.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.17"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.17.tgz"; - sha512 = "Bzv4p3ODgS/qpBE0DiJ9qf5WxSmrQ8gVTe8ClMfwwsY2x/rhykxxy3bXzG7AGTnPB2ij37zGJ/Q/6FruxHxsxg=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz"; + sha512 = "yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ=="; }; }; "@babel/helper-module-imports-7.12.13" = { @@ -490,13 +481,13 @@ let sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g=="; }; }; - "@babel/helper-module-transforms-7.12.17" = { + "@babel/helper-module-transforms-7.13.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.12.17"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.17.tgz"; - sha512 = "sFL+p6zOCQMm9vilo06M4VHuTxUAwa6IxgL56Tq1DVtA0ziAGTH1ThmJq7xwPqdQlgAbKX3fb0oZNbtRIyA5KQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz"; + sha512 = "Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw=="; }; }; "@babel/helper-optimise-call-expression-7.12.13" = { @@ -508,31 +499,31 @@ let sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; }; }; - "@babel/helper-plugin-utils-7.12.13" = { + "@babel/helper-plugin-utils-7.13.0" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz"; - sha512 = "C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; + sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.12.13" = { + "@babel/helper-remap-async-to-generator-7.13.0" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz"; - sha512 = "Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; + sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; }; }; - "@babel/helper-replace-supers-7.12.13" = { + "@babel/helper-replace-supers-7.13.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; - sha512 = "pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz"; + sha512 = "Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw=="; }; }; "@babel/helper-simple-access-7.12.13" = { @@ -580,40 +571,40 @@ let sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="; }; }; - "@babel/helper-wrap-function-7.12.13" = { + "@babel/helper-wrap-function-7.13.0" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz"; - sha512 = "t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; + sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; }; }; - "@babel/helpers-7.12.17" = { + "@babel/helpers-7.13.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.12.17"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.17.tgz"; - sha512 = "tEpjqSBGt/SFEsFikKds1sLNChKKGGR17flIgQKXH4fG6m9gTgl3gnOC1giHNyaBCSKuTfxaSzHi7UnvqiVKxg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz"; + sha512 = "aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ=="; }; }; - "@babel/highlight-7.12.13" = { + "@babel/highlight-7.13.8" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz"; - sha512 = "kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz"; + sha512 = "4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw=="; }; }; - "@babel/parser-7.12.17" = { + "@babel/parser-7.13.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.17"; + version = "7.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz"; - sha512 = "r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz"; + sha512 = "uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -625,13 +616,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.12.13" = { + "@babel/plugin-proposal-async-generator-functions-7.13.8" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz"; - sha512 = "1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz"; + sha512 = "rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA=="; }; }; "@babel/plugin-proposal-class-properties-7.12.13" = { @@ -643,13 +634,22 @@ let sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.12.17" = { + "@babel/plugin-proposal-class-properties-7.13.0" = { + name = "_at_babel_slash_plugin-proposal-class-properties"; + packageName = "@babel/plugin-proposal-class-properties"; + version = "7.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; + sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; + }; + }; + "@babel/plugin-proposal-dynamic-import-7.13.8" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.12.17"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.17.tgz"; - sha512 = "ZNGoFZqrnuy9H2izB2jLlnNDAfVPlGl5NhFEiFe4D84ix9GQGygF+CWMGHKuE+bpyS/AOuDQCnkiRNqW2IzS1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; + sha512 = "ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ=="; }; }; "@babel/plugin-proposal-export-default-from-7.12.13" = { @@ -670,31 +670,31 @@ let sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw=="; }; }; - "@babel/plugin-proposal-json-strings-7.12.13" = { + "@babel/plugin-proposal-json-strings-7.13.8" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz"; - sha512 = "v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; + sha512 = "w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.12.13" = { + "@babel/plugin-proposal-logical-assignment-operators-7.13.8" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz"; - sha512 = "fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; + sha512 = "aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz"; - sha512 = "Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; + sha512 = "iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A=="; }; }; "@babel/plugin-proposal-numeric-separator-7.12.13" = { @@ -706,40 +706,40 @@ let sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.12.13" = { + "@babel/plugin-proposal-object-rest-spread-7.13.8" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz"; - sha512 = "WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz"; + sha512 = "DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.12.13" = { + "@babel/plugin-proposal-optional-catch-binding-7.13.8" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz"; - sha512 = "9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; + sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.12.17" = { + "@babel/plugin-proposal-optional-chaining-7.13.8" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.12.17"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.17.tgz"; - sha512 = "TvxwI80pWftrGPKHNfkvX/HnoeSTR7gC4ezWnAL39PuktYUe6r8kEpOLTYnkBTsaoeazXm2jHJ22EQ81sdgfcA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz"; + sha512 = "hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ=="; }; }; - "@babel/plugin-proposal-private-methods-7.12.13" = { + "@babel/plugin-proposal-private-methods-7.13.0" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz"; - sha512 = "sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; + sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; }; }; "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { @@ -913,22 +913,22 @@ let sha512 = "cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w=="; }; }; - "@babel/plugin-transform-arrow-functions-7.12.13" = { + "@babel/plugin-transform-arrow-functions-7.13.0" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz"; - sha512 = "tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; + sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.12.13" = { + "@babel/plugin-transform-async-to-generator-7.13.0" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz"; - sha512 = "psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; + sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg=="; }; }; "@babel/plugin-transform-block-scoped-functions-7.12.13" = { @@ -949,31 +949,31 @@ let sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ=="; }; }; - "@babel/plugin-transform-classes-7.12.13" = { + "@babel/plugin-transform-classes-7.13.0" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz"; - sha512 = "cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; + sha512 = "9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g=="; }; }; - "@babel/plugin-transform-computed-properties-7.12.13" = { + "@babel/plugin-transform-computed-properties-7.13.0" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz"; - sha512 = "dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; + sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; }; }; - "@babel/plugin-transform-destructuring-7.12.13" = { + "@babel/plugin-transform-destructuring-7.13.0" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz"; - sha512 = "Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz"; + sha512 = "zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA=="; }; }; "@babel/plugin-transform-dotall-regex-7.12.13" = { @@ -1003,22 +1003,22 @@ let sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.12.13" = { + "@babel/plugin-transform-flow-strip-types-7.13.0" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.13.tgz"; - sha512 = "39/t9HtN+Jlc7EEY6oCSCf3kRrKIl2JULOGPnHZiaRjoYZEFaDXDZI32uE2NosQRh8o6N9B+8iGvDK7ToJhJaw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz"; + sha512 = "EXAGFMJgSX8gxWD7PZtW/P6M+z74jpx3wm/+9pn+c2dOawPpBkUX7BrfyPvo6ZpXbgRIEuwgwDb/MGlKvu2pOg=="; }; }; - "@babel/plugin-transform-for-of-7.12.13" = { + "@babel/plugin-transform-for-of-7.13.0" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz"; - sha512 = "xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; + sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg=="; }; }; "@babel/plugin-transform-function-name-7.12.13" = { @@ -1048,40 +1048,40 @@ let sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; }; }; - "@babel/plugin-transform-modules-amd-7.12.13" = { + "@babel/plugin-transform-modules-amd-7.13.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz"; - sha512 = "JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz"; + sha512 = "EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.12.13" = { + "@babel/plugin-transform-modules-commonjs-7.13.8" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz"; - sha512 = "OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz"; + sha512 = "9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.12.13" = { + "@babel/plugin-transform-modules-systemjs-7.13.8" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.12.13"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz"; - sha512 = "aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; + sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; }; }; - "@babel/plugin-transform-modules-umd-7.12.13" = { + "@babel/plugin-transform-modules-umd-7.13.0" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz"; - sha512 = "BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz"; + sha512 = "D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw=="; }; }; "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { @@ -1120,13 +1120,13 @@ let sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; }; }; - "@babel/plugin-transform-parameters-7.12.13" = { + "@babel/plugin-transform-parameters-7.13.0" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz"; - sha512 = "e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; + sha512 = "Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw=="; }; }; "@babel/plugin-transform-property-literals-7.12.13" = { @@ -1156,6 +1156,15 @@ let sha512 = "mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw=="; }; }; + "@babel/plugin-transform-react-jsx-self-7.12.13" = { + name = "_at_babel_slash_plugin-transform-react-jsx-self"; + packageName = "@babel/plugin-transform-react-jsx-self"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz"; + sha512 = "FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ=="; + }; + }; "@babel/plugin-transform-react-jsx-source-7.12.13" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; @@ -1183,13 +1192,13 @@ let sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; }; }; - "@babel/plugin-transform-runtime-7.12.17" = { + "@babel/plugin-transform-runtime-7.13.8" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.12.17"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.17.tgz"; - sha512 = "s+kIJxnaTj+E9Q3XxQZ5jOo+xcogSe3V78/iFQ5RmoT0jROdpcdxhfGdq/VLqW1hFSzw6VjqN8aQqTaAMixWsw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.8.tgz"; + sha512 = "6UbZ7P0FuuJiiUyRCfDgLw4PIG9bR2x6swHocv4qNZItkhXad0WsN6YX0deILuyZY2++meDKiDMuSVcejDZN0Q=="; }; }; "@babel/plugin-transform-shorthand-properties-7.12.13" = { @@ -1201,13 +1210,13 @@ let sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; }; }; - "@babel/plugin-transform-spread-7.12.13" = { + "@babel/plugin-transform-spread-7.13.0" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz"; - sha512 = "dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; + sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg=="; }; }; "@babel/plugin-transform-sticky-regex-7.12.13" = { @@ -1219,13 +1228,13 @@ let sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; }; }; - "@babel/plugin-transform-template-literals-7.12.13" = { + "@babel/plugin-transform-template-literals-7.13.0" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.12.13"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz"; - sha512 = "arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; + sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw=="; }; }; "@babel/plugin-transform-typeof-symbol-7.12.13" = { @@ -1237,13 +1246,13 @@ let sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; }; }; - "@babel/plugin-transform-typescript-7.12.17" = { + "@babel/plugin-transform-typescript-7.13.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.12.17"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.17.tgz"; - sha512 = "1bIYwnhRoetxkFonuZRtDZPFEjl1l5r+3ITkxLC3mlMaFja+GQFo94b/WHEPjqWLU9Bc+W4oFZbvCGe9eYMu1g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz"; + sha512 = "elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ=="; }; }; "@babel/plugin-transform-unicode-escapes-7.12.13" = { @@ -1282,6 +1291,15 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; + "@babel/preset-env-7.13.8" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.8.tgz"; + sha512 = "Sso1xOpV4S3ofnxW2DsWTE5ziRk62jEAKLGuQ+EJHC+YHTbFG38QUTixO3JVa1cYET9gkJhO1pMu+/+2dDhKvw=="; + }; + }; "@babel/preset-flow-7.12.13" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; @@ -1318,22 +1336,22 @@ let sha512 = "T513uT4VSThRcmWeqcLkITKJ1oGQho9wfWuhQm10paClQkp1qyd0Wf8mvC8Se7UYssMyRSj4tZYpVTkCmAK/mA=="; }; }; - "@babel/register-7.12.13" = { - name = "_at_babel_slash_register"; - packageName = "@babel/register"; - version = "7.12.13"; + "@babel/preset-typescript-7.13.0" = { + name = "_at_babel_slash_preset-typescript"; + packageName = "@babel/preset-typescript"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.12.13.tgz"; - sha512 = "fnCeRXj970S9seY+973oPALQg61TRvAaW0nRDe1f4ytKqM3fZgsNXewTZWmqZedg74LFIRpg/11dsrPZZvYs2g=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz"; + sha512 = "LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw=="; }; }; - "@babel/runtime-7.12.18" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.12.18"; + "@babel/register-7.13.8" = { + name = "_at_babel_slash_register"; + packageName = "@babel/register"; + version = "7.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.18.tgz"; - sha512 = "BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.13.8.tgz"; + sha512 = "yCVtABcmvQjRsX2elcZFUV5Q5kDDpHdtXKKku22hNDma60lYuhKmtp1ykZ/okRCPLT2bR5S+cA1kvtBdAFlDTQ=="; }; }; "@babel/runtime-7.12.5" = { @@ -1345,6 +1363,15 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; + "@babel/runtime-7.13.8" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.8.tgz"; + sha512 = "CwQljpw6qSayc0fRG1soxHAKs1CnQMOChm4mlQP6My0kf9upVGizj/KhlTTgyUnETmHpcUXjaluNAkteRFuafg=="; + }; + }; "@babel/runtime-7.9.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1363,13 +1390,13 @@ let sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; }; }; - "@babel/traverse-7.12.17" = { + "@babel/traverse-7.13.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.17"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.17.tgz"; - sha512 = "LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz"; + sha512 = "xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ=="; }; }; "@babel/types-7.10.4" = { @@ -1381,13 +1408,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.17" = { + "@babel/types-7.13.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.17"; + version = "7.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz"; - sha512 = "tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz"; + sha512 = "hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1426,22 +1453,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.7.0" = { + "@bugsnag/js-7.8.0" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.7.0"; + version = "7.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.7.0.tgz"; - sha512 = "ENdwgPnn7hBzkK1fZLFzK4HsIoE4nrmGlJI+rxuZFeXUkawx78ijt63Szf3yFnTt4Pa0yoDkiWS7H9dHDwH3kw=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.8.0.tgz"; + sha512 = "knSEXI4Znch4KzKooG3IgrYcZhKHYyTt/hGEmFhKCNmEiNGhGVisl0mbFCyjTBT+wYmWqqbv6kx4YOyGLCH0Yw=="; }; }; - "@bugsnag/node-7.7.0" = { + "@bugsnag/node-7.8.0" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.7.0"; + version = "7.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.7.0.tgz"; - sha512 = "pzxmKFDyEs5RYt63+IvxSOgd4Diio8VHvSWEr4S4V6rxM/5xopGv36oLVKGuf6qIn4ypy8nXXOGrlPIfl4sXyQ=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.8.0.tgz"; + sha512 = "2ZkXP5gmTE4LcPu2TB350BUmClbwsPZ1ZjYMiHqHDb2Xjoico0PNt6F9tBLjDRy9jS/pFGbjt/iOpyfr4GFm8A=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1696,13 +1723,13 @@ let sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ=="; }; }; - "@eslint/eslintrc-0.3.0" = { + "@eslint/eslintrc-0.4.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; - sha512 = "1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; }; }; "@evocateur/libnpmaccess-3.1.2" = { @@ -1759,15 +1786,6 @@ let sha512 = "ecpC6e3xTtMVVKWpp231L8vptoSPqwtKSmfJ8sXfMlQRtWbq8Bu1pCHR/pdAx9X4IYzygjrTa9IDAPpbGuSaMg=="; }; }; - "@expo/babel-preset-cli-0.2.18" = { - name = "_at_expo_slash_babel-preset-cli"; - packageName = "@expo/babel-preset-cli"; - version = "0.2.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/babel-preset-cli/-/babel-preset-cli-0.2.18.tgz"; - sha512 = "y2IZFynVtRxMQ4uxXYUnrnXZa+pvSH1R1aSUAfC6RsUb2UNOxC6zRehdLGSOyF4s9Wy+j3/CPm6fC0T5UJYoQg=="; - }; - }; "@expo/bunyan-4.0.0" = { name = "_at_expo_slash_bunyan"; packageName = "@expo/bunyan"; @@ -1777,22 +1795,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.28" = { + "@expo/config-3.3.30" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.28"; + version = "3.3.30"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.28.tgz"; - sha512 = "0zJBOZIl/p4KejUkz6G6uzMjGnWsooWayDk7TeFSCxWZ84HWGCx+LIXbEkc8c/CmMm9HyjYlhESw96mwZZzpPQ=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.30.tgz"; + sha512 = "mOFebiAcowOD9MCpXGtZG/oMku1vAOazGx9BGaDnrod5YHjmrIN65W+hP+eK2dQBcJV1VjbU5K3VpkXO6aWwBA=="; }; }; - "@expo/config-plugins-1.0.18" = { + "@expo/config-plugins-1.0.20" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.18"; + version = "1.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.18.tgz"; - sha512 = "8Ey+22cEAOxK+SBJY+OazaLsPyL5FXdsykfBg/QQJE2Y/DTFebUVlr5bQyeqavbASDvmDxg3Fd71A8Se8+qT1g=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.20.tgz"; + sha512 = "BucZQbi7edu8Pin8zFUNsaQeZAj/8ga7Ei3PKivKZKd5F53DdFU6Yb+ZDyQ0UeOGDi0hZlZWdaBzmQqHEg37TQ=="; }; }; "@expo/config-types-40.0.0-beta.2" = { @@ -1804,31 +1822,40 @@ let sha512 = "t9pHCQMXOP4nwd7LGXuHkLlFy0JdfknRSCAeVF4Kw2/y+5OBbR9hW9ZVnetpBf0kORrekgiI7K/qDaa3hh5+Qg=="; }; }; - "@expo/configure-splash-screen-0.3.3" = { + "@expo/configure-splash-screen-0.3.4" = { name = "_at_expo_slash_configure-splash-screen"; packageName = "@expo/configure-splash-screen"; - version = "0.3.3"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.3.tgz"; - sha512 = "fWy6Z52Mj2a7yjdvpIJkP9G3kfkoXE79aHvTDwgggIE0KLhwnPF27v+KS0wJUf7b4JM6w0zKOlUZjQhn0kSNyA=="; + url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.3.4.tgz"; + sha512 = "HsukM03X5/EXSucVsLN/oLqyFq/1jAjpADkgU1HLaezFpkr+TOquI6yDwdDp1450kcm891PE/SYJ+mCdPxzDLw=="; }; }; - "@expo/dev-server-0.1.54" = { + "@expo/dev-server-0.1.56" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.54"; + version = "0.1.56"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.54.tgz"; - sha512 = "15JC58wiL1N6N95lxM7pG42SY8geMYq19i0FSp5CsEvNZrbc1tuzaRGZhrW7I1EwOhNNdR2teyoLaIKCP7ynSg=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.56.tgz"; + sha512 = "BXKJW6KB7AckjJkDIM4mmuMhbiP9GQtmfsNoEsXg9Ci1NxJxu4vc/UdaL4tC+SLlDNpKgSIBvSNDY0AdPKUAeA=="; }; }; - "@expo/dev-tools-0.13.82" = { + "@expo/dev-tools-0.13.84" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.82"; + version = "0.13.84"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.82.tgz"; - sha512 = "Uq3HoRP0/+w/c6LHdRAMEPLqO3NZS4cailJCYR/MXcZ6xGMrAOjBZwB64H7SP12ADyzhjOsISvr+JG5SE/lRRA=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.84.tgz"; + sha512 = "HmN5Gb+uSpLxIhHKjPgRSLZaAEJW8UmV6h2eQmVUrpc+VoT0M4roCHd50xJQv+OqLllgo9ZmmyWHnNckOd+RJA=="; + }; + }; + "@expo/devcert-1.0.0" = { + name = "_at_expo_slash_devcert"; + packageName = "@expo/devcert"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/devcert/-/devcert-1.0.0.tgz"; + sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; "@expo/image-utils-0.3.10" = { @@ -1840,22 +1867,22 @@ let sha512 = "EebukeUnzyk4ts1E1vMQSb0p8otYqWKsZNDZEoqHtERhxMSO7WhQLqa7/z2kB/YMHRJjrhaa3Aa2X5zjYot1kA=="; }; }; - "@expo/json-file-8.2.27" = { + "@expo/json-file-8.2.28-alpha.0" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.27"; + version = "8.2.28-alpha.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.27.tgz"; - sha512 = "Iyqg1jbXOTg0JfCGwMrkaaRmVFjQrWDBQAhYLTdvOD3GrXYuKI1vUV+3Wqw0NnU+TYoNUpi7aB8dNzPvLj0oag=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.28-alpha.0.tgz"; + sha512 = "cCQdw/Nfw8doXjN3onvUnWkuJjtVxx2iUjSOLMydvgI87YpW3x05uUXOVs4P+77YFVoFS6xbki+fmKK2JSCf8w=="; }; }; - "@expo/metro-config-0.1.54" = { + "@expo/metro-config-0.1.56" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.54"; + version = "0.1.56"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.54.tgz"; - sha512 = "DOlTzNheS5IZDDmQjWt60mAmbFreH8xT3ZXc6y/k4UVq7khQ41/g5kl1AJOC9WzE6xgPtmDQqTWanBprn+OhzA=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.56.tgz"; + sha512 = "h7IBc8GWzqKhdv2OWqU9tU3i5ZMpoXU1gao+kZzvi02dEAV5GzKxvGPiZu9nsvXeeRlCIpzTHvzFPh5n5mtSnA=="; }; }; "@expo/osascript-2.0.24" = { @@ -1867,13 +1894,13 @@ let sha512 = "oqar3vmvxkVx1OBG7hTjTbCaVVUX2o+aEMLxZWLUiubL0ly1qxgQKEt5p3g3pzkxTft+b1oMf8bT7jMi6iOv+Q=="; }; }; - "@expo/package-manager-0.0.38" = { + "@expo/package-manager-0.0.39-alpha.0" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.38"; + version = "0.0.39-alpha.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.38.tgz"; - sha512 = "meuDK53dkORUCRnIMBOkgPNWMfH47KJgUFZ3b1shYD+JFpsk4OX4OieKdyFX/J6Q7HgHwFSJvdCCFxgPbsAQyg=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.39-alpha.0.tgz"; + sha512 = "NLd93cG7pVmJaoWeJZsTab6jOTMvgW0UZz3NGq2mf9jbxlJUEj9QIGF/tzt4dIhtfdDFd5FbEpGRidcE3jGdOg=="; }; }; "@expo/plist-0.0.11" = { @@ -1894,13 +1921,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.26" = { + "@expo/schemer-1.3.27-alpha.0" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.26"; + version = "1.3.27-alpha.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.26.tgz"; - sha512 = "++PmBy75BpaPRrbIzmgpp3r73gtoa2PkSKucTXRH8OfADlF0FDJ7W0S1L6iKMhZml3339pjUMLo7a9A7OlgU6g=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.27-alpha.0.tgz"; + sha512 = "RJB1VCPROzfy4XFx79PLfz5WD5QvVSA6Xq2f6CUVyxOpWwpMyQfXA2vv3ebmLJYmr67OZDa26kn3fUxQLI4BHw=="; }; }; "@expo/simple-spinner-1.0.2" = { @@ -1921,22 +1948,22 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.12.58" = { + "@expo/webpack-config-0.12.60" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.58"; + version = "0.12.60"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.58.tgz"; - sha512 = "c3UrHaNll4+nBmmNA/1HU7OYm7USsaqzMqExfC+mB3E1RnPi0qft83zf7wgwNwQCcqs06NH3VRKxpmQ7qzKuNw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.60.tgz"; + sha512 = "UieL5oLo4rm0jNx/Gzz6gs4fZ37THSdptvy4dQFsHGQrvZgxd1lCHEe4NNv56/Zs3H/FrX7vczpZ2fwS/LXvmQ=="; }; }; - "@expo/xdl-59.0.22" = { + "@expo/xdl-59.0.24" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "59.0.22"; + version = "59.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.22.tgz"; - sha512 = "1kfDyr5Gg9f1d93eJJ2JXiMXvhtf5IGWMp4C+aSPcH1ajxaWGak9SRpkTGv0Mi0VN9jIimTFT+kTkWZv9W1VMQ=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.24.tgz"; + sha512 = "rl0lJ3z4v0VPu8Z37Vl2sTYSupAVjD6MxUHAJd+FRKgQMb7kyJUTpWvBAlbYCgMM+WH5XZZSvgWdwCTLocwPtw=="; }; }; "@fast-csv/format-4.3.5" = { @@ -1957,67 +1984,67 @@ let sha512 = "uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA=="; }; }; - "@fluentui/date-time-utilities-7.9.0" = { + "@fluentui/date-time-utilities-7.9.1" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.9.0"; + version = "7.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.9.0.tgz"; - sha512 = "D8p5WWeonqRO1EgIvo7WSlX1rcm87r2VQd62zTJPQImx8rpwc77CRI+iAvfxyVHRZMdt4Qk6Jq99dUaudPWaZw=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.9.1.tgz"; + sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; }; }; - "@fluentui/dom-utilities-1.1.1" = { + "@fluentui/dom-utilities-1.1.2" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.1.tgz"; - sha512 = "w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.2.tgz"; + sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; - "@fluentui/keyboard-key-0.2.13" = { + "@fluentui/keyboard-key-0.2.14" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.13"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.13.tgz"; - sha512 = "HLZNtkETFUuCP76Wk/oF54+tVp6aPGzsoJRsmnkh78gloC9CGp8JK+LQUYfj9dtzcHDHq64/dAA2e4j2tzjhaQ=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.14.tgz"; + sha512 = "SMyoMFCPRNoDeHB5MMIi8W3loDxjXsSBeQfQaaKqmph7gVN48DCky6K/xBHHDJDeqJjcmEgwPTRP8qsuuLWnqw=="; }; }; - "@fluentui/react-7.161.0" = { + "@fluentui/react-7.162.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.161.0"; + version = "7.162.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.161.0.tgz"; - sha512 = "TZQvDVeOrZrkkcOvrg3+EwOJYE8M9UWn01BIIOULv4tjKnIpRreyKHr/nrG0Cbb0PYEmqxUex0CR+RFCqIYlpg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.162.0.tgz"; + sha512 = "RRZ7a3st/ApdTV5Mzv6OYw5WOqiycRxAkEBLWS52WLEDRySUq8Z5xK9Z/SnnrOxAX1WSZY8VNn72eEWyv8MW2Q=="; }; }; - "@fluentui/react-focus-7.17.4" = { + "@fluentui/react-focus-7.17.5" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.17.4"; + version = "7.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.4.tgz"; - sha512 = "L7MK538JOSpLQubyVxYZV1ftd3hViBQhcFftuJfah/mdekQkIcFTS0fsymQ4MK5i7bn13jE7lPM8QfH23wpaJg=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.5.tgz"; + sha512 = "FBgvHMOpFnmMSGVV+QdlKNMQ61kEzqv2wjUObWxdpqxVUeFIk4rSAalCp2R8c2Sg8YxTGmH5ywhySQ6GQEM6sA=="; }; }; - "@fluentui/react-window-provider-1.0.1" = { + "@fluentui/react-window-provider-1.0.2" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.1.tgz"; - sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.2.tgz"; + sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; }; }; - "@fluentui/theme-1.7.3" = { + "@fluentui/theme-1.7.4" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.3.tgz"; - sha512 = "S97i1SBL5ytQtZQpygAIvOnQSg9tFZM25843xCY40eWRA/eAdPixzWvVmV8PPQs/K5WmXhghepWaC1SjxVO90g=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.4.tgz"; + sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; "@gardenapple/yargs-17.0.0-candidate.0" = { @@ -2065,13 +2092,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.9.0" = { + "@google-cloud/pubsub-2.10.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.9.0.tgz"; - sha512 = "hxj8b4o+m3+XmMOfrl1jcQnPhG4C57YhL/8FHkmUdXeaRA5694TAqH+P0S3NUiM1DfsHqhp3glb2mYChwU7G/Q=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.10.0.tgz"; + sha512 = "XM/Fc6/W/LYzGH2pnhGLDR5E6JNZFMfzyUFP5bWgC4FK1KqIZ4g6hrnCCO38G4JfH2i1IuSQuefPF7FrZZo9tw=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2119,13 +2146,13 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/import-6.2.6" = { + "@graphql-tools/import-6.3.0" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.6"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.6.tgz"; - sha512 = "/0H/bDjNK1MnKonk8fMbB7wIYU6QLCwbQOHtSHbFJ4j2qki5CqfAxpF+fGX6KovDtkdigcgRMvSKKi14oiuHPA=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.3.0.tgz"; + sha512 = "zmaVhJ3UPjzJSb005Pjn2iWvH+9AYRXI4IUiTi14uPupiXppJP3s7S25Si3+DbHpFwurDF2nWRxBLiFPWudCqw=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -2146,13 +2173,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.9" = { + "@graphql-tools/merge-6.2.10" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.9"; + version = "6.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.9.tgz"; - sha512 = "4PPB2rOEjnN91CVltOIVdBOOTEsC+2sHzOVngSoqtgZxvLwcRKwivy3sBuL3WyucBonzpXlV97Q418njslYa/w=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.10.tgz"; + sha512 = "dM3n37PcslvhOAkCz7Cwk0BfoiSVKXGmCX+VMZkATbXk/0vlxUfNEpVfA5yF4IkP27F04SzFQSaNrbD0W2Rszw=="; }; }; "@graphql-tools/schema-7.1.3" = { @@ -2839,13 +2866,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.21.0" = { + "@jsii/spec-1.22.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.21.0.tgz"; - sha512 = "MWQpJKciYytEmYzuwsT+4UM1JPiQyCAqr3PfkZxuosoPUaF7vBrWSs2+TXDb5dcCwpSnSim9iKZrM/Uc2ppUzA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.22.0.tgz"; + sha512 = "OI9LOxU3YhVyzUVvzh5nKDCalFZm0CjPaCdo6X/lL0TaVcpkYyJ8qDRuGF8WCW9PJEORkOhBwC7ySoFl/RVv9A=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3469,13 +3496,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@nestjs/schematics-7.2.7" = { + "@nestjs/schematics-7.2.8" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "7.2.7"; + version = "7.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.7.tgz"; - sha512 = "71XqMPf7s2P1Q6PVMDLbSLphVWgGDK2CgURVYyreuIWXVSoi9pcPIeO5k0Qb5n5jELlKwdrf66g05U2I6TIxzg=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.8.tgz"; + sha512 = "cxs76Ia1SHTp18jXTusZtUucNjAmorlTzSaeKUH+71fri2pA0JOS4RJlfta5znDuA26gboolanPE6U0ZzaLM3A=="; }; }; "@netflix/nerror-1.1.3" = { @@ -3487,13 +3514,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-9.1.3" = { + "@netlify/build-9.5.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "9.1.3"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-9.1.3.tgz"; - sha512 = "UaTinHY6ysncUEaT7u0i3GGL8r+qDnvqusLw+OWSavvnHIdvW6qdkRMZhQ6dUi3vSIh6NUKvddWCYdi49R4n+w=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-9.5.0.tgz"; + sha512 = "1CEl1gd7B83IpmMRSATkVrODE3fuw9bBUKnGAU+QA0JS219SXLHrSaYj1Uu+lsLSbOnaTeTVMrfXl5+dMzOoEQ=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3523,13 +3550,13 @@ let sha512 = "vqy9wbBRP8qWnkzA/OQsThr1+cfqapMrORJ4hWcrjhIPRmXIJtwB6OWuLIUalMeSGCwqZjYpKfudc4BLuxxvjw=="; }; }; - "@netlify/functions-utils-1.3.13" = { + "@netlify/functions-utils-1.3.14" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.13"; + version = "1.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.13.tgz"; - sha512 = "YhLVj9Vv9uyBrnEbg+dOgSFVRfYg1DFs1itmFR9q5ruI0pYwd2MlfmoYr436U+HFWAmZYC1F8e3Mh3bWEtsFnA=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.14.tgz"; + sha512 = "5i3PbQxLpwqS1HNiAuxlGGA/Zsr5yjJm9J69GyQI5yW70aga1NwnY6teyAmGSksSYGR5BkPSKPhBhUCm6AzXKA=="; }; }; "@netlify/git-utils-1.0.8" = { @@ -3613,13 +3640,13 @@ let sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; }; }; - "@netlify/zip-it-and-ship-it-2.3.0" = { + "@netlify/zip-it-and-ship-it-2.4.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.3.0.tgz"; - sha512 = "dqYXA/e2ZY6bO7fvp18YKXLYE/CK8cAbjBE2mo339sA+xchoV3ryYEjsLpoYqFWofUBLQnCYahm4D9a4H7RT0A=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-2.4.0.tgz"; + sha512 = "ApuQqnm5x97mFaUEQmmkogcH3MtvPmX1W6MI3Yp4pBXBtRjqTbkrUOiEq97mNnvRR3zEvR8kTLOY7Hd7lAL4bQ=="; }; }; "@node-red/editor-api-1.2.9" = { @@ -3883,6 +3910,15 @@ let sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg=="; }; }; + "@oclif/plugin-plugins-1.10.0" = { + name = "_at_oclif_slash_plugin-plugins"; + packageName = "@oclif/plugin-plugins"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.10.0.tgz"; + sha512 = "lfHNiuuCrCUtH9A912T/ztxRA9lS1lCZm+gcmVWksIJG/gwKH/fMn+GdLTbRzU2k6ojtMhBblYk1RWKxUEJuzA=="; + }; + }; "@oclif/plugin-plugins-1.9.5" = { name = "_at_oclif_slash_plugin-plugins"; packageName = "@oclif/plugin-plugins"; @@ -3928,13 +3964,13 @@ let sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; }; }; - "@octokit/openapi-types-5.1.0" = { + "@octokit/openapi-types-5.2.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.1.0.tgz"; - sha512 = "bodZvSYgycbUuuKrC/anCBUExvaSSWzMMFz0xl7pcJujxnmGxvqvcFHktjx1ZOSyeNKLfYF0QCgibaHUGsZTng=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.2.1.tgz"; + sha512 = "Bf7MBvQ1nMpv15ANaQtRBsC7YnwQFPM0eUztp3luQs9L6sBEiQ6ArM1Wx5CG+N7tXETtd0oE0DMcU4wbLlCZIw=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4018,13 +4054,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.10.0" = { + "@octokit/types-6.11.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.10.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.10.0.tgz"; - sha512 = "aMDo10kglofejJ96edCBIgQLVuzMDyjxmhdgEcoUUD64PlHYSrNsAGqN0wZtoiX4/PCQ3JLA50IpkP1bcKD/cA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.11.1.tgz"; + sha512 = "UiSRTG2lrFbMUMwhKNR0uSV33Fzv4bNu1n5iFuuNOg80XCh0VYNhR4TQWgrkLhVxdDuej6s61aP3eQvVm6K6uA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4117,310 +4153,310 @@ let sha512 = "2TUGhTGkhgnxTciHCNAILPSeyXageJewRqfP9wOrx65sKd/jgvNYoY8nYf4EVWVMirDOxKDsmYgUkjdQrwb2dg=="; }; }; - "@ot-builder/bin-composite-types-1.0.2" = { + "@ot-builder/bin-composite-types-1.0.3" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.2.tgz"; - sha512 = "YWlWy5Btp4aSCX6stibMdAaB6Z7pgwimDXYlrgJ8HoXZkWmkWLXvpwPYw+zMWTNeWqOT+qAjnHacsl06ryZA6A=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.3.tgz"; + sha512 = "PEjk6MhiY53QQEW6NQAPYfNBdCqoFEE9OkG+25tvhJ6MWsEUz+hUq9argDjeP2DNckd4WRyGcmp6GtH8J4clLQ=="; }; }; - "@ot-builder/bin-util-1.0.2" = { + "@ot-builder/bin-util-1.0.3" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.2.tgz"; - sha512 = "YHT0oXrmq3taDdIIopV6YBsH8DkzSkkiKW6a/jMZTYYb0tRHgybpuqRUq5uoDNnkA0ntl7sx+nf8p4e4TOUpJQ=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.3.tgz"; + sha512 = "x66vsg6oNJmQ/xp+sQLMUk2imXn5L0psdKj5FYziqZQ99B055+t8Ydf6FM42GRYW2xIczeDIesmLZkRaQPgTOA=="; }; }; - "@ot-builder/cli-help-shower-1.0.2" = { + "@ot-builder/cli-help-shower-1.0.3" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.2.tgz"; - sha512 = "7LJTbtkACJjwEBPWvkzCFnoK6H7HPYSFiXNFBL+p4ta9/z4OQM6AawvAdmmA/nVXA77WwTB4j2pPNJj6wjvQNQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.3.tgz"; + sha512 = "gLKTb/EnGKl5qmhzRQum0szIT0v5Fzk0UxVWdbmJjeCl6xWNsWQd2sCUujIFVz0qaKGLPvImvn2W8Q5j8JnOkw=="; }; }; - "@ot-builder/cli-proc-1.0.2" = { + "@ot-builder/cli-proc-1.0.3" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.2.tgz"; - sha512 = "JKG11KtIhj+n9FIbyzlE+8C3esEM0VrBUYhdm+q95DhG5b0Jvw0CoJBb9TpEK83jwYxJKbvVfoqOmtnJ5YJ2tA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.3.tgz"; + sha512 = "m+oaigFwF2fuXEvK1OQxfF3n0c4KOnNdq0TV+nIqRHzovU/e4Z1WM8Z3uUt0MJFy4k+SS+HUlQTTAOP9VA1Fcw=="; }; }; - "@ot-builder/cli-shared-1.0.2" = { + "@ot-builder/cli-shared-1.0.3" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.2.tgz"; - sha512 = "zpNhTkSUpK41jrWBZworApKhqslOVijcyOCbmJ2EitFSkajoA0PeFmjeLak3LR5HoMNIoS8yYcPtzr/lTt7vXQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.3.tgz"; + sha512 = "cGZvNRD/YQ1CKwfNoN+93PDkAifZJ5Ey57Pgaheo/K2C60WqNYooIhjI6ws4YKJ3fyR7Bnblm3i+X3Yk8VSCBg=="; }; }; - "@ot-builder/common-impl-1.0.2" = { + "@ot-builder/common-impl-1.0.3" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.2.tgz"; - sha512 = "73L6qruH8QcEGpGuYCzE6tFqlAX/9wKAbIEhJWjk1ymEBGXIkBzIbhTGXxyGAgYmrDwT23pwMIG9ozH/okauvw=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.3.tgz"; + sha512 = "WflKduZfy2q3NbnBcHpkKRo/ifSxRaSqnTQkJD9UBmhS10zVYv6XoPL9NC/CAUjbeRLL8eS3WMdBZWaw6mwEvQ=="; }; }; - "@ot-builder/errors-1.0.2" = { + "@ot-builder/errors-1.0.3" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.2.tgz"; - sha512 = "n1xUxFPmG+nM4BCM13vXNufkRtQ0dWHyTB3K5OtoYWoATle6ETfHiQk0S4k9IsIyjysVWUOvtRTPAO4hJA6csQ=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.3.tgz"; + sha512 = "tpgnvmZeaK36OvAcbDQ4eeCWxJMk223BHYT2xUw7cRq7fUXJZI7+CqSg81Hwbir1sL6SbHjl356bkgbut1zHJQ=="; }; }; - "@ot-builder/io-bin-cff-1.0.2" = { + "@ot-builder/io-bin-cff-1.0.3" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.2.tgz"; - sha512 = "N49Bj2EsaHPWfPAoM7zbzSpX+DniKHjpakVa6319F0lwY4FRUYqQPbvEEFDo8tgwDWDNuke1Rg4EQXCh4iENxQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.3.tgz"; + sha512 = "LfXw3RkxrvudKYAwVsWMGXZ7R6fSUM9GFl4tBCOiY/MmSwkZ3pI7JicrVTLOs+ZuizKdtVQe5KfY/sjz0SyFeg=="; }; }; - "@ot-builder/io-bin-encoding-1.0.2" = { + "@ot-builder/io-bin-encoding-1.0.3" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.2.tgz"; - sha512 = "WFENprSBPDXmavzzKzegdjNKzhUCgDyoUEiIGpYCJqnylCW1/h8Ebw0HVt8Je3N4MZWT+9yah4+95C7wNNyYTA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.3.tgz"; + sha512 = "0QTgXPfEyItzkqNGXhxPIciOrF7+hbAwfnJf1yBSYvJl3JiE0FKpN3XDIWrPl71flkvvXFBHGoB+wIp8vwiLNw=="; }; }; - "@ot-builder/io-bin-ext-private-1.0.2" = { + "@ot-builder/io-bin-ext-private-1.0.3" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.2.tgz"; - sha512 = "L326SWioJmP9tN4rC7Cjg/UuKigraTREwZlhGPgFgvokTbJxBJOI5vYdAKBRWQoMauzqsq4a6+LZspmDehjIWg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.3.tgz"; + sha512 = "RRzfr6yzFTDx0w7L5AKIIJPZ0ab+5WUxUssnBxnBatzOnmtgJmobYdX4R6SLbFPiq+YDyAa/mB44EGLyWcVAgw=="; }; }; - "@ot-builder/io-bin-font-1.0.2" = { + "@ot-builder/io-bin-font-1.0.3" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.2.tgz"; - sha512 = "QmDocVL2Omtvbb3SAZVajNDHK2/wEvP9jRnHiMTWMKLKy8Q1EaHhxhZNTMmcPji9aoMuYFDn9FFUCyCDhgyJMQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.3.tgz"; + sha512 = "Eq+tjzRqivY8e3r3rCzVppWizqXpXutacWO8Mdw0TqlnfSONVfJStLafzDTOKrbrr2m7dYEC7sBwkQz65iuARQ=="; }; }; - "@ot-builder/io-bin-glyph-store-1.0.2" = { + "@ot-builder/io-bin-glyph-store-1.0.3" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.2.tgz"; - sha512 = "GUoAfN1NFBDiHJ+vI1g4hmY6D+tDosOYWqnXYki9atBjH4biTxGB2qFAIz5WcNBZXeooQxjMb1eLt4zLl4gA3Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.3.tgz"; + sha512 = "TNHLSZ7Hs6X92HMMjZQ6Zru84bbu/5p/SWJDIEq4IuiNrDGIrTHFtIAC4XfK5mWOFfP0fNXR00ox9wjeerYeZw=="; }; }; - "@ot-builder/io-bin-layout-1.0.2" = { + "@ot-builder/io-bin-layout-1.0.3" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.2.tgz"; - sha512 = "z6iC8jBSJ0sGszxxmyJ+esCZXdiLrUY9bCeqbx8UQWDa2DC9359okr6YHr9VPeiP8DN2ezT3g0DmXnKLzm/QgA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.3.tgz"; + sha512 = "XyyAgn6FjXgdyudq5CcbDoWpUbqlraqDiXHAY1XttpiIvLiTDtWj8KTryLoS8WkfaWLvZ/W2t8VylL6wvR4Saw=="; }; }; - "@ot-builder/io-bin-metadata-1.0.2" = { + "@ot-builder/io-bin-metadata-1.0.3" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.2.tgz"; - sha512 = "D2P4HXha0KM3MrTEu4/CSzJjT7jk0WD7qzopRk74z2dOc3O4qLQZ19fqSPUfBCpGWcaHF4u2QA+0Nuaw5oyyJg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.3.tgz"; + sha512 = "JmnK3csx7+M+61Id/w9+cRNz/hrCShNZbG04yPMAWKbq7YXuPRhX1/4/vdlDwmJFRF3V3TIz1WsIVpjmdrhocw=="; }; }; - "@ot-builder/io-bin-metric-1.0.2" = { + "@ot-builder/io-bin-metric-1.0.3" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.2.tgz"; - sha512 = "HpYj3YifEzfDfT640SE1UWqkmkrwqQMKjMqgivcMrfLRIkJwBIWW+oCZIoGlcvf9vY4CDDMmjPiQmZ2l43TrdQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.3.tgz"; + sha512 = "b6pvou6rYgT+VUkRLM1UqdVcCCgi+/YIRuzLH+mKfYcP3oEhdK5g1FbX0gEzPHuwjIksOAq+z57JY5WuWkRAbQ=="; }; }; - "@ot-builder/io-bin-name-1.0.2" = { + "@ot-builder/io-bin-name-1.0.3" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.2.tgz"; - sha512 = "pE+NBTv2NKg7d0eDbs1TVdLERZ+BUJy7AXMa9Hq7c8tRYOg3krk+Fa48joKPQWtdezVQYtTMc/TJBOcC3Ww5fQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.3.tgz"; + sha512 = "jDKoPRX4to+z5yuY/pZv7owEGjzjIvqqlZN8jNeDYwbnq1+Mheyfwe+0A5RnYSTdvQceLHtwRN722/rap33r7A=="; }; }; - "@ot-builder/io-bin-sfnt-1.0.2" = { + "@ot-builder/io-bin-sfnt-1.0.3" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.2.tgz"; - sha512 = "xXfccIbP1ZTSTp+r1ZZfq+S4HpNPe8Oy4sW0k5d92+rMSWmvImM2gm1v+PjC0A473QjyqZg7S9l3CPE+2qcbYw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.3.tgz"; + sha512 = "7AOYNulmBGQxvr+4jeQTz2cgS88l8arPE4m8EcLcNj9AGlKF5Mhk1an+OjH8JRvuHjRaq7yqfO8ZCdAaF32U9Q=="; }; }; - "@ot-builder/io-bin-ttf-1.0.2" = { + "@ot-builder/io-bin-ttf-1.0.3" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.2.tgz"; - sha512 = "eCv/6sCAATeFoUwbQSw839RQz61z7nkMv/k075b56wBw8vPSqV6d/8zGkRKFjeE5ma+0PuuiYjH7FfDPCNV9uQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.3.tgz"; + sha512 = "xQFAG3lnzycqNrxbZ9jn8V+b9RzdgMg7YFRMd12TYoRzdoHaIh+v2DZ8lyhwkv3owvYDzr6iRCI6nts3mFQuug=="; }; }; - "@ot-builder/ot-1.0.2" = { + "@ot-builder/ot-1.0.3" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.2.tgz"; - sha512 = "r4359lMQTpiQ2cHhxFuoonxo8rLFzUZw0NiEXTzCL0UxSu5kcGH7gDDGtHDdSB5a5W+qCNDLt/goD/FnYddlyg=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.3.tgz"; + sha512 = "fEQdRjO58o5PfnUSpx3KzqC4l5tpvX9tquKrvEi/MgKr08PykTs9iUFkzcfQ3+1zHDrebfrq2Peei0vpcaGC3Q=="; }; }; - "@ot-builder/ot-encoding-1.0.2" = { + "@ot-builder/ot-encoding-1.0.3" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.2.tgz"; - sha512 = "mZ7s/hEHYaGZFpKZ+FB9vynHrZWWObCvnuCtRvcp51DwF4J8/NCp5VT3n7/20BSfEnghQQjhpk6z2RzQD9k3mA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.3.tgz"; + sha512 = "Bmd7Zdb6E791681fH2a7th9puyVbQb1YARYaIdns3fGu9+BJCrvZ2D5SBOIVuPen2TxSDZ5tfQkf/yjz63WbPQ=="; }; }; - "@ot-builder/ot-ext-private-1.0.2" = { + "@ot-builder/ot-ext-private-1.0.3" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.2.tgz"; - sha512 = "XRRjq69p/MWKJOWfeAWJnMWF/4RrMlDIz3sp/pMn5vUivysh6qcOoOHHwkD2MFKI9PysmDgMrYIyxnKvmQczMA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.3.tgz"; + sha512 = "yu7C79YRwHV7W6cuee0ONsye2Dd6MOgAWcAcORtpFn5VjBc2Nvxs5OAXKlysbOeHtaVGfDub4w8phx/9ZfoxvA=="; }; }; - "@ot-builder/ot-glyphs-1.0.2" = { + "@ot-builder/ot-glyphs-1.0.3" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.2.tgz"; - sha512 = "mTtKVG0n2O9KVFNBBgfitidkulXEA747tdQofa+mo6CZghFGgJaVSm4xXkqh0nv3TmuWPWcLUDzzXovrwSyaEg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.3.tgz"; + sha512 = "NJgyHqEINRlZnyEiP+tBsYvQceIvD2XBM1bcJqUCY4xwrOBGtEceP3ChVz44UQEBrtdIOCjv/nycxp55VIKqug=="; }; }; - "@ot-builder/ot-layout-1.0.2" = { + "@ot-builder/ot-layout-1.0.3" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.2.tgz"; - sha512 = "FC/LkcZ1MB9cRdXMpOoYiC06tdLWWj1XdV4q8+L+q3wM0EGH8YzqHqoI9MXFpGlB9ucHC/FDWXybjXOYWFtQAA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.3.tgz"; + sha512 = "HIpQABvaJTKfFi4ui+Vu3AM51VV0Zr2sU3jtAy2kS8HFIyiNVlJCn925jc3n/NzLHvU2FjBeQDFr8o2sQGRchg=="; }; }; - "@ot-builder/ot-metadata-1.0.2" = { + "@ot-builder/ot-metadata-1.0.3" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.2.tgz"; - sha512 = "WVZfIDb90XblRRuhK1EWsMePidBs96/uhv4T1/uNi8o8lhgdAszJo/qeOakhDqn29X3rWyYWZutAxVqx37GBsg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.3.tgz"; + sha512 = "JK6IPCVCuCdi5k6FQWEXMqdPlPoORuWan4skXWpe7s7NUXYHonJBwZ6sLrPqPIbYmOlEotxT93VvoUo1sqZS0A=="; }; }; - "@ot-builder/ot-name-1.0.2" = { + "@ot-builder/ot-name-1.0.3" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.2.tgz"; - sha512 = "1mNhgVPmz88699vVMmyHp6SYUldRi0tmNLgzoH98Wrg4GghEGyu11fG7GMoT6HsrKxdXCysUZjWdMvsidfyoaw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.3.tgz"; + sha512 = "Z1VjRAoCgxMDloyOEoKWiimHf0S/AHXHsw57QtNAyPwzn8MR7tuzZ2epMxygrAQSaGHgOwPQ/th+fZ2RdvPuzA=="; }; }; - "@ot-builder/ot-sfnt-1.0.2" = { + "@ot-builder/ot-sfnt-1.0.3" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.2.tgz"; - sha512 = "8jP3zzSP2u0kIj8JyMH9ZLJox97T6VC7dkiRwq9ekGMbxLa+5nWWh6DuAOSFfdlVyUK3I/4sl4aqSP7Lyp/hYw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.3.tgz"; + sha512 = "uLctpLG/QM15IBuP8GQG7UfwFEcWVLPwTbOlrx0K6he393YVtZ3t+QwNzT1T+Ucvy2E6oxnlDSzvlz+xGHLvJA=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.0.2" = { + "@ot-builder/ot-standard-glyph-namer-1.0.3" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.2.tgz"; - sha512 = "xTPAXBMQq1iILVphw9L7DW0KBQdeniQ1l+42oCDJK4XtKAOkSQZ7IQUBHD2rJjX2LmklEm/isLfLDIZxFezj9g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.3.tgz"; + sha512 = "JW9cwINVxteCadCKiBo4ufCWS7DP1t+RfcVbDgQ940VGIRm59MJw5CbVM50k4Pf3dYXHJmDYMGDzSKGAZ9x+6g=="; }; }; - "@ot-builder/prelude-1.0.2" = { + "@ot-builder/prelude-1.0.3" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.2.tgz"; - sha512 = "h9JHlibcc4w6cTVcuIARxcmvH8JhuB0z6CcUj+s+7zfzlkQXghuOk6wgHzimcrxDDOZeRNmXJNG7RCqdDeAGiA=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.3.tgz"; + sha512 = "7GJ+sMzMqsI7Pe4bqM4lATQLdOJrxOoQudg3xJBe1C0UbVfXLmqvVUkKM1GMd3eR0C1sTkAxRdqILycAXzNwKQ=="; }; }; - "@ot-builder/primitive-1.0.2" = { + "@ot-builder/primitive-1.0.3" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.2.tgz"; - sha512 = "bf03EipsJQZH4+o9QW11B54DzN0QdEyg61xZdbK5PCaoEeb0ahYYtzkb/CZF6nw3UFEVtci3MQww8XZWpEgydQ=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.3.tgz"; + sha512 = "IgtWW8Q+gb5lzXWyPivKG0CxU3CdPZUB6tjxA9Ui+TNxTZAmj1nxmJ90Cw9CODFkcywRykSHzo3WTgLGWH6kIQ=="; }; }; - "@ot-builder/rectify-1.0.2" = { + "@ot-builder/rectify-1.0.3" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.2.tgz"; - sha512 = "tDbC/ap6X1JoJqTIlVsbWgi6IbVFZ5Fc+csNHI7B11/y5aY0Nz1Eupar+nnnoABtXNO3pWP0A3suY2z7U6B91A=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.3.tgz"; + sha512 = "nm6Ql6oyxEdDrGtFAPOqBlEKUGIyiM8QaI57MosPshfB8UUDJAI6uAaQP4pzV4Go8/6Do3zPkDnmqQIYt/lmmQ=="; }; }; - "@ot-builder/stat-glyphs-1.0.2" = { + "@ot-builder/stat-glyphs-1.0.3" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.2.tgz"; - sha512 = "xFKPyM0zLRktvpTdzVQB+ffmzGbROJd4atcLKr+UB6hTSVcSiLBsOU+BQNeveb7Njz/mgAmFhnVkWO+2uSwIMA=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.3.tgz"; + sha512 = "1pZ7I/OXbQ5egHlHAK4bOthg04qp9Og/RPvFN2UTNAobRPEun/IOpnf6yO7t/JLR4Lvr1lxxDeQjt4tdPMOWOQ=="; }; }; - "@ot-builder/trace-1.0.2" = { + "@ot-builder/trace-1.0.3" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.2.tgz"; - sha512 = "4+cOuSys8WTBOsvSXJqKgYlZu5TrukYpViSA3pbUnjWSJRmpGtwDtNiX62F8Wo/F+9pTIwOBwAbh/yWjYjCRng=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.3.tgz"; + sha512 = "wr+cLAXFEdXOyLpBRW9XR28NapfJhhqOnJIiOaC3g0A31nvQtINBZaiQ8o2tSekmcmhCOsimoYWpg/SjLgq0GA=="; }; }; - "@ot-builder/var-store-1.0.2" = { + "@ot-builder/var-store-1.0.3" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.2.tgz"; - sha512 = "hMkIu2DaIiiBMkolGtjZ0P/Urx76zaSBeXO8aItjw0xiu/JGo843vngU7P6FNtingaolchrVrm6SRrIz7jFD6g=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.3.tgz"; + sha512 = "qJSHH+bll62V+T1oa2AvB/kAamgdFO2ZmTfkiyUK1Rb1zaBthYDADHXrzrAUdUARgAkXUXGHTZEGWc8WeU2smw=="; }; }; - "@ot-builder/variance-1.0.2" = { + "@ot-builder/variance-1.0.3" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.2.tgz"; - sha512 = "VYSKYfLmfnQckio6C5SEsv5gaUkdKIPNX0Yusidc9EpmdoOyHdBGlHDmpWEtzyAni3Jl2eMHGhd+GCnfkdBhYA=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.3.tgz"; + sha512 = "K23fg29QU8hJkwqwhAHjVeoFVxzdEi8miOXopn8MIjPPnKUCQ+Zkbnml1I+XKrz9juQDhBszcB0kuPpBy4/hxA=="; }; }; "@parcel/fs-1.11.0" = { @@ -4630,15 +4666,6 @@ let sha512 = "UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg=="; }; }; - "@react-native-community/cli-platform-ios-4.13.0" = { - name = "_at_react-native-community_slash_cli-platform-ios"; - packageName = "@react-native-community/cli-platform-ios"; - version = "4.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.13.0.tgz"; - sha512 = "6THlTu8zp62efkzimfGr3VIuQJ2514o+vScZERJCV1xgEi8XtV7mb/ZKt9o6Y9WGxKKkc0E0b/aVAtgy+L27CA=="; - }; - }; "@react-native-community/cli-server-api-4.9.0" = { name = "_at_react-native-community_slash_cli-server-api"; packageName = "@react-native-community/cli-server-api"; @@ -4747,13 +4774,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.2.1" = { + "@schematics/angular-11.2.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.2.1"; + version = "11.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.1.tgz"; - sha512 = "CnN4bkRwhCp7jc4HGJ9qp/xqLwmnkn/zRf/EEb5tHFC0Bz2WvoNuAoqPRSkgIis3L+Ozahmeb8JxTIdazK1Hog=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.2.tgz"; + sha512 = "TcxPy58adUnkirGXyZVVSMuKkA0eIz2PWSQWEgB9l7kO+5LvDOn+RMoc6AVx0s/bU9nH+eozBUJ1XAD/E8QnYQ=="; }; }; "@schematics/schematics-0.1102.0" = { @@ -4765,13 +4792,13 @@ let sha512 = "0mN6qGnI31GVNYAKDdZ6ISiJMtN8Z0rekpJ/xNHK/lDNl/QkoJVBHDf68oEcNE8dvWMq86ULpznCdT1IBQ7YFA=="; }; }; - "@schematics/update-0.1102.1" = { + "@schematics/update-0.1102.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1102.1"; + version = "0.1102.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.1.tgz"; - sha512 = "BvTqw2OhKnX+VNHt613vGvjg+O1WNdeJYy79aaRCGsVZogOAjolnA7R4tzk6WelTLKo9k8wQZ9d+6IMplYQKNQ=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.2.tgz"; + sha512 = "Nz8kjeixzDnOw00bnZznq3qrbIv8yWEWNb9eDkRBqgOUXQwlhKJY/sYBK58JF2D+conaRVuEqMsBlX08GlFtIA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4801,13 +4828,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.7.0" = { + "@serverless/components-3.7.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.0.tgz"; - sha512 = "ndyDPykboC5PlkSFXXVAWwiWp4d8G1uLDqoyF3TWaNpmcjvHiLbBwmgRzV1E3u9Y9RE766EJqOxEBfdvsUXD4w=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.1.tgz"; + sha512 = "f938wGpjGWW4slLVwswLlne8hEUPmzBeFiJ3eylwpRAKLUSOTOmdgiumAKXhqiBtxdqUgDp1hTpvimu0X44jdQ=="; }; }; "@serverless/core-1.1.2" = { @@ -4846,13 +4873,13 @@ let sha512 = "f5bo8P5+xAxsnOCUnyEyAmiGTs9sTG8v8t5dTDAdCqSxEEJyl3/Ro5djeW5L2MHzw1XnIMxxrtG38m7rNQSFFg=="; }; }; - "@serverless/platform-client-4.1.0" = { + "@serverless/platform-client-4.2.0" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.1.0.tgz"; - sha512 = "XoDUE5UDkt6JzEY4nWPdCd6ofldBLqfBAaqCcMlnYDNyTispHNVJeaxNvsFZc9EoUpneu6vTj3vhdviUAnzX8w=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.0.tgz"; + sha512 = "92/Mc09zQbJAw917KhJk0kM76Jpf3njoSevHEu9ASYx7OSjTbZw9B5VdOe4Z2m+4NvUwK0mWBNpSmCvd5uwOhg=="; }; }; "@serverless/platform-client-china-2.1.4" = { @@ -5395,6 +5422,15 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; + "@trysound/sax-0.1.1" = { + name = "_at_trysound_slash_sax"; + packageName = "@trysound/sax"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz"; + sha512 = "Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow=="; + }; + }; "@types/accepts-1.3.5" = { name = "_at_types_slash_accepts"; packageName = "@types/accepts"; @@ -5539,15 +5575,6 @@ let sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; }; }; - "@types/configstore-2.1.1" = { - name = "_at_types_slash_configstore"; - packageName = "@types/configstore"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/configstore/-/configstore-2.1.1.tgz"; - sha1 = "cd1e8553633ad3185c3f2f239ecff5d2643e92b6"; - }; - }; "@types/connect-3.4.34" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; @@ -5611,15 +5638,6 @@ let sha512 = "fO3gf3DxU2Trcbr75O7obVndW/X5k8rJNZkLXlQWStTHhP71PkRqjwPIEI0yMnJdg9R9OasjU+Bsr+Hr1xy/0w=="; }; }; - "@types/debug-0.0.30" = { - name = "_at_types_slash_debug"; - packageName = "@types/debug"; - version = "0.0.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz"; - sha512 = "orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ=="; - }; - }; "@types/debug-4.1.5" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; @@ -5728,15 +5746,6 @@ let sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="; }; }; - "@types/events-3.0.0" = { - name = "_at_types_slash_events"; - packageName = "@types/events"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; - }; - }; "@types/express-4.17.7" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -5782,15 +5791,6 @@ let sha512 = "mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ=="; }; }; - "@types/filesize-5.0.0" = { - name = "_at_types_slash_filesize"; - packageName = "@types/filesize"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/filesize/-/filesize-5.0.0.tgz"; - sha512 = "zgn1Kmm6VfqruG9STpwpZiSnpzHjF9hlvHVw+5hhM20xRCOIgjxnXJxOoLuZ/aWS6v/M5d6fvXFbbVQfBe4cMg=="; - }; - }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -5800,24 +5800,6 @@ let sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ=="; }; }; - "@types/get-port-3.2.0" = { - name = "_at_types_slash_get-port"; - packageName = "@types/get-port"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/get-port/-/get-port-3.2.0.tgz"; - sha512 = "TiNg8R1kjDde5Pub9F9vCwZA/BNW9HeXP5b9j7Qucqncy/McfPZ6xze/EyBdXS5FhMIGN6Fx3vg75l5KHy3V1Q=="; - }; - }; - "@types/glob-5.0.36" = { - name = "_at_types_slash_glob"; - packageName = "@types/glob"; - version = "5.0.36"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-5.0.36.tgz"; - sha512 = "KEzSKuP2+3oOjYYjujue6Z3Yqis5HKA1BsIC+jZ1v3lrRNdsqyNNtX0rQf6LSuI4DJJ2z5UV//zBZCcvM0xikg=="; - }; - }; "@types/glob-7.1.3" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; @@ -6448,15 +6430,6 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/rimraf-2.0.4" = { - name = "_at_types_slash_rimraf"; - packageName = "@types/rimraf"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.4.tgz"; - sha512 = "8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q=="; - }; - }; "@types/sass-1.16.0" = { name = "_at_types_slash_sass"; packageName = "@types/sass"; @@ -6574,15 +6547,6 @@ let sha512 = "FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg=="; }; }; - "@types/tmp-0.0.33" = { - name = "_at_types_slash_tmp"; - packageName = "@types/tmp"; - version = "0.0.33"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/tmp/-/tmp-0.0.33.tgz"; - sha1 = "1073c4bc824754ae3d10cfab88ab0237ba964e4d"; - }; - }; "@types/tough-cookie-4.0.0" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; @@ -6745,13 +6709,13 @@ let sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="; }; }; - "@typescript-eslint/eslint-plugin-4.15.1" = { + "@typescript-eslint/eslint-plugin-4.15.2" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.1.tgz"; - sha512 = "yW2epMYZSpNJXZy22Biu+fLdTG8Mn6b22kR3TqblVk50HGNV8Zya15WAXuQCr8tKw4Qf1BL4QtI6kv6PCkLoJw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.2.tgz"; + sha512 = "uiQQeu9tWl3f1+oK0yoAv9lt/KXO24iafxgQTkIYO/kitruILGx3uH+QtIAHqxFV+yIsdnJH+alel9KuE3J15Q=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -6763,13 +6727,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.15.1" = { + "@typescript-eslint/experimental-utils-4.15.2" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.1.tgz"; - sha512 = "9LQRmOzBRI1iOdJorr4jEnQhadxK4c9R2aEAsm7WE/7dq8wkKD1suaV0S/JucTL8QlYUPU1y2yjqg+aGC0IQBQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.2.tgz"; + sha512 = "Fxoshw8+R5X3/Vmqwsjc8nRO/7iTysRtDqx6rlfLZ7HbT8TZhPeQqbPjTyk2RheH3L8afumecTQnUc9EeXxohQ=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -6781,22 +6745,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.15.1" = { + "@typescript-eslint/parser-4.15.2" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.1.tgz"; - sha512 = "V8eXYxNJ9QmXi5ETDguB7O9diAXlIyS+e3xzLoP/oVE4WCAjssxLIa0mqCLsCGXulYJUfT+GV70Jv1vHsdKwtA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.2.tgz"; + sha512 = "SHeF8xbsC6z2FKXsaTb1tBCf0QZsjJ94H6Bo51Y1aVEZ4XAefaw5ZAilMoDPlGghe+qtq7XdTiDlGfVTOmvA+Q=="; }; }; - "@typescript-eslint/scope-manager-4.15.1" = { + "@typescript-eslint/scope-manager-4.15.2" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.1.tgz"; - sha512 = "ibQrTFcAm7yG4C1iwpIYK7vDnFg+fKaZVfvyOm3sNsGAerKfwPVFtYft5EbjzByDJ4dj1WD8/34REJfw/9wdVA=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.2.tgz"; + sha512 = "Zm0tf/MSKuX6aeJmuXexgdVyxT9/oJJhaCkijv0DvJVT3ui4zY6XYd6iwIo/8GEZGy43cd7w1rFMiCLHbRzAPQ=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -6808,13 +6772,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.15.1" = { + "@typescript-eslint/types-4.15.2" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.1.tgz"; - sha512 = "iGsaUyWFyLz0mHfXhX4zO6P7O3sExQpBJ2dgXB0G5g/8PRVfBBsmQIc3r83ranEQTALLR3Vko/fnCIVqmH+mPw=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.2.tgz"; + sha512 = "r7lW7HFkAarfUylJ2tKndyO9njwSyoy6cpfDKWPX6/ctZA+QyaYscAHXVAfJqtnY6aaTwDYrOhp+ginlbc7HfQ=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -6835,13 +6799,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.15.1" = { + "@typescript-eslint/typescript-estree-4.15.2" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.1.tgz"; - sha512 = "z8MN3CicTEumrWAEB2e2CcoZa3KP9+SMYLIA2aM49XW3cWIaiVSOAGq30ffR5XHxRirqE90fgLw3e6WmNx5uNw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.2.tgz"; + sha512 = "cGR8C2g5SPtHTQvAymEODeqx90pJHadWsgTtx6GbnTWKqsg7yp6Eaya9nFzUd4KrKhxdYTTFBiYeTPQaz/l8bw=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -6853,76 +6817,76 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.15.1" = { + "@typescript-eslint/visitor-keys-4.15.2" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.1.tgz"; - sha512 = "tYzaTP9plooRJY8eNlpAewTOqtWW/4ff/5wBjNVaJ0S0wC4Gpq/zDVRTJa5bq2v1pCNQ08xxMCndcvR+h7lMww=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.2.tgz"; + sha512 = "TME1VgSb7wTwgENN5KVj4Nqg25hP8DisXxNBojM4Nn31rYaNDIocNm5cmjOFfh42n7NVERxWrDFoETO/76ePyg=="; }; }; - "@uifabric/foundation-7.9.24" = { + "@uifabric/foundation-7.9.25" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.24"; + version = "7.9.25"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.24.tgz"; - sha512 = "f9W6x6gqczgkayA89TsiGzdze2A8RJXc/GbANYvBad3zeyDlQahepMrlgRMOXcTiwZIiltTje+7ADtvD/o176Q=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.25.tgz"; + sha512 = "E9YMzbbgvNtZEJx1/AZBJX6Ut2chgoA7/ODB9+el6QyUErL/WUeIlXHbl8TZungRL9e1T4Bma48CNvBT8Ul+Fg=="; }; }; - "@uifabric/icons-7.5.21" = { + "@uifabric/icons-7.5.22" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.21"; + version = "7.5.22"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.21.tgz"; - sha512 = "ZTqLpdCZeCChcMWCgEyWUke2wJxfi3SNdSjNFXWK90SsDWlafg3s/eDd7+n6oRi4pHlF6eBnc4oTLR6PFXt8kQ=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.22.tgz"; + sha512 = "xJwgJG2IoEM/sFc4qzG5vXE/eY+vuz6IxPVXH0UoQ+9XY2KRb9p5pjBIx4SM/h0belCBMPF5rGnWYeg6hi14dQ=="; }; }; - "@uifabric/merge-styles-7.19.1" = { + "@uifabric/merge-styles-7.19.2" = { name = "_at_uifabric_slash_merge-styles"; packageName = "@uifabric/merge-styles"; - version = "7.19.1"; + version = "7.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.1.tgz"; - sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A=="; + url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.2.tgz"; + sha512 = "kTlhwglDqwVgIaJq+0yXgzi65plGhmFcPrfme/rXUGMJZoU+qlGT5jXj5d3kuI59p6VB8jWEg9DAxHozhYeu0g=="; }; }; - "@uifabric/react-hooks-7.13.11" = { + "@uifabric/react-hooks-7.13.12" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.13.11"; + version = "7.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.11.tgz"; - sha512 = "9qX4hiZ4MelUxOxx4IPl+vgn9/e43KkYTpYedl2QtUxFpDjsOVJ0jbG3Dkokyl+Kvw1gerYCT1SXL8UC4kG97w=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.12.tgz"; + sha512 = "TVeBLMI9Cpo0duxt5NkyMAAPyTVsqYQSt+EmjDIZI92abptqBpuiLGXHnLaf+Egw8VgzBv5Vqs8ZRzMg6mhYkA=="; }; }; - "@uifabric/set-version-7.0.23" = { + "@uifabric/set-version-7.0.24" = { name = "_at_uifabric_slash_set-version"; packageName = "@uifabric/set-version"; - version = "7.0.23"; + version = "7.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.23.tgz"; - sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; + url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.24.tgz"; + sha512 = "t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg=="; }; }; - "@uifabric/styling-7.18.0" = { + "@uifabric/styling-7.18.1" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.18.0"; + version = "7.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.18.0.tgz"; - sha512 = "PuCSr2PeVDLTtyqOjS67QBgN7rDYf044oRvMEkSCP57p9Du8rIAJio0LQjVNRKo+QlmfgFzmT3XjpS2LYkhFIg=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.18.1.tgz"; + sha512 = "yLavWTQ4rAE3uZ3h/odlCKyun3amjlESZu+KAdEfQWnsMMV4VFpJXc1Mhqm/Rzf9rNySaiZMzJ2R4urWcHTJHQ=="; }; }; - "@uifabric/utilities-7.33.4" = { + "@uifabric/utilities-7.33.5" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.33.4"; + version = "7.33.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.4.tgz"; - sha512 = "FgEL2+GWOHMNMQqmI5Mko293W3c9PWIc/WrlU6jQ5AU83M1BQSxhS0LPNnRbahukiEFNkosCOOKzKCNdjzkCwA=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.5.tgz"; + sha512 = "I+Oi0deD/xltSluFY8l2EVd/J4mvOaMljxKO2knSD9/KoGDlo/o5GN4gbnVo8nIt76HWHLAk3KtlJKJm6BhbIQ=="; }; }; "@ungap/from-entries-0.2.1" = { @@ -6997,76 +6961,76 @@ let sha512 = "uUZIfWWfvFMAtfyzaJDtwRqN2vNzc2nnALEJliv2ccVRZHS8mwB/aLoaX0hL3h+RBJ8WV2PDiXmRFcESyDfKjA=="; }; }; - "@vue/compiler-core-3.0.5" = { + "@vue/compiler-core-3.0.6" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.5.tgz"; - sha512 = "iFXwk2gmU/GGwN4hpBwDWWMLvpkIejf/AybcFtlQ5V1ur+5jwfBaV0Y1RXoR6ePfBPJixtKZ3PmN+M+HgMAtfQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.6.tgz"; + sha512 = "O7QzQ39DskOoPpEDWRvKwDX7Py9UNT7SvLHvBdIfckGA3OsAEBdiAtuYQNcVmUDeBajm+08v5wyvHWBbWgkilQ=="; }; }; - "@vue/compiler-dom-3.0.5" = { + "@vue/compiler-dom-3.0.6" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.5.tgz"; - sha512 = "HSOSe2XSPuCkp20h4+HXSiPH9qkhz6YbW9z9ZtL5vef2T2PMugH7/osIFVSrRZP/Ul5twFZ7MIRlp8tPX6e4/g=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.6.tgz"; + sha512 = "q1wfHzYwvDRAhBlx+Qa+n3Bu5nHr1qL/j0UbpNlbQDwIlt9zpvmXUrUCL+i55Bh5lLKvSe+mNo0qlwNEApm+jA=="; }; }; - "@vue/compiler-sfc-3.0.5" = { + "@vue/compiler-sfc-3.0.6" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.5.tgz"; - sha512 = "uOAC4X0Gx3SQ9YvDC7YMpbDvoCmPvP0afVhJoxRotDdJ+r8VO3q4hFf/2f7U62k4Vkdftp6DVni8QixrfYzs+w=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.6.tgz"; + sha512 = "g1tkswnhtiJpj4ELQ3SzeGxtOd0t8E5GkT+n2VlElEnTI1BzueSvr41D5QthnUS+TNWZd52ZnPtdaNz+Lfum1w=="; }; }; - "@vue/compiler-ssr-3.0.5" = { + "@vue/compiler-ssr-3.0.6" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.5.tgz"; - sha512 = "Wm//Kuxa1DpgjE4P9W0coZr8wklOfJ35Jtq61CbU+t601CpPTK4+FL2QDBItaG7aoUUDCWL5nnxMkuaOgzTBKg=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.6.tgz"; + sha512 = "Y4amPwRevUiiNQDho0cq1Ith9q6UU5N6CD6YiXkHIboFPeXEiGvH3ULJWjFzlGqn1eUV1AReNJpFJrhjtQNc7g=="; }; }; - "@vue/reactivity-3.0.5" = { + "@vue/reactivity-3.0.6" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.5.tgz"; - sha512 = "3xodUE3sEIJgS7ntwUbopIpzzvi7vDAOjVamfb2l+v1FUg0jpd3gf62N2wggJw3fxBMr+QvyxpD+dBoxLsmAjw=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.6.tgz"; + sha512 = "hX8PnZayNMoljWSYrZW0OclQnRaMoHxvi5eeFVFPDr7+tzBeiftmmozKttxxCLoDxBWX1B4gNc237DIcYU63Lw=="; }; }; - "@vue/runtime-core-3.0.5" = { + "@vue/runtime-core-3.0.6" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.5.tgz"; - sha512 = "Cnyi2NqREwOLcTEsIi1DQX1hHtkVj4eGm4hBG7HhokS05DqpK4/80jG6PCCnCH9rIJDB2FqtaODX397210plXg=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.6.tgz"; + sha512 = "x6N38P0DeMyrHiAxCE/rACHTyydOzlg8IyUIPkSJ4rrSkuJnAtFKQicK6fm8NuD21dwdPr8KcZ4Cn4xaqL1JJg=="; }; }; - "@vue/runtime-dom-3.0.5" = { + "@vue/runtime-dom-3.0.6" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.5.tgz"; - sha512 = "iilX1KySeIzHHtErT6Y44db1rhWK5tAI0CiJIPr+SJoZ2jbjoOSE6ff/jfIQakchbm1d6jq6VtRVnp5xYdOXKA=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.6.tgz"; + sha512 = "Y6y4Tak9//VXB2mp2NVQxbwC4a5xsnJpotpo8yBAB3qB3L4v4HQLpqxSkwThRwI6Y6Z7dydX/sgfraqLBE8BWg=="; }; }; - "@vue/shared-3.0.5" = { + "@vue/shared-3.0.6" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.5.tgz"; - sha512 = "gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.6.tgz"; + sha512 = "c37C60HpelUZIx+SNZVEINSxkFzQYhIXFg5AynnIA4QDBmY4iSPoACfGSwSUTCTKImukPeCgY2oqRJVP3R1Mnw=="; }; }; "@webassemblyjs/ast-1.11.0" = { @@ -8446,6 +8410,15 @@ let sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; }; }; + "ajv-formats-1.5.1" = { + name = "ajv-formats"; + packageName = "ajv-formats"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-1.5.1.tgz"; + sha512 = "s1RBVF4HZd2UjGkb6t6uWoXjf6o7j7dXPQIL7vprcIT/67bTD6+5ocsU0UKShS2qWxueGDWuGfKHfOxHWrlTQg=="; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -10579,13 +10552,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.848.0" = { + "aws-sdk-2.853.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.848.0"; + version = "2.853.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.848.0.tgz"; - sha512 = "c/e5kaEFl+9aYkrYDkmu5mSZlL+EfP6DnBOMD06fH12gIsaFSMBGtbsDTHABhvSu++LxeI1dJAD148O17MuZvg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.853.0.tgz"; + sha512 = "3cifeifeMHKtpvQ6OcrA9j34BEdvWmLlSGzZU/mZf9nYcV+22PPXjwpVhPh9BvfC2S77upKNbMgnkv4u50aQKw=="; }; }; "aws-sign2-0.6.0" = { @@ -10903,6 +10876,33 @@ let sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500"; }; }; + "babel-plugin-polyfill-corejs2-0.1.8" = { + name = "babel-plugin-polyfill-corejs2"; + packageName = "babel-plugin-polyfill-corejs2"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.8.tgz"; + sha512 = "kB5/xNR9GYDuRmVlL9EGfdKBSUVI/9xAU7PCahA/1hbC2Jbmks9dlBBYjHF9IHMNY2jV/G2lIG7z0tJIW27Rog=="; + }; + }; + "babel-plugin-polyfill-corejs3-0.1.6" = { + name = "babel-plugin-polyfill-corejs3"; + packageName = "babel-plugin-polyfill-corejs3"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.6.tgz"; + sha512 = "IkYhCxPrjrUWigEmkMDXYzM5iblzKCdCD8cZrSAkQOyhhJm26DcG+Mxbx13QT//Olkpkg/AlRdT2L+Ww4Ciphw=="; + }; + }; + "babel-plugin-polyfill-regenerator-0.1.5" = { + name = "babel-plugin-polyfill-regenerator"; + packageName = "babel-plugin-polyfill-regenerator"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.5.tgz"; + sha512 = "EyhBA6uN94W97lR7ecQVTvH9F5tIIdEw3ZqHuU4zekMlW82k5cXNXniiB7PRxQm06BqAjVr4sDT1mOy4RcphIA=="; + }; + }; "babel-plugin-styled-components-1.12.0" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; @@ -12199,22 +12199,22 @@ let sha512 = "nXWOXtQHbfPaMl6jyEF/rmRMrcemj2qn+OCAI/uZYurjfx7Dg3baoXdPzHOL0U8Cfvn8CWxKcnM/rgxL7DR4zw=="; }; }; - "bn.js-4.11.9" = { + "bn.js-4.12.0" = { name = "bn.js"; packageName = "bn.js"; - version = "4.11.9"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz"; - sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"; + sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; }; - "bn.js-5.1.3" = { + "bn.js-5.2.0" = { name = "bn.js"; packageName = "bn.js"; - version = "5.1.3"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz"; - sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ=="; + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz"; + sha512 = "D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="; }; }; "bncode-0.2.3" = { @@ -12811,13 +12811,13 @@ let sha512 = "/l9Kg/c5o+n/0AqreMxh2jpzDMl1ikl4gUxT7RFNe3A3YRIyZkiREhwcjmqxiymJSRI/Qhew357xGn1SLw/xEw=="; }; }; - "bsocks-0.2.5" = { + "bsocks-0.2.6" = { name = "bsocks"; packageName = "bsocks"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/bsocks/-/bsocks-0.2.5.tgz"; - sha512 = "w1yG8JmfKPIaTDLuR9TIxJM2Ma6nAiInRpLNZ43g3qPnPHjawCC4SV6Bdy84bEJQX1zJWYTgdod/BnQlDhq4Gg=="; + url = "https://registry.npmjs.org/bsocks/-/bsocks-0.2.6.tgz"; + sha512 = "66UkjoB9f7lhT+WKgYq8MQa6nkr96mlX64JYMlIsXe/X4VeqNwvsx7UOE3ZqD6lkwg8GvBhapRTWj0qWO3Pw8w=="; }; }; "btcp-0.1.5" = { @@ -13702,13 +13702,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001190" = { + "caniuse-lite-1.0.30001192" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001190"; + version = "1.0.30001192"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001190.tgz"; - sha512 = "62KVw474IK8E+bACBYhRS0/L6o/1oeAVkpF2WetjV58S5vkzNh0/Rz3lD8D4YCbOTqi0/aD4X3LtoP7V5xnuAg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001192.tgz"; + sha512 = "63OrUnwJj5T1rUmoyqYTdRWBqFFxZFlyZnRRjDR8NSUQFB6A+j/uBORU/SyJ5WzDLg4SPiZH40hQCBNdZ/jmAw=="; }; }; "canvas-2.6.1" = { @@ -13828,13 +13828,13 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.8" = { + "cdk8s-1.0.0-beta.9" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.8.tgz"; - sha512 = "99jNfGUIVic0hZCWXTU1yQLJ5ww06O7egXkgjltlHS0Fom9MY4bzFpqlVTNlmKguEO5eK3OEjjkoek4qVpEbpw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.9.tgz"; + sha512 = "jWqgWCrZ2ez/o644fHMEex5qOxgAWK+RnFwiYHf9AEDeT7ww94mGjcSU7k6HdLpOFMA8oiyFzKxlj2HM8JIw3A=="; }; }; "cdktf-0.1.0" = { @@ -15268,13 +15268,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.21.0" = { + "codemaker-1.22.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.21.0.tgz"; - sha512 = "YxTt3lWcR6PC/3fByU7FGjIoUDOcTs1KmqRJcK14xN9X7wxBOWO129WuSTm/4XfKlz/3iSo9CtRX/5HYkE1oCQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.22.0.tgz"; + sha512 = "0c77XXwpCOR9SrlKqNtaBhvzi0zo2tYuiUMuTISq+qclyunpDzgkKH27SxyGG1Ju6gNtv10bME7A/8zlWstICw=="; }; }; "codepage-1.4.0" = { @@ -15421,13 +15421,13 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; - "colorette-1.2.1" = { + "colorette-1.2.2" = { name = "colorette"; packageName = "colorette"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz"; - sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="; + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; + sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; }; }; "colornames-1.1.1" = { @@ -16087,6 +16087,15 @@ let sha512 = "r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg=="; }; }; + "conf-9.0.2" = { + name = "conf"; + packageName = "conf"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/conf/-/conf-9.0.2.tgz"; + sha512 = "rLSiilO85qHgaTBIIHQpsv8z+NnVfZq3cKuYNCXN1AOqPzced0GWZEe/A517VldRLyQYXUMyV+vszavE2jSAqw=="; + }; + }; "config-1.31.0" = { name = "config"; packageName = "config"; @@ -16303,13 +16312,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.29" = { + "constructs-3.3.43" = { name = "constructs"; packageName = "constructs"; - version = "3.3.29"; + version = "3.3.43"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.29.tgz"; - sha512 = "rGQzkq2M/qKZ0hMEtt4YPpsZKOwzmiyAQx3PqexXXsjdVnTqEfIwQuDpc+1jP6CtaBHl7rR6CxQcfsP5DmaERw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.43.tgz"; + sha512 = "4Fi9XuoYAPkVrimpU/fo3SOUxB3cS/WjP77DGeJl1o0vsYsggqeBHRLK6GxRG7vpmnOhiyDlBIazJkMuR6YWuQ=="; }; }; "constructs-3.3.5" = { @@ -16799,22 +16808,22 @@ let sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; }; }; - "core-js-3.9.0" = { + "core-js-3.9.1" = { name = "core-js"; packageName = "core-js"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.9.0.tgz"; - sha512 = "PyFBJaLq93FlyYdsndE5VaueA9K5cNB7CGzeCj191YYLhkQM0gdZR2SKihM70oF0wdqKSKClv/tEBOpoRmdOVQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz"; + sha512 = "gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg=="; }; }; - "core-js-compat-3.9.0" = { + "core-js-compat-3.9.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.0.tgz"; - sha512 = "YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.1.tgz"; + sha512 = "jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA=="; }; }; "core-util-is-1.0.2" = { @@ -17582,13 +17591,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-2.6.15" = { + "csstype-2.6.16" = { name = "csstype"; packageName = "csstype"; - version = "2.6.15"; + version = "2.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.15.tgz"; - sha512 = "FNeiVKudquehtR3t9TRRnsHL+lJhuHF5Zn9dt01jpojlurLEPDhhEtUkWmAUJ7/fOLaLG4dCDEnUsR0N1rZSsg=="; + url = "https://registry.npmjs.org/csstype/-/csstype-2.6.16.tgz"; + sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q=="; }; }; "csurf-1.11.0" = { @@ -19112,13 +19121,13 @@ let sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; }; - "defer-to-connect-2.0.0" = { + "defer-to-connect-2.0.1" = { name = "defer-to-connect"; packageName = "defer-to-connect"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz"; - sha512 = "bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg=="; + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz"; + sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; "deferred-0.7.11" = { @@ -19256,15 +19265,6 @@ let sha512 = "aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ=="; }; }; - "delay-async-1.2.0" = { - name = "delay-async"; - packageName = "delay-async"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delay-async/-/delay-async-1.2.0.tgz"; - sha512 = "BDhPL4k42yL2c0b5zTUlMIM3/wmv77HOgZi4ya/8tOHw16GZ1i9Qj7Tmy3xt0jWb4VmpQtklLPReUtOUZUuzuQ=="; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -19589,22 +19589,13 @@ let sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg=="; }; }; - "devcert-1.1.3" = { - name = "devcert"; - packageName = "devcert"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/devcert/-/devcert-1.1.3.tgz"; - sha512 = "7/nIzKdQ8y2K0imjIP7dyg2GJ2h38Ps6VOMXWZHIarNDV3p6mTXyEugKFnkmsZ2DD58JEG34ILyVb3qdOMmP9w=="; - }; - }; - "devtools-protocol-0.0.818844" = { + "devtools-protocol-0.0.847576" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.818844"; + version = "0.0.847576"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz"; - sha512 = "AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.847576.tgz"; + sha512 = "0M8kobnSQE0Jmly7Mhbeq0W/PpZfnuK+WjN2ZRVPbGqYwCHCioAVp84H0TcLimgECcN5H976y5QiXMGBC9JKmg=="; }; }; "dezalgo-1.0.3" = { @@ -20723,13 +20714,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-to-chromium-1.3.671" = { + "electron-to-chromium-1.3.675" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.671"; + version = "1.3.675"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.671.tgz"; - sha512 = "RTD97QkdrJKaKwRv9h/wGAaoR2lGxNXEcBXS31vjitgTPwTWAbLdS7cEsBK68eEQy7p6YyT8D5BxBEYHu2SuwQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.675.tgz"; + sha512 = "GEQw+6dNWjueXGkGfjgm7dAMtXfEqrfDG3uWcZdeaD4cZ3dKYdPRQVruVXQRXtPLtOr5GNVVlNLRMChOZ611pQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -20824,13 +20815,13 @@ let sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ=="; }; }; - "emmet-2.3.1" = { + "emmet-2.3.2" = { name = "emmet"; packageName = "emmet"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/emmet/-/emmet-2.3.1.tgz"; - sha512 = "u8h++9u3y9QWhn0imUXfQO+s80To5MGD97zd/00wGC39CfNGBPe//ZKepJz9I1LQ2FDRXHrn+e3JaN/53Y5z6A=="; + url = "https://registry.npmjs.org/emmet/-/emmet-2.3.2.tgz"; + sha512 = "PRHGy5RfLp7+WBgoNq0QYtjSbbG1g28PtnN8McPhlEMoPwZWBDftVIz4vDNUNvQFSBtekuYZxB7J0vLgodZxFw=="; }; }; "emoji-named-characters-1.0.2" = { @@ -21436,13 +21427,13 @@ let sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; }; }; - "es-module-lexer-0.3.26" = { + "es-module-lexer-0.4.0" = { name = "es-module-lexer"; packageName = "es-module-lexer"; - version = "0.3.26"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.3.26.tgz"; - sha512 = "Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA=="; + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.0.tgz"; + sha512 = "iuEGihqqhKWFgh72Q/Jtch7V2t/ft8w8IPP2aEN8ArYKO+IWyo6hsi96hCdgyeEDQIV3InhYQ9BlwUFPGXrbEQ=="; }; }; "es-to-primitive-1.2.1" = { @@ -21589,13 +21580,13 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esbuild-0.8.50" = { + "esbuild-0.8.53" = { name = "esbuild"; packageName = "esbuild"; - version = "0.8.50"; + version = "0.8.53"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.50.tgz"; - sha512 = "oidFLXssA7IccYzkqLVZSqNJDwDq8Mh/vqvrW+3fPWM7iUiC5O2bCllhnO8+K9LlyL/2Z6n+WwRJAz9fqSIVRg=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.53.tgz"; + sha512 = "GIaYGdMukH58hu+lf07XWAeESBYFAsz8fXnrylHDCbBXKOSNtFmoYA8PhSeSF+3/qzeJ0VjzV9AkLURo5yfu3g=="; }; }; "esc-exit-2.0.2" = { @@ -21796,13 +21787,13 @@ let sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA=="; }; }; - "eslint-7.20.0" = { + "eslint-7.21.0" = { name = "eslint"; packageName = "eslint"; - version = "7.20.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.20.0.tgz"; - sha512 = "qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz"; + sha512 = "W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg=="; }; }; "eslint-plugin-no-unsanitized-3.1.4" = { @@ -22300,6 +22291,15 @@ let sha512 = "t0A2msp6BzOf+QAcI6z9XMktLj52OjGQg+8SJH6v5+3uxNpWYRR3wQmfA+6xtMU9kOC59qk9licus5dYcrYkMQ=="; }; }; + "eventemitter2-6.4.4" = { + name = "eventemitter2"; + packageName = "eventemitter2"; + version = "6.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz"; + sha512 = "HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw=="; + }; + }; "eventemitter3-1.2.0" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -22363,13 +22363,13 @@ let sha512 = "3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg=="; }; }; - "events-3.2.0" = { + "events-3.3.0" = { name = "events"; packageName = "events"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz"; - sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="; + url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz"; + sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; }; }; "events-listener-1.1.0" = { @@ -22669,13 +22669,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.64" = { + "expo-pwa-0.0.66" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.64"; + version = "0.0.66"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.64.tgz"; - sha512 = "pMZ1UP5ionvJYw5ny602Av8KKhLHiv3W0rWUTOU2LZpPe4GQn+saHJMh1dSNDBo9gQ/QZM3x//pFqnI8tFqE9A=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.66.tgz"; + sha512 = "9+Pv5qL/W3PnInyXTYhCQ6ukzo2IFzQEJDss9b6frNvxBJzAJWR7F7dsvIaCOr5WrtMBStf4SVdWvGTdssi+XA=="; }; }; "express-2.5.11" = { @@ -22768,13 +22768,13 @@ let sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; - "express-openapi-7.3.0" = { + "express-openapi-7.4.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.3.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.3.0.tgz"; - sha512 = "SENL0+eC1P2NMXAZJr/xGTGlWw62pUbD49EkRKrVdCZO4M3dNLEfvPsdkDhvJvzL8YiFjrQ2C3hF77/RhVgC4w=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.4.0.tgz"; + sha512 = "pwFIbxXcs0oQ+meXRVK6FIBSgUFlOzvkLT6p64JkMzKopRCWYykVzwU4ojWHNRUax9/RnnOQMtdJMJ7yWsM6OA=="; }; }; "express-session-1.17.1" = { @@ -23326,13 +23326,13 @@ let sha512 = "l4Whw9/MDkl/0XuqZEzGE/sw9T7dIxuUnxqq4ZJDLt8AE45j8wkx4/nBRZm50aQ9kN71NB9mwQzglLsvQGROsw=="; }; }; - "fastq-1.10.1" = { + "fastq-1.11.0" = { name = "fastq"; packageName = "fastq"; - version = "1.10.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz"; - sha512 = "AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; + sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; }; }; "fault-1.0.4" = { @@ -24307,13 +24307,13 @@ let sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; }; }; - "follow-redirects-1.13.2" = { + "follow-redirects-1.13.3" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.13.2"; + version = "1.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz"; - sha512 = "6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz"; + sha512 = "DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="; }; }; "font-awesome-filetypes-2.1.0" = { @@ -26072,13 +26072,13 @@ let sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; - "globalthis-1.0.1" = { + "globalthis-1.0.2" = { name = "globalthis"; packageName = "globalthis"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz"; - sha512 = "mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw=="; + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz"; + sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ=="; }; }; "globalyzer-0.1.4" = { @@ -26324,13 +26324,13 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; - "got-11.8.1" = { + "got-11.8.2" = { name = "got"; packageName = "got"; - version = "11.8.1"; + version = "11.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.8.1.tgz"; - sha512 = "9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q=="; + url = "https://registry.npmjs.org/got/-/got-11.8.2.tgz"; + sha512 = "D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ=="; }; }; "got-3.3.1" = { @@ -27035,13 +27035,13 @@ let sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; - "has-symbols-1.0.1" = { + "has-symbols-1.0.2" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; }; "has-to-string-tag-x-1.4.1" = { @@ -27332,6 +27332,15 @@ let sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; }; }; + "hcl-to-json-0.1.1" = { + name = "hcl-to-json"; + packageName = "hcl-to-json"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hcl-to-json/-/hcl-to-json-0.1.1.tgz"; + sha512 = "sj1RPsdgX/ilBGZGnyjbSHQbRe20hyA6VDXYBGJedHSCdwSWkr/7tr85N7FGeM7KvBjIQX7Gl897bo0Ug73Z/A=="; + }; + }; "he-0.5.0" = { name = "he"; packageName = "he"; @@ -28062,13 +28071,13 @@ let sha512 = "nUxLymWQ9pzkzTmir24p2RtsgruLmhje7lH3hLX1IpwvyTg77fW+1brenPPP3USAR+rQ36p5sTA/x7sjCJVkAA=="; }; }; - "http2-wrapper-1.0.0-beta.5.2" = { + "http2-wrapper-1.0.3" = { name = "http2-wrapper"; packageName = "http2-wrapper"; - version = "1.0.0-beta.5.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz"; - sha512 = "xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ=="; + url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; + sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; }; }; "http_ece-1.1.0" = { @@ -28332,6 +28341,15 @@ let sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; }; }; + "icss-utils-5.1.0" = { + name = "icss-utils"; + packageName = "icss-utils"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; + sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; + }; + }; "idb-kv-store-4.5.0" = { name = "idb-kv-store"; packageName = "idb-kv-store"; @@ -28341,15 +28359,6 @@ let sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA=="; }; }; - "idx-2.4.0" = { - name = "idx"; - packageName = "idx"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/idx/-/idx-2.4.0.tgz"; - sha512 = "FnV6fXF1/cXvam/OXAz98v3GbhQVws+ecMEVLxyQ1aXgK2nooTkTDqex5Lks84wiCsS1So6QtwwCYT6H+vIKkw=="; - }; - }; "ieee754-1.1.13" = { name = "ieee754"; packageName = "ieee754"; @@ -28503,13 +28512,13 @@ let sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA=="; }; }; - "immer-7.0.9" = { + "immer-8.0.1" = { name = "immer"; packageName = "immer"; - version = "7.0.9"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-7.0.9.tgz"; - sha512 = "Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A=="; + url = "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz"; + sha512 = "aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA=="; }; }; "import-cwd-3.0.0" = { @@ -29592,6 +29601,15 @@ let sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; }; + "is-ci-3.0.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz"; + sha512 = "kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ=="; + }; + }; "is-color-stop-1.1.0" = { name = "is-color-stop"; packageName = "is-color-stop"; @@ -30654,13 +30672,13 @@ let sha512 = "pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw=="; }; }; - "is-what-3.13.0" = { + "is-what-3.14.1" = { name = "is-what"; packageName = "is-what"; - version = "3.13.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-what/-/is-what-3.13.0.tgz"; - sha512 = "qYTOcdAo0H0tvMTl9ZhsjpEZH5Q07JDVrPnFMAQgBM0UctGqVsKE7LgZPNZEFPw1EhUkpaBL/BKnRgVX7CoMTw=="; + url = "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz"; + sha512 = "sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="; }; }; "is-whitespace-character-1.0.4" = { @@ -31545,49 +31563,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.21.0" = { + "jsii-1.22.0" = { name = "jsii"; packageName = "jsii"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.21.0.tgz"; - sha512 = "6siaRt1OyrQxC9pzLaFGj6bDkHMTsofcu8ODM0NCcukq2P4PlF1O39H0DV8Z40QF3KWbawJ/Utl7GtaSrdG2Ww=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.22.0.tgz"; + sha512 = "iBYlf/wSCsaohM14JSpN3NsIrfsqWi0FXrKvW0tU52z+ED/ZyNQWJKT/JfGuO+EAd5GpjPmpK7r4R9ZGGQW0rQ=="; }; }; - "jsii-pacmak-1.21.0" = { + "jsii-pacmak-1.22.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.21.0.tgz"; - sha512 = "04/fIZqM31cfTf48v7ni7MGeAwBEREP1WhvGkf4TSAZmAdMx1FUWQxuKiDK1/YeEvIUhNHIy/Ng9GcoSf+Rwfg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.22.0.tgz"; + sha512 = "s1X++lvN8oPTE2e8XI4qADBZ7MUXjfzw0Bjr2at5XwhW8QaSSnGe2KHuqjj0JTUhdlVsRar9JlWXKDwMraYBww=="; }; }; - "jsii-reflect-1.21.0" = { + "jsii-reflect-1.22.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.21.0.tgz"; - sha512 = "OwXhVhe+NRv/e6jaGBdIpm3S1KQcEXTZN+USiBd+c4kROLqxw+ubpMBsEVSKEZ7t+4WksLTWWNot31VZkJrZ5g=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.22.0.tgz"; + sha512 = "EsPL/mXNaUsBeF50IHOMizX3R2B8mcKCBEhxvfptXpgMT6BzssNUK4v9MC7tY3c3fR8CNs2dr+I2Bqdgs0ogOg=="; }; }; - "jsii-rosetta-1.21.0" = { + "jsii-rosetta-1.22.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.21.0.tgz"; - sha512 = "8W0vcWTr28q+1NWhVAY4lOwOlPHdGdg8b/gPHFccRi9ZM4uwRjW7YjmqD9FmX74dEg1Qmvd8nujW4Opow6PFtQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.22.0.tgz"; + sha512 = "d+f5vwbaAQCQI+EJLnfSTGYsTWYeUdzb3NJvRLEKiR0y31DWVuMU7y7c+IKrXjNY8vOvphWjPgZ21ECV6/r54g=="; }; }; - "jsii-srcmak-0.1.222" = { + "jsii-srcmak-0.1.238" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.222"; + version = "0.1.238"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.222.tgz"; - sha512 = "OLeezlo5ag/GoW+7YmiYVfE8zItDmV+rFcovlfYQCjCnksg6nX/e0t1mXOeLmCSetUNnu0DNrzwuqiO4hhgODQ=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.238.tgz"; + sha512 = "l1qlMC6IfGGZ46gERs06dBzbJWtkzKPWKm59Qx3cy4VOktB5jxpT48VEi8DpM3SbrIcm7Ga79kJRi9eRHpYaug=="; }; }; "json-bigint-0.2.3" = { @@ -31842,13 +31860,13 @@ let sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; }; }; - "json-stringify-pretty-compact-2.0.0" = { + "json-stringify-pretty-compact-3.0.0" = { name = "json-stringify-pretty-compact"; packageName = "json-stringify-pretty-compact"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz"; - sha512 = "WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ=="; + url = "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz"; + sha512 = "Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA=="; }; }; "json-stringify-safe-5.0.1" = { @@ -36388,6 +36406,15 @@ let sha512 = "51j4kUedbqkWGby44hAhf5f/hj8GOvHoLX00/YHURBNxOMf5k8JbPuGfmeNpZEXhc3vrmfnFben4+rOOx3HjEQ=="; }; }; + "memorystore-1.6.5" = { + name = "memorystore"; + packageName = "memorystore"; + version = "1.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.5.tgz"; + sha512 = "2RD1kTZhF0nywVtps2NoQgbMiPO6o1+dIRUAi2cRQDxMyCKwOZdBrC/Lk9/ttlF6lHn3T6uCPwSbgWxEef9djQ=="; + }; + }; "memorystream-0.3.1" = { name = "memorystream"; packageName = "memorystream"; @@ -36622,49 +36649,49 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "metro-babel-transformer-0.58.0" = { + "metro-babel-transformer-0.59.0" = { name = "metro-babel-transformer"; packageName = "metro-babel-transformer"; - version = "0.58.0"; + version = "0.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.58.0.tgz"; - sha512 = "yBX3BkRhw2TCNPhe+pmLSgsAEA3huMvnX08UwjFqSXXI1aiqzRQobn92uKd1U5MM1Vx8EtXVomlJb95ZHNAv6A=="; + url = "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.59.0.tgz"; + sha512 = "fdZJl8rs54GVFXokxRdD7ZrQ1TJjxWzOi/xSP25VR3E8tbm3nBZqS+/ylu643qSr/IueABR+jrlqAyACwGEf6w=="; }; }; - "metro-react-native-babel-preset-0.58.0" = { + "metro-react-native-babel-preset-0.59.0" = { name = "metro-react-native-babel-preset"; packageName = "metro-react-native-babel-preset"; - version = "0.58.0"; + version = "0.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.58.0.tgz"; - sha512 = "MRriNW+fF6jxABsgPphocUY6mIhmCm8idcrQZ58fT3Iti2vCdtkaK32TyCGUNUptzhUe2/cbE57j4aC+eaodAA=="; + url = "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.59.0.tgz"; + sha512 = "BoO6ncPfceIDReIH8pQ5tQptcGo5yRWQXJGVXfANbiKLq4tfgdZB1C1e2rMUJ6iypmeJU9dzl+EhPmIFKtgREg=="; }; }; - "metro-react-native-babel-transformer-0.58.0" = { + "metro-react-native-babel-transformer-0.59.0" = { name = "metro-react-native-babel-transformer"; packageName = "metro-react-native-babel-transformer"; - version = "0.58.0"; + version = "0.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.58.0.tgz"; - sha512 = "3A73+cRq1eUPQ8g+hPNGgMUMCGmtQjwqHfoG1DwinAoJ/kr4WOXWWbGZo0xHJNBe/zdHGl0uHcDCp2knPglTdQ=="; + url = "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.59.0.tgz"; + sha512 = "1O3wrnMq4NcPQ1asEcl9lRDn/t+F1Oef6S9WaYVIKEhg9m/EQRGVrrTVP+R6B5Eeaj3+zNKbzM8Dx/NWy1hUbQ=="; }; }; - "metro-source-map-0.58.0" = { + "metro-source-map-0.59.0" = { name = "metro-source-map"; packageName = "metro-source-map"; - version = "0.58.0"; + version = "0.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.58.0.tgz"; - sha512 = "yvN1YPmejmgiiS7T1aKBiiUTHPw2Vcm3r2TZ+DY92z/9PR4alysIywrCs/fTHs8rbDcKM5VfPCKGLpkBrbKeOw=="; + url = "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.59.0.tgz"; + sha512 = "0w5CmCM+ybSqXIjqU4RiK40t4bvANL6lafabQ2GP2XD3vSwkLY+StWzCtsb4mPuyi9R/SgoLBel+ZOXHXAH0eQ=="; }; }; - "metro-symbolicate-0.58.0" = { + "metro-symbolicate-0.59.0" = { name = "metro-symbolicate"; packageName = "metro-symbolicate"; - version = "0.58.0"; + version = "0.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.58.0.tgz"; - sha512 = "uIVxUQC1E26qOMj13dKROhwAa2FmZk5eR0NcBqej/aXmQhpr8LjJg2sondkoLKUp827Tf/Fm9+pS4icb5XiqCw=="; + url = "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.59.0.tgz"; + sha512 = "asLaF2A7rndrToGFIknL13aiohwPJ95RKHf0NM3hP/nipiLDoMzXT6ZnQvBqDxkUKyP+51AI75DMtb+Wcyw4Bw=="; }; }; "micro-api-client-3.3.0" = { @@ -37621,13 +37648,13 @@ let sha512 = "2/PRtGGiqPc/VEhbm7xAQ+gbb7yzHjjMAv6MpAifr5pCpbh3fQUdj93uNgwPiTppAGu8HFKe3PeU+OdRyAxStA=="; }; }; - "mp4-stream-3.1.2" = { + "mp4-stream-3.1.3" = { name = "mp4-stream"; packageName = "mp4-stream"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.2.tgz"; - sha512 = "AviUjTA6aER9DFVFPNYd4KrEKfhw2Pi8OKBY46r39ORmyX8qfaYx6XBIUGFCl67gX4+Giv2FLF+Gh6P3g81xrQ=="; + url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-3.1.3.tgz"; + sha512 = "DUT8f0x2jHbZjNMdqe9h6lZdt6RENWTTdGn8z3TXa4uEsoltuNY9lCCij84mdm0q7xcV0E2W25WRxlKBMo4hSw=="; }; }; "mpath-0.5.2" = { @@ -37648,13 +37675,13 @@ let sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q=="; }; }; - "mqtt-packet-6.8.1" = { + "mqtt-packet-6.9.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "6.8.1"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.8.1.tgz"; - sha512 = "XM+QN6/pNVvoTSAiaOCuOSy8AVau6/8LVdLyMhvv2wJqzJjp8IL/h4R+wTcfm+CV+HhL6i826pHqDTCCKyBdyA=="; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.9.0.tgz"; + sha512 = "cngFSAXWSl5XHKJYUQiYQjtp75zhf1vygY00NnJdhQoXOH2v3aizmaaMIHI5n1N/TJEHSAbHryQhFr3gJ9VNvA=="; }; }; "mri-1.1.6" = { @@ -39090,13 +39117,13 @@ let sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; }; }; - "node-ipc-9.1.3" = { + "node-ipc-9.1.4" = { name = "node-ipc"; packageName = "node-ipc"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.3.tgz"; - sha512 = "8RS4RZyS/KMKKYG8mrje+cLxwATe9dBCuOiqKFSWND4oOuKytfuKCiR9yinvhoXF/nGdX/WnbywaUee+9U87zA=="; + url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.4.tgz"; + sha512 = "A+f0mn2KxUt1uRTSd5ktxQUsn2OEhj5evo7NUi/powBzMSZ0vocdzDjlq9QN2v3LH6CJi3e5xAenpZ1QwU5A8g=="; }; }; "node-libs-browser-2.2.1" = { @@ -39234,13 +39261,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.70" = { + "node-releases-1.1.71" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.70"; + version = "1.1.71"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.70.tgz"; - sha512 = "Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz"; + sha512 = "zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="; }; }; "node-source-walk-4.2.0" = { @@ -40000,13 +40027,13 @@ let sha1 = "793cef251d45ebdeac32ae40a8b6814faab1d483"; }; }; - "ob1-0.58.0" = { + "ob1-0.59.0" = { name = "ob1"; packageName = "ob1"; - version = "0.58.0"; + version = "0.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/ob1/-/ob1-0.58.0.tgz"; - sha512 = "uZP44cbowAfHafP1k4skpWItk5iHCoRevMfrnUvYCfyNNPPJd3rfDCyj0exklWi2gDXvjlj2ObsfiqP/bs/J7Q=="; + url = "https://registry.npmjs.org/ob1/-/ob1-0.59.0.tgz"; + sha512 = "opXMTxyWJ9m68ZglCxwo0OPRESIC/iGmKFPXEXzMZqsVIrgoRXOHmoMDkQzz4y3irVjbyPJRAh5pI9fd0MJTFQ=="; }; }; "object-assign-1.0.0" = { @@ -40207,13 +40234,13 @@ let sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg=="; }; }; - "object.fromentries-2.0.3" = { + "object.fromentries-2.0.4" = { name = "object.fromentries"; packageName = "object.fromentries"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.3.tgz"; - sha512 = "IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw=="; + url = "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz"; + sha512 = "EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ=="; }; }; "object.getownpropertydescriptors-2.1.2" = { @@ -40261,13 +40288,13 @@ let sha1 = "6fe348f2ac7fa0f95ca621226599096825bb03ad"; }; }; - "object.values-1.1.2" = { + "object.values-1.1.3" = { name = "object.values"; packageName = "object.values"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz"; - sha512 = "MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz"; + sha512 = "nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw=="; }; }; "objectorarray-1.0.4" = { @@ -40333,13 +40360,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.161.0" = { + "office-ui-fabric-react-7.162.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.161.0"; + version = "7.162.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.161.0.tgz"; - sha512 = "BH326SCR6KS8vEbL1hJXXBMlG+sOBFEVDetLltJNKluFYhzmwiOun76ea6dzl+CHBh/7yLCkWlmtPIx1fQu81Q=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.162.0.tgz"; + sha512 = "KLvT9qREaFAH0/TJFaCDMHstZ86yVi4EvG938RyHpzsdbI/ciHjQby7PvfAL5M4l1zAzV52qFjfKL5o4naqCLw=="; }; }; "omggif-1.0.10" = { @@ -40513,13 +40540,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.21.0" = { + "oo-ascii-tree-1.22.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.21.0.tgz"; - sha512 = "N91VyM/R9K8axskaVYSg+IJiSDJVKFQ2IfQyBp5Rv7t2YETjJDMgA6Ew9MGv82fhpz95qKLlZmgrQsb7scb2Eg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.22.0.tgz"; + sha512 = "IoB8ybGGYKZ2hu4TQts9+AB2T4VHu3Bf896mOt3m1XzV9Xo5fZvO29rFn7Xfy3SaVzm6IjbaXGcxUcCHhz7hRQ=="; }; }; "opal-runtime-1.0.11" = { @@ -40630,13 +40657,13 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; - "openapi-framework-7.3.0" = { + "openapi-framework-7.4.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.3.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.3.0.tgz"; - sha512 = "I0KDyH9LNYNfMUGK+nmM+0S+E1hiqKAikEIogGaVmKcJSenHaZyfbjuw1BdotBuQyCKSpcYg5yUZOyLwHVlytg=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.4.0.tgz"; + sha512 = "F3cxFsKqgojwQryCsv5gAnU3J9Mol2+xCmN8b0m3z2xLlD58bZ88gsOJVLftcxb3F6sRgLZwzdQZztP2LAKKiw=="; }; }; "openapi-jsonschema-parameters-1.2.0" = { @@ -40684,13 +40711,13 @@ let sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; }; }; - "openapi-request-validator-7.3.0" = { + "openapi-request-validator-7.4.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "7.3.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.3.0.tgz"; - sha512 = "Apyo0eiR1ya63vWxjAKuPBkqr953133o5BgBxXS0gFSfvbK9tmXCPwYOhvafPknkoJGaCKy5psRuBRWjUuVNSg=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.4.0.tgz"; + sha512 = "0rnslY82Btw5nM6rUEuXkvupav4ujvP+e9WziZvcMrE+VZ6IxRGDP8F7w0XmtPBwMS2nJGgt/J7BnRXAFTx5tw=="; }; }; "openapi-response-validator-4.0.0" = { @@ -40702,13 +40729,13 @@ let sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; }; }; - "openapi-response-validator-7.2.3" = { + "openapi-response-validator-7.4.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "7.2.3"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.2.3.tgz"; - sha512 = "j9OvLWO/6sWiR4fwdbzPbZuuj02abk+kt8Zd2aXS4mS8K7/sl7QiJGI/VmQpvq9CTlNG67eEKyqgmBzI1ovu/g=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.4.0.tgz"; + sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; "openapi-sampler-1.0.0-beta.18" = { @@ -41062,15 +41089,6 @@ let sha512 = "9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w=="; }; }; - "ora-5.2.0" = { - name = "ora"; - packageName = "ora"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-5.2.0.tgz"; - sha512 = "+wG2v8TUU8EgzPHun1k/n45pXquQ9fHnbXVetl9rRgO6kjZszGGbraF3XPTIdgeA+s1lbRjSEftAnyT0w8ZMvQ=="; - }; - }; "ora-5.3.0" = { name = "ora"; packageName = "ora"; @@ -41215,22 +41233,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.0.2" = { + "ot-builder-1.0.3" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.2.tgz"; - sha512 = "LLb8H2Rbe/x4BgzoTOWuWH2cQm0hJKu6PXVQc7WHNQuRx1O82Rg+0GeXjV36cznOXM6IsA1VZgsuLz9oNb+15Q=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.3.tgz"; + sha512 = "ApuXJZmB30IAspJwojBh2VxQfLMMqu6fkQ7nrNmG+ubL6uvgqW7kZYIyCcaXU4utONLP6bDP988bNovQXVfNAQ=="; }; }; - "otb-ttc-bundle-1.0.2" = { + "otb-ttc-bundle-1.0.3" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.2.tgz"; - sha512 = "FK+d5iSrwQogNNNT+IPsk3wNmwOK6xunP4fytztaU3zZUK3YtaiuJjp4VeqF1+CpOaFr6MYlQHOTfhChT+ssSg=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.3.tgz"; + sha512 = "U2Eh0kXe8YzP/F8sNJvqnBi8Y57oG4xcAND0IsGGSm+q1Csn30V0k34rA3rKmelnM/oXT5J0EbZKIvlapPdfLw=="; }; }; "ow-0.21.0" = { @@ -43556,6 +43574,15 @@ let sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg=="; }; }; + "postcss-8.2.6" = { + name = "postcss"; + packageName = "postcss"; + version = "8.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.2.6.tgz"; + sha512 = "xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg=="; + }; + }; "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -43727,13 +43754,13 @@ let sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; - "postcss-modules-3.2.2" = { + "postcss-modules-4.0.0" = { name = "postcss-modules"; packageName = "postcss-modules"; - version = "3.2.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-3.2.2.tgz"; - sha512 = "JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw=="; + url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.0.0.tgz"; + sha512 = "ghS/ovDzDqARm4Zj6L2ntadjyQMoyJmi0JkLlYtH2QFLrvNlxH5OAVRPWPeKilB0pY7SbuhO173KOWkPAxRJcw=="; }; }; "postcss-modules-extract-imports-1.1.0" = { @@ -43754,6 +43781,15 @@ let sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; }; }; + "postcss-modules-extract-imports-3.0.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; + }; + }; "postcss-modules-local-by-default-1.2.0" = { name = "postcss-modules-local-by-default"; packageName = "postcss-modules-local-by-default"; @@ -43772,6 +43808,15 @@ let sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="; }; }; + "postcss-modules-local-by-default-4.0.0" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; + }; + }; "postcss-modules-scope-1.1.0" = { name = "postcss-modules-scope"; packageName = "postcss-modules-scope"; @@ -43790,6 +43835,15 @@ let sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; }; }; + "postcss-modules-scope-3.0.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; + }; + }; "postcss-modules-values-1.3.0" = { name = "postcss-modules-values"; packageName = "postcss-modules-values"; @@ -43808,6 +43862,15 @@ let sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; }; }; + "postcss-modules-values-4.0.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; + }; + }; "postcss-normalize-charset-4.0.1" = { name = "postcss-normalize-charset"; packageName = "postcss-normalize-charset"; @@ -45050,13 +45113,13 @@ let sha512 = "TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ=="; }; }; - "pug-code-gen-2.0.2" = { + "pug-code-gen-2.0.3" = { name = "pug-code-gen"; packageName = "pug-code-gen"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.2.tgz"; - sha512 = "kROFWv/AHx/9CRgoGJeRSm+4mLWchbgpRzTEn8XCiwwOy6Vh0gAClS8Vh5TEJ9DBjaP8wCjS3J6HKsEsYdvaCw=="; + url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.3.tgz"; + sha512 = "r9sezXdDuZJfW9J91TN/2LFbiqDhmltTFmGpHTsGdrNGp3p4SxAjjXEfnuK2e4ywYsRIVP0NeLbSAMHUcaX1EA=="; }; }; "pug-error-1.3.3" = { @@ -45779,13 +45842,13 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-5.5.0" = { + "puppeteer-7.1.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "5.5.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-5.5.0.tgz"; - sha512 = "OM8ZvTXAhfgFA7wBIIGlPQzvyEETzDjeRa4mZRCRHxYL+GNH5WAuYUQdja3rpWZvkX/JKqmuVgbsxDNsDFjMEg=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-7.1.0.tgz"; + sha512 = "lqOLzqCKdh7yUAHvK6LxgOpQrL8Bv1/jvS8MLDXxcNms2rlM3E8p/Wlwc7efbRZ0twxTzUeqjN5EqrTwxOwc9g=="; }; }; "purgecss-2.3.0" = { @@ -45833,13 +45896,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.113" = { + "pyright-1.1.116" = { name = "pyright"; packageName = "pyright"; - version = "1.1.113"; + version = "1.1.116"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.113.tgz"; - sha512 = "VcitW5t5lG1KY0w8xY/ubMhFZZ2lfXJvhBW4TfTwy067R4WtXKSa23br4to1pdRA1rwpxOREgxVTnOWmf3YkYg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.116.tgz"; + sha512 = "SdsLo/bahs+ncCYIY7E4bL/B+ZuI/OdKJudNuUFAJciXEkkkp2ICzpzQSt0n4ZeYsPfqb5g48QoGo7x4a+LDcQ=="; }; }; "q-0.9.7" = { @@ -46040,13 +46103,13 @@ let sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; - "query-string-6.14.0" = { + "query-string-6.14.1" = { name = "query-string"; packageName = "query-string"; - version = "6.14.0"; + version = "6.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-6.14.0.tgz"; - sha512 = "In3o+lUxlgejoVJgwEdYtdxrmlL0cQWJXj0+kkI7RWVo7hg5AhFtybeKlC9Dpgbr8eOC4ydpEh8017WwyfzqVQ=="; + url = "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz"; + sha512 = "XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw=="; }; }; "querystring-0.2.0" = { @@ -46247,13 +46310,13 @@ let sha512 = "xZW1BT26g+gl8AF1kC/oXX97jCMVoLIbf6yx4eVMwLgOddGhhkJygimnfERSEmhUKiGs3DTymNao6wf/P23Nkg=="; }; }; - "random-access-file-2.1.5" = { + "random-access-file-2.2.0" = { name = "random-access-file"; packageName = "random-access-file"; - version = "2.1.5"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.1.5.tgz"; - sha512 = "lqmUGgF9X+LD0XSeWSHcs7U2nSLYp+RQvkDDqKWoxW8jcd13tZ00G6PHV32OZqDIHmS9ewoEUEa6jcvyB7UCvg=="; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.2.0.tgz"; + sha512 = "B744003Mj7v3EcuPl9hCiB2Ot4aZjgtU2mV6yFY1THiWU/XfGf1uSadR+SlQdJcwHgAWeG7Lbos0aUqjtj8FQg=="; }; }; "random-access-idb-1.2.1" = { @@ -46535,13 +46598,13 @@ let sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; }; - "react-dev-utils-11.0.2" = { + "react-dev-utils-11.0.3" = { name = "react-dev-utils"; packageName = "react-dev-utils"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.2.tgz"; - sha512 = "xG7GlMoYkrgc2M1kDCHKRywXMDbFnjOB+/VzpytQyYBusEzR8NlGTMmUbvN86k94yyKu5XReHB8eZC2JZrNchQ=="; + url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.3.tgz"; + sha512 = "4lEA5gF4OHrcJLMUV1t+4XbNDiJbsAWCH5Z2uqlTqW6dD7Cf5nEASkeXrCI/Mz83sI2o527oBIFKVMXtRf1Vtg=="; }; }; "react-devtools-core-4.10.1" = { @@ -46715,13 +46778,13 @@ let sha512 = "39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ=="; }; }; - "read-package-json-fast-2.0.1" = { + "read-package-json-fast-2.0.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.1.tgz"; - sha512 = "bp6z0tdgLy9KzdfENDIw/53HWAolOVoQTRWXv7PUiqAo3YvvoUVeLr7RWPWq+mu7KUOu9kiT4DvxhUgNUBsvug=="; + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.2.tgz"; + sha512 = "5fyFUyO9B799foVk4n6ylcoAktG/FbE3jwRKxvwaeSrIunaoMc0u81dzXxjeAFKOce7O5KncdfwpGvvs6r5PsQ=="; }; }; "read-package-tree-5.3.1" = { @@ -47804,13 +47867,13 @@ let sha512 = "eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw=="; }; }; - "request-light-0.3.0" = { + "request-light-0.4.0" = { name = "request-light"; packageName = "request-light"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/request-light/-/request-light-0.3.0.tgz"; - sha512 = "xlVlZVT0ZvCT+c3zm3SjeFCzchoQxsUUmx5fkal0I6RIDJK+lmb1UYyKJ7WM4dTfnzHP4ElWwAf8Dli8c0/tVA=="; + url = "https://registry.npmjs.org/request-light/-/request-light-0.4.0.tgz"; + sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA=="; }; }; "request-progress-2.0.1" = { @@ -48506,13 +48569,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.39.0" = { + "rollup-2.40.0" = { name = "rollup"; packageName = "rollup"; - version = "2.39.0"; + version = "2.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.39.0.tgz"; - sha512 = "+WR3bttcq7zE+BntH09UxaW3bQo3vItuYeLsyk4dL2tuwbeSKJuvwiawyhEnvRdRgrII0Uzk00FpctHO/zB1kw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.40.0.tgz"; + sha512 = "WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -48839,6 +48902,15 @@ let sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; }; }; + "rxjs-6.6.6" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz"; + sha512 = "/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg=="; + }; + }; "s3-stream-upload-2.0.2" = { name = "s3-stream-upload"; packageName = "s3-stream-upload"; @@ -49514,15 +49586,6 @@ let sha1 = "ae02af3a424793d8ccbf212d69174e0c54dffe38"; }; }; - "serialize-error-5.0.0" = { - name = "serialize-error"; - packageName = "serialize-error"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz"; - sha512 = "/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA=="; - }; - }; "serialize-error-6.0.0" = { name = "serialize-error"; packageName = "serialize-error"; @@ -50090,13 +50153,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.35.1" = { + "simple-git-2.35.2" = { name = "simple-git"; packageName = "simple-git"; - version = "2.35.1"; + version = "2.35.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.35.1.tgz"; - sha512 = "Y5/hXf5ivfMziWRNGhVsbiG+1h4CkTW2qVC3dRidLuSZYAPFbLCPP1d7rgiL40lgRPhPTBuhVzNJAV9glWstEg=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.35.2.tgz"; + sha512 = "UjOKsrz92Bx7z00Wla5V6qLSf5X2XSp0sL2gzKw1Bh7iJfDPDaU7gK5avIup0yo1/sMOSUMQer2b9GcnF6nmTQ=="; }; }; "simple-markdown-0.4.4" = { @@ -50144,13 +50207,13 @@ let sha512 = "TQl9rm4rdKAVmhO++sXAb8TNN0D6JAD5iyI1mqEPNpxUzTRrtm4aOG1pDf/5W/qCFihiaoK6uuL9rvQz1x1VKw=="; }; }; - "simple-sha1-3.0.1" = { + "simple-sha1-3.1.0" = { name = "simple-sha1"; packageName = "simple-sha1"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.0.1.tgz"; - sha512 = "q7ehqWfHc1VhOm7sW099YDZ4I0yYX7rqyhqqhHV1IYeUTjPOhHyD3mXvv8k2P+rO7+7c8R4/D+8ffzC9BE7Cqg=="; + url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-3.1.0.tgz"; + sha512 = "ArTptMRC1v08H8ihPD6l0wesKvMfF9e8XL5rIHPanI7kGOsSsbY514MwVu6X1PITHCTB2F08zB7cyEbfc4wQjg=="; }; }; "simple-swizzle-0.2.2" = { @@ -50504,13 +50567,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.17.2" = { + "snyk-docker-plugin-4.17.3" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.17.2"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.17.2.tgz"; - sha512 = "fOz1KYM6Xs40pBhuXTMmVQmb+ySnxSRWJLJSIrVgOuJ3Ot05v1O2MCzZHwQzyVPGSaHpIxKFGvA09dOBjd76qQ=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.17.3.tgz"; + sha512 = "Egqkad3YTP41Dlu19/3A2gQfqf4nxa7C36USQGSXIC5JodPvptObiSLmyQssjxVJ7iCRpw6IxytZVf412KKJCg=="; }; }; "snyk-go-parser-1.4.1" = { @@ -50621,13 +50684,13 @@ let sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g=="; }; }; - "snyk-python-plugin-1.19.4" = { + "snyk-python-plugin-1.19.5" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.4"; + version = "1.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.4.tgz"; - sha512 = "d1c/QKb3Il3xF1HY0IYoqQ+16+i0Ex5ai+J4KqOMbcKFvNcfkiOSPpCsrgSNJtBa50srbRleUrILdorALxaV2w=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.5.tgz"; + sha512 = "wgfhloo6PZ8V+6eIUU7pLcVfHx4yo5LQPPQX6rLfTSZ6p9uRYazIvw/NoUmIjb8Qrn9GdD3zUJY9/83TyTgKLw=="; }; }; "snyk-resolve-1.0.1" = { @@ -50711,13 +50774,13 @@ let sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; }; }; - "socket.io-3.1.1" = { + "socket.io-3.1.2" = { name = "socket.io"; packageName = "socket.io"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz"; - sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz"; + sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; "socket.io-adapter-0.2.0" = { @@ -51674,13 +51737,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-1.17.1" = { + "ssb-db2-1.18.0" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "1.17.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.17.1.tgz"; - sha512 = "XaKxShFGwy9NRSF26PnnLYQAUMeSb8xGilU2WZ3C2QJRmNQ3YJWBzIWI9d0cn547LuuE+AO9lQhh2SwRtJ2qTQ=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.18.0.tgz"; + sha512 = "SMTNiuWfeIKyOtHI5FcUwOZkfLlJzFWyYTFqA0VXtYtZLAMzfXK+phqbJMZW1ReUXYgFlYZS+w+2oDGj4A8elA=="; }; }; "ssb-ebt-5.6.7" = { @@ -52763,22 +52826,22 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string-width-4.2.0" = { + "string-width-4.2.2" = { name = "string-width"; packageName = "string-width"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; - sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; + sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; }; }; - "string.prototype.matchall-4.0.3" = { + "string.prototype.matchall-4.0.4" = { name = "string.prototype.matchall"; packageName = "string.prototype.matchall"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz"; - sha512 = "OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw=="; + url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz"; + sha512 = "pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ=="; }; }; "string.prototype.repeat-0.2.0" = { @@ -52790,31 +52853,31 @@ let sha1 = "aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"; }; }; - "string.prototype.trim-1.2.3" = { + "string.prototype.trim-1.2.4" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.3.tgz"; - sha512 = "16IL9pIBA5asNOSukPfxX2W68BaBvxyiRK16H3RA/lWW9BDosh+w7f+LhomPHpXJ82QEe7w7/rY/S1CV97raLg=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz"; + sha512 = "hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q=="; }; }; - "string.prototype.trimend-1.0.3" = { + "string.prototype.trimend-1.0.4" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz"; - sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; }; }; - "string.prototype.trimstart-1.0.3" = { + "string.prototype.trimstart-1.0.4" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz"; - sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; }; }; "string2compact-1.3.0" = { @@ -53573,13 +53636,13 @@ let sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA=="; }; }; - "svelte2tsx-0.1.174" = { + "svelte2tsx-0.1.175" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.1.174"; + version = "0.1.175"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.174.tgz"; - sha512 = "+sOMKaiUw7GADDyg5rhQWi6ajL0LWytZbwRwyH62WP6OTjXGIM8/J9mOCA3uHA9dDI39OsmprcgfhUQp8ymekg=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.175.tgz"; + sha512 = "A3G2piBjQdUQzHu0aHu7jT3i3QCGaUsmdgXzkPTeFT8k6OUigSW/9Pzx9IoiUZ3btXNrqN0q5vNW2kBxcPLoiQ=="; }; }; "sver-compat-1.5.0" = { @@ -53708,13 +53771,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.43.0" = { + "swagger-ui-dist-3.44.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.43.0"; + version = "3.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.43.0.tgz"; - sha512 = "PtE+g23bNbYv8qqAVoPBqNQth8hU5Sl5ZsQ7gHXlO5jlCt31dVTiKI9ArHIT1b23ZzUYTnKsFgPYYFoiWyNCAw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.44.0.tgz"; + sha512 = "xqz5rNDKexAEIYST50+Z4fUu7CbJVpALoRJdKOZfddQX+0hAjN9T9bVGRlI054gst62F8SqQAcS84tdcwmSe8A=="; }; }; "swagger2openapi-6.2.3" = { @@ -53834,13 +53897,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.34.14" = { + "systeminformation-4.34.15" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.34.14"; + version = "4.34.15"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.14.tgz"; - sha512 = "cPkHQIBgCZrfvenIfbXv1ChCPoXwqCBF8il2ZnqTBsyZPBNBFm6zij4W3f6Y/J4agBD3n56DGLl6TwZ8tLFsyA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.15.tgz"; + sha512 = "GRm0ntHg/MTISxZSu7r0T8reU1LLXUZxMcuDnqCcxIP0V+vjrt7SsiTWKrlsiL/DnThgUQHo1PT7VlZ5aKxdlQ=="; }; }; "table-3.8.3" = { @@ -55725,15 +55788,6 @@ let sha512 = "wAH28hcEKwna96/UacuWaVspVLkg4x1aDM9JlzqaQTOFczCktkVAb5fmXChgandR1EraDPs2w8P+ozM+oafwxg=="; }; }; - "tslib-2.0.3" = { - name = "tslib"; - packageName = "tslib"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz"; - sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="; - }; - }; "tslib-2.1.0" = { name = "tslib"; packageName = "tslib"; @@ -56238,6 +56292,15 @@ let sha512 = "6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA=="; }; }; + "typescript-4.2.2" = { + name = "typescript"; + packageName = "typescript"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz"; + sha512 = "tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -56715,13 +56778,13 @@ let sha512 = "lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw=="; }; }; - "unified-9.2.0" = { + "unified-9.2.1" = { name = "unified"; packageName = "unified"; - version = "9.2.0"; + version = "9.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz"; - sha512 = "vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg=="; + url = "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz"; + sha512 = "juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA=="; }; }; "unified-diff-3.1.0" = { @@ -58228,15 +58291,6 @@ let sha512 = "UwCu50Sqd8kNZ1X/XgiAY+QAyQUmGFAwyDu7y0T5fs6/TPQnDo/Bo346NgSgINBEhEKOAMY1Nd/rPOk4UEm/ew=="; }; }; - "vega-expression-3.0.1" = { - name = "vega-expression"; - packageName = "vega-expression"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-expression/-/vega-expression-3.0.1.tgz"; - sha512 = "+UwOFEkBnAWo8Zud6i8O4Pd2W6QqmPUOaAhjNtj0OxRL+d+Duoy7M4edUDZ+YuoUcMnjjBFfDQu7oRAA1fIMEQ=="; - }; - }; "vega-expression-4.0.1" = { name = "vega-expression"; packageName = "vega-expression"; @@ -58804,13 +58858,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.85.0" = { + "vsce-1.85.1" = { name = "vsce"; packageName = "vsce"; - version = "1.85.0"; + version = "1.85.1"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.85.0.tgz"; - sha512 = "YVFwjXWvHRwk75mm3iL4Wr3auCdbBPTv2amtLf97ccqH0hkt0ZVBddu7iOs4HSEbSr9xiiaZwQHUsqMm6Ks0ag=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.85.1.tgz"; + sha512 = "IdfH8OCK+FgQGmihFoh6/17KBl4Ad3q4Sw3NFNI9T9KX6KdMR5az2/GO512cC9IqCjbgJl12CA7X84vYoc0ifg=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -58840,22 +58894,22 @@ let sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; }; }; - "vscode-debugadapter-testsupport-1.44.0" = { + "vscode-debugadapter-testsupport-1.45.0" = { name = "vscode-debugadapter-testsupport"; packageName = "vscode-debugadapter-testsupport"; - version = "1.44.0"; + version = "1.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.44.0.tgz"; - sha512 = "5sPAQ4/OFPBvZoyx2nPI91Zv7CCZ63CS9XrsCaR1t2awEY+hv+yjwryaWpV0AQX6lrYOCO/PehYvzmDsGLEy6A=="; + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.45.0.tgz"; + sha512 = "/5q/F2K1mNLfJWxXStG9pO86mgOeK73PoMJpOBZaniToplrzM7LgFEdXUPlzNH07//XZwzRsCFn7Eq3brqYk6Q=="; }; }; - "vscode-debugprotocol-1.44.0" = { + "vscode-debugprotocol-1.45.0" = { name = "vscode-debugprotocol"; packageName = "vscode-debugprotocol"; - version = "1.44.0"; + version = "1.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.44.0.tgz"; - sha512 = "qf+eBnrDyR2MpP08y1JfzJnFZGHdkk86+SRGRp0XepDGNA6n/Nann5XhtAzdGX/yaZokjTAINK313S2yYhHoPQ=="; + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.45.0.tgz"; + sha512 = "xU6XtdKJ0waWIt79Zt4WVyIQ3oDkhilku9Shbv7Vc4KXEr/npsf8dhinyIZXSIlH2lzJiE3imp1xbYpyRTIrhg=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -58903,6 +58957,15 @@ let sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; + "vscode-json-languageservice-4.0.2" = { + name = "vscode-json-languageservice"; + packageName = "vscode-json-languageservice"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.0.2.tgz"; + sha512 = "d8Ahw990Cq/G60CzN26rehXcbhbMgMGMmXeN6C/V/RYZUhfs16EELRK+EL7b/3Y8ZGshtKqboePSeDVa94qqFg=="; + }; + }; "vscode-jsonrpc-3.5.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -58957,15 +59020,6 @@ let sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="; }; }; - "vscode-jsonrpc-6.0.0-next.2" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "6.0.0-next.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.2.tgz"; - sha512 = "dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw=="; - }; - }; "vscode-jsonrpc-6.1.0-next.2" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -59065,15 +59119,6 @@ let sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw=="; }; }; - "vscode-languageserver-7.0.0-next.3" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "7.0.0-next.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0-next.3.tgz"; - sha512 = "qSt8eb546iFuoFIN+9MPl4Avru6Iz2/JP0UmS/3djf40ICa31Np/yJ7anX2j0Az5rCzb0fak8oeKwDioGeVOYg=="; - }; - }; "vscode-languageserver-protocol-3.14.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -59110,15 +59155,6 @@ let sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; - "vscode-languageserver-protocol-3.16.0-next.4" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.16.0-next.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.4.tgz"; - sha512 = "6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ=="; - }; - }; "vscode-languageserver-protocol-3.17.0-next.5" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -59344,13 +59380,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.5" = { + "vue-3.0.6" = { name = "vue"; packageName = "vue"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.5.tgz"; - sha512 = "TfaprOmtsAfhQau7WsomXZ8d9op/dkQLNIq8qPV3A0Vxs6GR5E+c1rfJS1SDkXRQj+dFyfnec7+U0Be1huiScg=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.6.tgz"; + sha512 = "fgjbe/+f1EsqG7ZbaFSnxdzQXF2DKoFCdJlPxZZJy9XMtyXS6SY8pGzLi8WYb4zmsPLHvTZz4bHW30kFDk7vfA=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -59821,13 +59857,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.114.1" = { + "webtorrent-0.115.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.114.1"; + version = "0.115.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.114.1.tgz"; - sha512 = "RJqwy6cTG1kysvd3xX2CJIAMeC/3e5M/MPu4MuZKcBxa2I+D75nONoNjP0cLTnE+gVb0MFQSQU93ln/2/f6k6g=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.115.0.tgz"; + sha512 = "KYiWsUMdI/qXABrgm3LU+dqsaeyOWx66etJXjiGFyuKWD0tMCwcECdUBdBKcnKPFNQnfuu9sjCPnrWGncF9C5Q=="; }; }; "well-known-symbols-2.0.0" = { @@ -59848,13 +59884,13 @@ let sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; - "whatwg-fetch-3.6.1" = { + "whatwg-fetch-3.6.2" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.1.tgz"; - sha512 = "IEmN/ZfmMw6G1hgZpVd0LuZXOQDisrMOZrzYd5x3RAK4bMPlJohKUZWZ9t/QsTvH0dV9TbPDcc2OSuIDcihnHA=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; + sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -61289,13 +61325,13 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; - "yaml-language-server-0.13.1-dcc82a9.0" = { + "yaml-language-server-0.13.1-d0f9b44.0" = { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.13.1-dcc82a9.0"; + version = "0.13.1-d0f9b44.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.1-dcc82a9.0.tgz"; - sha512 = "26QP9JhfcrroDTeMv2OsY4eoI+NKb6tZwy1Uz0MBWi1uGmOw0/6aR9Oa3guOsC96U27GAqT6glRFMjCGqLro7A=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.1-d0f9b44.0.tgz"; + sha512 = "6q5NKJiCqB1ptEopsA6pQDNDBnpwQ5o3A6im9Mus9XdB1gM0TCaR2TT9XU13CFo6JoCgVZ6s3lgoUOsbN8Y5Qw=="; }; }; "yaml-language-server-parser-0.1.2" = { @@ -61523,13 +61559,13 @@ let sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="; }; }; - "yargs-parser-20.2.5" = { + "yargs-parser-20.2.6" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "20.2.5"; + version = "20.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.5.tgz"; - sha512 = "jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.6.tgz"; + sha512 = "AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA=="; }; }; "yargs-parser-4.2.1" = { @@ -61826,15 +61862,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.2.1"; + version = "11.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.1.tgz"; - sha512 = "FVwJQyPTMTTikrsKYqaP44/23UqTQ6txNt6xGoWPyI/v8VQ1afyjswcw4Z/zHWIoscmltjPuV00IYJ+NZLYPBQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.2.tgz"; + sha512 = "rOVBzDzrMuOgJY43O46/7yYbncx0egGfr+DMJDQdazePGH1H3INN/eA9gkVcVK53ztCYb9X1sbZKOs9TUhF6nw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1102.1" - sources."@angular-devkit/core-11.2.1" - sources."@angular-devkit/schematics-11.2.1" + sources."@angular-devkit/architect-0.1102.2" + sources."@angular-devkit/core-11.2.2" + sources."@angular-devkit/schematics-11.2.2" sources."@npmcli/ci-detect-1.3.0" (sources."@npmcli/git-2.0.6" // { dependencies = [ @@ -61847,11 +61883,11 @@ in sources."@npmcli/promise-spawn-1.3.2" (sources."@npmcli/run-script-1.8.3" // { dependencies = [ - sources."read-package-json-fast-2.0.1" + sources."read-package-json-fast-2.0.2" ]; }) - sources."@schematics/angular-11.2.1" - sources."@schematics/update-0.1102.1" + sources."@schematics/angular-11.2.2" + sources."@schematics/update-0.1102.2" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -62067,7 +62103,7 @@ in sources."sourcemap-codec-1.4.8" sources."sshpk-1.16.1" sources."ssri-8.0.1" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" @@ -62303,7 +62339,7 @@ in }) sources."handlebars-4.7.7" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."http-cache-semantics-4.1.0" sources."ieee754-1.2.1" sources."ignore-5.1.8" @@ -62584,7 +62620,7 @@ in sources."request-promise-native-1.0.9" sources."restore-cursor-2.0.0" sources."run-async-2.4.1" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-3.1.11" @@ -62638,10 +62674,10 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "7.5.5"; + version = "7.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.5.tgz"; - sha512 = "j45givEQQxMwZA4z78XQyYwNrLoe3PHtTRZsneRIWmgSNJ6t0Lfv9MGbNTot0hQ6LYLiEPnvWTpgg2tkKrwUmA=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.6.tgz"; + sha512 = "nJCoKFleVV6NCkezc+cokJCVnDQBJoxmBVggQ1XfJ6Lvjy9TFQfG2J/nDdVurxpm7mlJm/Yg/rbXxaiUZVcJAQ=="; }; dependencies = [ sources."@angular-devkit/core-11.2.0" @@ -62649,7 +62685,7 @@ in sources."@angular-devkit/schematics-cli-0.1102.0" sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -62659,14 +62695,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-7.2.7" // { - dependencies = [ - sources."@angular-devkit/core-11.1.0" - sources."@angular-devkit/schematics-11.1.0" - sources."chalk-4.1.0" - sources."ora-5.2.0" - ]; - }) + sources."@nestjs/schematics-7.2.8" sources."@schematics/schematics-0.1102.0" sources."@types/anymatch-1.3.1" sources."@types/eslint-7.2.6" @@ -62714,7 +62743,7 @@ in sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-3.0.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."at-least-node-1.0.0" @@ -62728,7 +62757,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -62740,7 +62769,7 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."colors-1.4.0" sources."commander-4.1.1" sources."concat-map-0.0.1" @@ -62749,7 +62778,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.5.0" @@ -62764,7 +62793,7 @@ in ]; }) sources."estraverse-4.3.0" - sources."events-3.2.0" + sources."events-3.3.0" sources."execa-4.1.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" @@ -62797,9 +62826,11 @@ in sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."chalk-4.1.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" ]; }) sources."interpret-1.4.0" @@ -62851,7 +62882,7 @@ in sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.70" + sources."node-releases-1.1.71" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -62859,7 +62890,9 @@ in sources."onetime-5.1.2" (sources."ora-5.3.0" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."chalk-4.1.0" + sources."strip-ansi-6.0.0" ]; }) sources."os-name-4.0.0" @@ -62907,14 +62940,9 @@ in ]; }) sources."sourcemap-codec-1.4.8" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-2.1.1" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-4.0.0" sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" @@ -63012,128 +63040,124 @@ in sources."@apollographql/graphql-playground-html-1.6.26" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.12.13" - (sources."@babel/core-7.12.17" // { + sources."@babel/compat-data-7.13.8" + (sources."@babel/core-7.13.8" // { dependencies = [ - sources."@babel/generator-7.12.17" - sources."@babel/types-7.12.17" - sources."semver-5.7.1" + sources."@babel/generator-7.13.0" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/generator-7.12.11" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/helper-annotate-as-pure-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.17" - ]; - }) - (sources."@babel/helper-compilation-targets-7.12.17" // { - dependencies = [ - sources."semver-5.7.1" + sources."@babel/types-7.13.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.17" + sources."@babel/helper-compilation-targets-7.13.8" + sources."@babel/helper-create-class-features-plugin-7.13.8" sources."@babel/helper-create-regexp-features-plugin-7.12.17" - (sources."@babel/helper-explode-assignable-expression-7.12.13" // { + sources."@babel/helper-define-polyfill-provider-0.1.4" + (sources."@babel/helper-explode-assignable-expression-7.13.0" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/helper-function-name-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/helper-get-function-arity-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) - (sources."@babel/helper-hoist-variables-7.12.13" // { + (sources."@babel/helper-hoist-variables-7.13.0" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) - (sources."@babel/helper-member-expression-to-functions-7.12.17" // { + (sources."@babel/helper-member-expression-to-functions-7.13.0" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/helper-module-imports-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) - (sources."@babel/helper-module-transforms-7.12.17" // { + (sources."@babel/helper-module-transforms-7.13.0" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/helper-optimise-call-expression-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) - sources."@babel/helper-plugin-utils-7.12.13" - (sources."@babel/helper-remap-async-to-generator-7.12.13" // { + sources."@babel/helper-plugin-utils-7.13.0" + (sources."@babel/helper-remap-async-to-generator-7.13.0" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) - (sources."@babel/helper-replace-supers-7.12.13" // { + (sources."@babel/helper-replace-supers-7.13.0" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/helper-simple-access-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) (sources."@babel/helper-split-export-declaration-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - (sources."@babel/helper-wrap-function-7.12.13" // { + (sources."@babel/helper-wrap-function-7.13.0" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) - (sources."@babel/helpers-7.12.17" // { + (sources."@babel/helpers-7.13.0" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) - sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.17" - sources."@babel/plugin-proposal-async-generator-functions-7.12.13" - sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.17" + sources."@babel/highlight-7.13.8" + sources."@babel/parser-7.13.4" + sources."@babel/plugin-proposal-async-generator-functions-7.13.8" + sources."@babel/plugin-proposal-class-properties-7.13.0" + sources."@babel/plugin-proposal-dynamic-import-7.13.8" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" - sources."@babel/plugin-proposal-json-strings-7.12.13" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.13.8" + sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" sources."@babel/plugin-proposal-numeric-separator-7.12.13" - sources."@babel/plugin-proposal-object-rest-spread-7.12.13" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.17" - sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.13.8" + sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -63149,66 +63173,65 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.12.13" sources."@babel/plugin-syntax-typescript-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.12.13" - sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.13.0" + sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" sources."@babel/plugin-transform-block-scoping-7.12.13" - sources."@babel/plugin-transform-classes-7.12.13" - sources."@babel/plugin-transform-computed-properties-7.12.13" - sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-computed-properties-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.0" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.12.13" - sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.13.0" + sources."@babel/plugin-transform-for-of-7.13.0" sources."@babel/plugin-transform-function-name-7.12.13" sources."@babel/plugin-transform-literals-7.12.13" sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.12.13" - sources."@babel/plugin-transform-modules-commonjs-7.12.13" - sources."@babel/plugin-transform-modules-systemjs-7.12.13" - sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.13.0" + sources."@babel/plugin-transform-modules-commonjs-7.13.8" + sources."@babel/plugin-transform-modules-systemjs-7.13.8" + sources."@babel/plugin-transform-modules-umd-7.13.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" sources."@babel/plugin-transform-new-target-7.12.13" sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-regenerator-7.12.13" sources."@babel/plugin-transform-reserved-words-7.12.13" sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-spread-7.13.0" sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-template-literals-7.13.0" sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-typescript-7.12.17" + sources."@babel/plugin-transform-typescript-7.13.0" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.12.17" // { + (sources."@babel/preset-env-7.13.8" // { dependencies = [ - sources."@babel/types-7.12.17" - sources."semver-5.7.1" + sources."@babel/types-7.13.0" ]; }) sources."@babel/preset-flow-7.12.13" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.17" - (sources."@babel/register-7.12.13" // { + sources."@babel/preset-typescript-7.13.0" + (sources."@babel/register-7.13.8" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.12.18" + sources."@babel/runtime-7.13.8" (sources."@babel/template-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" ]; }) - (sources."@babel/traverse-7.12.17" // { + (sources."@babel/traverse-7.13.0" // { dependencies = [ - sources."@babel/generator-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/generator-7.13.0" + sources."@babel/types-7.13.0" ]; }) sources."@babel/types-7.10.4" @@ -63389,24 +63412,24 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.11" sources."@vue/cli-ui-addon-widgets-4.5.11" - (sources."@vue/compiler-core-3.0.5" // { + (sources."@vue/compiler-core-3.0.6" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.5" - (sources."@vue/compiler-sfc-3.0.5" // { + sources."@vue/compiler-dom-3.0.6" + (sources."@vue/compiler-sfc-3.0.6" // { dependencies = [ - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.5" - sources."@vue/reactivity-3.0.5" - sources."@vue/runtime-core-3.0.5" - sources."@vue/runtime-dom-3.0.5" - sources."@vue/shared-3.0.5" + sources."@vue/compiler-ssr-3.0.6" + sources."@vue/reactivity-3.0.6" + sources."@vue/runtime-core-3.0.6" + sources."@vue/runtime-dom-3.0.6" + sources."@vue/shared-3.0.6" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -63544,6 +63567,9 @@ in sources."aws4-1.11.0" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" + sources."babel-plugin-polyfill-corejs2-0.1.8" + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -63626,7 +63652,7 @@ in ]; }) sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" (sources."capital-case-1.0.4" // { dependencies = [ sources."tslib-2.1.0" @@ -63726,7 +63752,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -63756,8 +63782,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.9.0" - (sources."core-js-compat-3.9.0" // { + sources."core-js-3.9.1" + (sources."core-js-compat-3.9.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -63778,7 +63804,7 @@ in sources."crypto-random-string-1.0.0" sources."cssesc-3.0.0" sources."cssfilter-0.0.10" - sources."csstype-2.6.15" + sources."csstype-2.6.16" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" @@ -63853,7 +63879,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -63937,7 +63963,7 @@ in sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."fd-slicer-1.1.0" sources."figures-1.7.0" sources."file-type-8.1.0" @@ -64014,7 +64040,7 @@ in }) sources."global-dirs-0.1.1" sources."globals-11.12.0" - sources."globalthis-1.0.1" + sources."globalthis-1.0.2" (sources."globby-9.2.0" // { dependencies = [ sources."@nodelib/fs.stat-1.1.3" @@ -64079,7 +64105,7 @@ in }) sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -64114,7 +64140,7 @@ in sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."icss-replace-symbols-1.1.0" - sources."icss-utils-4.1.1" + sources."icss-utils-5.1.0" sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."ignore-by-default-1.0.1" @@ -64368,7 +64394,7 @@ in }) sources."node-dir-0.1.17" sources."node-fetch-2.6.1" - sources."node-ipc-9.1.3" + sources."node-ipc-9.1.4" sources."node-modules-regexp-1.0.0" (sources."node-notifier-9.0.0" // { dependencies = [ @@ -64379,7 +64405,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-1.1.70" + sources."node-releases-1.1.71" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.7" @@ -64505,17 +64531,17 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-8.2.6" // { dependencies = [ + sources."nanoid-3.1.20" sources."source-map-0.6.1" - sources."supports-color-6.1.0" ]; }) - sources."postcss-modules-3.2.2" - sources."postcss-modules-extract-imports-2.0.0" - sources."postcss-modules-local-by-default-3.0.3" - sources."postcss-modules-scope-2.2.0" - sources."postcss-modules-values-3.0.0" + sources."postcss-modules-4.0.0" + sources."postcss-modules-extract-imports-3.0.0" + sources."postcss-modules-local-by-default-4.0.0" + sources."postcss-modules-scope-3.0.0" + sources."postcss-modules-values-4.0.0" sources."postcss-selector-parser-6.0.4" sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" @@ -64533,7 +64559,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."query-string-6.14.0" + sources."query-string-6.14.1" sources."queue-microtask-1.2.2" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { @@ -64616,7 +64642,7 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -64747,9 +64773,9 @@ in sources."streamsearch-0.1.2" sources."strict-uri-encode-2.0.0" sources."string-hash-1.1.3" - sources."string-width-4.2.0" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string-width-4.2.2" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -64942,7 +64968,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.5" + sources."vue-3.0.6" ]; }) sources."watch-1.0.2" @@ -65127,12 +65153,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/generator-7.12.17" + sources."@babel/generator-7.13.0" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.17" + sources."@babel/highlight-7.13.8" + sources."@babel/parser-7.13.4" sources."@babel/template-7.12.13" - sources."@babel/types-7.12.17" + sources."@babel/types-7.13.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -65208,48 +65234,56 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - (sources."@babel/core-7.12.17" // { + sources."@babel/compat-data-7.13.8" + (sources."@babel/core-7.13.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.17" // { + (sources."@babel/generator-7.13.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) + sources."@babel/helper-compilation-targets-7.13.8" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.17" + sources."@babel/helper-member-expression-to-functions-7.13.0" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.17" + sources."@babel/helper-module-transforms-7.13.0" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-replace-supers-7.13.0" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.17" - sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.17" + sources."@babel/helper-validator-option-7.12.17" + sources."@babel/helpers-7.13.0" + sources."@babel/highlight-7.13.8" + sources."@babel/parser-7.13.4" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" sources."async-3.2.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."browserslist-4.16.3" + sources."caniuse-lite-1.0.30001192" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."colorette-1.2.2" sources."colors-1.4.0" sources."commander-2.20.3" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" sources."debug-4.3.2" sources."ejs-3.1.5" + sources."electron-to-chromium-1.3.675" sources."ensure-posix-path-1.1.1" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."filelist-1.0.2" sources."fs-extra-5.0.0" @@ -65293,6 +65327,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" + sources."node-releases-1.1.71" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -65306,7 +65341,7 @@ in sources."resolve-1.20.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" - sources."semver-5.7.1" + sources."semver-6.3.0" sources."source-map-0.6.1" sources."strip-ansi-0.1.1" sources."supports-color-5.5.0" @@ -65672,7 +65707,7 @@ in sources."array-filter-1.0.0" (sources."asn1.js-5.4.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) (sources."assert-1.5.0" // { @@ -65684,7 +65719,7 @@ in sources."available-typed-arrays-1.0.2" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" - sources."bn.js-5.1.3" + sources."bn.js-5.2.0" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."browser-pack-6.1.0" @@ -65715,7 +65750,7 @@ in sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."create-hash-1.2.0" @@ -65729,19 +65764,19 @@ in sources."detective-5.2.0" (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" - sources."events-3.2.0" + sources."events-3.3.0" sources."evp_bytestokey-1.0.3" sources."fast-safe-stringify-2.0.7" sources."foreach-2.0.5" @@ -65751,7 +65786,7 @@ in sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -65783,7 +65818,7 @@ in sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."minimalistic-assert-1.0.1" @@ -65810,7 +65845,7 @@ in sources."process-nextick-args-2.0.1" (sources."public-encrypt-4.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."punycode-1.4.1" @@ -65846,8 +65881,8 @@ in ]; }) sources."stream-splicer-2.0.1" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.3.0" sources."subarg-1.0.0" sources."syntax-error-1.4.0" @@ -65937,7 +65972,7 @@ in sources."bitcoin-ops-1.4.1" sources."bitcoinjs-lib-5.2.0" sources."bluebird-3.7.2" - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -66060,7 +66095,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" (sources."hash-base-3.1.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -66185,7 +66220,7 @@ in sources."psl-1.8.0" sources."pug-2.0.4" sources."pug-attrs-2.0.4" - sources."pug-code-gen-2.0.2" + sources."pug-code-gen-2.0.3" sources."pug-error-1.3.3" sources."pug-filters-3.1.1" sources."pug-lexer-4.1.0" @@ -66394,7 +66429,7 @@ in ]; }) sources."blob-to-buffer-1.2.9" - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" sources."bncode-0.5.3" sources."brace-expansion-1.1.11" sources."buffer-alloc-1.2.0" @@ -66618,7 +66653,7 @@ in sources."qs-6.5.2" sources."query-string-1.0.1" sources."queue-microtask-1.2.2" - sources."random-access-file-2.1.5" + sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" @@ -66767,13 +66802,13 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.8.tgz"; - sha512 = "3gtzVdy2/KcfUsXmbEuehe8O1L1EtjzEvfzBYcQtZ1VYJK+X95H2UXlDwI6ug+K8A/Fmnrh2TjtIq1Vakv0fcQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.9.tgz"; + sha512 = "S9ER79LVYYGKPoD3Xwm27E5+GBWseLdQ9oKbzIPuJplz++SapOhuHnAYIr9m4nuriQYq4grYonkwaaBQWiGyrA=="; }; dependencies = [ - sources."@jsii/spec-1.21.0" + sources."@jsii/spec-1.22.0" sources."@types/node-10.17.54" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -66783,10 +66818,10 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.8" + sources."cdk8s-1.0.0-beta.9" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.21.0" // { + (sources."codemaker-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -66825,7 +66860,7 @@ in sources."get-intrinsic-1.1.1" sources."graceful-fs-4.2.6" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."is-arguments-1.1.0" sources."is-bigint-1.0.1" sources."is-boolean-object-1.1.0" @@ -66843,31 +66878,31 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.21.0" // { + (sources."jsii-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.21.0" // { + (sources."jsii-pacmak-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.21.0" // { + (sources."jsii-reflect-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.21.0" // { + (sources."jsii-rosetta-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.222" // { + (sources."jsii-srcmak-0.1.238" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -66889,7 +66924,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.21.0" + sources."oo-ascii-tree-1.22.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -66915,10 +66950,10 @@ in sources."date-format-2.1.0" ]; }) - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."string.prototype.repeat-0.2.0" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."strip-ansi-6.0.0" sources."tslib-2.1.0" sources."typescript-3.9.9" @@ -66943,7 +66978,7 @@ in sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -66964,7 +66999,7 @@ in sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA=="; }; dependencies = [ - sources."@jsii/spec-1.21.0" + sources."@jsii/spec-1.22.0" sources."@skorfmann/terraform-cloud-1.9.1" sources."@types/archiver-5.1.0" sources."@types/glob-7.1.3" @@ -67022,7 +67057,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.0.2" sources."concat-map-0.0.1" - sources."constructs-3.3.29" + sources."constructs-3.3.43" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" @@ -67055,7 +67090,7 @@ in sources."exit-on-epipe-1.0.1" sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."foreach-2.0.5" sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" @@ -67067,7 +67102,7 @@ in sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -67106,7 +67141,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.21.0" // { + (sources."jsii-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67114,10 +67149,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.21.0" // { + (sources."jsii-pacmak-1.22.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.21.0" + sources."codemaker-1.22.0" sources."decamelize-5.0.0" sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67125,7 +67160,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.21.0" // { + (sources."jsii-reflect-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67133,7 +67168,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.21.0" // { + (sources."jsii-rosetta-1.22.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67141,7 +67176,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.222" // { + (sources."jsii-srcmak-0.1.238" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67198,11 +67233,11 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.entries-1.1.3" - sources."object.fromentries-2.0.3" - sources."object.values-1.1.2" + sources."object.fromentries-2.0.4" + sources."object.values-1.1.3" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.21.0" + sources."oo-ascii-tree-1.22.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -67254,11 +67289,11 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string-width-4.2.0" - sources."string.prototype.matchall-4.0.3" + sources."string-width-4.2.2" + sources."string.prototype.matchall-4.0.4" sources."string.prototype.repeat-0.2.0" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" @@ -67286,7 +67321,7 @@ in sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" sources."yn-3.1.1" sources."yoga-layout-prebuilt-1.10.0" sources."zip-stream-4.0.4" @@ -67387,7 +67422,7 @@ in sources."path-is-absolute-1.0.1" sources."prompt-1.1.0" sources."punycode-2.1.1" - sources."query-string-6.14.0" + sources."query-string-6.14.1" sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.7.1" @@ -67400,7 +67435,7 @@ in sources."universal-url-2.0.0" sources."utile-0.3.0" sources."webidl-conversions-4.0.2" - sources."whatwg-fetch-3.6.1" + sources."whatwg-fetch-3.6.2" sources."whatwg-url-7.1.0" (sources."winston-2.4.5" // { dependencies = [ @@ -67535,10 +67570,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.2.1.tgz"; - sha512 = "UlT5D++GU9vWlK/bANGHDxtThdPOWWiVRg9Fsist2ytrg6pjNPSDT/f6US1J7aBCRCB9p2463e/G7JSUT4WTow=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.2.2.tgz"; + sha512 = "XM0bJ/dzVatUh6/BOFI/DbfaD4cC9mF+MvVGEmYI+4Xx/wAafWfHrnnpVA7y1mrZ6qTPYtIOCrHW7uXL73dbsA=="; }; buildInputs = globalBuildInputs; meta = { @@ -67601,7 +67636,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.1.5" + sources."typescript-4.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -67722,10 +67757,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.1.tgz"; - sha512 = "1chc5qluoxF39fNKSoLNrPWrWsBQc+zHkXmleOka2HLYDQHmqgYqWZiPgJ03IqOoR3uJcS8sgdrCLyVdqWBwrg=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.2.tgz"; + sha512 = "oONqWYHICin0t9chOrx6dkL2pEBeaFwrfwaBPX9we0bNrhQ3XQNLNC/O+/x4ZSHzHQ0hucmmGOuCoQ9Q7wbdGg=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.13" @@ -67771,7 +67806,7 @@ in sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."fp-ts-2.9.5" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" @@ -67788,7 +67823,7 @@ in sources."glob-7.1.6" sources."graceful-fs-4.2.6" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."ieee754-1.2.1" @@ -67865,8 +67900,8 @@ in sources."date-format-2.1.0" ]; }) - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -67902,10 +67937,10 @@ in coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; - version = "1.2.22"; + version = "1.2.23"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.22.tgz"; - sha512 = "AskNxINhyImxvFhlt0tvFJUS/Z4sUehgKPdy1jxVa+vu4CU903cNR6Dot4phrRRfgSCH3NT8SrYBhg4YvsxlkA=="; + url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.23.tgz"; + sha512 = "vV4rjZqtgHNTlXhHQyQ9cabwbwummPOtxyHYUJDZvfuAGKKTbFpvoC3iS6Qv1P7FTAaxuEpB72EME7+K1bdk7A=="; }; buildInputs = globalBuildInputs; meta = { @@ -67920,15 +67955,15 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.20"; + version = "1.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.20.tgz"; - sha512 = "3p4AwJnsjtLJM53wLsMtcVUzWPMnnYI6pkwQraHH6Tp7/ZuXwIVhjUvDgMcAvhmIkVePyvJF5xZHN4ghLLP02A=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.21.tgz"; + sha512 = "KgGvNm7vnJTUfOx7V4PDEoDJRHUMrUqkqdJy/YPk6AaW/fYhm32RGGiwDfcC3WtMv6Xo+d/zCxq5QYj8Pt0q2w=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" + sources."@babel/highlight-7.13.8" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" @@ -68000,7 +68035,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -68057,7 +68092,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.9.0" + sources."core-js-3.9.1" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -68097,7 +68132,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -68618,7 +68653,7 @@ in sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.4.1" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -68699,7 +68734,7 @@ in sources."kind-of-5.1.0" ]; }) - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."strip-ansi-6.0.0" ]; @@ -68879,13 +68914,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.113"; + version = "1.1.116"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.113.tgz"; - sha512 = "a9mC0b7oVLT3KEHbBw1e7D7k2UD0lRaTk/HrZJJ/lkIDlpF/6TrwqTcL/BUWptUjwUA4sOOdAoQQeOR88Ugsww=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.116.tgz"; + sha512 = "KI+f2ZI5xYRrbRjejstDfQlY0U5zaEKhQT16SXywzoS49MPsP++yEw0Om6155JopMrKNE2Qo60P0awInopzSAg=="; }; dependencies = [ - sources."pyright-1.1.113" + sources."pyright-1.1.116" ]; buildInputs = globalBuildInputs; meta = { @@ -68959,10 +68994,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.33.0"; + version = "0.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.33.0.tgz"; - sha512 = "0KXO4O25iL5Cl+E5Tn7QCDh4FbeyGtQKP4VpKp6tP3gQyO8X4W5AN3RSj5RHHeV8TIT0EMoI26FRVQ2MiALmGg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.35.0.tgz"; + sha512 = "iivHZAR6Xec7Tc0sSzEbJaJgnUrLGgb5pVisJgWoHlPDe/KsxYM9JRlKmBqqmcYs9Bmu2vc8j+3Af7ODwW8+2A=="; }; buildInputs = globalBuildInputs; meta = { @@ -68995,10 +69030,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.0.tgz"; - sha512 = "XjL23iRnKCxeh/qG6FN1SJQQRHLunlxs6UlJua35A42tjztC6ZZYwuE4W9W8oU53iqGrSYrIrkT1+WFznBr/0g=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.1.tgz"; + sha512 = "+81jc8T250Ipl50MMypedTqHvAAGPu/COg9wEUsBzEOHmA0r4ouvRhzjAOWt7G6L2dHdB4KJl8AWfiVZhc5dRA=="; }; buildInputs = globalBuildInputs; meta = { @@ -69036,28 +69071,31 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/core-7.12.17" - sources."@babel/generator-7.12.17" + sources."@babel/compat-data-7.13.8" + sources."@babel/core-7.13.8" + sources."@babel/generator-7.13.0" + sources."@babel/helper-compilation-targets-7.13.8" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.17" + sources."@babel/helper-member-expression-to-functions-7.13.0" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.17" + sources."@babel/helper-module-transforms-7.13.0" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-replace-supers-7.13.0" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.17" - (sources."@babel/highlight-7.12.13" // { + sources."@babel/helper-validator-option-7.12.17" + sources."@babel/helpers-7.13.0" + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.17" + sources."@babel/parser-7.13.4" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -69083,7 +69121,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -69099,7 +69137,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" sources."cosmiconfig-7.0.0" @@ -69121,7 +69159,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -69133,7 +69171,7 @@ in sources."fast-diff-1.2.0" sources."fast-glob-3.2.5" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -69216,7 +69254,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.70" + sources."node-releases-1.1.71" (sources."normalize-package-data-3.0.0" // { dependencies = [ sources."semver-7.3.4" @@ -69266,6 +69304,7 @@ in dependencies = [ sources."hosted-git-info-2.8.8" sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" sources."type-fest-0.6.0" ]; }) @@ -69287,7 +69326,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" - sources."semver-5.7.1" + sources."semver-6.3.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -69303,7 +69342,7 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" sources."specificity-0.4.1" - sources."string-width-4.2.0" + sources."string-width-4.2.2" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -69323,7 +69362,7 @@ in sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unified-9.2.0" + sources."unified-9.2.1" sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.0.4" @@ -69349,7 +69388,7 @@ in sources."write-file-atomic-3.0.3" sources."yallist-4.0.0" sources."yaml-1.10.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" sources."zwitch-1.0.5" ]; buildInputs = globalBuildInputs; @@ -69407,7 +69446,7 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" + sources."@babel/highlight-7.13.8" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" @@ -69460,10 +69499,10 @@ in coc-tslint-plugin = nodeEnv.buildNodePackage { name = "coc-tslint-plugin"; packageName = "coc-tslint-plugin"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.1.2.tgz"; - sha512 = "wLm2JJVkf2yUk3XzMSmAs8pnibQRTroHnF3XkIH7DJ5mrcrZe9o0Od2lYyuNxgJn2v6/Iw221o8/LfoamfywdQ=="; + url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.2.0.tgz"; + sha512 = "WEl0FM8ui0Oip6YqyOYApf8vErXFudj2ftjSYqm5WNLNuPq53JSNi+5w+WNqHwX2UWE8MOB2mQszqwU2fyE8Ag=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -69493,13 +69532,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.7.tgz"; - sha512 = "NVBl6AEbEax6GQdBlBy/SelJ5TXCkrnLN/dDqgDWwhIPX6UBFhFTFCLcqcHbfMjLM/MDvP/t85w+OYBGe2gXxg=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.8.tgz"; + sha512 = "No0Eio7RJDawPS2fuWyJgnbDRN9ivtxf085o4jOuSOrwFeId88Se1ngPoT7whVAOkAiW75KgqFyuLDlr9XH+9w=="; }; dependencies = [ - sources."typescript-4.1.5" + sources."typescript-4.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -69522,12 +69561,12 @@ in dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.3.0" + sources."@eslint/eslintrc-0.4.0" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -69561,7 +69600,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.20.0" + sources."eslint-7.21.0" sources."eslint-plugin-vue-7.6.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { @@ -69650,7 +69689,7 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" @@ -69671,7 +69710,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" - sources."typescript-4.1.5" + sources."typescript-4.2.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.2.0" sources."vls-0.5.10" @@ -69751,10 +69790,10 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.3.0.tgz"; - sha512 = "i71kwyF20R+vAHhuF9uBbvs6kkvKuSifMkxTeIbBnLobHE500rSSwUD2SPIvt+I1g1rfHrM0Sj89fzrhDA60NQ=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.3.1.tgz"; + sha512 = "OJeA16cZ7ds4QsyPP9Vmztca4DDpcz7odPN5O75+jb5nmTD5UgYWQE71sY10vIIqdI+dKYdWw+iausu90cuZHA=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -69766,16 +69805,18 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.1" - sources."jsonc-parser-3.0.0" + sources."jsonc-parser-2.3.1" sources."ms-2.0.0" sources."prettier-2.0.5" - (sources."request-light-0.2.5" // { + sources."request-light-0.2.5" + sources."sprintf-js-1.0.3" + (sources."vscode-json-languageservice-3.11.0" // { dependencies = [ - sources."vscode-nls-4.1.2" + sources."jsonc-parser-3.0.0" + sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-nls-5.0.0" ]; }) - sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.11.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -69788,16 +69829,10 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.16.0-next.2" - sources."vscode-nls-5.0.0" + sources."vscode-languageserver-types-3.16.0" + sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" - (sources."yaml-language-server-0.13.1-dcc82a9.0" // { - dependencies = [ - sources."jsonc-parser-2.3.1" - sources."vscode-languageserver-types-3.16.0" - sources."vscode-nls-4.1.2" - ]; - }) + sources."yaml-language-server-0.13.1-d0f9b44.0" sources."yaml-language-server-parser-0.1.3-fa8245c.0" ]; buildInputs = globalBuildInputs; @@ -69848,10 +69883,10 @@ in coinmon = nodeEnv.buildNodePackage { name = "coinmon"; packageName = "coinmon"; - version = "0.0.27"; + version = "0.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.27.tgz"; - sha512 = "aOxDy3oAUu5oKpjb+ZrQgOuT+yBPxbaOc4CMLD+c8uKyDbAodf/0Xee53xVihqeQtjvdCXszoAnMNtKid+/MrA=="; + url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.28.tgz"; + sha512 = "jARqwj0uyTfbcsTr3IDoaGI6ZXUV8e8qVjw+LaRBujvjgsiWypJweze5IZy0/sjNEKlptwB7GDjmuphtBzngFA=="; }; dependencies = [ sources."ansi-regex-3.0.0" @@ -69866,7 +69901,7 @@ in sources."colors-1.4.0" sources."commander-2.20.3" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" sources."log-symbols-2.2.0" @@ -69914,7 +69949,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" sources."fn.name-1.1.0" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -70028,7 +70063,7 @@ in sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -70156,7 +70191,7 @@ in sources."fast-glob-3.2.5" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."figures-2.0.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -70425,7 +70460,7 @@ in sources."read-1.0.7" sources."read-chunk-3.2.0" sources."read-package-json-2.1.2" - sources."read-package-json-fast-2.0.1" + sources."read-package-json-fast-2.0.2" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -70444,7 +70479,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -70490,7 +70525,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.34.14" + sources."systeminformation-4.34.15" sources."tar-6.1.0" sources."term-size-2.2.1" sources."through-2.3.8" @@ -70529,7 +70564,7 @@ in sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -70576,7 +70611,7 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" + sources."@babel/highlight-7.13.8" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" @@ -71004,7 +71039,7 @@ in sources."figures-2.0.0" sources."form-data-2.5.1" sources."formidable-1.2.2" - sources."globalthis-1.0.1" + sources."globalthis-1.0.2" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -71097,10 +71132,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.2.tgz"; - sha512 = "B78UC1E8LwvbmvEjIPumKXvu9yeNTpaKrNVf0HpP5AJmGgq9fdipcYKtpqRNAwm06lvhpNhO3jvR9xeRQDsmog=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.3.tgz"; + sha512 = "Gz/ilrPq0ehiZ+K3L4jAZXGVep6NDkAytIdiHXsE4cWJav9uHe8xzEN84i3SjMYox6yNrBaULXHAkWdn4ZBF9Q=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -71664,7 +71699,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."random-access-file-2.1.5" + sources."random-access-file-2.2.0" sources."random-access-memory-3.1.2" sources."random-access-storage-1.4.1" sources."randombytes-2.1.0" @@ -71934,7 +71969,7 @@ in sources."del-6.0.0" sources."dir-glob-3.0.1" sources."fast-glob-3.2.5" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" @@ -71970,7 +72005,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."slash-3.0.0" sources."temp-dir-2.0.0" sources."tempy-0.7.1" @@ -72197,32 +72232,43 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/core-7.12.17" - sources."@babel/generator-7.12.17" + sources."@babel/compat-data-7.13.8" + (sources."@babel/core-7.13.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/generator-7.13.0" sources."@babel/helper-annotate-as-pure-7.12.13" + (sources."@babel/helper-compilation-targets-7.13.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.17" + sources."@babel/helper-member-expression-to-functions-7.13.0" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.17" + sources."@babel/helper-module-transforms-7.13.0" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.12.13" - sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-plugin-utils-7.13.0" + sources."@babel/helper-replace-supers-7.13.0" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.17" - sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.17" - sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/helper-validator-option-7.12.17" + sources."@babel/helpers-7.13.0" + sources."@babel/highlight-7.13.8" + sources."@babel/parser-7.13.4" + sources."@babel/plugin-proposal-object-rest-spread-7.13.8" sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.12.13" - sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-destructuring-7.13.0" + sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-react-jsx-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -72248,6 +72294,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."browserslist-4.16.3" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.1" // { dependencies = [ @@ -72263,6 +72310,7 @@ in sources."quick-lru-4.0.1" ]; }) + sources."caniuse-lite-1.0.30001192" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -72273,6 +72321,7 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."colorette-1.2.2" sources."commondir-1.0.1" sources."concat-map-0.0.1" (sources."conf-7.1.2" // { @@ -72296,13 +72345,15 @@ in sources."mimic-response-3.1.0" ]; }) - sources."defer-to-connect-2.0.0" + sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" + sources."electron-to-chromium-1.3.675" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" sources."error-ex-1.3.2" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."execa-1.0.0" sources."fast-deep-equal-3.1.3" @@ -72315,13 +72366,13 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globals-11.12.0" - sources."got-11.8.1" + sources."got-11.8.2" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-cache-semantics-4.1.0" - sources."http2-wrapper-1.0.0-beta.5.2" + sources."http2-wrapper-1.0.3" sources."import-jsx-4.0.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -72393,6 +72444,7 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" + sources."node-releases-1.1.71" sources."normalize-package-data-2.5.0" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" @@ -72485,7 +72537,7 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" sources."strip-indent-3.0.0" @@ -72546,20 +72598,20 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."supports-color-5.5.0" ]; }) - sources."@fluentui/date-time-utilities-7.9.0" - sources."@fluentui/dom-utilities-1.1.1" - sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.161.0" - sources."@fluentui/react-focus-7.17.4" - sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.7.3" + sources."@fluentui/date-time-utilities-7.9.1" + sources."@fluentui/dom-utilities-1.1.2" + sources."@fluentui/keyboard-key-0.2.14" + sources."@fluentui/react-7.162.0" + sources."@fluentui/react-focus-7.17.5" + sources."@fluentui/react-window-provider-1.0.2" + sources."@fluentui/theme-1.7.4" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -72619,13 +72671,13 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.24" - sources."@uifabric/icons-7.5.21" - sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.11" - sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.18.0" - sources."@uifabric/utilities-7.33.4" + sources."@uifabric/foundation-7.9.25" + sources."@uifabric/icons-7.5.22" + sources."@uifabric/merge-styles-7.19.2" + sources."@uifabric/react-hooks-7.13.12" + sources."@uifabric/set-version-7.0.24" + sources."@uifabric/styling-7.18.1" + sources."@uifabric/utilities-7.33.5" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -72726,7 +72778,7 @@ in sources."asn1-0.2.4" (sources."asn1.js-5.4.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) (sources."assert-1.5.0" // { @@ -72774,7 +72826,7 @@ in sources."blob-0.0.5" sources."block-stream-0.0.9" sources."bluebird-3.7.2" - sources."bn.js-5.1.3" + sources."bn.js-5.2.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -72929,7 +72981,7 @@ in sources."crc-3.8.0" (sources."create-ecdh-4.0.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."create-hash-1.2.0" @@ -72983,7 +73035,7 @@ in sources."diff-4.0.2" (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."difunc-0.0.4" @@ -73004,7 +73056,7 @@ in sources."ee-first-1.1.1" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" sources."inherits-2.0.4" ]; }) @@ -73054,7 +73106,7 @@ in sources."etag-1.8.1" sources."event-emitter-0.3.5" sources."eventemitter3-2.0.3" - sources."events-3.2.0" + sources."events-3.3.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -73102,7 +73154,7 @@ in sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-1.1.4" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."figgy-pudding-3.5.2" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -73242,7 +73294,7 @@ in }) sources."has-cors-1.1.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -73423,7 +73475,7 @@ in sources."micromatch-4.0.2" (sources."miller-rabin-4.0.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."mime-1.6.0" @@ -73593,7 +73645,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.161.0" + sources."office-ui-fabric-react-7.162.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -73603,7 +73655,7 @@ in sources."openapi-types-7.2.3" ]; }) - (sources."openapi-framework-7.3.0" // { + (sources."openapi-framework-7.4.0" // { dependencies = [ sources."openapi-types-7.2.3" ]; @@ -73618,12 +73670,12 @@ in sources."openapi-types-7.2.3" ]; }) - (sources."openapi-request-validator-7.3.0" // { + (sources."openapi-request-validator-7.4.0" // { dependencies = [ sources."openapi-types-7.2.3" ]; }) - (sources."openapi-response-validator-7.2.3" // { + (sources."openapi-response-validator-7.4.0" // { dependencies = [ sources."openapi-types-7.2.3" ]; @@ -73740,7 +73792,7 @@ in sources."psl-1.8.0" (sources."public-encrypt-4.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."pump-3.0.0" @@ -74227,20 +74279,20 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.20.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.20.0.tgz"; - sha512 = "qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz"; + sha512 = "W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.3.0" + sources."@eslint/eslintrc-0.4.0" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -74350,7 +74402,7 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" @@ -74383,22 +74435,22 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "10.0.2"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.0.2.tgz"; - sha512 = "owgGugHDhfzqe2tjbkz+Htv4stRwFfXJEG6lc+c9dKxwgAvuYNurldosLJ2gyC66Uv/cPf4IS70wuUTmNLTrOQ=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-10.0.4.tgz"; + sha512 = "DEJaGxP6VDs3byYKQYw6Py8l2b1KH9S5vUo4IjvhWIEcdo5gjNkJjjzUCoExTIb0Bo7/GbKyNRI/dctUQ5f+7w=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."chalk-2.4.2" sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) - sources."@eslint/eslintrc-0.3.0" + sources."@eslint/eslintrc-0.4.0" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -74429,7 +74481,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.20.0" + sources."eslint-7.21.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -74510,7 +74562,7 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" @@ -74563,66 +74615,71 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.1.6"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.1.6.tgz"; - sha512 = "C6UvtUWCsJyFOah57CKNeSP+tZeJDfED7dyHIWDQ+cQx2EYzNQVt4GIOu63u1Hzf3WArehxMroTmMayHCdhTeA=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.2.1.tgz"; + sha512 = "3qgir7nj1jD7L+ETEUBYQfwsd57GaOTLhJ+6rzwvRwSXdU04oM+nfiZHMyabgKHMzslyHpVnvOod9OjKVWTtuQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.12.13" + sources."@babel/compat-data-7.13.8" (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.17" + sources."@babel/generator-7.13.0" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.12.17" // { + (sources."@babel/helper-compilation-targets-7.13.8" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.17" + sources."@babel/helper-create-class-features-plugin-7.13.8" sources."@babel/helper-create-regexp-features-plugin-7.12.17" - sources."@babel/helper-explode-assignable-expression-7.12.13" + (sources."@babel/helper-define-polyfill-provider-0.1.4" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.17" + sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.0" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.17" + sources."@babel/helper-module-transforms-7.13.0" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.12.13" - sources."@babel/helper-remap-async-to-generator-7.12.13" - sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-plugin-utils-7.13.0" + sources."@babel/helper-remap-async-to-generator-7.13.0" + sources."@babel/helper-replace-supers-7.13.0" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.12.13" - sources."@babel/helpers-7.12.17" - (sources."@babel/highlight-7.12.13" // { + sources."@babel/helper-wrap-function-7.13.0" + sources."@babel/helpers-7.13.0" + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.17" - sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/parser-7.13.4" + sources."@babel/plugin-proposal-async-generator-functions-7.13.8" sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.17" + sources."@babel/plugin-proposal-dynamic-import-7.13.8" sources."@babel/plugin-proposal-export-default-from-7.12.13" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" - sources."@babel/plugin-proposal-json-strings-7.12.13" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.13.8" + sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" sources."@babel/plugin-proposal-numeric-separator-7.12.13" - sources."@babel/plugin-proposal-object-rest-spread-7.12.13" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.17" - sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.13.8" + sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -74640,47 +74697,48 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.12.13" sources."@babel/plugin-syntax-typescript-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.12.13" - sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.13.0" + sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" sources."@babel/plugin-transform-block-scoping-7.12.13" - sources."@babel/plugin-transform-classes-7.12.13" - sources."@babel/plugin-transform-computed-properties-7.12.13" - sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-computed-properties-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.0" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.12.13" - sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.13.0" + sources."@babel/plugin-transform-for-of-7.13.0" sources."@babel/plugin-transform-function-name-7.12.13" sources."@babel/plugin-transform-literals-7.12.13" sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.12.13" - sources."@babel/plugin-transform-modules-commonjs-7.12.13" - sources."@babel/plugin-transform-modules-systemjs-7.12.13" - sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.13.0" + sources."@babel/plugin-transform-modules-commonjs-7.13.8" + sources."@babel/plugin-transform-modules-systemjs-7.13.8" + sources."@babel/plugin-transform-modules-umd-7.13.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" sources."@babel/plugin-transform-new-target-7.12.13" sources."@babel/plugin-transform-object-assign-7.12.13" sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-react-display-name-7.12.13" sources."@babel/plugin-transform-react-jsx-7.12.17" + sources."@babel/plugin-transform-react-jsx-self-7.12.13" sources."@babel/plugin-transform-react-jsx-source-7.12.13" sources."@babel/plugin-transform-regenerator-7.12.13" sources."@babel/plugin-transform-reserved-words-7.12.13" - (sources."@babel/plugin-transform-runtime-7.12.17" // { + (sources."@babel/plugin-transform-runtime-7.13.8" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-spread-7.13.0" sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-template-literals-7.13.0" sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-typescript-7.12.17" + sources."@babel/plugin-transform-typescript-7.13.0" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" (sources."@babel/preset-env-7.12.17" // { @@ -74690,29 +74748,27 @@ in }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.12.18" + sources."@babel/runtime-7.13.8" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."@expo/apple-utils-0.0.0-alpha.17" - sources."@expo/babel-preset-cli-0.2.18" sources."@expo/bunyan-4.0.0" - sources."@expo/config-3.3.28" - (sources."@expo/config-plugins-1.0.18" // { + sources."@expo/config-3.3.30" + (sources."@expo/config-plugins-1.0.20" // { dependencies = [ - sources."slash-3.0.0" sources."uuid-3.4.0" sources."xcode-2.1.0" ]; }) sources."@expo/config-types-40.0.0-beta.2" - (sources."@expo/configure-splash-screen-0.3.3" // { + (sources."@expo/configure-splash-screen-0.3.4" // { dependencies = [ sources."commander-5.1.0" sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.54" // { + (sources."@expo/dev-server-0.1.56" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -74723,27 +74779,32 @@ in sources."ms-2.0.0" sources."qs-6.7.0" sources."raw-body-2.4.0" - sources."serialize-error-6.0.0" sources."setprototypeof-1.1.1" sources."statuses-1.5.0" - sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.82" + sources."@expo/dev-tools-0.13.84" + (sources."@expo/devcert-1.0.0" // { + dependencies = [ + sources."debug-3.2.7" + sources."rimraf-2.7.1" + sources."sudo-prompt-8.2.5" + ]; + }) (sources."@expo/image-utils-0.3.10" // { dependencies = [ sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.27" // { + (sources."@expo/json-file-8.2.28-alpha.0" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.54" + sources."@expo/metro-config-0.1.56" sources."@expo/osascript-2.0.24" - (sources."@expo/package-manager-0.0.38" // { + (sources."@expo/package-manager-0.0.39-alpha.0" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -74756,17 +74817,17 @@ in ]; }) sources."@expo/results-1.0.0" - sources."@expo/schemer-1.3.26" + sources."@expo/schemer-1.3.27-alpha.0" sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.12.58" // { + (sources."@expo/webpack-config-0.12.60" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-59.0.22" // { + (sources."@expo/xdl-59.0.24" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -74848,18 +74909,6 @@ in sources."@npmcli/run-script-1.8.3" sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" sources."@react-native-community/cli-debugger-ui-4.13.1" - (sources."@react-native-community/cli-platform-ios-4.13.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - sources."uuid-3.4.0" - sources."xcode-2.1.0" - ]; - }) (sources."@react-native-community/cli-server-api-4.9.0" // { dependencies = [ sources."ultron-1.0.2" @@ -74882,10 +74931,6 @@ in sources."@tootallnate/once-1.1.2" sources."@types/anymatch-1.3.1" sources."@types/cacheable-request-6.0.1" - sources."@types/configstore-2.1.1" - sources."@types/debug-0.0.30" - sources."@types/events-3.0.0" - sources."@types/get-port-3.2.0" sources."@types/glob-7.1.3" sources."@types/html-minifier-terser-5.1.1" sources."@types/http-cache-semantics-4.0.0" @@ -74894,18 +74939,14 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.168" sources."@types/minimatch-3.0.3" - sources."@types/mkdirp-0.5.2" sources."@types/node-9.6.61" sources."@types/q-1.5.4" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.0" - sources."@types/rimraf-2.0.4" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" sources."@types/text-table-0.2.1" - sources."@types/tmp-0.0.33" (sources."@types/uglify-js-3.12.0" // { dependencies = [ sources."source-map-0.6.1" @@ -74970,11 +75011,7 @@ in ]; }) sources."ansi-colors-3.2.4" - (sources."ansi-escapes-4.3.1" // { - dependencies = [ - sources."type-fest-0.11.0" - ]; - }) + sources."ansi-escapes-3.2.0" sources."ansi-html-0.0.7" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -74990,7 +75027,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-filter-0.0.1" + sources."array-filter-1.0.0" sources."array-flatten-1.1.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" @@ -75001,7 +75038,7 @@ in sources."asn1-0.2.4" (sources."asn1.js-5.4.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) (sources."assert-1.5.0" // { @@ -75018,11 +75055,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."available-typed-arrays-1.0.2" // { - dependencies = [ - sources."array-filter-1.0.0" - ]; - }) + sources."available-typed-arrays-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.1" @@ -75030,6 +75063,13 @@ in sources."babel-extract-comments-1.0.0" sources."babel-loader-8.1.0" sources."babel-plugin-dynamic-import-node-2.3.3" + (sources."babel-plugin-polyfill-corejs2-0.1.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0" sources."babel-plugin-transform-object-rest-spread-6.26.0" @@ -75059,7 +75099,7 @@ in sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bmp-js-0.1.0" - sources."bn.js-5.1.3" + sources."bn.js-5.2.0" (sources."body-parser-1.18.3" // { dependencies = [ sources."debug-2.6.9" @@ -75134,7 +75174,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -75203,7 +75243,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.4" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" @@ -75254,18 +75294,19 @@ in sources."loader-utils-2.0.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" + sources."p-limit-3.1.0" (sources."p-locate-4.1.0" // { dependencies = [ sources."p-limit-2.3.0" ]; }) + sources."path-exists-4.0.0" sources."pkg-dir-4.2.0" sources."semver-6.3.0" - sources."slash-3.0.0" ]; }) - sources."core-js-3.9.0" - (sources."core-js-compat-3.9.0" // { + sources."core-js-3.9.1" + (sources."core-js-compat-3.9.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -75274,7 +75315,7 @@ in sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."create-hash-1.2.0" @@ -75354,7 +75395,6 @@ in sources."rimraf-2.7.1" ]; }) - sources."delay-async-1.2.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -75368,18 +75408,9 @@ in sources."ms-2.0.0" ]; }) - (sources."devcert-1.1.3" // { - dependencies = [ - sources."@types/glob-5.0.36" - sources."@types/node-8.10.66" - sources."debug-3.2.7" - sources."rimraf-2.7.1" - sources."sudo-prompt-8.2.5" - ]; - }) (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."dir-glob-3.0.1" @@ -75413,10 +75444,10 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."emoji-regex-8.0.0" @@ -75464,7 +75495,7 @@ in sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-2.0.3" - sources."events-3.2.0" + sources."events-3.3.0" sources."eventsource-1.0.7" sources."evp_bytestokey-1.0.3" sources."exec-async-2.2.0" @@ -75490,7 +75521,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.64" // { + (sources."expo-pwa-0.0.66" // { dependencies = [ sources."commander-2.20.0" ]; @@ -75517,7 +75548,7 @@ in sources."fast-deep-equal-1.1.0" sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."faye-websocket-0.10.0" sources."figgy-pudding-3.5.2" sources."figures-3.2.0" @@ -75537,10 +75568,17 @@ in ]; }) sources."find-cache-dir-2.1.0" - sources."find-up-5.0.0" + (sources."find-up-5.0.0" // { + dependencies = [ + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."path-exists-4.0.0" + ]; + }) sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -75610,13 +75648,13 @@ in sources."pify-2.3.0" ]; }) - (sources."got-11.8.1" // { + (sources."got-11.8.2" // { dependencies = [ sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."cacheable-request-7.0.1" sources."decompress-response-6.0.0" - sources."defer-to-connect-2.0.0" + sources."defer-to-connect-2.0.1" sources."get-stream-5.2.0" sources."json-buffer-3.0.1" sources."keyv-4.0.3" @@ -75646,7 +75684,7 @@ in }) sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -75715,18 +75753,17 @@ in ]; }) sources."http-signature-1.2.0" - sources."http2-wrapper-1.0.0-beta.5.2" + sources."http2-wrapper-1.0.3" sources."https-browserify-1.0.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.23" sources."icss-utils-4.1.1" - sources."idx-2.4.0" sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-5.1.8" sources."ignore-walk-3.0.3" - sources."immer-7.0.9" + sources."immer-8.0.1" (sources."import-fresh-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -75863,7 +75900,7 @@ in sources."json5-1.0.1" ]; }) - sources."locate-path-6.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.assign-4.2.0" @@ -75912,16 +75949,16 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."metro-babel-transformer-0.58.0" - sources."metro-react-native-babel-preset-0.58.0" - sources."metro-react-native-babel-transformer-0.58.0" - sources."metro-source-map-0.58.0" - sources."metro-symbolicate-0.58.0" + sources."metro-babel-transformer-0.59.0" + sources."metro-react-native-babel-preset-0.59.0" + sources."metro-react-native-babel-transformer-0.59.0" + sources."metro-source-map-0.59.0" + sources."metro-symbolicate-0.59.0" sources."microevent.ts-0.1.1" sources."micromatch-4.0.2" (sources."miller-rabin-4.0.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."mime-2.5.2" @@ -76020,7 +76057,7 @@ in ]; }) sources."node-fetch-2.6.1" - sources."node-forge-0.7.6" + sources."node-forge-0.10.0" (sources."node-gyp-7.1.2" // { dependencies = [ sources."rimraf-3.0.2" @@ -76035,7 +76072,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.70" + sources."node-releases-1.1.71" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -76066,7 +76103,7 @@ in sources."nth-check-1.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" - sources."ob1-0.58.0" + sources."ob1-0.59.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -76089,7 +76126,7 @@ in sources."object.entries-1.1.3" sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" - sources."object.values-1.1.2" + sources."object.values-1.1.3" sources."obuf-1.1.2" sources."omggif-1.0.10" sources."on-finished-2.3.0" @@ -76119,8 +76156,8 @@ in }) sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" sources."p-map-3.0.0" sources."p-retry-4.1.0" (sources."p-some-4.1.0" // { @@ -76170,14 +76207,10 @@ in ]; }) sources."pascalcase-0.1.1" - (sources."password-prompt-1.1.2" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - ]; - }) + sources."password-prompt-1.1.2" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" - sources."path-exists-4.0.0" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -76195,19 +76228,11 @@ in (sources."pkg-dir-3.0.0" // { dependencies = [ sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" ]; }) (sources."pkg-up-3.1.0" // { dependencies = [ sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" ]; }) sources."plist-3.0.1" @@ -76364,7 +76389,7 @@ in sources."psl-1.8.0" (sources."public-encrypt-4.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."puka-1.0.1" @@ -76393,7 +76418,7 @@ in }) sources."raw-body-2.3.3" sources."rc-1.2.8" - (sources."react-dev-utils-11.0.2" // { + (sources."react-dev-utils-11.0.3" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."array-union-2.1.0" @@ -76411,13 +76436,12 @@ in sources."loader-utils-2.0.0" sources."locate-path-5.0.0" sources."open-7.4.2" - sources."p-limit-2.3.0" sources."p-locate-4.1.0" + sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.7.2" - sources."slash-3.0.0" sources."which-2.0.2" ]; }) @@ -76426,7 +76450,7 @@ in sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" - sources."read-package-json-fast-2.0.1" + sources."read-package-json-fast-2.0.2" (sources."readable-stream-2.3.7" // { dependencies = [ sources."isarray-1.0.0" @@ -76526,11 +76550,7 @@ in ]; }) sources."select-hose-2.0.0" - (sources."selfsigned-1.10.8" // { - dependencies = [ - sources."node-forge-0.10.0" - ]; - }) + sources."selfsigned-1.10.8" sources."semver-7.3.2" (sources."send-0.16.2" // { dependencies = [ @@ -76539,9 +76559,9 @@ in sources."ms-2.0.0" ]; }) - (sources."serialize-error-5.0.0" // { + (sources."serialize-error-6.0.0" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.12.0" ]; }) sources."serialize-javascript-4.0.0" @@ -76563,13 +76583,17 @@ in sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.6.1" + (sources."shell-quote-1.6.1" // { + dependencies = [ + sources."array-filter-0.0.1" + ]; + }) sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."simple-plist-1.1.1" sources."simple-swizzle-0.2.2" sources."sisteransi-1.0.5" - sources."slash-1.0.0" + sources."slash-3.0.0" (sources."slugid-1.1.0" // { dependencies = [ sources."uuid-2.0.3" @@ -76673,9 +76697,9 @@ in ]; }) sources."stream-shift-1.0.1" - sources."string-width-4.2.0" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string-width-4.2.2" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -76730,14 +76754,18 @@ in sources."is-stream-2.0.0" sources."p-map-4.0.0" sources."rimraf-3.0.2" - sources."slash-3.0.0" sources."temp-dir-2.0.0" sources."type-fest-0.16.0" sources."unique-string-2.0.0" ]; }) sources."term-size-2.2.1" - sources."terminal-link-2.1.1" + (sources."terminal-link-2.1.1" // { + dependencies = [ + sources."ansi-escapes-4.3.1" + sources."type-fest-0.11.0" + ]; + }) (sources."terser-4.8.0" // { dependencies = [ sources."commander-2.20.3" @@ -76751,11 +76779,13 @@ in sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" + sources."p-limit-3.1.0" (sources."p-locate-4.1.0" // { dependencies = [ sources."p-limit-2.3.0" ]; }) + sources."path-exists-4.0.0" sources."pkg-dir-4.2.0" sources."semver-6.3.0" sources."source-map-0.6.1" @@ -77015,10 +77045,12 @@ in }) (sources."webpackbar-4.0.0" // { dependencies = [ + sources."ansi-escapes-4.3.1" sources."ansi-styles-4.3.0" sources."chalk-2.4.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."type-fest-0.11.0" sources."wrap-ansi-6.2.0" ]; }) @@ -77103,10 +77135,6 @@ in sources."emoji-regex-7.0.3" sources."find-up-3.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -77532,7 +77560,7 @@ in sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."faunadb-4.0.3" sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" @@ -77808,7 +77836,7 @@ in }) sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -77876,10 +77904,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.4.0"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.4.0.tgz"; - sha512 = "qqiNUiMb60GNIz/d8lv4eCSzBU/0AjcdnwWfGsOlGgeWRks9SeuWXvXt6JF7bn/7t15+z41Q7S4avsIRhAHD1Q=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.5.0.tgz"; + sha512 = "M73hIhqfdzGO4eMAd+Jj8V2RPG1KDmhjdnHQaZsJOwmPXyX4eBeOO7dpeHTXU5bYg8AeHVzkCOcLobBcXgYxZw=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.7" @@ -77888,7 +77916,7 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.0.1" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.9.0" // { + (sources."@google-cloud/pubsub-2.10.0" // { dependencies = [ sources."google-auth-library-7.0.2" ]; @@ -77925,7 +77953,6 @@ in sources."@tootallnate/once-1.1.2" sources."@types/archiver-5.1.0" sources."@types/duplexify-3.6.0" - sources."@types/filesize-5.0.0" sources."@types/glob-7.1.3" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" @@ -78005,7 +78032,7 @@ in sources."emoji-regex-8.0.0" sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" ]; @@ -78525,7 +78552,7 @@ in }) sources."rsvp-4.8.5" sources."run-async-2.4.1" - (sources."rxjs-6.6.3" // { + (sources."rxjs-6.6.6" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -78686,7 +78713,7 @@ in sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -78751,13 +78778,13 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."require-directory-2.1.1" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.5" sources."yargs-16.2.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -78780,7 +78807,7 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -78904,7 +78931,7 @@ in sources."resolve-1.20.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safer-buffer-2.1.2" sources."semver-7.3.4" sources."shebang-command-2.0.0" @@ -78915,7 +78942,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" @@ -78936,7 +78963,7 @@ in sources."which-2.0.2" sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -79114,7 +79141,7 @@ in }) sources."graceful-fs-4.2.6" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -79372,7 +79399,7 @@ in sources."indent-string-4.0.0" sources."is-fullwidth-code-point-3.0.0" sources."lossless-json-1.0.4" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" ]; @@ -79669,15 +79696,15 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.18"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.18.tgz"; - sha512 = "2H4Y6kXvYRBdh42FUz8gaLkQ5AvtYYBXRgRElXjX/st4QhG+bgHdnCFGYoTbrVc2uA2vS63HtUS8AJ7SNE6Rew=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.3.0.tgz"; + sha512 = "xvuBiQdo0pbBaucrIIGEicPU5ibX+aCDdr9X7kHpsy55q+qqLlzhDJ0aF8LtYFgSI4/hsrk2gSYMVLRAyy6HQg=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -79691,7 +79718,8 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" - sources."ajv-6.12.6" + sources."ajv-7.1.1" + sources."ajv-formats-1.5.1" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -79734,8 +79762,12 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-7.1.2" - sources."configstore-5.0.1" + sources."conf-9.0.2" + (sources."configstore-5.0.1" // { + dependencies = [ + sources."dot-prop-5.3.0" + ]; + }) sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."debounce-fn-4.0.0" @@ -79749,7 +79781,7 @@ in sources."deep-extend-0.6.0" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."dot-prop-5.3.0" + sources."dot-prop-6.0.1" sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -79760,7 +79792,6 @@ in sources."execa-5.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."find-up-3.0.0" sources."function-bind-1.1.1" @@ -79806,7 +79837,7 @@ in sources."js-tokens-4.0.0" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-schema-typed-7.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -79827,7 +79858,7 @@ in ]; }) sources."map-obj-4.1.0" - (sources."meow-8.1.2" // { + (sources."meow-9.0.0" // { dependencies = [ sources."type-fest-0.18.1" ]; @@ -79895,11 +79926,12 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" + sources."require-from-string-2.0.2" sources."resolve-1.20.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.4" @@ -79915,7 +79947,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" @@ -79943,7 +79975,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."yallist-4.0.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -79967,7 +79999,7 @@ in sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -80001,7 +80033,7 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.2.6" // { + (sources."@graphql-tools/import-6.3.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -80016,7 +80048,7 @@ in ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.9" // { + (sources."@graphql-tools/merge-6.2.10" // { dependencies = [ sources."@graphql-tools/utils-7.5.0" sources."tslib-2.1.0" @@ -80177,7 +80209,7 @@ in sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."figlet-1.5.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -80219,7 +80251,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."http-cache-semantics-4.1.0" sources."http-errors-1.8.0" sources."http-signature-1.2.0" @@ -80431,7 +80463,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - (sources."rxjs-6.6.3" // { + (sources."rxjs-6.6.6" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -80458,14 +80490,14 @@ in sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-env-interpolation-1.0.1" - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."strip-ansi-6.0.0" ]; }) - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -80512,7 +80544,7 @@ in sources."yallist-4.0.0" sources."yaml-1.10.0" sources."yargs-16.0.3" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -81005,7 +81037,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.34.14" + sources."systeminformation-4.34.15" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -81220,7 +81252,7 @@ in sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -81611,7 +81643,7 @@ in sources."graceful-fs-4.2.6" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -82005,7 +82037,7 @@ in sources."debug-3.2.7" sources."ecstatic-3.3.2" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."he-1.2.0" sources."http-proxy-1.18.1" sources."lodash-4.17.21" @@ -82059,7 +82091,7 @@ in sources."bs32-0.1.6" sources."bsert-0.0.10" sources."bsock-0.1.9" - sources."bsocks-0.2.5" + sources."bsocks-0.2.6" sources."btcp-0.1.5" sources."budp-0.1.6" sources."buffer-map-0.0.7" @@ -82871,7 +82903,7 @@ in sources."rimraf-3.0.2" sources."rsvp-3.6.2" sources."run-async-2.4.1" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -82902,7 +82934,7 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -82974,9 +83006,9 @@ in }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-1.0.2" - sources."@ot-builder/bin-util-1.0.2" - (sources."@ot-builder/cli-help-shower-1.0.2" // { + sources."@ot-builder/bin-composite-types-1.0.3" + sources."@ot-builder/bin-util-1.0.3" + (sources."@ot-builder/cli-help-shower-1.0.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82986,7 +83018,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-1.0.2" // { + (sources."@ot-builder/cli-proc-1.0.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -82996,7 +83028,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-1.0.2" // { + (sources."@ot-builder/cli-shared-1.0.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -83006,35 +83038,35 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-1.0.2" - sources."@ot-builder/errors-1.0.2" - sources."@ot-builder/io-bin-cff-1.0.2" - sources."@ot-builder/io-bin-encoding-1.0.2" - sources."@ot-builder/io-bin-ext-private-1.0.2" - sources."@ot-builder/io-bin-font-1.0.2" - sources."@ot-builder/io-bin-glyph-store-1.0.2" - sources."@ot-builder/io-bin-layout-1.0.2" - sources."@ot-builder/io-bin-metadata-1.0.2" - sources."@ot-builder/io-bin-metric-1.0.2" - sources."@ot-builder/io-bin-name-1.0.2" - sources."@ot-builder/io-bin-sfnt-1.0.2" - sources."@ot-builder/io-bin-ttf-1.0.2" - sources."@ot-builder/ot-1.0.2" - sources."@ot-builder/ot-encoding-1.0.2" - sources."@ot-builder/ot-ext-private-1.0.2" - sources."@ot-builder/ot-glyphs-1.0.2" - sources."@ot-builder/ot-layout-1.0.2" - sources."@ot-builder/ot-metadata-1.0.2" - sources."@ot-builder/ot-name-1.0.2" - sources."@ot-builder/ot-sfnt-1.0.2" - sources."@ot-builder/ot-standard-glyph-namer-1.0.2" - sources."@ot-builder/prelude-1.0.2" - sources."@ot-builder/primitive-1.0.2" - sources."@ot-builder/rectify-1.0.2" - sources."@ot-builder/stat-glyphs-1.0.2" - sources."@ot-builder/trace-1.0.2" - sources."@ot-builder/var-store-1.0.2" - sources."@ot-builder/variance-1.0.2" + sources."@ot-builder/common-impl-1.0.3" + sources."@ot-builder/errors-1.0.3" + sources."@ot-builder/io-bin-cff-1.0.3" + sources."@ot-builder/io-bin-encoding-1.0.3" + sources."@ot-builder/io-bin-ext-private-1.0.3" + sources."@ot-builder/io-bin-font-1.0.3" + sources."@ot-builder/io-bin-glyph-store-1.0.3" + sources."@ot-builder/io-bin-layout-1.0.3" + sources."@ot-builder/io-bin-metadata-1.0.3" + sources."@ot-builder/io-bin-metric-1.0.3" + sources."@ot-builder/io-bin-name-1.0.3" + sources."@ot-builder/io-bin-sfnt-1.0.3" + sources."@ot-builder/io-bin-ttf-1.0.3" + sources."@ot-builder/ot-1.0.3" + sources."@ot-builder/ot-encoding-1.0.3" + sources."@ot-builder/ot-ext-private-1.0.3" + sources."@ot-builder/ot-glyphs-1.0.3" + sources."@ot-builder/ot-layout-1.0.3" + sources."@ot-builder/ot-metadata-1.0.3" + sources."@ot-builder/ot-name-1.0.3" + sources."@ot-builder/ot-sfnt-1.0.3" + sources."@ot-builder/ot-standard-glyph-namer-1.0.3" + sources."@ot-builder/prelude-1.0.3" + sources."@ot-builder/primitive-1.0.3" + sources."@ot-builder/rectify-1.0.3" + sources."@ot-builder/stat-glyphs-1.0.3" + sources."@ot-builder/trace-1.0.3" + sources."@ot-builder/var-store-1.0.3" + sources."@ot-builder/variance-1.0.3" sources."@unicode/unicode-13.0.0-1.0.3" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" @@ -83124,8 +83156,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.0.2" - (sources."otb-ttc-bundle-1.0.2" // { + sources."ot-builder-1.0.3" + (sources."otb-ttc-bundle-1.0.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -83175,7 +83207,7 @@ in sources."split-1.0.1" sources."sprintf-js-1.0.3" sources."stack-trace-0.0.9" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" (sources."stylus-0.54.8" // { dependencies = [ @@ -83227,7 +83259,7 @@ in sources."y18n-5.0.5" sources."yallist-4.0.0" sources."yargs-16.2.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -83417,7 +83449,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.848.0" // { + (sources."aws-sdk-2.853.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -83578,7 +83610,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."find-up-2.1.0" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -84163,7 +84195,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.17" + sources."@babel/parser-7.13.4" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -84544,7 +84576,7 @@ in sources."signal-exit-3.0.3" sources."statuses-1.5.0" sources."steno-0.4.4" - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" @@ -84579,7 +84611,7 @@ in sources."y18n-5.0.5" sources."yallist-4.0.0" sources."yargs-16.2.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -84677,7 +84709,7 @@ in sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."flatted-2.0.2" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -84729,7 +84761,7 @@ in sources."rimraf-3.0.2" sources."safer-buffer-2.1.2" sources."setprototypeof-1.1.1" - (sources."socket.io-3.1.1" // { + (sources."socket.io-3.1.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -84751,7 +84783,7 @@ in sources."ms-2.1.2" ]; }) - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" @@ -84768,7 +84800,7 @@ in sources."ws-7.4.3" sources."y18n-5.0.5" sources."yargs-16.2.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -84815,7 +84847,7 @@ in sources."glob-stream-6.1.0" sources."graceful-fs-4.2.6" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -85145,7 +85177,7 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" + sources."@babel/highlight-7.13.8" (sources."@evocateur/libnpmaccess-3.1.2" // { dependencies = [ sources."aproba-2.0.0" @@ -85247,7 +85279,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-5.1.0" + sources."@octokit/openapi-types-5.2.1" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ @@ -85273,7 +85305,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.10.0" + sources."@octokit/types-6.11.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" @@ -85642,7 +85674,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -85783,7 +85815,7 @@ in sources."semver-7.3.4" sources."type-fest-0.18.1" sources."yallist-4.0.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; }) sources."merge2-1.4.1" @@ -85922,7 +85954,7 @@ in sources."punycode-2.1.1" sources."q-1.5.1" sources."qs-6.5.2" - sources."query-string-6.14.0" + sources."query-string-6.14.1" sources."quick-lru-4.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.5" @@ -85970,7 +86002,7 @@ in sources."rimraf-2.7.1" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -86069,8 +86101,8 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -86201,7 +86233,7 @@ in sources."graceful-fs-4.2.6" sources."iconv-lite-0.4.24" sources."image-size-0.5.5" - sources."is-what-3.13.0" + sources."is-what-3.14.1" sources."make-dir-2.1.0" sources."mime-1.6.0" sources."ms-2.1.3" @@ -87084,51 +87116,52 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.12.13" - sources."@babel/core-7.12.17" - sources."@babel/generator-7.12.17" + sources."@babel/compat-data-7.13.8" + sources."@babel/core-7.13.8" + sources."@babel/generator-7.13.0" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.12.17" - sources."@babel/helper-create-class-features-plugin-7.12.17" + sources."@babel/helper-compilation-targets-7.13.8" + sources."@babel/helper-create-class-features-plugin-7.13.8" sources."@babel/helper-create-regexp-features-plugin-7.12.17" - sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-define-polyfill-provider-0.1.4" + sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.17" + sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.0" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.17" + sources."@babel/helper-module-transforms-7.13.0" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.12.13" - sources."@babel/helper-remap-async-to-generator-7.12.13" - sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-plugin-utils-7.13.0" + sources."@babel/helper-remap-async-to-generator-7.13.0" + sources."@babel/helper-replace-supers-7.13.0" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.12.13" - sources."@babel/helpers-7.12.17" - (sources."@babel/highlight-7.12.13" // { + sources."@babel/helper-wrap-function-7.13.0" + sources."@babel/helpers-7.13.0" + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.17" + sources."@babel/parser-7.13.4" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.12.13" - sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.17" + sources."@babel/plugin-proposal-async-generator-functions-7.13.8" + sources."@babel/plugin-proposal-class-properties-7.13.0" + sources."@babel/plugin-proposal-dynamic-import-7.13.8" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" - sources."@babel/plugin-proposal-json-strings-7.12.13" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.13.8" + sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" sources."@babel/plugin-proposal-numeric-separator-7.12.13" - sources."@babel/plugin-proposal-object-rest-spread-7.12.13" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.17" - sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.13.8" + sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" @@ -87144,46 +87177,46 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.12.13" - sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.13.0" + sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" sources."@babel/plugin-transform-block-scoping-7.12.13" - sources."@babel/plugin-transform-classes-7.12.13" - sources."@babel/plugin-transform-computed-properties-7.12.13" - sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-computed-properties-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.0" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-for-of-7.13.0" sources."@babel/plugin-transform-function-name-7.12.13" sources."@babel/plugin-transform-literals-7.12.13" sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.12.13" - sources."@babel/plugin-transform-modules-commonjs-7.12.13" - sources."@babel/plugin-transform-modules-systemjs-7.12.13" - sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.13.0" + sources."@babel/plugin-transform-modules-commonjs-7.13.8" + sources."@babel/plugin-transform-modules-systemjs-7.13.8" + sources."@babel/plugin-transform-modules-umd-7.13.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" sources."@babel/plugin-transform-new-target-7.12.13" sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-regenerator-7.12.13" sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-runtime-7.12.17" + sources."@babel/plugin-transform-runtime-7.13.8" sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-spread-7.13.0" sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-template-literals-7.13.0" sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.12.17" + sources."@babel/preset-env-7.13.8" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.12.18" + sources."@babel/runtime-7.13.8" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -87250,7 +87283,7 @@ in sources."asn1-0.2.4" (sources."asn1.js-5.4.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) (sources."assert-1.5.0" // { @@ -87293,6 +87326,9 @@ in sources."babel-plugin-minify-replace-0.5.0" sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" + sources."babel-plugin-polyfill-corejs2-0.1.8" + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" sources."babel-plugin-syntax-flow-6.18.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" sources."babel-plugin-transform-inline-consecutive-adds-0.4.3" @@ -87332,7 +87368,7 @@ in ]; }) sources."bluebird-3.7.2" - sources."bn.js-5.1.3" + sources."bn.js-5.2.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -87374,7 +87410,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -87423,7 +87459,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."colors-1.4.0" (sources."combine-source-map-0.8.0" // { dependencies = [ @@ -87446,7 +87482,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.9.0" // { + (sources."core-js-compat-3.9.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -87454,7 +87490,7 @@ in sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."create-hash-1.2.0" @@ -87469,6 +87505,7 @@ in }) (sources."cross-spawn-6.0.5" // { dependencies = [ + sources."semver-5.7.1" sources."which-1.3.1" ]; }) @@ -87490,17 +87527,17 @@ in sources."detective-5.2.0" (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."emoji-regex-7.0.3" @@ -87628,7 +87665,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -87698,11 +87735,7 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."istanbul-lib-coverage-3.0.0" - (sources."istanbul-lib-instrument-4.0.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."istanbul-lib-instrument-4.0.3" sources."jest-haste-map-25.5.1" sources."jest-regex-util-25.2.6" sources."jest-serializer-25.5.0" @@ -87739,14 +87772,11 @@ in }) sources."locate-path-5.0.0" sources."lodash-4.17.21" + sources."lodash.debounce-4.0.8" sources."lodash.memoize-3.0.4" sources."lru-cache-5.1.1" sources."magic-string-0.25.7" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."make-dir-3.1.0" sources."makeerror-1.0.11" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -87763,7 +87793,7 @@ in }) (sources."miller-rabin-4.0.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."mime-db-1.46.0" @@ -87797,7 +87827,7 @@ in (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."buffer-4.9.2" - sources."events-3.2.0" + sources."events-3.3.0" sources."inherits-2.0.3" sources."punycode-1.4.1" sources."stream-http-2.8.3" @@ -87807,8 +87837,12 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.70" - sources."normalize-package-data-2.5.0" + sources."node-releases-1.1.71" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -87871,7 +87905,7 @@ in sources."psl-1.8.0" (sources."public-encrypt-4.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."pump-3.0.0" @@ -87951,7 +87985,7 @@ in ]; }) sources."schema-utils-2.7.1" - sources."semver-5.7.1" + sources."semver-6.3.0" sources."serialize-javascript-4.0.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -88076,6 +88110,7 @@ in sources."path-exists-3.0.0" sources."pkg-dir-3.0.0" sources."schema-utils-1.0.0" + sources."semver-5.7.1" sources."source-map-0.6.1" ]; }) @@ -88689,16 +88724,16 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.9.0"; + version = "8.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.0.tgz"; - sha512 = "DF3nwcCi2ihM3OXIcCn4cNKUxSSU9UeyVuH9bNpgtymjpwAFU45jJXCK9RHtNhLtdjuXz+tcE/sYop3tnBGSuw=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.1.tgz"; + sha512 = "I/p3LzJv6gOAgHWdx0QMVbLVBN/xolqi5elACsbEWAnKuLPC+bjELsWDj35AYWBJalX01u8q1LdV0uhcCIJlMg=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@types/node-14.14.31" sources."@types/yauzl-2.9.1" - sources."agent-base-5.1.1" + sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" @@ -88755,7 +88790,7 @@ in sources."dagre-0.8.5" sources."dagre-d3-0.6.4" sources."debug-4.3.2" - sources."devtools-protocol-0.0.818844" + sources."devtools-protocol-0.0.847576" sources."end-of-stream-1.4.4" sources."entity-decode-2.0.2" sources."extract-zip-2.0.1" @@ -88773,7 +88808,7 @@ in sources."commander-2.20.3" ]; }) - sources."https-proxy-agent-4.0.0" + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."inflight-1.0.6" @@ -88802,7 +88837,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-5.5.0" + sources."puppeteer-7.1.0" sources."readable-stream-3.6.0" sources."relateurl-0.2.7" sources."rimraf-3.0.2" @@ -88851,23 +88886,23 @@ in sha512 = "j2ukrvANZQUreLl2grOQxPl0pbRSoJthYLqujdphZdwJyDwYjPqGOs+KrWwY26QbfqG2Toy06qFnYTaGx9txIg=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.9.0" - sources."@fluentui/dom-utilities-1.1.1" - sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.161.0" - sources."@fluentui/react-focus-7.17.4" - sources."@fluentui/react-window-provider-1.0.1" - sources."@fluentui/theme-1.7.3" + sources."@fluentui/date-time-utilities-7.9.1" + sources."@fluentui/dom-utilities-1.1.2" + sources."@fluentui/keyboard-key-0.2.14" + sources."@fluentui/react-7.162.0" + sources."@fluentui/react-focus-7.17.5" + sources."@fluentui/react-window-provider-1.0.2" + sources."@fluentui/theme-1.7.4" sources."@microsoft/load-themed-styles-1.10.147" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.24" - sources."@uifabric/icons-7.5.21" - sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.11" - sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.18.0" - sources."@uifabric/utilities-7.33.4" + sources."@uifabric/foundation-7.9.25" + sources."@uifabric/icons-7.5.22" + sources."@uifabric/merge-styles-7.19.2" + sources."@uifabric/react-hooks-7.13.12" + sources."@uifabric/set-version-7.0.24" + sources."@uifabric/styling-7.18.1" + sources."@uifabric/utilities-7.33.5" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -88934,7 +88969,7 @@ in sources."eventemitter3-4.0.7" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.3.0" + sources."express-openapi-7.4.0" sources."external-editor-2.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -88994,17 +89029,17 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.161.0" + sources."office-ui-fabric-react-7.162.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."openapi-default-setter-7.2.3" - sources."openapi-framework-7.3.0" + sources."openapi-framework-7.4.0" sources."openapi-jsonschema-parameters-7.2.3" sources."openapi-request-coercer-7.2.3" - sources."openapi-request-validator-7.3.0" - sources."openapi-response-validator-7.2.3" + sources."openapi-request-validator-7.4.0" + sources."openapi-response-validator-7.4.0" sources."openapi-schema-validator-7.2.3" sources."openapi-security-handler-7.2.3" sources."openapi-types-7.2.3" @@ -89085,7 +89120,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.43.0" + sources."swagger-ui-dist-3.44.0" sources."tail-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -89145,7 +89180,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -89212,7 +89247,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -89222,7 +89257,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -89369,61 +89404,66 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.8.5"; + version = "3.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.8.5.tgz"; - sha512 = "W0/Kp1QSJ+CKGc5fmtuikXMtQ1GSPtbtonaQ9+wjRuUp/hM/swSqeMcD1Nl7lylfPsTDbkMYBxyU/e4xsssMnw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.10.2.tgz"; + sha512 = "OPdLNdrk0CDnPdQ6DNrJTLwDf9Nzay5VLlcApuEQQ+twvAhW1cA30YDwX6t5pr+tSA+MpxWEFmWdRNMgbaZ1oQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.12.13" - (sources."@babel/core-7.12.17" // { + sources."@babel/compat-data-7.13.8" + (sources."@babel/core-7.13.8" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.12.17" + sources."@babel/generator-7.13.0" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.12.17" // { + (sources."@babel/helper-compilation-targets-7.13.8" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.17" + sources."@babel/helper-create-class-features-plugin-7.13.8" sources."@babel/helper-create-regexp-features-plugin-7.12.17" - sources."@babel/helper-explode-assignable-expression-7.12.13" + (sources."@babel/helper-define-polyfill-provider-0.1.4" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.17" + sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.0" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.17" + sources."@babel/helper-module-transforms-7.13.0" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.12.13" - sources."@babel/helper-remap-async-to-generator-7.12.13" - sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-plugin-utils-7.13.0" + sources."@babel/helper-remap-async-to-generator-7.13.0" + sources."@babel/helper-replace-supers-7.13.0" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.12.13" - sources."@babel/helpers-7.12.17" - sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.17" - sources."@babel/plugin-proposal-async-generator-functions-7.12.13" - sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.17" + sources."@babel/helper-wrap-function-7.13.0" + sources."@babel/helpers-7.13.0" + sources."@babel/highlight-7.13.8" + sources."@babel/parser-7.13.4" + sources."@babel/plugin-proposal-async-generator-functions-7.13.8" + sources."@babel/plugin-proposal-class-properties-7.13.0" + sources."@babel/plugin-proposal-dynamic-import-7.13.8" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" - sources."@babel/plugin-proposal-json-strings-7.12.13" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.13.8" + sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" sources."@babel/plugin-proposal-numeric-separator-7.12.13" - sources."@babel/plugin-proposal-object-rest-spread-7.12.13" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.17" - sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.13.8" + sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -89437,58 +89477,58 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.12.13" - sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.13.0" + sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" sources."@babel/plugin-transform-block-scoping-7.12.13" - sources."@babel/plugin-transform-classes-7.12.13" - sources."@babel/plugin-transform-computed-properties-7.12.13" - sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-computed-properties-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.0" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-for-of-7.13.0" sources."@babel/plugin-transform-function-name-7.12.13" sources."@babel/plugin-transform-literals-7.12.13" sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.12.13" - sources."@babel/plugin-transform-modules-commonjs-7.12.13" - sources."@babel/plugin-transform-modules-systemjs-7.12.13" - sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.13.0" + sources."@babel/plugin-transform-modules-commonjs-7.13.8" + sources."@babel/plugin-transform-modules-systemjs-7.13.8" + sources."@babel/plugin-transform-modules-umd-7.13.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" sources."@babel/plugin-transform-new-target-7.12.13" sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-regenerator-7.12.13" sources."@babel/plugin-transform-reserved-words-7.12.13" sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-spread-7.13.0" sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-template-literals-7.13.0" sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.12.17" // { + (sources."@babel/preset-env-7.13.8" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.18" + sources."@babel/runtime-7.13.8" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."@bugsnag/browser-7.7.0" sources."@bugsnag/core-7.7.0" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.7.0" - sources."@bugsnag/node-7.7.0" + sources."@bugsnag/js-7.8.0" + sources."@bugsnag/node-7.8.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-9.1.3" // { + (sources."@netlify/build-9.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -89514,7 +89554,7 @@ in sources."locate-path-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.13" + sources."@netlify/functions-utils-1.3.14" (sources."@netlify/git-utils-1.0.8" // { dependencies = [ sources."braces-3.0.2" @@ -89555,7 +89595,7 @@ in sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" - (sources."@netlify/zip-it-and-ship-it-2.3.0" // { + (sources."@netlify/zip-it-and-ship-it-2.4.0" // { dependencies = [ sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -89671,7 +89711,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@oclif/plugin-plugins-1.9.5" // { + (sources."@oclif/plugin-plugins-1.10.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -89689,7 +89729,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-5.1.0" + sources."@octokit/openapi-types-5.2.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -89714,7 +89754,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.10.0" + sources."@octokit/types-6.11.1" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ @@ -89809,7 +89849,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.848.0" // { + (sources."aws-sdk-2.853.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -89817,6 +89857,13 @@ in ]; }) sources."babel-plugin-dynamic-import-node-2.3.3" + (sources."babel-plugin-polyfill-corejs2-0.1.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" sources."backoff-2.5.0" sources."bail-1.0.5" sources."balanced-match-1.0.0" @@ -89870,7 +89917,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -89957,7 +90004,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-string-1.5.4" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -90002,7 +90049,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.9.0" // { + (sources."core-js-compat-3.9.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -90127,7 +90174,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -90138,7 +90185,7 @@ in sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."esbuild-0.8.50" + sources."esbuild-0.8.53" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -90216,7 +90263,7 @@ in sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" sources."fast-stringify-1.1.2" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" sources."figures-3.2.0" @@ -90244,7 +90291,7 @@ in sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" sources."folder-walker-3.2.0" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."for-in-1.0.2" sources."form-data-3.0.1" sources."forwarded-0.1.2" @@ -90329,7 +90376,7 @@ in ]; }) sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -90417,7 +90464,11 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-ci-2.0.0" + (sources."is-ci-3.0.0" // { + dependencies = [ + sources."ci-info-3.1.1" + ]; + }) sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" @@ -90536,6 +90587,7 @@ in sources."lodash._reinterpolate-3.0.0" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" + sources."lodash.debounce-4.0.8" sources."lodash.deburr-4.1.0" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" @@ -90653,7 +90705,7 @@ in sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.70" + sources."node-releases-1.1.71" sources."node-source-walk-4.2.0" sources."noop2-2.0.0" (sources."normalize-package-data-2.5.0" // { @@ -90871,7 +90923,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.39.0" + sources."rollup-2.40.0" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -90886,7 +90938,7 @@ in }) sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safe-join-0.1.3" sources."safe-json-stringify-1.2.0" @@ -91014,7 +91066,7 @@ in sources."statsd-client-0.4.5" sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -91098,14 +91150,14 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.1.5" + sources."typescript-4.2.2" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" - (sources."unified-9.2.0" // { + (sources."unified-9.2.1" // { dependencies = [ sources."is-buffer-2.0.5" ]; @@ -91139,6 +91191,7 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" + sources."is-ci-2.0.0" ]; }) sources."uri-js-4.4.1" @@ -91776,7 +91829,7 @@ in sha512 = "1BXFaT7oDd5VM80O+1Lf72P9wCkYjg3CODROPRIPvcSEke6ubMo1M5GFsgh5EwGPLlTTlkuSgI+a4T3UhjAzbQ=="; }; dependencies = [ - sources."@babel/runtime-7.12.18" + sources."@babel/runtime-7.13.8" sources."@node-red/editor-api-1.2.9" sources."@node-red/editor-client-1.2.9" (sources."@node-red/nodes-1.2.9" // { @@ -91943,7 +91996,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.1.2" @@ -92065,7 +92118,7 @@ in sources."ws-7.4.3" ]; }) - (sources."mqtt-packet-6.8.1" // { + (sources."mqtt-packet-6.9.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -92569,7 +92622,7 @@ in ]; }) sources."signal-exit-3.0.3" - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" @@ -92621,7 +92674,7 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -92728,7 +92781,7 @@ in }) sources."decompress-response-5.0.0" sources."deep-extend-0.6.0" - sources."defer-to-connect-2.0.0" + sources."defer-to-connect-2.0.1" sources."del-6.0.0" sources."dir-glob-3.0.1" sources."dot-prop-6.0.1" @@ -92742,7 +92795,7 @@ in sources."execa-5.0.0" sources."external-editor-3.1.0" sources."fast-glob-3.2.5" - sources."fastq-1.10.1" + sources."fastq-1.11.0" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -93065,7 +93118,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safer-buffer-2.1.2" sources."scoped-regex-2.1.0" sources."semver-7.3.4" @@ -93084,7 +93137,7 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" sources."split-1.0.1" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" @@ -93128,7 +93181,7 @@ in sources."xdg-basedir-4.0.0" sources."yallist-4.0.0" sources."yaml-1.10.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -93144,10 +93197,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.5.4.tgz"; - sha512 = "p04kiYgTn8ncpqZbBjdRQ8uUisXStILIH+zppnRHfUKAgNyIXn3Aq/Pf0B1SIC6WCNVDA6Gn9NmHXvU4feLnWg=="; + url = "https://registry.npmjs.org/npm/-/npm-7.6.0.tgz"; + sha512 = "1Jexc9EoGJEMEdWWLQMs2a7a5nNtD0INmBY4Gzv+RI727VZO05kruXhL8NnHtsvBfVn+eoMmBJKzy1exJRfymQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -93162,10 +93215,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "11.1.4"; + version = "11.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.1.4.tgz"; - sha512 = "jq1KAfYcbeFWBLyRj7YT5rwQ3paInsqukeawlwfUdnvmgxKb5uFpd7km/ghPjxAQWVvIecvsYJX0FCHWk4j/iA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.1.9.tgz"; + sha512 = "Ztl5q785Hw+yiUUnlhN/lmrYdzDpH6Mopr0xtijb9t6ltS4RwkIU9qZXuYlOJtPyEXNdmEdmSc2NpfFFs/Nreg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" @@ -93212,7 +93265,7 @@ in sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -93270,7 +93323,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."figgy-pudding-3.5.2" sources."fill-range-7.0.1" sources."find-up-5.0.0" @@ -93433,7 +93486,7 @@ in sources."queue-microtask-1.2.2" sources."rc-1.2.8" sources."rc-config-loader-4.0.0" - sources."read-package-json-fast-2.0.1" + sources."read-package-json-fast-2.0.2" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -93494,7 +93547,7 @@ in sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -93503,7 +93556,7 @@ in sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -93748,55 +93801,65 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.12.13" - (sources."@babel/core-7.12.17" // { + sources."@babel/compat-data-7.13.8" + (sources."@babel/core-7.13.8" // { dependencies = [ sources."json5-2.2.0" + sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.17" // { + (sources."@babel/generator-7.13.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.12.17" - sources."@babel/helper-create-class-features-plugin-7.12.17" + (sources."@babel/helper-compilation-targets-7.13.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.13.8" sources."@babel/helper-create-regexp-features-plugin-7.12.17" - sources."@babel/helper-explode-assignable-expression-7.12.13" + (sources."@babel/helper-define-polyfill-provider-0.1.4" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.17" + sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.0" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.17" + sources."@babel/helper-module-transforms-7.13.0" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.12.13" - sources."@babel/helper-remap-async-to-generator-7.12.13" - sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-plugin-utils-7.13.0" + sources."@babel/helper-remap-async-to-generator-7.13.0" + sources."@babel/helper-replace-supers-7.13.0" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.12.13" - sources."@babel/helpers-7.12.17" - sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.17" - sources."@babel/plugin-proposal-async-generator-functions-7.12.13" - sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.17" + sources."@babel/helper-wrap-function-7.13.0" + sources."@babel/helpers-7.13.0" + sources."@babel/highlight-7.13.8" + sources."@babel/parser-7.13.4" + sources."@babel/plugin-proposal-async-generator-functions-7.13.8" + sources."@babel/plugin-proposal-class-properties-7.13.0" + sources."@babel/plugin-proposal-dynamic-import-7.13.8" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" - sources."@babel/plugin-proposal-json-strings-7.12.13" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.13.8" + sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" sources."@babel/plugin-proposal-numeric-separator-7.12.13" - sources."@babel/plugin-proposal-object-rest-spread-7.12.13" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.17" - sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.13.8" + sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" + sources."@babel/plugin-proposal-optional-chaining-7.13.8" + sources."@babel/plugin-proposal-private-methods-7.13.0" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -93812,46 +93875,50 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.12.13" - sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.13.0" + sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" sources."@babel/plugin-transform-block-scoping-7.12.13" - sources."@babel/plugin-transform-classes-7.12.13" - sources."@babel/plugin-transform-computed-properties-7.12.13" - sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-classes-7.13.0" + sources."@babel/plugin-transform-computed-properties-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.0" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.12.13" - sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.13.0" + sources."@babel/plugin-transform-for-of-7.13.0" sources."@babel/plugin-transform-function-name-7.12.13" sources."@babel/plugin-transform-literals-7.12.13" sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.12.13" - sources."@babel/plugin-transform-modules-commonjs-7.12.13" - sources."@babel/plugin-transform-modules-systemjs-7.12.13" - sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.13.0" + sources."@babel/plugin-transform-modules-commonjs-7.13.8" + sources."@babel/plugin-transform-modules-systemjs-7.13.8" + sources."@babel/plugin-transform-modules-umd-7.13.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" sources."@babel/plugin-transform-new-target-7.12.13" sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-react-jsx-7.12.17" sources."@babel/plugin-transform-regenerator-7.12.13" sources."@babel/plugin-transform-reserved-words-7.12.13" sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-spread-7.13.0" sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-template-literals-7.13.0" sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.12.17" + (sources."@babel/preset-env-7.13.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.18" + sources."@babel/runtime-7.13.8" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -93888,7 +93955,7 @@ in sources."asn1-0.2.4" (sources."asn1.js-5.4.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) (sources."assert-1.5.0" // { @@ -93906,6 +93973,13 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."babel-plugin-dynamic-import-node-2.3.3" + (sources."babel-plugin-polyfill-corejs2-0.1.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.1.6" + sources."babel-plugin-polyfill-regenerator-0.1.5" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -93927,7 +94001,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."bn.js-5.1.3" + sources."bn.js-5.2.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" @@ -93966,7 +94040,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -93981,7 +94055,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.4" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.20.3" @@ -93993,7 +94067,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.9.0" // { + (sources."core-js-compat-3.9.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -94002,7 +94076,7 @@ in sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."create-hash-1.2.0" @@ -94081,7 +94155,7 @@ in sources."destroy-1.0.4" (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) (sources."dom-serializer-0.2.2" // { @@ -94101,10 +94175,10 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."encodeurl-1.0.2" @@ -94125,7 +94199,7 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" - sources."events-3.2.0" + sources."events-3.3.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -94183,7 +94257,7 @@ in ]; }) sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -94296,6 +94370,7 @@ in sources."levn-0.3.0" sources."lodash-4.17.21" sources."lodash.clone-4.5.0" + sources."lodash.debounce-4.0.8" sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" @@ -94321,7 +94396,7 @@ in }) (sources."miller-rabin-4.0.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."mime-1.6.0" @@ -94356,7 +94431,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.70" + sources."node-releases-1.1.71" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -94370,7 +94445,7 @@ in sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" - sources."object.values-1.1.2" + sources."object.values-1.1.3" sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -94469,7 +94544,7 @@ in sources."psl-1.8.0" (sources."public-encrypt-4.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."punycode-2.1.1" @@ -94597,8 +94672,8 @@ in sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { @@ -94826,7 +94901,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."hat-0.0.3" sources."heapdump-0.3.15" sources."hot-shots-6.8.7" @@ -95000,10 +95075,10 @@ in patch-package = nodeEnv.buildNodePackage { name = "patch-package"; packageName = "patch-package"; - version = "6.2.2"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz"; - sha512 = "YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg=="; + url = "https://registry.npmjs.org/patch-package/-/patch-package-6.4.0.tgz"; + sha512 = "KePc85SXRoN//6T4uSDvWpH05xfyH+VGbtzgeNNsGgallox5l4UKWFHCd26SCfAI9ob9DB7MZqsxMjGMweIY+A=="; }; dependencies = [ sources."@yarnpkg/lockfile-1.1.0" @@ -95117,6 +95192,7 @@ in sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" + sources."is-docker-2.1.1" sources."is-extendable-0.1.1" (sources."is-number-3.0.0" // { dependencies = [ @@ -95125,6 +95201,7 @@ in }) sources."is-plain-object-2.0.4" sources."is-windows-1.0.2" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -95160,6 +95237,7 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" + sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" @@ -95304,7 +95382,7 @@ in ]; }) sources."blob-to-buffer-1.2.9" - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" sources."bncode-0.5.3" sources."bonjour-3.5.0" sources."bplist-creator-0.0.6" @@ -95371,7 +95449,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."hat-0.0.3" sources."hosted-git-info-2.8.8" sources."http-headers-3.0.2" @@ -95481,7 +95559,7 @@ in sources."process-nextick-args-2.0.1" sources."pump-2.0.1" sources."queue-microtask-1.2.2" - sources."random-access-file-2.1.5" + sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" @@ -95628,7 +95706,7 @@ in }) sources."bl-4.1.0" sources."blob-0.0.5" - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" sources."bncode-0.5.3" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" @@ -95830,7 +95908,7 @@ in sources."punycode-2.1.1" sources."qs-6.7.0" sources."queue-microtask-1.2.2" - sources."random-access-file-2.1.5" + sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" @@ -95950,10 +96028,10 @@ in pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; - version = "4.5.4"; + version = "4.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/pm2/-/pm2-4.5.4.tgz"; - sha512 = "2xKXrKz21i1R3BK2XxVIPq5Iy9fKHBVgZ+KMfRrx72mc7bq84SG/D+iTO32ihLf2Qe+N1o8rDskAt4M30JWyiA=="; + url = "https://registry.npmjs.org/pm2/-/pm2-4.5.5.tgz"; + sha512 = "feLYWAq8liDsM2IV0ViZ4TSnEUoOtpuICakzFnhh2bb51BUnpJMOjO1sojR1jDuNHvhrYGWqneOUglxE6slKwg=="; }; dependencies = [ (sources."@opencensus/core-0.0.9" // { @@ -95993,7 +96071,7 @@ in dependencies = [ sources."async-2.6.3" sources."debug-4.1.1" - sources."eventemitter2-6.4.3" + sources."eventemitter2-6.4.4" sources."semver-6.3.0" sources."tslib-1.9.3" ]; @@ -96001,7 +96079,7 @@ in (sources."@pm2/js-api-0.6.7" // { dependencies = [ sources."async-2.6.3" - sources."eventemitter2-6.4.3" + sources."eventemitter2-6.4.4" ]; }) sources."@pm2/pm2-version-check-1.0.3" @@ -96076,7 +96154,7 @@ in sources."fclone-1.0.11" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" (sources."ftp-0.3.10" // { @@ -96209,7 +96287,6 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.34.14" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -96244,10 +96321,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.17.3"; + version = "5.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.17.3.tgz"; - sha512 = "Dy2MkOEYsE/9xRNEc6JdiA5HXRo0hxtBOKiYbnbU2BPtBmUt7FVwhnJI4oPW5LrbP1p6lXt/RpPFWl3WmwRH9A=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.18.1.tgz"; + sha512 = "pGOoysRHIarMHkF8ZxRwCN39ZWSffivlK+Bo4mkuFeRSKwQhF2e04n/PxQttyj6kfN0nR+4RkxFcY7Ts+Y10ZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -96298,7 +96375,7 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -96325,7 +96402,7 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."cosmiconfig-7.0.0" sources."dependency-graph-0.9.0" sources."dir-glob-3.0.1" @@ -96334,7 +96411,7 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fast-glob-3.2.5" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."fill-range-7.0.1" sources."fs-extra-9.1.0" sources."fsevents-2.3.2" @@ -96386,7 +96463,7 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."slash-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" @@ -96395,7 +96472,7 @@ in sources."y18n-5.0.5" sources."yaml-1.10.0" sources."yargs-16.2.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -96477,7 +96554,7 @@ in sources."acorn-walk-7.2.0" (sources."asn1.js-5.4.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) (sources."assert-1.5.0" // { @@ -96489,7 +96566,7 @@ in sources."async-1.5.2" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" - sources."bn.js-5.1.3" + sources."bn.js-5.2.0" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."browser-pack-6.1.0" @@ -96537,7 +96614,7 @@ in sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."create-hash-1.2.0" @@ -96550,14 +96627,14 @@ in sources."detective-5.2.0" (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."es6-promise-3.3.1" @@ -96603,7 +96680,7 @@ in sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."mime-1.6.0" @@ -96646,7 +96723,7 @@ in sources."process-nextick-args-2.0.1" (sources."public-encrypt-4.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."punycode-1.4.1" @@ -96796,10 +96873,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.113"; + version = "1.1.116"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.113.tgz"; - sha512 = "VcitW5t5lG1KY0w8xY/ubMhFZZ2lfXJvhBW4TfTwy067R4WtXKSa23br4to1pdRA1rwpxOREgxVTnOWmf3YkYg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.116.tgz"; + sha512 = "SdsLo/bahs+ncCYIY7E4bL/B+ZuI/OdKJudNuUFAJciXEkkkp2ICzpzQSt0n4ZeYsPfqb5g48QoGo7x4a+LDcQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -96814,10 +96891,10 @@ in quicktype = nodeEnv.buildNodePackage { name = "quicktype"; packageName = "quicktype"; - version = "15.0.258"; + version = "15.0.260"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype/-/quicktype-15.0.258.tgz"; - sha512 = "nTDC6LmwsFNJU1qY9+t09e4k1J1PosVDhZKRizkRinQzRVITFOzKSMuFBD3UJ1yaO9Irn7QKBlm9rae+9p+Cdg=="; + url = "https://registry.npmjs.org/quicktype/-/quicktype-15.0.260.tgz"; + sha512 = "OYP77enVz2UkcdDqVFc2AcFGYjk5/ENGYZHmSEY5Oy6Y2xVatlHUnrScddEkI+xJxSfYS6UXSH8oOTW7mEOiEw=="; }; dependencies = [ sources."@mark.probst/typescript-json-schema-0.32.0" @@ -96885,7 +96962,11 @@ in sources."is-url-1.2.4" sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."isomorphic-fetch-2.2.1" + (sources."isomorphic-fetch-2.2.1" // { + dependencies = [ + sources."node-fetch-1.7.3" + ]; + }) sources."iterall-1.1.3" sources."js-base64-2.6.4" sources."json-stable-stringify-1.0.1" @@ -96908,7 +96989,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."nice-try-1.0.5" - sources."node-fetch-1.7.3" + sources."node-fetch-2.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-inspect-1.4.1" @@ -97002,7 +97083,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vlq-0.2.3" - sources."whatwg-fetch-3.6.1" + sources."whatwg-fetch-3.6.2" sources."which-1.3.1" sources."which-module-2.0.0" sources."word-wrap-1.2.3" @@ -97067,7 +97148,7 @@ in sources."glob-7.1.6" sources."has-1.0.3" sources."has-ansi-2.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -97108,8 +97189,8 @@ in sources."semver-5.7.1" sources."side-channel-1.0.4" sources."stack-trace-0.0.10" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."utile-0.2.1" @@ -97299,7 +97380,7 @@ in sources."source-map-0.6.1" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."symbol-tree-3.2.4" sources."tough-cookie-3.0.1" @@ -97322,7 +97403,7 @@ in sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.5" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -97344,7 +97425,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - (sources."@babel/generator-7.12.17" // { + (sources."@babel/generator-7.13.0" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -97355,12 +97436,12 @@ in sources."@babel/helper-module-imports-7.12.13" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.17" - sources."@babel/runtime-7.12.18" + sources."@babel/highlight-7.13.8" + sources."@babel/parser-7.13.4" + sources."@babel/runtime-7.13.8" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -97375,7 +97456,7 @@ in sources."argparse-1.0.10" (sources."asn1.js-5.4.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) (sources."assert-1.5.0" // { @@ -97388,7 +97469,7 @@ in sources."base64-js-1.5.1" sources."better-ajv-errors-0.6.7" sources."binary-extensions-2.2.0" - sources."bn.js-5.1.3" + sources."bn.js-5.2.0" sources."braces-3.0.2" sources."brorand-1.1.0" sources."browserify-aes-1.2.0" @@ -97425,11 +97506,11 @@ in sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.9.0" + sources."core-js-3.9.1" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."create-hash-1.2.0" @@ -97444,14 +97525,14 @@ in sources."des.js-1.0.1" (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."domain-browser-1.2.0" sources."dompurify-2.2.6" (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" sources."inherits-2.0.4" ]; }) @@ -97461,7 +97542,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."eventemitter3-4.0.7" - sources."events-3.2.0" + sources."events-3.3.0" sources."evp_bytestokey-1.0.3" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.1.0" @@ -97520,7 +97601,7 @@ in sources."memoize-one-5.1.1" (sources."miller-rabin-4.0.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."minimalistic-assert-1.0.1" @@ -97567,7 +97648,7 @@ in sources."prop-types-15.7.2" (sources."public-encrypt-4.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."punycode-1.4.1" @@ -97614,7 +97695,7 @@ in sources."stickyfill-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."styled-components-5.2.1" @@ -97664,7 +97745,7 @@ in sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -97697,10 +97778,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.39.0"; + version = "2.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.39.0.tgz"; - sha512 = "+WR3bttcq7zE+BntH09UxaW3bQo3vItuYeLsyk4dL2tuwbeSKJuvwiawyhEnvRdRgrII0Uzk00FpctHO/zB1kw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.40.0.tgz"; + sha512 = "WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -97723,12 +97804,12 @@ in dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."chalk-2.4.2" ]; }) - (sources."@eslint/eslintrc-0.3.0" // { + (sources."@eslint/eslintrc-0.4.0" // { dependencies = [ sources."ignore-4.0.6" ]; @@ -97753,13 +97834,13 @@ in sources."@types/node-fetch-2.5.8" sources."@types/resolve-1.17.1" sources."@types/vscode-1.53.0" - sources."@typescript-eslint/eslint-plugin-4.15.1" - sources."@typescript-eslint/experimental-utils-4.15.1" - sources."@typescript-eslint/parser-4.15.1" - sources."@typescript-eslint/scope-manager-4.15.1" - sources."@typescript-eslint/types-4.15.1" - sources."@typescript-eslint/typescript-estree-4.15.1" - sources."@typescript-eslint/visitor-keys-4.15.1" + sources."@typescript-eslint/eslint-plugin-4.15.2" + sources."@typescript-eslint/experimental-utils-4.15.2" + sources."@typescript-eslint/parser-4.15.2" + sources."@typescript-eslint/scope-manager-4.15.2" + sources."@typescript-eslint/types-4.15.2" + sources."@typescript-eslint/typescript-estree-4.15.2" + sources."@typescript-eslint/visitor-keys-4.15.2" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -97840,7 +97921,7 @@ in sources."entities-2.1.0" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.20.0" // { + (sources."eslint-7.21.0" // { dependencies = [ sources."ignore-4.0.6" ]; @@ -97875,7 +97956,7 @@ in sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" @@ -98015,7 +98096,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.39.0" + sources."rollup-2.40.0" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.4" @@ -98034,7 +98115,7 @@ in }) sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" + sources."string-width-4.2.2" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -98063,7 +98144,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."typed-rest-client-1.2.0" - sources."typescript-4.1.5" + sources."typescript-4.2.2" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.8.3" @@ -98072,7 +98153,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" - (sources."vsce-1.85.0" // { + (sources."vsce-1.85.1" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -98417,10 +98498,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.25.2"; + version = "2.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.25.2.tgz"; - sha512 = "TjFQLW2Nfx3C323rIkHhuFcDyfGwe+z2TGpOYIyNWHGG8uZ1Q4AJs8jJGEhvuXzWSvXcANX8tSztloNuIaaY3Q=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.28.0.tgz"; + sha512 = "3sd09oTyr9X8qle39WeO6076uFSd2pQlItt5n/LVGyb+PW/ScnVqutYxslZgYa94P87jZGl8XLuSoD3xQ233iw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -98452,7 +98533,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.7.0" // { + (sources."@serverless/components-3.7.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."js-yaml-3.14.1" @@ -98474,7 +98555,7 @@ in ]; }) sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.1.0" // { + (sources."@serverless/platform-client-4.2.0" // { dependencies = [ sources."js-yaml-3.14.1" ]; @@ -98571,7 +98652,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.848.0" // { + (sources."aws-sdk-2.853.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -98610,7 +98691,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."type-fest-0.20.2" ]; @@ -98798,7 +98879,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" sources."figures-3.2.0" @@ -98810,7 +98891,7 @@ in sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.2" @@ -98845,13 +98926,13 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globby-11.0.2" - (sources."got-11.8.1" // { + (sources."got-11.8.2" // { dependencies = [ sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."cacheable-request-7.0.1" sources."decompress-response-6.0.0" - sources."defer-to-connect-2.0.0" + sources."defer-to-connect-2.0.1" sources."get-stream-5.2.0" sources."json-buffer-3.0.1" sources."keyv-4.0.3" @@ -98877,7 +98958,7 @@ in sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" - sources."http2-wrapper-1.0.0-beta.5.2" + sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."agent-base-6.0.2" @@ -98898,7 +98979,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -99123,7 +99204,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -99137,7 +99218,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.35.1" // { + (sources."simple-git-2.35.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -99274,7 +99355,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -99293,7 +99374,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -99949,10 +100030,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.458.0"; + version = "1.462.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.458.0.tgz"; - sha512 = "w/ZCb8rOyFDn09OmoyuLDQcmW63rSfbVsXINM+bvT9UJ4ML4JRWA2qKURcaMy9RnkXEK3gPYstly7ezb9iF82g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.462.0.tgz"; + sha512 = "DJ17t2ZAvdUwE+PoOU8o4k2wkvq+HxZYcuLVMGdVWprPnScnnA0R918vaJDYDEGNUIhJwe6liXbBoY7UQahr8A=="; }; dependencies = [ sources."@open-policy-agent/opa-wasm-1.2.0" @@ -100093,7 +100174,7 @@ in }) sources."deep-extend-0.6.0" sources."deep-is-0.1.3" - sources."defer-to-connect-2.0.0" + sources."defer-to-connect-2.0.1" (sources."degenerator-1.0.4" // { dependencies = [ sources."esprima-3.1.3" @@ -100155,6 +100236,11 @@ in sources."gunzip-maybe-1.4.2" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" + (sources."hcl-to-json-0.1.1" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) (sources."hosted-git-info-3.0.8" // { dependencies = [ sources."lru-cache-6.0.0" @@ -100169,7 +100255,7 @@ in sources."ms-2.0.0" ]; }) - sources."http2-wrapper-1.0.0-beta.5.2" + sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-3.0.1" // { dependencies = [ sources."debug-3.2.7" @@ -100348,7 +100434,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -100367,7 +100453,7 @@ in sources."tslib-2.1.0" ]; }) - (sources."snyk-docker-plugin-4.17.2" // { + (sources."snyk-docker-plugin-4.17.3" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -100439,7 +100525,7 @@ in }) ]; }) - sources."snyk-python-plugin-1.19.4" + sources."snyk-python-plugin-1.19.5" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.2.7" @@ -100480,7 +100566,7 @@ in sources."statuses-1.5.0" sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."strip-ansi-6.0.0" ]; @@ -100573,10 +100659,10 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz"; - sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz"; + sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" @@ -101053,7 +101139,7 @@ in sources."has-ansi-2.0.0" sources."has-flag-4.0.0" sources."has-network-0.0.1" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" (sources."has-value-1.0.0" // { dependencies = [ sources."isobject-3.0.1" @@ -101395,7 +101481,7 @@ in sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."random-access-chrome-file-1.1.4" - sources."random-access-file-2.1.5" + sources."random-access-file-2.2.0" (sources."random-access-idb-1.2.1" // { dependencies = [ sources."buffer-from-0.1.2" @@ -101569,7 +101655,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-1.17.1" // { + (sources."ssb-db2-1.18.0" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -101577,10 +101663,12 @@ in sources."level-codec-6.2.0" ]; }) + sources."glob-7.1.6" sources."level-6.0.1" sources."level-js-5.0.2" sources."mkdirp-1.0.4" sources."push-stream-11.0.0" + sources."rimraf-3.0.2" (sources."ssb-keys-8.0.2" // { dependencies = [ sources."mkdirp-0.5.5" @@ -101651,9 +101739,9 @@ in ]; }) sources."string-width-1.0.2" - sources."string.prototype.trim-1.2.3" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trim-1.2.4" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" @@ -101830,7 +101918,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.848.0" // { + (sources."aws-sdk-2.853.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -102014,7 +102102,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -102050,7 +102138,7 @@ in ]; }) sources."has-cors-1.1.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."hawk-3.1.3" sources."highlight.js-8.2.0" (sources."hipchatter-0.3.2" // { @@ -102270,7 +102358,7 @@ in sources."psl-1.8.0" sources."pug-2.0.4" sources."pug-attrs-2.0.4" - sources."pug-code-gen-2.0.2" + sources."pug-code-gen-2.0.3" sources."pug-error-1.3.3" sources."pug-filters-3.1.1" sources."pug-lexer-4.1.0" @@ -102605,28 +102693,31 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/core-7.12.17" - sources."@babel/generator-7.12.17" + sources."@babel/compat-data-7.13.8" + sources."@babel/core-7.13.8" + sources."@babel/generator-7.13.0" + sources."@babel/helper-compilation-targets-7.13.8" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.17" + sources."@babel/helper-member-expression-to-functions-7.13.0" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.17" + sources."@babel/helper-module-transforms-7.13.0" sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-replace-supers-7.13.0" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.17" - (sources."@babel/highlight-7.12.13" // { + sources."@babel/helper-validator-option-7.12.17" + sources."@babel/helpers-7.13.0" + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.17" + sources."@babel/parser-7.13.4" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.17" - sources."@babel/types-7.12.17" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -102652,7 +102743,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -102668,7 +102759,7 @@ in sources."clone-regexp-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" sources."cosmiconfig-7.0.0" @@ -102690,7 +102781,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -102701,7 +102792,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.5" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -102784,7 +102875,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.70" + sources."node-releases-1.1.71" (sources."normalize-package-data-3.0.0" // { dependencies = [ sources."semver-7.3.4" @@ -102833,6 +102924,7 @@ in dependencies = [ sources."hosted-git-info-2.8.8" sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" sources."type-fest-0.6.0" ]; }) @@ -102854,7 +102946,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" - sources."semver-5.7.1" + sources."semver-6.3.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -102870,7 +102962,7 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" sources."specificity-0.4.1" - sources."string-width-4.2.0" + sources."string-width-4.2.2" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -102889,7 +102981,7 @@ in sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unified-9.2.0" + sources."unified-9.2.1" sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.0.4" @@ -102905,7 +102997,7 @@ in sources."write-file-atomic-3.0.3" sources."yallist-4.0.0" sources."yaml-1.10.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" sources."zwitch-1.0.5" ]; buildInputs = globalBuildInputs; @@ -102921,15 +103013,15 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.12.14"; + version = "0.12.15"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.14.tgz"; - sha512 = "pf569M9VeeyyPrRbmmQlndYO2nr8/Q2OMC1TlrCf7SBzqyqkCV1XirRRX5w2/RVq+T5tJC6k2tKTrNyhVF1mqQ=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.15.tgz"; + sha512 = "7tYY1iEVc883QABfXDjwqHwVbJlsWkfgMQhR3PisHuzICGMCCV8Y/oZnhP9Tzc/R8N+tanBhQCYaGlfgE+T1lQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" + sources."@babel/highlight-7.13.8" sources."@emmetio/abbreviation-2.2.1" sources."@emmetio/css-abbreviation-2.1.2" sources."@emmetio/scanner-1.0.0" @@ -102949,7 +103041,7 @@ in sources."cosmiconfig-7.0.0" sources."dedent-js-1.0.1" sources."detect-indent-6.0.0" - sources."emmet-2.3.1" + sources."emmet-2.3.2" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" @@ -102986,10 +103078,10 @@ in sources."supports-color-5.5.0" sources."svelte-3.32.3" sources."svelte-preprocess-4.6.9" - sources."svelte2tsx-0.1.174" + sources."svelte2tsx-0.1.175" sources."to-regex-range-5.0.1" sources."tslib-2.1.0" - sources."typescript-4.1.5" + sources."typescript-4.2.2" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" sources."vscode-html-languageservice-4.0.0" @@ -103015,12 +103107,13 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.0.3.tgz"; - sha512 = "q6YtEaLXkPN1ARaifoENYPPweAbBV8YoqWg+8DFQ3xsImfyRIdBbr42Cqz4NZwCftmVJjh+m1rEK7ItRdLTxdg=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.1.0.tgz"; + sha512 = "f5iEvWkSesVHPqBBc26s9/9LFKJZ+4aWPpOVX0uxXz/39SlNL4XuwfhOWsqOS5Q1j7Z6WLayCF/s1lISeAHjwA=="; }; dependencies = [ + sources."@trysound/sax-0.1.1" sources."ansi-styles-4.3.0" sources."boolbase-1.0.0" sources."chalk-4.1.0" @@ -103040,7 +103133,6 @@ in sources."has-flag-4.0.0" sources."mdn-data-2.0.14" sources."nth-check-2.0.0" - sources."sax-1.2.4" sources."source-map-0.6.1" sources."stable-0.1.8" sources."supports-color-7.2.0" @@ -103933,7 +104025,7 @@ in sources."graceful-fs-4.2.6" sources."has-1.0.3" sources."has-ansi-2.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."hosted-git-info-2.8.8" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -104119,7 +104211,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."match-index-1.0.3" sources."object-keys-1.1.1" sources."regexp.prototype.flags-1.3.1" @@ -104145,7 +104237,7 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" + sources."@babel/highlight-7.13.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.4.1" @@ -104445,7 +104537,7 @@ in sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" sources."stream-combiner-0.0.4" - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" @@ -104485,7 +104577,7 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-1.1.3" - (sources."unified-9.2.0" // { + (sources."unified-9.2.1" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; @@ -104691,7 +104783,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."inherits-2.0.4" sources."is-callable-1.2.3" sources."is-date-object-1.0.2" @@ -104702,12 +104794,12 @@ in sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."object.values-1.1.2" + sources."object.values-1.1.3" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."sentence-splitter-3.2.0" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -104747,7 +104839,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."is-callable-1.2.3" sources."is-date-object-1.0.2" sources."is-regex-1.1.2" @@ -104755,8 +104847,8 @@ in sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -104845,7 +104937,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."is-callable-1.2.3" sources."is-capitalized-1.0.0" sources."is-date-object-1.0.2" @@ -104856,8 +104948,8 @@ in sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -104888,7 +104980,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."no-cliches-0.1.1" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -104971,7 +105063,7 @@ in sources."better-assert-1.0.2" sources."blob-0.0.5" sources."block-stream-0.0.9" - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" sources."body-parser-1.19.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" @@ -105004,7 +105096,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.9.0" + sources."core-js-3.9.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -105016,7 +105108,7 @@ in ]; }) sources."deep-extend-0.6.0" - sources."defer-to-connect-2.0.0" + sources."defer-to-connect-2.0.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -105097,7 +105189,7 @@ in ]; }) sources."http-signature-1.2.0" - sources."http2-wrapper-1.0.0-beta.5.2" + sources."http2-wrapper-1.0.3" sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ @@ -105362,10 +105454,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.125.2"; + version = "0.126.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.125.2.tgz"; - sha512 = "7rIRO23jVKWcAPFdW/HREU2NZMGWPBZ4XwEMt0Ak0jwLUKVJhcKM55eCBWyGZq/KiQbeo1IeuAoo/9l2dzhTXA=="; + url = "https://registry.npmjs.org/three/-/three-0.126.0.tgz"; + sha512 = "/MecvboUefStCkUfXLImoJxthN+FoLPcEP7pz1r1Dd9i8BPGGuj+S1sOPRvW4Z+ViZjP2oWWm1inNC/MT52ybA=="; }; buildInputs = globalBuildInputs; meta = { @@ -105794,10 +105886,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.1.5"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz"; - sha512 = "6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz"; + sha512 = "tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -106027,7 +106119,7 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."media-typer-0.3.0" - (sources."memorystore-1.6.4" // { + (sources."memorystore-1.6.5" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -106118,7 +106210,7 @@ in }) sources."stack-trace-0.0.10" sources."statuses-1.5.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -106156,7 +106248,7 @@ in sources."y18n-5.0.5" sources."yallist-2.1.2" sources."yargs-16.2.0" - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -106190,7 +106282,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -106325,7 +106417,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) @@ -106336,11 +106428,11 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -106355,10 +106447,10 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "4.17.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-4.17.0.tgz"; - sha512 = "MO2XsaVZqx6iWWmVA5vwYFamvhRUsKfVp7n0pNlkZ2/21cuxelSl92EePZ2YGmzL6z4/3K7r/45zaG8p+qNHeg=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.0.0.tgz"; + sha512 = "CrMAy3D2E662qtShrOeGttwwthRxUOZUfdu39THyxkOfLNJBCLkNjfQpFekEidxwbtFTO1zMZzyFIP3AE2I8kQ=="; }; dependencies = [ sources."@types/clone-2.1.0" @@ -106376,18 +106468,18 @@ in sources."fast-json-stable-stringify-2.1.0" sources."get-caller-file-2.0.5" sources."is-fullwidth-code-point-3.0.0" - sources."json-stringify-pretty-compact-2.0.0" + sources."json-stringify-pretty-compact-3.0.0" sources."require-directory-2.1.1" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."tslib-2.0.3" + sources."tslib-2.1.0" sources."vega-event-selector-2.0.6" - sources."vega-expression-3.0.1" + sources."vega-expression-4.0.1" sources."vega-util-1.16.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.5" - sources."yargs-16.0.3" - sources."yargs-parser-20.2.5" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -106486,10 +106578,10 @@ in vscode-json-languageserver = nodeEnv.buildNodePackage { name = "vscode-json-languageserver"; packageName = "vscode-json-languageserver"; - version = "1.3.1"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageserver/-/vscode-json-languageserver-1.3.1.tgz"; - sha512 = "yP75lCPSZVkFUfA0pUA9yKu2OumueIIaht5i9c7XVwwm08PMt1GMDI8RNv/fPkUjU9uBnb5bJW20BHxWBATgrA=="; + url = "https://registry.npmjs.org/vscode-json-languageserver/-/vscode-json-languageserver-1.3.4.tgz"; + sha512 = "+ghebnslXk6fVDySBrT0BVqozLDdmKY/qxgkDD4JtOQcU2vXc3e7jh7YyMxvuvE93E9OLvBqUrvajttj8xf3BA=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -106498,22 +106590,21 @@ in sources."es6-promisify-5.0.0" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" - sources."jsonc-parser-2.3.1" + sources."jsonc-parser-3.0.0" sources."ms-2.0.0" - sources."request-light-0.3.0" - (sources."vscode-json-languageservice-3.11.0" // { + sources."request-light-0.4.0" + (sources."vscode-json-languageservice-4.0.2" // { dependencies = [ - sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" ]; }) - sources."vscode-jsonrpc-6.0.0-next.2" - sources."vscode-languageserver-7.0.0-next.3" - sources."vscode-languageserver-protocol-3.16.0-next.4" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-7.0.0" + sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" - sources."vscode-uri-2.1.2" + sources."vscode-uri-3.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -106622,7 +106713,7 @@ in sources."array-unique-0.3.2" (sources."asn1.js-5.4.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) (sources."assert-1.5.0" // { @@ -106646,7 +106737,7 @@ in sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" - sources."bn.js-5.1.3" + sources."bn.js-5.2.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -106738,7 +106829,7 @@ in sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."create-hash-1.2.0" @@ -106759,7 +106850,7 @@ in sources."diff-3.5.0" (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."dom-serializer-1.2.0" @@ -106776,7 +106867,7 @@ in }) (sources."elliptic-6.5.4" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."emoji-regex-7.0.3" @@ -106807,7 +106898,7 @@ in ]; }) sources."estraverse-4.3.0" - sources."events-3.2.0" + sources."events-3.3.0" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -106887,7 +106978,7 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -106997,7 +107088,7 @@ in }) (sources."miller-rabin-4.0.1" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."mime-1.6.0" @@ -107097,7 +107188,7 @@ in sources."prr-1.0.1" (sources."public-encrypt-4.0.3" // { dependencies = [ - sources."bn.js-4.11.9" + sources."bn.js-4.12.0" ]; }) sources."pump-3.0.0" @@ -107225,8 +107316,8 @@ in sources."stream-shift-1.0.1" sources."string-argv-0.3.1" sources."string-width-2.1.1" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-0.10.31" sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" @@ -107302,9 +107393,9 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."vm-browserify-1.1.2" - sources."vsce-1.85.0" - sources."vscode-debugadapter-testsupport-1.44.0" - sources."vscode-debugprotocol-1.44.0" + sources."vsce-1.85.1" + sources."vscode-debugadapter-testsupport-1.45.0" + sources."vscode-debugprotocol-1.45.0" (sources."watchpack-1.7.5" // { dependencies = [ sources."chokidar-3.5.1" @@ -107588,7 +107679,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.6" @@ -107673,7 +107764,7 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" + sources."@babel/highlight-7.13.8" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -108304,7 +108395,7 @@ in sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -108528,7 +108619,7 @@ in sources."ansi-regex-5.0.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" + sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."supports-color-6.1.0" ]; @@ -108608,7 +108699,7 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.12.13" // { + (sources."@babel/highlight-7.13.8" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -108777,7 +108868,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.8" @@ -108991,7 +109082,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -109371,7 +109462,7 @@ in sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" sources."stream-to-promise-3.0.0" - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."strip-ansi-6.0.0" @@ -109511,7 +109602,7 @@ in sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.5" + sources."yargs-parser-20.2.6" sources."yauzl-2.10.0" (sources."zip-dir-1.0.2" // { dependencies = [ @@ -109533,10 +109624,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.23.0"; + version = "5.24.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.23.0.tgz"; - sha512 = "RC6dwDuRxiU75F8XC4H08NtzUrMfufw5LDnO8dTtaKU2+fszEdySCgZhNwSBBn516iNaJbQI7T7OPHIgCwcJmg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.24.2.tgz"; + sha512 = "uxxKYEY4kMNjP+D2Y+8aw5Vd7ar4pMuKCNemxV26ysr1nk0YDiQTylg9U3VZIdkmI0YHa0uC8ABxL+uGxGWWJg=="; }; dependencies = [ sources."@types/eslint-7.2.6" @@ -109566,13 +109657,13 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.3" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001190" + sources."caniuse-lite-1.0.30001192" sources."chrome-trace-event-1.0.2" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.671" + sources."electron-to-chromium-1.3.675" sources."enhanced-resolve-5.7.0" - sources."es-module-lexer-0.3.26" + sources."es-module-lexer-0.4.0" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -109581,7 +109672,7 @@ in ]; }) sources."estraverse-4.3.0" - sources."events-3.2.0" + sources."events-3.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."glob-to-regexp-0.4.1" @@ -109595,7 +109686,7 @@ in sources."mime-db-1.46.0" sources."mime-types-2.1.29" sources."neo-async-2.6.2" - sources."node-releases-1.1.70" + sources."node-releases-1.1.71" sources."p-limit-3.1.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -109644,7 +109735,7 @@ in sources."@webpack-cli/serve-1.3.0" sources."ansi-colors-4.1.1" sources."clone-deep-4.0.1" - sources."colorette-1.2.1" + sources."colorette-1.2.2" sources."commander-7.1.0" sources."cross-spawn-7.0.3" sources."enquirer-2.3.6" @@ -109896,7 +109987,7 @@ in ]; }) sources."find-up-3.0.0" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -109923,7 +110014,7 @@ in sources."handle-thing-2.0.1" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" + sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -110304,7 +110395,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.10.1" + sources."fastq-1.11.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.1" sources."globby-11.0.2" @@ -110404,7 +110495,7 @@ in }) sources."blob-to-buffer-1.2.9" sources."block-stream2-2.1.0" - sources."bn.js-5.1.3" + sources."bn.js-5.2.0" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" sources."buffer-6.0.3" @@ -110513,7 +110604,7 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."mp4-box-encoding-1.4.1" - sources."mp4-stream-3.1.2" + sources."mp4-stream-3.1.3" sources."ms-2.0.0" (sources."multicast-dns-6.2.3" // { dependencies = [ @@ -110553,7 +110644,7 @@ in sources."pump-3.0.0" sources."qap-3.3.1" sources."queue-microtask-1.2.2" - sources."random-access-file-2.1.5" + sources."random-access-file-2.2.0" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" @@ -110583,7 +110674,7 @@ in sources."ms-2.1.2" ]; }) - sources."simple-sha1-3.0.1" + sources."simple-sha1-3.1.0" (sources."simple-websocket-9.1.0" // { dependencies = [ sources."debug-4.3.2" @@ -110633,7 +110724,7 @@ in sources."utp-native-2.3.0" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.114.1" // { + (sources."webtorrent-0.115.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -110791,8 +110882,8 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.12.13" - sources."@babel/runtime-7.12.18" + sources."@babel/highlight-7.13.8" + sources."@babel/runtime-7.13.8" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" @@ -110914,7 +111005,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.9.0" + sources."core-js-3.9.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -111016,7 +111107,7 @@ in sources."find-up-2.1.0" sources."find-versions-2.0.0" sources."first-chunk-stream-2.0.0" - sources."follow-redirects-1.13.2" + sources."follow-redirects-1.13.3" sources."for-in-1.0.2" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -111054,7 +111145,7 @@ in }) sources."global-dirs-0.1.1" sources."global-tunnel-ng-2.7.1" - sources."globalthis-1.0.1" + sources."globalthis-1.0.2" sources."globby-8.0.2" (sources."got-8.3.2" // { dependencies = [ @@ -111398,7 +111489,7 @@ in sources."root-check-1.0.0" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-6.6.3" + sources."rxjs-6.6.6" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -111667,7 +111758,7 @@ in sources."semver-7.3.4" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - (sources."string-width-4.2.0" // { + (sources."string-width-4.2.2" // { dependencies = [ sources."strip-ansi-6.0.0" ]; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 9284bbaf9c628..94f254a2edfb6 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -2,28 +2,26 @@ , ocaml, findlib, ocamlbuild, ocaml_oasis , bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp , utop, libxml2, ncurses +, linenoise +, ppx_bap , ppx_bitstring -, ppx_tools_versioned +, yojson , which, makeWrapper, writeText , z3 }: -if !lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.08" then throw "BAP is not available for OCaml ${ocaml.version}" else -if lib.versionAtLeast core_kernel.version "0.13" -then throw "BAP needs core_kernel-0.12 (hence OCaml 4.07)" -else - stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-bap-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap"; rev = "v${version}"; - sha256 = "10fkr6p798ad18j4h9bvp9dg4pmjdpv3hmj7k389i0vhqniwi5xq"; + sha256 = "0c53sps6ba9n5cjdmapi8ylzlpcc11pksijp9swzlwgxyz5d276f"; }; sigs = fetchurl { @@ -41,12 +39,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which makeWrapper ]; buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis - llvm ppx_bitstring ppx_tools_versioned + linenoise + ounit + ppx_bitstring z3 utop libxml2 ncurses ]; - propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp - piqi-ocaml uuidm frontc ounit ]; + propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_bap core_kernel ezjsonm fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp + piqi-ocaml uuidm frontc yojson ]; installPhase = '' export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { patches = [ ./curses_is_ncurses.patch ]; preConfigure = '' - substituteInPlace oasis/elf --replace bitstring.ppx ppx_bitstring + substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring ''; configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ]; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 6bae728cafacf..ec20eedd7688f 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "camomile"; version = "1.0.2"; + useDune2 = true; + src = fetchFromGitHub { owner = "yoriyuki"; repo = pname; diff --git a/pkgs/development/ocaml-modules/mmap/default.nix b/pkgs/development/ocaml-modules/mmap/default.nix index 8ae1f4a9d47c4..b13639150b0d9 100644 --- a/pkgs/development/ocaml-modules/mmap/default.nix +++ b/pkgs/development/ocaml-modules/mmap/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mmap"; version = "1.1.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/mmap/releases/download/v${version}/mmap-v${version}.tbz"; sha256 = "0l6waidal2n8mkdn74avbslvc10sf49f5d889n838z03pra5chsc"; diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix index afe3d34963ae6..ca88fe32416aa 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; version = "2.1.0"; + useDune2 = true; + minimumOCamlVersion = "4.02"; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix index 2814c6c528064..2fda6f1440be9 100644 --- a/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -1,9 +1,11 @@ -{ lib, buildDunePackage, fetchurl }: +{ lib, buildDunePackage, fetchurl, ocaml }: buildDunePackage rec { pname = "result"; version = "1.5"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + src = fetchurl { url = "https://github.com/janestreet/result/releases/download/${version}/result-${version}.tbz"; sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw"; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index b4842da12dd77..cf869b6e5ef90 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -29,9 +29,8 @@ stdenv.mkDerivation rec { sha256 = "0xda4fj8p5102lh9xmrn5mv3s0ps6yykqj3mpjf72gf4zd6fzcn7"; }) ]; - buildInputs = [ which makeWrapper ocaml findlib - lwt_react pgocaml camlzip ocaml_sqlite3 - ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which ocaml findlib lwt_react pgocaml camlzip ocaml_sqlite3 ]; propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet ocaml_pcre tyxml xml-light diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix index 5127dc3b1e6d5..37006bf30da67 100644 --- a/pkgs/development/ocaml-modules/parmap/default.nix +++ b/pkgs/development/ocaml-modules/parmap/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "parmap"; - version = "1.1.1"; + version = "1.2"; src = fetchurl { url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1pci7b1jqxkgmrbhr0p5j98i4van5nfmmb3sak8cyvxhwgna93j4"; + sha256 = "sha256-XUXptzD0eytaypaBQ+EBp4iVFRE6/Y0inS93t/YZrM8="; }; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ppx_bap/default.nix b/pkgs/development/ocaml-modules/ppx_bap/default.nix new file mode 100644 index 0000000000000..f0a223c3db758 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_bap/default.nix @@ -0,0 +1,51 @@ +{ lib, buildDunePackage +, fetchFromGitHub +, ppx_assert +, ppx_bench +, ppx_bin_prot +, ppx_compare +, ppx_enumerate +, ppx_hash +, ppx_here +, ppx_optcomp +, ppx_sexp_conv +, ppx_sexp_value +}: + +buildDunePackage rec { + pname = "ppx_bap"; + version = "0.14"; + useDune2 = true; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = pname; + rev = "v${version}"; + sha256 = "1c6rcdp8bicdiwqc2mb59cl9l2vxlp3y8hmnr9x924fq7acly248"; + }; + + buildInputs = [ + ppx_optcomp + ppx_sexp_value + ]; + + propagatedBuildInputs = [ + ppx_assert + ppx_bench + ppx_bin_prot + ppx_compare + ppx_enumerate + ppx_hash + ppx_here + ppx_sexp_conv + ]; + + meta = { + description = "The set of ppx rewriters for BAP"; + license = lib.licenses.mit; + inherit (src.meta) homepage; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix index 3d4675ed90b9b..84dda38846fe5 100644 --- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -1,9 +1,11 @@ -{ lib, fetchFromGitHub, buildDunePackage }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml }: buildDunePackage rec { pname = "ppx_derivers"; version = "1.2.1"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + minimumOCamlVersion = "4.02"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index d5829127a8bcb..5e9a89a837693 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "qtest"; - version = "2.11.1"; + version = "2.11.2"; useDune2 = true; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "vincent-hugot"; repo = pname; rev = "v${version}"; - sha256 = "01aaqnblpkrkv1b2iy5cwn92vxdj4yjiav9s2nvvrqz5m8b9hi1f"; + sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE="; }; propagatedBuildInputs = [ qcheck ]; diff --git a/pkgs/development/ocaml-modules/stdlib-shims/default.nix b/pkgs/development/ocaml-modules/stdlib-shims/default.nix index d76ec29e63aa5..470a2a5bd030f 100644 --- a/pkgs/development/ocaml-modules/stdlib-shims/default.nix +++ b/pkgs/development/ocaml-modules/stdlib-shims/default.nix @@ -2,11 +2,12 @@ buildDunePackage rec { pname = "stdlib-shims"; - version = "0.1.0"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/ocaml/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1jv6yb47f66239m7hsz7zzw3i48mjpbvfgpszws48apqx63wjwsk"; + sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; minimumOCamlVersion = "4.02"; doCheck = true; meta = { diff --git a/pkgs/development/perl-modules/ham/default.nix b/pkgs/development/perl-modules/ham/default.nix index 4f6dc5d9ddb78..8b19c9404fe05 100644 --- a/pkgs/development/perl-modules/ham/default.nix +++ b/pkgs/development/perl-modules/ham/default.nix @@ -13,7 +13,7 @@ buildPerlPackage { outputs = [ "out" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ openssh GitRepository URI XMLMini ]; preConfigure = '' diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 8d6bba3e460ca..8ff61920ac85f 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "box"; version = "2.7.5"; @@ -12,7 +12,7 @@ mkDerivation { }; phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/php-packages/composer/2.0.nix b/pkgs/development/php-packages/composer/1.x.nix index 5b0234fa7a147..4660da9532dcc 100644 --- a/pkgs/development/php-packages/composer/2.0.nix +++ b/pkgs/development/php-packages/composer/1.x.nix @@ -1,29 +1,29 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.0.9"; + version = "1.10.15"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-JPqlvIB+OZ8y6aIaM/u1sGht+ciFDvq+LAR8LM+5+cw="; + sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6"; }; dontUnpack = true; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar makeWrapper ${php}/bin/php $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ - --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} + --prefix PATH : ${lib.makeBinPath [ unzip ]} ''; - meta = with pkgs.lib; { + meta = with lib; { description = "Dependency Manager for PHP"; license = licenses.mit; homepage = "https://getcomposer.org/"; diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 37c983507ce3f..d704b5f9a27dc 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,29 +1,29 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "1.10.15"; + version = "2.0.11"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6"; + sha256 = "sha256-6r8pFwcglqlGeRk3YlATGeYh4rNppKElaywn9OaYRHc="; }; dontUnpack = true; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar makeWrapper ${php}/bin/php $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ - --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} + --prefix PATH : ${lib.makeBinPath [ unzip ]} ''; - meta = with pkgs.lib; { + meta = with lib; { description = "Dependency Manager for PHP"; license = licenses.mit; homepage = "https://getcomposer.org/"; diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 4ec718469197a..3566c7916e558 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pkgs, php }: +{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php }: let pname = "couchbase"; version = "2.6.2"; @@ -6,7 +6,7 @@ in buildPecl { inherit pname version; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; @@ -16,12 +16,12 @@ buildPecl { configureFlags = [ "--with-couchbase" ]; broken = lib.versionAtLeast php.version "8.0"; - buildInputs = with pkgs; [ libcouchbase zlib ]; + buildInputs = [ libcouchbase zlib ]; internalDeps = [] ++ lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; peclDeps = [ php.extensions.igbinary ]; patches = [ - (pkgs.writeText "php-couchbase.patch" '' + (writeText "php-couchbase.patch" '' --- a/config.m4 +++ b/config.m4 @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then @@ -29,7 +29,7 @@ buildPecl { else AC_MSG_CHECKING(for libcouchbase in default path) - for i in /usr/local /usr; do - + for i in ${pkgs.libcouchbase}; do + + for i in ${libcouchbase}; do if test -r $i/include/libcouchbase/couchbase.h; then LIBCOUCHBASE_DIR=$i AC_MSG_RESULT(found in $i) diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index 940150ac9867e..420f2385e544c 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pkgs, php }: +{ buildPecl, lib, php, pkg-config, openssl, libevent }: buildPecl { pname = "event"; @@ -6,7 +6,7 @@ buildPecl { sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq"; configureFlags = [ - "--with-event-libevent-dir=${pkgs.libevent.dev}" + "--with-event-libevent-dir=${libevent.dev}" "--with-event-core" "--with-event-extra" "--with-event-pthreads" @@ -18,11 +18,11 @@ buildPecl { ':' ''; - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ openssl libevent ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl libevent ]; internalDeps = [ php.extensions.sockets ]; - meta = with pkgs.lib; { + meta = with lib; { description = '' This is an extension to efficiently schedule I/O, time and signal based events using the best I/O notification mechanism available for specific platform. diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index f697b44affd60..ebff9b00f02c4 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, fetchpatch, lib, pkgs, pcre' }: +{ buildPecl, fetchpatch, lib, imagemagick, pkg-config, pcre' }: buildPecl { pname = "imagick"; @@ -19,8 +19,8 @@ buildPecl { }) ]; - configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ]; - nativeBuildInputs = [ pkgs.pkg-config ]; + configureFlags = [ "--with-imagick=${imagemagick.dev}" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre' ]; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 11c6e50acc95d..9a5a96e15c23c 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pkgs }: +{ buildPecl, lib, fetchFromGitHub, libmaxminddb }: let pname = "maxminddb"; version = "1.10.0"; @@ -6,17 +6,17 @@ in buildPecl { inherit pname version; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "maxmind"; repo = "MaxMind-DB-Reader-php"; rev = "v${version}"; sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ="; }; - buildInputs = [ pkgs.libmaxminddb ]; + buildInputs = [ libmaxminddb ]; sourceRoot = "source/ext"; - meta = with pkgs.lib; { + meta = with lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 3eb1da463b9f6..4880e08e0629a 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, fetchgit, php, pkgs }: +{ buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }: let pname = "memcached"; version = "3.1.5"; @@ -19,12 +19,12 @@ buildPecl { ]; configureFlags = [ - "--with-zlib-dir=${pkgs.zlib.dev}" - "--with-libmemcached-dir=${pkgs.libmemcached}" + "--with-zlib-dir=${zlib.dev}" + "--with-libmemcached-dir=${libmemcached}" ]; - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ cyrus_sasl zlib ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cyrus_sasl zlib ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 18bb515d15e1e..95e51892f04e7 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -1,4 +1,5 @@ -{ buildPecl, lib, pkgs, pcre' }: +{ stdenv, buildPecl, lib, pcre', pkg-config, cyrus_sasl, icu64 +, openssl, snappy, zlib, darwin }: buildPecl { pname = "mongodb"; @@ -6,15 +7,15 @@ buildPecl { version = "1.9.0"; sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs"; - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cyrus_sasl icu64 openssl snappy zlib pcre' - ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index 697ad6740200a..eeaffb4b7fc98 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -1,14 +1,14 @@ -{ buildPecl, lib, pkgs, version, sha256 }: +{ buildPecl, lib, version, sha256, oracle-instantclient }: buildPecl { pname = "oci8"; inherit version sha256; - buildInputs = [ pkgs.oracle-instantclient ]; - configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + buildInputs = [ oracle-instantclient ]; + configureFlags = [ "--with-oci8=shared,instantclient,${oracle-instantclient.lib}/lib" ]; postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4 ''; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix index 8305194670176..e217edd29ef7f 100644 --- a/pkgs/development/php-packages/pdlib/default.nix +++ b/pkgs/development/php-packages/pdlib/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pkgs }: +{ buildPecl, fetchFromGitHub, lib, pkg-config, dlib }: let pname = "pdlib"; version = "1.0.2"; @@ -6,15 +6,15 @@ in buildPecl { inherit pname version; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "goodspb"; repo = "pdlib"; rev = "v${version}"; sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i"; }; - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ (pkgs.dlib.override { guiSupport = true; }) ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ (dlib.override { guiSupport = true; }) ]; meta = with lib; { description = "A PHP extension for Dlib"; diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index ae01594444303..d80944ada09f5 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pkgs, php }: +{ stdenv, buildPecl, lib, libiconv, unixODBC, php }: buildPecl { pname = "pdo_sqlsrv"; @@ -8,7 +8,7 @@ buildPecl { internalDeps = [ php.extensions.pdo ]; - buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index c855b975e5462..a142c69512161 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; version = "2.18.2"; @@ -12,7 +12,7 @@ mkDerivation { }; phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin @@ -21,7 +21,7 @@ mkDerivation { --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" ''; - meta = with pkgs.lib; { + meta = with lib; { description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; homepage = "http://cs.sensiolabs.org/"; diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index f479581fb2eea..50fd23540ee51 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, pkgs, lib, php }: +{ mkDerivation, fetchFromGitHub, makeWrapper, lib, php }: let pname = "php-parallel-lint"; version = "1.0.0"; @@ -14,7 +14,7 @@ mkDerivation { }; nativeBuildInputs = [ - pkgs.makeWrapper + makeWrapper php.packages.composer php.packages.box ]; @@ -31,7 +31,7 @@ mkDerivation { --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" ''; - meta = with pkgs.lib; { + meta = with lib; { description = "Tool to check syntax of PHP files faster than serial check with fancier output"; license = licenses.bsd2; homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint"; diff --git a/pkgs/development/php-packages/php_excel/default.nix b/pkgs/development/php-packages/php_excel/default.nix index ab6d193fcd4d3..8b83f558a53a2 100644 --- a/pkgs/development/php-packages/php_excel/default.nix +++ b/pkgs/development/php-packages/php_excel/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, fetchurl, lib, pkgs }: +{ buildPecl, fetchurl, lib, libxl }: let pname = "php_excel"; phpVersion = "php7"; @@ -12,12 +12,12 @@ buildPecl { sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; }; - buildInputs = with pkgs; [ libxl ]; + buildInputs = [ libxl ]; configureFlags = [ "--with-excel" - "--with-libxl-incdir=${pkgs.libxl}/include_c" - "--with-libxl-libdir=${pkgs.libxl}/lib" + "--with-libxl-incdir=${libxl}/include_c" + "--with-libxl-libdir=${libxl}/lib" ]; meta.maintainers = lib.teams.php.members; diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix index b58ba42a5d04a..da114a4d348fa 100644 --- a/pkgs/development/php-packages/phpcbf/default.nix +++ b/pkgs/development/php-packages/phpcbf/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, lib, php, makeWrapper }: let pname = "phpcbf"; version = "3.5.8"; @@ -12,7 +12,7 @@ mkDerivation { }; phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin @@ -21,7 +21,7 @@ mkDerivation { --add-flags "$out/libexec/phpcbf/phpcbf.phar" ''; - meta = with pkgs.lib; { + meta = with lib; { description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix index 0e8557c04eb70..d2053dbe9cb73 100644 --- a/pkgs/development/php-packages/phpcs/default.nix +++ b/pkgs/development/php-packages/phpcs/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpcs"; version = "3.5.8"; @@ -12,7 +12,7 @@ mkDerivation { }; phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin @@ -21,7 +21,7 @@ mkDerivation { --add-flags "$out/libexec/phpcs/phpcs.phar" ''; - meta = with pkgs.lib; { + meta = with lib; { description = "PHP coding standard tool"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index fd7390498ba39..fde674701eb22 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpmd"; version = "2.8.2"; @@ -8,13 +8,13 @@ in mkDerivation { inherit pname version; - src = pkgs.fetchurl { + src = fetchurl { url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb"; }; phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin @@ -23,7 +23,7 @@ mkDerivation { --add-flags "$out/libexec/phpmd/phpmd.phar" ''; - meta = with pkgs.lib; { + meta = with lib; { description = "PHP code quality analyzer"; license = licenses.bsd3; homepage = "https://phpmd.org/"; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 8fc15a7b0b8ab..5a7a856f3ae55 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,18 +1,18 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "0.12.78"; + version = "0.12.79"; in mkDerivation { inherit pname version; - src = pkgs.fetchurl { + src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-YPCh6HAVuFf2rJhUj/uzfqkWKN+Jd2iPfugSiTh65zc="; + sha256 = "sha256-H6JmjdJtcCrNvad0ZbJ73OdRXimeTIJMVPuk8K6X6v8="; }; phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin @@ -21,7 +21,7 @@ mkDerivation { --add-flags "$out/libexec/phpstan/phpstan.phar" ''; - meta = with pkgs.lib; { + meta = with lib; { description = "PHP Static Analysis Tool"; longDescription = '' PHPStan focuses on finding errors in your code without actually diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index a7b2de240ef39..01160fc35fe67 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psalm"; version = "4.6.1"; @@ -12,7 +12,7 @@ mkDerivation { }; phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin @@ -21,7 +21,7 @@ mkDerivation { --add-flags "$out/libexec/psalm/psalm.phar" ''; - meta = with pkgs.lib; { + meta = with lib; { description = "A static analysis tool for finding errors in PHP applications"; license = licenses.mit; homepage = "https://github.com/vimeo/psalm"; diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index 4c5f703d025f8..514706dc178c7 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchurl, pkgs, lib, php }: +{ mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psysh"; version = "0.10.4"; @@ -12,7 +12,7 @@ mkDerivation { }; phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin @@ -21,7 +21,7 @@ mkDerivation { wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}" ''; - meta = with pkgs.lib; { + meta = with lib; { description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index e5bdc2a229845..0e78d3bbc9763 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pkgs, pcre' }: +{ buildPecl, lib, rdkafka, pcre' }: buildPecl { pname = "rdkafka"; @@ -6,11 +6,11 @@ buildPecl { version = "5.0.0"; sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs="; - buildInputs = [ pkgs.rdkafka pcre' ]; + buildInputs = [ rdkafka pcre' ]; postPhpize = '' substituteInPlace configure \ - --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' + --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${rdkafka}' ''; meta = with lib; { diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix index cf3f9569d3bfa..0486db82cc3d7 100644 --- a/pkgs/development/php-packages/smbclient/default.nix +++ b/pkgs/development/php-packages/smbclient/default.nix @@ -1,14 +1,14 @@ -{ buildPecl, lib, pkgs }: +{ buildPecl, lib, samba, pkg-config }: buildPecl { pname = "smbclient"; version = "1.0.5"; sha256 = "sha256-cNvTa1qzYrlhuX4oNehXt+XKqmqfonyomW/usQdQQO0="; # TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66 - LIBSMBCLIENT_INCDIR = "${pkgs.samba.dev}/include/samba-4.0"; + LIBSMBCLIENT_INCDIR = "${samba.dev}/include/samba-4.0"; - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ pkgs.samba ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ samba ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 939be27671b10..4522129b2aa33 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pkgs }: +{ stdenv, buildPecl, lib, unixODBC, libiconv }: buildPecl { pname = "sqlsrv"; @@ -7,10 +7,8 @@ buildPecl { sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a"; buildInputs = [ - pkgs.unixODBC - ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ - pkgs.libiconv - ]; + unixODBC + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 780bb8c9086b9..56341be436a0f 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.0.2"; - sha256 = "05sfgkw55ym7mg0b54l9x3i9598kf2bkp4z3sdl1hd31q3g4cv89"; + version = "3.0.3"; + sha256 = "sha256-5yZagVGOOX+XLcki50bRpIRTcXf/SJVDUWfRCeKTJDI="; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index 40e5a859f9e49..9bd30ff4e3c41 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pkgs }: +{ buildPecl, lib, pkg-config, libyaml }: buildPecl { pname = "yaml"; @@ -6,9 +6,9 @@ buildPecl { version = "2.2.1"; sha256 = "sha256-4XrQTnUuJf0Jm93S350m3+8YPI0AxBebydei4cl9eBk="; - configureFlags = [ "--with-yaml=${pkgs.libyaml}" ]; + configureFlags = [ "--with-yaml=${libyaml}" ]; - nativeBuildInputs = [ pkgs.pkg-config ]; + nativeBuildInputs = [ pkg-config ]; meta.maintainers = lib.teams.php.members; } diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index e180f0cea3324..054cce0ce5206 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, imagemagick7Big +, imagemagickBig }: buildPythonPackage rec { @@ -16,13 +16,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace wand/api.py --replace \ "magick_home = os.environ.get('MAGICK_HOME')" \ - "magick_home = '${imagemagick7Big}'" + "magick_home = '${imagemagickBig}'" ''; # tests not included with pypi release doCheck = false; - passthru.imagemagick = imagemagick7Big; + passthru.imagemagick = imagemagickBig; meta = with lib; { description = "Ctypes-based simple MagickWand API binding for Python"; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 1b68cc7bb551c..75eb4d0052ccb 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JcqDuTzR2sffEbmhJHRPJggLruc9lKQ4aO/Ab88yo/I="; + sha256 = "a14c642b1f6849e57b5c442e81e809c9e1e3a0bcfebfd54b15a9f9fd273f9611"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index de6d72a61ecfa..8fc697828f0ad 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -1,10 +1,9 @@ { stdenv , lib -, rustPlatform , fetchFromGitHub -, pipInstallHook +, buildPythonPackage +, rustPlatform , pythonImportsCheckHook -, maturin , pkg-config , openssl , publicsuffix-list @@ -13,7 +12,7 @@ , Security }: -rustPlatform.buildRustPackage rec { +buildPythonPackage rec { pname = "adblock"; version = "0.4.0"; disabled = isPy27; @@ -25,39 +24,32 @@ rustPlatform.buildRustPackage rec { rev = version; sha256 = "10d6ks2fyzbizq3kb69q478idj0h86k6ygjb6wl3zq3mf65ma4zg"; }; - format = "pyproject"; - cargoSha256 = "0di05j942rrm2crpdpp9czhh65fmidyrvdp2n3pipgnagy7nchc0"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-gEFmj3/KvhvvsOK2nX2L1RUD4Wfp3nYzEzVnQZIsIDY="; + }; - nativeBuildInputs = [ pipInstallHook maturin pkg-config pythonImportsCheckHook ]; + format = "pyproject"; + + nativeBuildInputs = [ pkg-config pythonImportsCheckHook ] + ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook ]); buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; - buildPhase = '' - runHook preBuild - maturin build --release --manylinux off --strip - runHook postBuild - ''; - # There are no rust tests doCheck = false; - pythonImportsCheck = [ "adblock" ]; - installPhase = '' - runHook preInstall - install -Dm644 -t dist target/wheels/*.whl - pipInstallPhase - runHook postInstall - ''; + pythonImportsCheck = [ "adblock" ]; - passthru.meta = with lib; { + meta = with lib; { description = "Python wrapper for Brave's adblocking library, which is written in Rust"; homepage = "https://github.com/ArniDagur/python-adblock/"; maintainers = with maintainers; [ petabyteboy ]; license = with licenses; [ asl20 mit ]; - platforms = with platforms; [ all ]; }; } diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 4df6c5f6c4931..f86151f2f51f3 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -17,14 +17,19 @@ buildPythonPackage rec { sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw"; }; - # Skip date-dependent test. See - # https://github.com/adobe-type-tools/afdko/pull/1232 - # https://github.com/NixOS/nixpkgs/pull/98158#issuecomment-704321117 patches = [ + # Skip date-dependent test. See + # https://github.com/adobe-type-tools/afdko/pull/1232 + # https://github.com/NixOS/nixpkgs/pull/98158#issuecomment-704321117 (fetchpatch { url = "https://github.com/adobe-type-tools/afdko/commit/2c36ad10f9d964759f643e8ed7b0972a27aa26bd.patch"; sha256 = "0p6a485mmzrbfldfbhgfghsypfiad3cabcw7qlw2rh993ivpnibf"; }) + # fix tests for fonttools 4.21.1 + (fetchpatch { + url = "https://github.com/adobe-type-tools/afdko/commit/0919e7454a0a05a1b141c23bf8134c67e6b688fc.patch"; + sha256 = "0glly85swyl1kcc0mi8i0w4bm148bb001jz1winz5drfrw3a63jp"; + }) ]; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index e23db23d151e5..13386eb12a6be 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.5739"; + version = "9.0.5903"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1fjwksia6h7w7m5zhys65yr4zxvyfgp9hr1k5dn802p9kvz34bpc"; + sha256 = "sha256-75Ul9JfMFYv3AfBlgmer6IDyfgOAS4AdXexznoxi35Y="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix new file mode 100644 index 0000000000000..200bc41b7a5da --- /dev/null +++ b/pkgs/development/python-modules/aiopylgtv/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pythonOlder +, sqlitedict +, websockets +}: + +buildPythonPackage rec { + pname = "aiopylgtv"; + version = "0.4.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bendavid"; + repo = pname; + rev = version; + sha256 = "0x0xcnlz42arsp53zlq5wyv9pwif1in8j2pv48gh0pkdnz9s86b6"; + }; + + propagatedBuildInputs = [ + numpy + sqlitedict + websockets + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "aiopylgtv" ]; + + meta = with lib; { + description = "Python library to control webOS based LG TV units"; + homepage = "https://github.com/bendavid/aiopylgtv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index e69503777d4e3..ad80f62db0553 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta"; - version = "8.3.0"; + version = "8.4.0"; src = fetchPypi { inherit pname version; - sha256 = "83c7d751bad0cb9bd7886700da4cd83c5451b2e8eb8d4cc697966e02d6a565f8"; + sha256 = "260ff3118e73396104129928217b0f317ac5afdff8221874d8986df22ecf5f34"; }; propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ]; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 79f21a2762c56..b06e0320dc924 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.5739"; + version = "9.0.5903"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6qjX0r2vLYgJdrKBVKedplfa1yhWv9tBvTu5BsViXBc="; + sha256 = "sha256-4e+ZGIt/ouZj5rsmaVxUrz8gAq4Yq2+Qx4jdOojB4Sw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 0d4d41a54730a..a55aef99ecbb3 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.22"; + version = "0.9.23"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "newville"; repo = pname; rev = version; - sha256 = "sha256-93IBv6beYE/VTKJCWUbA1QTRdmQdn2kg35KBw6kmDis="; + sha256 = "sha256-9Zxb2EzB6nxDQHdlryFiwyNW+76VvysLUB78bXKzfv0="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index b5028e4bebc3a..21a3ed2a8fe3a 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NH53FaOJx79q5IIYeiz976H9Q8Vnw13qFw4zgRc2TTw="; + sha256 = "sha256-7EzSALAJcx8BNHX44FeeiSPRcTe9UFHXQ4IoSKxMU8w="; }; # Upstream hasn't release the tests yet diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index f02bee6befe62..9bd5371412d71 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c4b218a5d1353cd7c55b39c9b2bd1b13bfbe3b8a71bc735122b171eab81670d1"; + sha256 = "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 5591113ab0ad6..ca59a0d710aba 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, nose, pytestCheckHook }: buildPythonPackage rec { pname = "blinker"; @@ -9,6 +9,9 @@ buildPythonPackage rec { sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7"; }; + checkInputs = [ nose pytestCheckHook ]; + pythonImportsCheck = [ "blinker" ]; + meta = with lib; { homepage = "https://pythonhosted.org/blinker/"; description = "Fast, simple object-to-object and broadcast signaling"; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 2b256b07f85e5..9e2f1e3080db5 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.12"; # N.B: if you change this, change botocore too + version = "1.17.17"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-YvBs0eenjYqqTlJ8MnZT6abBr0FbWYNgSKkMKKJ+Xwk="; + sha256 = "sha256-RSPqs3/wBdUXQIO1k4LP1ia3iQwI1WzhYqS9kq99RN8="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 635203f94c2ba..efcd275b00a1c 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.12"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.17"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-OakjFaF6b4vBkU27Ag9S6SnxjluZpPocXYeF+RNCftg="; + sha256 = "sha256-F4zjFdGf4O8z6M5nVKSC0Ano0TLFrcxFf1zx2ZqYdTs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 6b27e8e5d4252..30a7e5174a6da 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -9,7 +9,7 @@ let withPlugins = plugins: buildPythonPackage { name = "${package.name}-with-plugins"; phases = [ "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; installPhase = '' diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 561d9651fed8c..23c883a48a4c6 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "censys"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "censys"; repo = "censys-python"; - rev = "v${version}"; - sha256 = "0vvd13g48i4alnqil98zc09zi5kv6l2s3kdfyg5syjxvq4lfd476"; + rev = version; + sha256 = "06jwk0ps80fjzbsy24qn5bsggfpgn4ccjzjz65cdh0ap1mfvh5jf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index e5c7c23e2e431..4d6c71a7e2a58 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { "bind_addr_unix" ]; - disabledTestFiles = [ + disabledTestPaths = [ # avoid attempting to use 3 packages not available on nixpkgs # (jaraco.apt, jaraco.context, yg.lockfile) "cheroot/test/test_wsgi.py" diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix new file mode 100644 index 0000000000000..a019dd651999a --- /dev/null +++ b/pkgs/development/python-modules/chirpstack-api/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpcio +}: + +buildPythonPackage rec { + pname = "chirpstack-api"; + version = "3.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "08djidy3fyhghyzvndcjas3hb1s9d7719gvmgbl8bzxjm4h2c433"; + }; + + propagatedBuildInputs = [ + google-api-core + grpcio + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "chirpstack_api" ]; + + meta = with lib; { + description = "ChirpStack gRPC API message and service wrappers for Python"; + homepage = "https://github.com/brocaar/chirpstack-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index eaf89948e8f29..859fb091ec990 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -11,24 +11,24 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0zpn3miyapskw6s71v614pmga5zfain9j085axm9v50b8r71xh1i"; + sha256 = "d83a77d94e9563c3fb0e982d847ec88ba6ac45e3e008e5e53729c0b9800097fc"; }; - checkInputs = [ - pytest - ]; - propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "ckcc" ]; + meta = with lib; { description = "Communicate with your Coldcard using Python"; homepage = "https://github.com/Coldcard/ckcc-protocol"; - license = licenses.gpl3; + license = licenses.mit; maintainers = [ maintainers.hkjn ]; }; } diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 1812ddff95201..61b72e8cf31f9 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.5739"; + version = "9.0.5903"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "1aym01f99zwb9w8qwy8gz631ka7g6akzdld0m4ykc5ip0rq70mki"; + sha256 = "sha256-NIKWUx1VT5TjnuqppuT6VzwNRwcBLc0xI5k3F2Nmj8A="; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index eb4eba0f5879e..1038431d31c73 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , fetchpatch -, isPy27 -, ipaddress +, rustPlatform +, setuptools-rust , openssl , cryptography_vectors , darwin @@ -13,27 +13,38 @@ , isPyPy , cffi , pytest +, pytest-subtests , pretend , iso8601 , pytz , hypothesis -, enum34 }: buildPythonPackage rec { pname = "cryptography"; - version = "3.3.2"; # Also update the hash in vectors.nix + version = "3.4.6"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s"; + sha256 = "11wgsihfq72fav67c3igi0xbhbd6c5dj869byd1jkq0fbcz24cid"; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${pname}-${version}/${cargoRoot}"; + name = "${pname}-${version}"; + sha256 = "1i0sd2y4a5g1yqwcpw2ycp6p4p8sk5v7clblq756i5864j52v6w1"; + }; + + cargoRoot = "src/rust"; + outputs = [ "out" "dev" ]; nativeBuildInputs = lib.optionals (!isPyPy) [ cffi - ]; + rustPlatform.cargoSetupHook + setuptools-rust + ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; @@ -42,8 +53,6 @@ buildPythonPackage rec { six ] ++ lib.optionals (!isPyPy) [ cffi - ] ++ lib.optionals isPy27 [ - ipaddress enum34 ]; checkInputs = [ @@ -52,6 +61,7 @@ buildPythonPackage rec { iso8601 pretend pytest + pytest-subtests pytz ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index f9b7c525237ab..a807be9c3bbbe 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc"; + sha256 = "1a1d5ix5b3ajhrqaf8rm6qmd6gkaidij0jgd1vrb8q1xn1gqmy75"; }; # No tests included diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 483c565536d56..54cec0f98addf 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.14.1"; + version = "0.14.2"; src = fetchPypi { inherit pname version; - sha256 = "bf94dc5187fa3500a31d52d7225fbc1a4699aa6e3c321223e7088eb5b5c94b62"; + sha256 = "9e956f0efb7aad100d9963f223db986392cf2dc3e9922f2f83e55d372e84ef16"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index a97d9bc0c985a..cb72bef323b57 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "7.3.8"; + version = "7.3.9"; src = fetchPypi { inherit pname version; - sha256 = "0c0f036cf30e00fdc47c983875c72d16a3073ae9be9bcf39371514280f00a82d"; + sha256 = "f789515f3be1bd1f88043110d62859b01a9661e384a81f1768fca4e4bb49a358"; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index 204c1a985425f..58ceb16870a8b 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage, stdenv, lib, dlib, python, pytest, more-itertools +, sse4Support ? stdenv.hostPlatform.sse4_1Support , avxSupport ? stdenv.hostPlatform.avxSupport }: @@ -12,7 +13,10 @@ buildPythonPackage { ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS ''; - setupPyBuildFlags = lib.optional avxSupport "--no USE_AVX_INSTRUCTIONS"; + setupPyBuildFlags = [ + "--set USE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}" + "--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" + ]; patches = [ ./build-cores.patch ]; diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix new file mode 100644 index 0000000000000..01e59fdb040da --- /dev/null +++ b/pkgs/development/python-modules/editdistance/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, cython +}: + +buildPythonPackage rec { + pname = "editdistance"; + version = "0.5.3"; + + + src = fetchFromGitHub { + owner = "roy-ht"; + repo = pname; + rev = "v${version}"; + sha256 = "0vk8vz41p2cs7s7zbaw3cnw2jnvy5rhy525xral68dh14digpgsd"; + }; + + nativeBuildInputs = [ cython ]; + + preBuild = '' + cythonize --inplace editdistance/bycython.pyx + ''; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "editdistance" ]; + + meta = with lib; { + description = "Python implementation of the edit distance (Levenshtein distance)"; + homepage = "https://github.com/roy-ht/editdistance"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix new file mode 100644 index 0000000000000..7ec3b8d1c1127 --- /dev/null +++ b/pkgs/development/python-modules/elmax/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, poetry-core +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "elmax"; + version = "0.1.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = "python-elmax"; + rev = version; + sha256 = "sha256-vDISJ/CVOjpM+GPF2TCm3/AMFTWTM0b/+ZPCpAEvNvY="; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + httpx + yarl + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "elmax" ]; + + meta = with lib; { + description = "Python API client for the Elmax Cloud services"; + homepage = "https://github.com/home-assistant-ecosystem/python-elmax"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 2f0f80bcf7a52..ca6158bd5e961 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -18,11 +18,11 @@ in buildPythonPackage rec { pname = "entrance"; - version = "1.1.14"; + version = "1.1.15"; src = fetchPypi { inherit pname version; - sha256 = "d1fc9d128ce05837d7e149413fbec71bcf84d9ca510accea56761d3f4bd0a021"; + sha256 = "5b354ecf03226edae567511c8a8db95038cc9c3da20fcfcf5546d1e197eb3aef"; }; # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index 9f1549e98f9fd..e802dbaa26914 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -1,11 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch +, pythonAtLeast , pbr , testtools , mock , python -, isPy39 }: buildPythonPackage rec { @@ -17,7 +18,26 @@ buildPythonPackage rec { sha256 = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef"; }; - propagatedBuildInputs = [ pbr testtools mock ]; + patches = lib.optional (pythonAtLeast "3.9") [ + # drop tests that try to monkeypatch a classmethod, which fails on python3.9 + # https://github.com/testing-cabal/fixtures/issues/44 + (fetchpatch { + url = "https://salsa.debian.org/openstack-team/python/python-fixtures/-/raw/debian/victoria/debian/patches/remove-broken-monkey-patch-test.patch"; + sha256 = "1s3hg2zmqc4shmnf90kscphzj5qlqpxghzw2a59p8f88zrbsj97r"; + }) + ]; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + testtools + ]; + + checkInputs = [ + mock + ]; checkPhase = '' ${python.interpreter} -m testtools.run fixtures.test_suite @@ -27,6 +47,5 @@ buildPythonPackage rec { description = "Reusable state for writing clean tests and more"; homepage = "https://pypi.python.org/pypi/fixtures"; license = lib.licenses.asl20; - broken = isPy39; # see https://github.com/testing-cabal/fixtures/issues/44 }; } diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index d0ad132991f66..407b72c953f1d 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.20.0"; + version = "4.21.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0yj83vsjh23g7gkmq6svbgc898x3qgygkhvpcbpycvmpwxxqxh1v"; + sha256 = "1x9qrg6ppqhm5214ymwvn0r34qdz8pqvyxd0sj7rkp06wa757z2i"; }; # all dependencies are optional, but @@ -67,9 +67,10 @@ buildPythonPackage rec { -k 'not ttcompile_timestamp_calcs and not recalc_timestamp' ''; - meta = { + meta = with lib; { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 22b02552cd757..d583de9c074bc 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -12,6 +12,7 @@ , pytest-localserver , responses , rsa +, six }: buildPythonPackage rec { @@ -23,7 +24,7 @@ buildPythonPackage rec { sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb"; }; - propagatedBuildInputs = [ pyasn1-modules cachetools rsa ]; + propagatedBuildInputs = [ pyasn1-modules cachetools rsa six ]; checkInputs = [ flask diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index fa6a9ec60a733..08e27c1948734 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -1,17 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, graphql-core, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, graphql-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, typing-extensions +}: buildPythonPackage rec { pname = "graphql-relay"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0mjmpf4abrxfyln0ykxq4xa6lp7xwgqr8631qp011hv0nfl6jgxd"; + sha256 = "sha256-cNWn7lmV6nwqmjflEidmOxpGTx9A6Y/d6VC+VBXf4LQ="; }; - propagatedBuildInputs = [ graphql-core ]; + propagatedBuildInputs = [ + graphql-core + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "graphql_relay" ]; diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix new file mode 100644 index 0000000000000..c222ea521bb82 --- /dev/null +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -0,0 +1,48 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pytestCheckHook +, pythonOlder + # Python dependencies +, colorama +, intervaltree +, json5 +, pyyaml +, scipy +, tqdm +, typing-extensions +}: + +buildPythonPackage rec { + pname = "graphtage"; + version = "0.2.5"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cFOTbPv7CnRdet7bx5LVq5xp9LG4yNm0oxlW5aSEeZs="; + }; + + propagatedBuildInputs = [ + colorama + intervaltree + json5 + pyyaml + scipy + tqdm + typing-extensions + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "graphtage" ]; + + meta = with lib; { + homepage = "https://github.com/trailofbits/graphtage"; + description = "A utility to diff tree-like files such as JSON and XML"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 1b1ffb975fb61..0fe6b9343eb3c 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , buildPythonPackage -, darwin , grpc , six , protobuf @@ -20,8 +19,7 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cython pkg-config ] - ++ lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ cython pkg-config ]; buildInputs = [ c-ares openssl zlib ]; propagatedBuildInputs = [ six protobuf ] diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix index fabc2d147fcae..92f33abb594a4 100644 --- a/pkgs/development/python-modules/gviz-api/default.nix +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -8,8 +8,7 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit pname version; - format = "wheel"; + inherit pname version format; sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg"; }; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 2e711141fcba8..ace9a7041e3fa 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , flask , flask-limiter , markupsafe diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index aa15c2555e679..dbbdf0bb38c0d 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -9,18 +9,20 @@ , pytestcov , sniffio , uvicorn +, trustme +, trio }: buildPythonPackage rec { pname = "httpcore"; - version = "0.12.0"; + version = "0.12.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0bwxn7m7r7h6k41swxj0jqj3nzi76wqxwbnry6y7d4qfh4m26g2j"; + sha256 = "09hbjc5wzhrnri5y3idxcq329d7jiaxljc7y6npwv9gh9saln109"; }; propagatedBuildInputs = [ @@ -34,11 +36,15 @@ buildPythonPackage rec { pytestCheckHook pytestcov uvicorn + trustme + trio ]; pytestFlagsArray = [ # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known + "--ignore=tests/test_threadsafety.py" "--ignore=tests/sync_tests/test_interfaces.py" + "--ignore=tests/sync_tests/test_retries.py" ]; pythonImportsCheck = [ "httpcore" ]; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 6e81cc92193c6..9fe636c3591b3 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.16.1"; + version = "0.17.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "00gmq45fckcqkj910bvd7pyqz1mvgsdvz4s0k7dzbnc5czzq1f4a"; + sha256 = "sha256-pRdhPAxKZOVbRhOm4881Dn+IRtpX5T3oFuYdtWp3cgY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 110c28ee2f406..cb4d538da3ddc 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -1,22 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, editdistance +}: buildPythonPackage rec { pname = "identify"; - version = "1.5.14"; + version = "1.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "de7129142a5c86d75a52b96f394d94d96d497881d2aaf8eafe320cdbe8ac4bcc"; + + src = fetchFromGitHub { + owner = "pre-commit"; + repo = pname; + rev = "v${version}"; + sha256 = "1sqhqqjp53dwm8yq4nrgggxbvzs3szbg49z5sj2ss9xzlgmimclm"; }; - pythonImportsCheck = [ "identify" ]; + checkInputs = [ + editdistance + pytestCheckHook + ]; - # Tests not included in PyPI tarball - doCheck = false; + pythonImportsCheck = [ "identify" ]; meta = with lib; { description = "File identification library for Python"; homepage = "https://github.com/chriskuehl/identify"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index c0f6fe920505a..130b6a49bda39 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -1,16 +1,32 @@ -{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, nose, six, importlib-metadata, toml }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, setuptools_scm +, toml +, pytestCheckHook +}: buildPythonPackage rec { pname = "inflect"; - version = "5.0.2"; + version = "5.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d284c905414fe37c050734c8600fe170adfb98ba40f72fc66fed393f5b8d5ea0"; + sha256 = "30e9d9d372e693739beaae1345dc53c48871ca70c5c7060edd3e7e77802bf945"; }; nativeBuildInputs = [ setuptools_scm toml ]; - propagatedBuildInputs = [ six importlib-metadata ]; - checkInputs = [ nose ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "inflect" ]; + + meta = with lib; { + description = "Correctly generate plurals, singular nouns, ordinals, indefinite articles"; + homepage = "https://github.com/jaraco/inflect"; + changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst"; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index 41973e8058460..947da75ce9a90 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ircrobots"; - version = "0.3.6"; + version = "0.3.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "1c8h8b78gmnfipppr9dxp7sl6wd9lx4l3pdwykaib1f49dqwavys"; + sha256 = "0cm4hcmprca24d979ydbzwn9mfxw16jki6ld7yykxryf0983nqc7"; }; postPatch = '' diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 77789fa44dbea..460b0cddf6164 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -1,14 +1,12 @@ { lib , stdenv -, rustPlatform , fetchFromGitHub -, pipInstallHook +, buildPythonPackage +, rustPlatform , llvmPackages , pkg-config -, maturin , pcsclite , nettle -, python , requests , vcrpy , numpy @@ -17,7 +15,7 @@ , PCSC }: -rustPlatform.buildRustPackage rec { +buildPythonPackage rec { pname = "johnnycanencrypt"; version = "0.5.0"; disabled = pythonOlder "3.7"; @@ -28,7 +26,16 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4"; }; - cargoPatches = [ ./Cargo.lock.patch ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit patches src; + name = "${pname}-${version}"; + hash = "sha256-2XhXCKyXVlFgbcOoMy/A5ajiIVxBii56YeI29mO720U="; + }; + + format = "pyproject"; + + patches = [ ./Cargo.lock.patch ]; cargoSha256 = "0ifvpdizcdp2c5x2x2j1bhhy5a75q0pk7a63dmh52mlpmh45fy6r"; @@ -42,10 +49,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ llvmPackages.clang pkg-config - python - maturin - pipInstallHook - ]; + ] ++ (with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]); buildInputs = [ pcsclite @@ -67,17 +74,6 @@ rustPlatform.buildRustPackage rec { sed '/project-url = /d' -i Cargo.toml ''; - buildPhase = '' - runHook preBuild - maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen" - runHook postBuild - ''; - - installPhase = '' - install -Dm644 -t dist target/wheels/*.whl - pipInstallPhase - ''; - preCheck = '' export TESTDIR=$(mktemp -d) cp -r tests/ $TESTDIR diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index 3d4097b071869..271f15c590001 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -8,10 +8,15 @@ buildPythonPackage rec { inherit pname version; sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e"; }; + patches = [ ./jq-py-setup.patch ]; buildInputs = [ jq ]; + # no tests executed + doCheck = false; + pythonImportsCheck = [ "jq" ]; + meta = { description = "Python bindings for jq, the flexible JSON processor"; homepage = "https://github.com/mwilliamson/jq.py"; diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix new file mode 100644 index 0000000000000..cecce31e0ecc4 --- /dev/null +++ b/pkgs/development/python-modules/json5/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, fetchFromGitHub +, hypothesis +, lib +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "json5"; + version = "0.9.5"; + + src = fetchFromGitHub { + owner = "dpranke"; + repo = "pyjson5"; + rev = "v${version}"; + sha256 = "sha256-VkJnZG1BuC49/jJuwObbqAF48CtbWU9rDEYW4Dg0w4U="; + }; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/dpranke/pyjson5"; + description = "A Python implementation of the JSON5 data format"; + license = licenses.asl20; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index c08bdab4cf347..4bead99619881 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -4,7 +4,6 @@ , argcomplete , colorama , jmespath -, knack , pygments , pyyaml , six diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index e3694bffe3786..0d0c1159332ad 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -8,25 +8,23 @@ , service-identity , zope_interface , isPy3k -, pythonAtLeast , python }: buildPythonPackage rec { pname = "ldaptor"; - version = "20.1.1"; + version = "21.2.0"; src = fetchPypi { inherit pname version; - sha256 = "778f45d68a0b5d63a892c804c05e57b464413a41d8ae52f92ae569321473ab67"; + sha256 = "sha256-jEnrGTddSqs+W4NYYGFODLF+VrtaIOGHSAj6W+xno1g="; }; propagatedBuildInputs = [ twisted passlib pyopenssl pyparsing service-identity zope_interface ]; - # https://github.com/twisted/ldaptor/pull/210 - disabled = !isPy3k || pythonAtLeast "3.9"; + disabled = !isPy3k; checkPhase = '' ${python.interpreter} -m twisted.trial ldaptor diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index 2edc9211d928d..4bc2dfa2ffda2 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libversion"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1"; + sha256 = "cf9ef702d0bc750f0ad44a2cffe8ebd83cd356b92cc25f767846509f84ea7e73"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 184a215c407aa..98878c90640f8 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd"; }; - buildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] ++ lib.optionals isPy27 [ singledispatch futures ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index aa009e0a3e732..b58376031039d 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.5.2"; + version = "4.6.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "1d0cpwdjxfzwjzmnz066ibzicyj2vhx15qxmm775l8hxqi65xps4"; + sha256 = "1zidx62sxh2r4fmjfjzd4f6i4yxgzkpd20nafbyr0i0wnw9da3fd"; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index d068380a7a2f8..2a57f2babeee8 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.25"; + version = "0.3.26"; src = fetchPypi { inherit pname version; - sha256 = "b5ef61c4f05493cfe78b3f955878a3d0a71950eead5ebb484282f07456a47bea"; + sha256 = "sha256-cW1757NImdi5tz98qrspzEdI5Q/26ap2jVxyah44qR8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 7ef78f9dfbbe5..832297c979dee 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -34,6 +34,8 @@ buildPythonPackage rec { inherit pname version; sha256 = "06vhk75hmzgv1sfbjzgnsw9x10h7y6bd6s6z7d6lfnn7wcgc83zi"; }; + # See https://github.com/scipy/scipy/issues/13585 and https://github.com/pandas-dev/pandas/pull/40020 + patches = [ ./fix-tests.patch ]; nativeBuildInputs = [ cython ]; buildInputs = lib.optional stdenv.isDarwin libcxx; @@ -59,16 +61,6 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/39687 hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - postPatch = lib.optionalString stdenv.isDarwin '' - cpp_sdk="${libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - ''; - # Parallel Cythonization is broken in Python 3.8 on Darwin. Fixed in the next # release. https://github.com/pandas-dev/pandas/pull/30862 setupPyBuildFlags = lib.optionals (!(isPy38 && stdenv.isDarwin)) [ diff --git a/pkgs/development/python-modules/pandas/fix-tests.patch b/pkgs/development/python-modules/pandas/fix-tests.patch new file mode 100644 index 0000000000000..8051cfec39aee --- /dev/null +++ b/pkgs/development/python-modules/pandas/fix-tests.patch @@ -0,0 +1,12 @@ +diff --color -ur a/pandas/tests/arrays/sparse/test_array.py b/pandas/tests/arrays/sparse/test_array.py +--- a/pandas/tests/arrays/sparse/test_array.py 2020-12-07 12:42:08.000000000 +0100 ++++ b/pandas/tests/arrays/sparse/test_array.py 2021-02-27 21:48:16.483903149 +0100 +@@ -1188,7 +1188,7 @@ + row = [0, 3, 1, 0] + col = [0, 3, 1, 2] + data = [4, 5, 7, 9] +- sp_array = scipy.sparse.coo_matrix((data, (row, col))) ++ sp_array = scipy.sparse.coo_matrix((data, (row, col)), dtype="int") + result = pd.Series.sparse.from_coo(sp_array) + + index = pd.MultiIndex.from_arrays([[0, 0, 1, 3], [0, 2, 1, 3]]) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index b05a525d91ad6..3e7c6ae00116c 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -3,7 +3,7 @@ , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions , prompt_toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k, pythonOlder, pytestcov +, python-doi, isPy3k, pytestcov #, optional, dependencies , whoosh, pytest , stdenv diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 9f9bb1702a90c..ad51a80674bcb 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,22 +8,25 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.16.6"; - + version = "1.17.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8fc1e6a62ccb7c9830f1e7e9288e2d20eaf373cc8875b5c55b7d5d9b7717be91"; + sha256 = "sha256-FBmMWv6yiRBuQO5uXkwFKcU2mTn2yliKAos3GnX+IN0="; }; propagatedBuildInputs = [ passlib scramp ]; + # Tests require a running PostgreSQL instance + doCheck = false; + pythonImportsCheck = [ "pg8000" ]; + meta = with lib; { + description = "Python driver for PostgreSQL"; homepage = "https://github.com/tlocke/pg8000"; - description = "PostgreSQL interface library, for asyncio"; + license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; }; - } diff --git a/pkgs/development/python-modules/pleroma-bot/default.nix b/pkgs/development/python-modules/pleroma-bot/default.nix new file mode 100644 index 0000000000000..1dca45eca762b --- /dev/null +++ b/pkgs/development/python-modules/pleroma-bot/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, requests-mock +, oauthlib +, requests_oauthlib +, requests +, pyaml +}: + +buildPythonPackage rec { + pname = "pleroma-bot"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "robertoszek"; + repo = "pleroma-bot"; + rev = version; + sha256 = "1q0xhgqq41zbqiawpd4kbdx41zhwxxp5ipn1c2rc8d7pjyb5p75w"; + }; + + propagatedBuildInputs = [ pyaml requests requests_oauthlib oauthlib ]; + checkInputs = [ pytestCheckHook requests-mock ]; + + pythonImportsCheck = [ "pleroma_bot" ]; + + meta = with lib; { + homepage = "https://robertoszek.github.io/pleroma-bot/"; + description = "Bot for mirroring one or multiple Twitter accounts in Pleroma/Mastodon"; + license = licenses.mit; + maintainers = with maintainers; [ robertoszek ]; + }; +} diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 1ad17d0459ddf..63f5feada5951 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, python , buildPythonPackage , socat , psutil diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 5ca1d3d83c91d..5047c1e88b0d9 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "7.1.4"; + version = "7.2.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-onxag3kmswqqSycbwW+orofrukry0pCaRSxVRq2u53A="; + sha256 = "sha256-/GV5ZhrJxeChcYwmH/9FsLceAYRSeTCDe4lMEwdTa8Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 2b6eff885f9e5..1e38f401a43d8 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "prawcore"; - version = "1.5.0"; + version = "2.0.0"; disabled = isPy27; # see https://github.com/praw-dev/prawcore/pull/101 src = fetchPypi { inherit pname version; - sha256 = "1f1eafc8a65d671f9892354f73142014fbb5d3a9ee621568c662d0a354e0578b"; + sha256 = "sha256-tJjZtvVJkQBecn1SNcj0nqW6DJpteT+3Q7QPoInNNtE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix new file mode 100644 index 0000000000000..c65ea3a695ff9 --- /dev/null +++ b/pkgs/development/python-modules/pycec/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, libcec +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pycec"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "konikvranik"; + repo = pname; + rev = "v${version}"; + sha256 = "1ivnmihajhfkwwghgl0f8n9ragpirbmbj1mhj9bmjjc29zzdc3m6"; + }; + + propagatedBuildInputs = [ + libcec + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pycec" ]; + + meta = with lib; { + description = "Python modules to access HDMI CEC devices"; + homepage = "https://github.com/konikvranik/pycec/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 9bf4bede1faf0..d3c6e37bbe4b1 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,44 +1,45 @@ { lib , buildPythonPackage -, fetchFromGitHub -, ujson , email_validator -, typing-extensions -, python -, isPy3k -, pytest -, pytestcov +, fetchFromGitHub , pytest-mock +, pytestCheckHook +, python-dotenv +, pythonOlder +, typing-extensions +, ujson }: buildPythonPackage rec { pname = "pydantic"; - version = "1.7.3"; - disabled = !isPy3k; + version = "1.8"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "xihEDmly0vprmA+VdeCoGXg9PjWRPmBWAwk/9f2DLts="; + sha256 = "sha256-+HfnM/IrFlUyQJdiOYyaJUNenh8dLtd8CUJWSbn6hwQ="; }; propagatedBuildInputs = [ - ujson email_validator + python-dotenv typing-extensions + ujson ]; checkInputs = [ - pytest - pytestcov pytest-mock + pytestCheckHook ]; - checkPhase = '' - pytest + preCheck = '' + export HOME=$(mktemp -d) ''; + pythonImportsCheck = [ "pydantic" ]; + meta = with lib; { homepage = "https://github.com/samuelcolvin/pydantic"; description = "Data validation and settings management using Python type hinting"; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index e9b66a95771b7..bac70be9987fb 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,40 +1,48 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz -, pkg-config, doctest-ignore-unicode, mock, nose }: +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, substituteAll +, graphviz +, coreutils +, pkg-config +, pytest +}: buildPythonPackage rec { pname = "pygraphviz"; - version = "1.6"; + version = "1.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "411ae84a5bc313e3e1523a1cace59159f512336318a510573b47f824edef8860"; + sha256 = "a7bec6609f37cf1e64898c59f075afd659106cf9356c5f387cecaa2e0cdb2304"; extension = "zip"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ graphviz ]; - checkInputs = [ doctest-ignore-unicode mock nose ]; - patches = [ - # pygraphviz depends on graphviz being in PATH. This patch always prepends - # graphviz to PATH. + # pygraphviz depends on graphviz executables and wc being in PATH (substituteAll { - src = ./graphviz-path.patch; - inherit graphviz; + src = ./path.patch; + path = lib.makeBinPath [ graphviz coreutils ]; }) ]; - # The tests are currently failing because of a bug in graphviz 2.40.1. - # Upstream does not want to skip the relevant tests: - # https://github.com/pygraphviz/pygraphviz/pull/129 - doCheck = false; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ graphviz ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest --pyargs pygraphviz + ''; meta = with lib; { description = "Python interface to Graphviz graph drawing package"; homepage = "https://github.com/pygraphviz/pygraphviz"; license = licenses.bsd3; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch b/pkgs/development/python-modules/pygraphviz/graphviz-path.patch deleted file mode 100644 index e4ff925009d79..0000000000000 --- a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py -index 8f72024..2d8358e 100644 ---- a/pygraphviz/agraph.py -+++ b/pygraphviz/agraph.py -@@ -1557,7 +1557,7 @@ class AGraph(object): - import os - import glob - -- paths = os.environ["PATH"] -+ paths = '@graphviz@/bin:' + os.environ["PATH"] - if os.name == "nt": - exe = ".exe" - else: diff --git a/pkgs/development/python-modules/pygraphviz/path.patch b/pkgs/development/python-modules/pygraphviz/path.patch new file mode 100644 index 0000000000000..a895eae775673 --- /dev/null +++ b/pkgs/development/python-modules/pygraphviz/path.patch @@ -0,0 +1,13 @@ +diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py +index d539ba0..f5bac3f 100644 +--- a/pygraphviz/agraph.py ++++ b/pygraphviz/agraph.py +@@ -1792,7 +1792,7 @@ class AGraph: + if platform.system() == "Windows": + name += ".exe" + +- paths = os.environ["PATH"] ++ paths = '@path@' + for path in paths.split(os.pathsep): + match = glob.glob(os.path.join(path, name)) + if match: diff --git a/pkgs/development/python-modules/pymediaroom/default.nix b/pkgs/development/python-modules/pymediaroom/default.nix new file mode 100644 index 0000000000000..e977cb23d7520 --- /dev/null +++ b/pkgs/development/python-modules/pymediaroom/default.nix @@ -0,0 +1,36 @@ +{ lib +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "pymediaroom"; + version = "0.6.4.1"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "dgomes"; + repo = pname; + rev = version; + sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy"; + }; + + propagatedBuildInputs = [ + async-timeout + xmltodict + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pymediaroom" ]; + + meta = with lib; { + description = "Python Remote Control for Mediaroom STB"; + homepage = "https://github.com/dgomes/pymediaroom"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix new file mode 100644 index 0000000000000..69bf011418240 --- /dev/null +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -0,0 +1,31 @@ +{ lib +, bluepy +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pyswitchbot"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pySwitchbot"; + rev = version; + sha256 = "16p11fmyms4q93m3rna76nkp2la9m8lmfmaflbvga666vljwfw6v"; + }; + + propagatedBuildInputs = [ bluepy ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "switchbot" ]; + + meta = with lib; { + description = "Python library to control Switchbot IoT devices"; + homepage = "https://github.com/Danielhiversen/pySwitchbot"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/pytankerkoenig/default.nix b/pkgs/development/python-modules/pytankerkoenig/default.nix new file mode 100644 index 0000000000000..0a6403107ab8d --- /dev/null +++ b/pkgs/development/python-modules/pytankerkoenig/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pytankerkoenig"; + version = "0.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "021fg1a4n3527fz86zxfbsi0jrk0dnai1y92q6hwh5za68lrs710"; + }; + + # Tests require an API key and network access + doCheck = false; + pythonImportsCheck = [ "pytankerkoenig" ]; + + meta = with lib; { + description = "Python module to get fuel data from tankerkoenig.de"; + homepage = "https://github.com/ultrara1n/pytankerkoenig"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index d3b6654931be9..508b7b7781be9 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -1,20 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, httpx, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pytest +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.10.1"; + version = "0.11.0"; - src = fetchPypi { - inherit version; - pname = "pytest_httpx"; - extension = "tar.gz"; - sha256 = "13ld6nnsc3f7i4zl4qm1jh358z0awr6xfk05azwgngmjb7jmcz0a"; + src = fetchFromGitHub { + owner = "Colin-b"; + repo = "pytest_httpx"; + rev = "v${version}"; + sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi"; }; - propagatedBuildInputs = [ httpx pytest ]; + propagatedBuildInputs = [ + httpx + pytest + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; - # not in pypi tarball - doCheck = false; pythonImportsCheck = [ "pytest_httpx" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 6bf3483d40f9a..5833790cf92d0 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { disabledTests = [ "test_suppresses_timeout_when_pdb_is_entered" + # Remove until https://github.com/pytest-dev/pytest/pull/7207 or similar + "test_suppresses_timeout_when_debugger_is_entered" ]; pytestFlagsArray = [ "-ra" diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix index 9373c597b367e..119f3021b4132 100644 --- a/pkgs/development/python-modules/pytest-vcr/default.nix +++ b/pkgs/development/python-modules/pytest-vcr/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , pytest , vcrpy }: diff --git a/pkgs/development/python-modules/python-awair/default.nix b/pkgs/development/python-modules/python-awair/default.nix new file mode 100644 index 0000000000000..8489247399a57 --- /dev/null +++ b/pkgs/development/python-modules/python-awair/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, voluptuous +, vcrpy +}: + +buildPythonPackage rec { + pname = "python-awair"; + version = "0.2.1"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ahayworth"; + repo = "python_awair"; + rev = version; + sha256 = "1fqjigc1a0lr9q6bjjq3j8pa39wg1cbkb0l67w94a0i4dkdfri8r"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + aiohttp + voluptuous + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + vcrpy + ]; + + pythonImportsCheck = [ "python_awair" ]; + + meta = with lib; { + description = "Python library for the Awair API"; + homepage = "https://github.com/ahayworth/python_awair"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index e654826e0bc2b..1d8a9a85457bc 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -1,29 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage , click +, fetchPypi , ipython -, pytest -, sh -, typing , mock +, pytestCheckHook +, pythonOlder +, sh }: buildPythonPackage rec { pname = "python-dotenv"; version = "0.15.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"; }; - propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ]; + propagatedBuildInputs = [ click ]; + + checkInputs = [ + ipython + mock + pytestCheckHook + sh + ]; - checkInputs = [ ipython mock pytest sh ]; + disabledTests = [ + "cli" + ]; - # cli tests are impure - checkPhase = '' - pytest tests/ -k 'not cli' - ''; + pythonImportsCheck = [ "dotenv" ]; meta = with lib; { description = "Add .env support to your django/flask apps in development and deployments"; diff --git a/pkgs/development/python-modules/python-gammu/default.nix b/pkgs/development/python-modules/python-gammu/default.nix new file mode 100644 index 0000000000000..1548a13894740 --- /dev/null +++ b/pkgs/development/python-modules/python-gammu/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + #, pytestCheckHook +, pythonOlder +, pkg-config +, gammu +}: + +buildPythonPackage rec { + pname = "python-gammu"; + version = "3.1"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "gammu"; + repo = pname; + rev = version; + sha256 = "1hw2mfrps6wqfyi40p5mp9r59n1ick6pj4hw5njz0k822pbb33p0"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gammu ]; + + # Check with the next release if tests could be run with pytest + # checkInputs = [ pytestCheckHook ]; + # Don't run tests for now + doCheck = false; + pythonImportsCheck = [ "gammu" ]; + + meta = with lib; { + description = "Python bindings for Gammu"; + homepage = "https://github.com/gammu/python-gammu/"; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 0be0d61ed0db7..2d276c6dccab9 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -1,28 +1,32 @@ { lib , buildPythonPackage -, isPyPy -, pkgs +, fetchFromGitHub +, libuv }: buildPythonPackage rec { pname = "pyuv"; - version = "1.2.0"; - disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49 + version = "1.4.0"; - src = pkgs.fetchurl { - url = "https://github.com/saghul/pyuv/archive/${pname}-${version}.tar.gz"; - sha256 = "19yl1l5l6dq1xr8xcv6dhx1avm350nr4v2358iggcx4ma631rycx"; + src = fetchFromGitHub { + owner = "saghul"; + repo = "pyuv"; + rev = "pyuv-${version}"; + sha256 = "1wiwwdylz66lfsjh6p4iv7pfhzvnhwjk332625njizfhz3gq9fwr"; }; - patches = [ ./pyuv-external-libuv.patch ]; + setupPyBuildFlags = [ "--use-system-libuv" ]; - buildInputs = [ pkgs.libuv ]; + buildInputs = [ libuv ]; + + doCheck = false; # doesn't work in sandbox + + pythonImportsCheck = [ "pyuv" ]; meta = with lib; { description = "Python interface for libuv"; homepage = "https://github.com/saghul/pyuv"; - repositories.git = "git://github.com/saghul/pyuv.git"; license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; - } diff --git a/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch b/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch deleted file mode 100644 index 41e169acd5f5d..0000000000000 --- a/pkgs/development/python-modules/pyuv/pyuv-external-libuv.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/setup.py b/setup.py -index 5071c3b..4b4a176 100644 ---- a/setup.py -+++ b/setup.py -@@ -7,7 +7,6 @@ try: - from setuptools import setup, Extension - except ImportError: - from distutils.core import setup, Extension --from setup_libuv import libuv_build_ext, libuv_sdist - - - def get_version(): -@@ -35,11 +34,10 @@ setup(name = "pyuv", - "Programming Language :: Python :: 3.3", - "Programming Language :: Python :: 3.4" - ], -- cmdclass = {'build_ext': libuv_build_ext, -- 'sdist' : libuv_sdist}, - packages = ['pyuv'], - ext_modules = [Extension('pyuv._cpyuv', - sources = ['src/pyuv.c'], -+ libraries = ['uv'] - )] - ) - diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ddec4f0f2397a..13c54f6a41e65 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , archinfo , bitstring , fetchPypi @@ -10,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.5739"; + version = "9.0.5903"; src = fetchPypi { inherit pname version; - sha256 = "1jwxxw2kw7wkz7kh8m8vbavzw6m5k6xph7mazfn3k2qbsshh3lk3"; + sha256 = "sha256-qhLlRlmb48zhjX2u9w6TVVv2gb0E9kSapabiv+u4J2s="; }; propagatedBuildInputs = [ @@ -35,5 +36,7 @@ buildPythonPackage rec { homepage = "https://github.com/angr/pyvex"; license = with licenses; [ bsd2 gpl3Plus lgpl3Plus ]; maintainers = with maintainers; [ fab ]; + # ERROR: pyvex-X-py3-none-manylinux1_aarch64.whl is not a supported wheel on this platform. + broken = stdenv.isAarch64; }; } diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix new file mode 100644 index 0000000000000..7c87431d80b30 --- /dev/null +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests_oauthlib +, simplejson +}: + +buildPythonPackage rec { + pname = "pyvicare"; + version = "0.2.5"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "PyViCare"; + inherit version; + sha256 = "16wqqjs238ad6znlz2gjadqj8891226bd02a1106xyz6vbbk2gdk"; + }; + + propagatedBuildInputs = [ + requests_oauthlib + simplejson + ]; + + # The published tarball on PyPI is incomplete and there are GitHub releases + doCheck = false; + pythonImportsCheck = [ "PyViCare" ]; + + meta = with lib; { + description = "Python Library to access Viessmann ViCare API"; + homepage = "https://github.com/somm15/PyViCare"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index a528de8e0ca27..49796054b564f 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildPhase = "${python.interpreter} ./setup.py build"; installPhase = '' ${python.interpreter} ./setup.py install --prefix="$out" || exit 1 diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index e0dfb9a24a643..20ba44ee2a860 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,24 +1,62 @@ -{ lib, fetchPypi, buildPythonPackage -, urllib3, idna, chardet, certifi -, pytest }: +{ lib +, buildPythonPackage +, certifi +, chardet +, fetchPypi +, idna +, pytest-mock +, pytest-xdist +, pytestCheckHook +, urllib3 +, isPy27 +}: buildPythonPackage rec { pname = "requests"; - version = "2.25.0"; + version = "2.25.1"; src = fetchPypi { inherit pname version; - sha256 = "1y6mb8c0ipd64d5axq2p368yxndp3f966hmabjka2q2a5y9hn6kz"; + sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ="; }; - nativeBuildInputs = [ pytest ]; - propagatedBuildInputs = [ urllib3 idna chardet certifi ]; - # sadly, tests require networking - doCheck = false; + propagatedBuildInputs = [ + certifi + chardet + idna + urllib3 + ]; + + checkInputs = [ + pytest-mock + pytest-xdist + pytestCheckHook + ]; + + disabledTests = [ + # Disable tests that require network access and use httpbin + "requests.api.request" + "requests.models.PreparedRequest" + "requests.sessions.Session" + "requests" + "test_redirecting_to_bad_url" + "test_requests_are_updated_each_time" + "test_should_bypass_proxies_pass_only_hostname" + "test_urllib3_pool_connection_closed" + "test_urllib3_retries" + "test_use_proxy_from_environment" + "TestRequests" + "TestTimeout" + ]; + + pythonImportsCheck = [ "requests" ]; meta = with lib; { - description = "An Apache2 licensed HTTP library, written in Python, for human beings"; + description = "Simple HTTP library for Python"; homepage = "http://docs.python-requests.org/en/latest/"; license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + # AttributeError: 'KeywordMapping' object has no attribute 'get' + broken = isPy27; }; } diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 02a3ef64c573d..8cce139facba7 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -1,16 +1,14 @@ { lib +, buildPythonPackage , rustPlatform -, python , fetchFromGitHub -, pipInstallHook -, maturin -, pip + # Check inputs , pytestCheckHook , numpy }: -rustPlatform.buildRustPackage rec { +buildPythonPackage rec { pname = "retworkx"; version = "0.6.0"; @@ -21,11 +19,15 @@ rustPlatform.buildRustPackage rec { sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20"; }; - cargoSha256 = "1vg4yf0k6yypqf9z46zz818mz7fdrgxj7zl6zjf7pnm2r8mq3qw5"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; + }; - propagatedBuildInputs = [ python ]; + format = "pyproject"; - nativeBuildInputs = [ pipInstallHook maturin pip ]; + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) doCheck = false; @@ -33,17 +35,6 @@ rustPlatform.buildRustPackage rec { installCheckInputs = [ pytestCheckHook numpy ]; - buildPhase = '' - runHook preBuild - maturin build --release --manylinux off --strip - runHook postBuild - ''; - - installPhase = '' - install -Dm644 -t dist target/wheels/*.whl - pipInstallPhase - ''; - preCheck = '' export TESTDIR=$(mktemp -d) cp -r tests/ $TESTDIR diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 5df445f299ba3..ddb93a21357ee 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.25.1"; + version = "2.26.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xQ1nt8FcjuoilzM5PbU8KHgirPyj9us+ykyjfgEqZhg="; + sha256 = "sha256-CT0vXt6x+cp4yHZtfBiRq+/Aurd4Q7Zagn4lNRqji/o="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 8d08e43bc7139..0bc8499a373b1 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -9,11 +9,11 @@ let }); in buildPythonPackage rec { pname = "scipy"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0rh5b1rwdcvvagld8vpxnpaibszy1skpx39a0fwzd5gx5pwcjvfb"; + sha256 = "048vd4c843xaq45yk3kn491gvqnvhp2i9rxhg671ddlh923fpz64"; }; checkInputs = [ nose pytest ]; @@ -53,9 +53,10 @@ in buildPythonPackage rec { SCIPY_USE_G77_ABI_WRAPPER = 1; - meta = { - description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; + meta = with lib; { + description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; homepage = "https://www.scipy.org/"; - maintainers = with lib.maintainers; [ fridh ]; + license = licenses.bsd3; + maintainers = [ maintainers.fridh ]; }; } diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index 1578764767619..5b7b7ea279724 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "secretstorage"; - version = "3.3.0"; + version = "3.3.1"; disabled = pythonOlder "3.5"; src = fetchPypi { pname = "SecretStorage"; inherit version; - sha256 = "1aj669d5s8pmr6y2d286fxd13apnxzw0ivd1dr6xdni9i3rdxkrh"; + sha256 = "15ginv4gzxrx77n7517xnvf2jcpqc6ran12s951hc85zlr8nqrpx"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 91c34734a8c59..e8ea874e5ca5f 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,41 +1,59 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, pythonOlder -, geos, pytestCheckHook, cython +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, pythonOlder +, geos +, pytestCheckHook +, cython , numpy +, fetchpatch }: buildPythonPackage rec { pname = "Shapely"; version = "1.7.1"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n"; }; - disabled = pythonOlder "3.5"; nativeBuildInputs = [ geos # for geos-config cython ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - # environment variable used in shapely/_buildcfg.py + # Environment variable used in shapely/_buildcfg.py GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; patches = [ + # Fix with geos 3.9. This patch will be part of the next release after 1.7.1 + (fetchpatch { + url = "https://github.com/Toblerity/Shapely/commit/77879a954d24d1596f986d16ba3eff5e13861164.patch"; + sha256 = "1w7ngjqbpf9vnvrfg4nyv34kckim9a60gvx20h6skc79xwihd4m5"; + excludes = [ + "tests/test_create_inconsistent_dimensionality.py" + "appveyor.yml" + ".travis.yml" + ]; + }) + # Patch to search form GOES .so/.dylib files in a Nix-aware way (substituteAll { src = ./library-paths.patch; libgeos_c = GEOS_LIBRARY_PATH; libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) - # included in next release. - (fetchpatch { - url = "https://github.com/Toblerity/Shapely/commit/ea5b05a0c87235d3d8f09930ad47c396a76c8b0c.patch"; - sha256 = "sha256-egdydlV+tpXosSQwQFHaXaeBhXEHAs+mn7vLUDpvybA="; - }) ]; preCheck = '' @@ -46,9 +64,12 @@ buildPythonPackage rec { "test_collection" ]; + pythonImportsCheck = [ "shapely" ]; + meta = with lib; { description = "Geometric objects, predicates, and operations"; - maintainers = with maintainers; [ knedlsepp ]; homepage = "https://pypi.python.org/pypi/Shapely/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ knedlsepp ]; }; } diff --git a/pkgs/development/python-modules/simplehound/default.nix b/pkgs/development/python-modules/simplehound/default.nix new file mode 100644 index 0000000000000..1ecd446c5b48f --- /dev/null +++ b/pkgs/development/python-modules/simplehound/default.nix @@ -0,0 +1,37 @@ +{ lib +, requests +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests-mock +}: + +buildPythonPackage rec { + pname = "simplehound"; + version = "0.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "robmarkcole"; + repo = pname; + rev = "v${version}"; + sha256 = "1b5m3xjmk0l6ynf0yvarplsfsslgklalfcib7sikxg3v5hiv9qwh"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + requests-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "simplehound" ]; + + meta = with lib; { + description = "Python API for Sighthound"; + homepage = "https://github.com/robmarkcole/simplehound"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/skybellpy/default.nix b/pkgs/development/python-modules/skybellpy/default.nix new file mode 100644 index 0000000000000..c94b03bcc6675 --- /dev/null +++ b/pkgs/development/python-modules/skybellpy/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, colorlog +, fetchFromGitHub +, pytest-sugar +, pytest-timeout +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "skybellpy"; + version = "0.6.3"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "MisterWil"; + repo = pname; + rev = "v${version}"; + sha256 = "1ghvm0pcdyhq6xfjc2dkldd701x77w07077sx09xsk6q2milmvzz"; + }; + + propagatedBuildInputs = [ + colorlog + requests + ]; + + checkInputs = [ + pytest-sugar + pytest-timeout + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "skybellpy" ]; + + meta = with lib; { + description = "Python wrapper for the Skybell alarm API"; + homepage = "https://github.com/MisterWil/skybellpy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 2a2f3bf42fb07..cb491cf600782 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.3.0"; + version = "3.4.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "0nr1avxycvjnvg1n8r09xi4sc5h6i4b64pzfgq14l55dgi5sv1rx"; + sha256 = "sha256-WlHVorltN8Apq0MZUStPlJZKbBFSbnAoIBQUZYGdDiY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index 08bdc183186cb..506fad5db48d5 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , boto3 , diskcache , enum34 @@ -10,7 +10,7 @@ , requests , scikitimage , six -, pytest +, pytestCheckHook , isPy27 , tifffile }: @@ -19,9 +19,11 @@ buildPythonPackage rec { pname = "slicedimage"; version = "4.1.1"; - src = fetchPypi { - inherit pname version; - sha256 = "7369f1d7fa09f6c9969625c4b76a8a63d2507a94c6fc257183da1c10261703e9"; + src = fetchFromGitHub { + owner = "spacetx"; + repo = pname; + rev = version; + sha256 = "1vpg8varvfx0nj6xscdfm7m118hzsfz7qfzn28r9rsfvrhr0dlcw"; }; propagatedBuildInputs = [ @@ -36,13 +38,13 @@ buildPythonPackage rec { ] ++ lib.optionals isPy27 [ pathlib enum34 ]; checkInputs = [ - pytest + pytestCheckHook ]; - # ignore tests which require setup - checkPhase = '' - pytest --ignore tests/io_ - ''; + # Ignore tests which require setup, check again if disabledTestFiles can be used + pytestFlagsArray = [ "--ignore tests/io_" ]; + + pythonImportsCheck = [ "slicedimage" ]; meta = with lib; { description = "Library to access sliced imaging data"; diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 341f53cfe0b52..f648905251e23 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; # Exclude live tests - disabledTestFiles = [ "tests/live_test.py" ]; + disabledTestPaths = [ "tests/live_test.py" ]; pythonImportsCheck = [ "slixmpp" ]; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index e203dc1c7aa54..e86144dff04dc 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,12 +1,15 @@ { buildPythonPackage -, coveralls , fetchFromGitHub -, flake8 +, fetchpatch , graphviz +, ifaddr +, isPy27 , lib , mock +, nix-update-script , pytestCheckHook , requests +, requests-mock , sphinx , sphinx_rtd_theme , toml @@ -15,7 +18,8 @@ buildPythonPackage rec { pname = "soco"; - version = "0.20"; + version = "0.21.2"; + disabled = isPy27; # N.B. We fetch from GitHub because the PyPI tarball doesn't contain the # required files to run the tests. @@ -23,34 +27,46 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "0p87aw7wxgdjz0m0nqqcfvbn24hlbq1hh1zxdq2c0k2jcbmaj8zc"; + sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0="; }; + patches = [(fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch"; + sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4="; + })]; + # N.B. These exist because: # 1. Upstream's pinning isn't well maintained, leaving dependency versions no # longer in nixpkgs. # 2. There is no benefit for us to be running linting and coverage tests. postPatch = '' sed -i "/black/d" ./requirements-dev.txt + sed -i "/coveralls/d" ./requirements-dev.txt + sed -i "/flake8/d" ./requirements-dev.txt sed -i "/pylint/d" ./requirements-dev.txt sed -i "/pytest-cov/d" ./requirements-dev.txt ''; propagatedBuildInputs = [ + ifaddr requests toml xmltodict ]; + checkInputs = [ pytestCheckHook - coveralls - flake8 graphviz mock + requests-mock sphinx sphinx_rtd_theme ]; + passthru.updateScript = nix-update-script { + attrPath = "python3Packages.${pname}"; + }; + meta = with lib; { homepage = "http://python-soco.com/"; description = "A CLI and library to control Sonos speakers"; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 83fd3e7b10b34..7d35bb8487c8a 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35 +{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch , mock , pysqlite , pytestCheckHook @@ -13,6 +13,14 @@ buildPythonPackage rec { sha256 = "d2f25c7f410338d31666d7ddedfa67570900e248b940d186b48461bd4e5569a1"; }; + patches = [ + # fix test_pyodbc_extra_connect_azure test failure + (fetchpatch { + url = "https://github.com/sqlalchemy/sqlalchemy/commit/7293b3dc0e9eb3dae84ffd831494b85355df8e73.patch"; + sha256 = "1z61lzxamz74771ddlqmbxba1dcr77f016vqfcmb44dxb228w2db"; + }) + ]; + checkInputs = [ pytestCheckHook mock diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 94513e5d620c4..071bbcd3061a1 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { typing-extensions ]; - disabledTestFiles = [ "tests/test_graphql.py" ]; + disabledTestPaths = [ "tests/test_graphql.py" ]; # https://github.com/encode/starlette/issues/1131 disabledTests = [ "test_debug_html" ]; pythonImportsCheck = [ "starlette" ]; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 616db71a94f4d..31b02e3f26414 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -51,6 +51,9 @@ buildPythonPackage rec { ''; meta = with lib; { + # scikit-learn in pythonPackages is too new for textacy + # remove as soon as textacy support scikit-learn >= 0.24 + broken = true; description = "Higher-level text processing, built on spaCy"; homepage = "https://textacy.readthedocs.io/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index cf122613f633c..ef265b87c054c 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -1,12 +1,10 @@ { lib -, rustPlatform , fetchFromGitHub , fetchurl -, pipInstallHook +, buildPythonPackage +, rustPlatform , setuptools-rust -, wheel , numpy -, python , datasets , pytestCheckHook , requests @@ -49,7 +47,7 @@ let url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt"; sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f"; }; -in rustPlatform.buildRustPackage rec { +in buildPythonPackage rec { pname = "tokenizers"; version = "0.10.0"; @@ -60,19 +58,22 @@ in rustPlatform.buildRustPackage rec { hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw="; }; - cargoSha256 = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src sourceRoot; + name = "${pname}-${version}"; + hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; + }; sourceRoot = "source/bindings/python"; - nativeBuildInputs = [ - pipInstallHook - setuptools-rust - wheel - ]; + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); propagatedBuildInputs = [ numpy - python ]; installCheckInputs = [ @@ -99,14 +100,6 @@ in rustPlatform.buildRustPackage rec { ln -s ${openaiMerges} openai-gpt-merges.txt ) ''; - buildPhase = '' - ${python.interpreter} setup.py bdist_wheel - ''; - - installPhase = '' - pipInstallPhase - ''; - preCheck = '' HOME=$TMPDIR ''; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index ba40723e7ddd0..950a618a52752 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -1,28 +1,39 @@ { lib , buildPythonPackage , fetchPypi -, nose -, coverage -, glibcLocales -, flake8 , setuptools_scm , pytestCheckHook +, pytest-asyncio +, pytest-timeout +, numpy +, pandas +, rich +, tkinter }: buildPythonPackage rec { pname = "tqdm"; - version = "4.54.1"; + version = "4.58.0"; src = fetchPypi { inherit pname version; - sha256 = "1x9chlh3msikddmq8p8p5s5kgqqs48bclxgzz3vb9ygcwjimidiq"; + sha256 = "1fjvaag1wy70gglxjkfnn0acrya7fbhzi4adbs1bpap8x03wffn2"; }; nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ nose coverage glibcLocales flake8 pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + pytest-asyncio + pytest-timeout + # tests of optional features + numpy + pandas + rich + tkinter + ]; # Remove performance testing. # Too sensitive for on Hydra. diff --git a/pkgs/development/python-modules/twinkly-client/default.nix b/pkgs/development/python-modules/twinkly-client/default.nix new file mode 100644 index 0000000000000..fc856430da955 --- /dev/null +++ b/pkgs/development/python-modules/twinkly-client/default.nix @@ -0,0 +1,30 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "twinkly-client"; + version = "0.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "16jbm4ya4yk2nfswza1kpgks70rmy5lpsv9dv3hdjdnr1j44hr3i"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "twinkly_client" ]; + + meta = with lib; { + description = "Python module to communicate with Twinkly LED strings"; + homepage = "https://github.com/dr1rrb/py-twinkly-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index e93fd83656f89..c278680404ba0 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # the default string formatting of regular expression flags which breaks test assertion "test_to_json_schema_complex_regular_expression" ]; - disabledTestFiles = [ + disabledTestPaths = [ # for some reason jinja2 not picking up forms directory (1% of tests) "tests/test_forms.py" ]; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 8b64bddc5a4fe..6d2c19d36750b 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { ''; # Ignore tests which require network access - disabledTestFiles = [ + disabledTestPaths = [ "tests/unit/create/test_creator.py" "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" ]; diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index ff4fffc821fb2..28c9b8b5c1660 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -1,62 +1,34 @@ { lib , rustPlatform , fetchFromGitHub -, maturin , buildPythonPackage -, python }: let pname = "wasmer"; version = "1.0.0"; +in buildPythonPackage rec { + inherit pname version; - wheel = rustPlatform.buildRustPackage rec { - inherit pname version; - - src = fetchFromGitHub { - owner = "wasmerio"; - repo = "wasmer-python"; - rev = version; - hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; - }; - - cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; - - nativeBuildInputs = [ maturin python ]; - - preBuild = '' - cd packages/api - ''; - - buildPhase = '' - runHook preBuild - maturin build --release --manylinux off --strip - runHook postBuild - ''; - - postBuild = '' - cd ../.. - ''; - - doCheck = false; + src = fetchFromGitHub { + owner = "wasmerio"; + repo = "wasmer-python"; + rev = version; + hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + }; - installPhase = '' - runHook preInstall - install -Dm644 -t $out target/wheels/*.whl - runHook postInstall - ''; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; }; -in -buildPythonPackage rec { - inherit pname version; + format = "pyproject"; + + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; - format = "wheel"; - src = wheel; + buildAndTestSubdir = "packages/api"; - unpackPhase = '' - mkdir -p dist - cp $src/*.whl dist - ''; + doCheck = false; pythonImportsCheck = [ "wasmer" ]; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 6930be7d65a95..31f41c50097a7 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , buildPythonPackage , fetchPypi +, fetchpatch , argh , pathtools , pyyaml @@ -11,13 +12,21 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.0.0"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/UtWz74NDZxPxDGs7KdXAKfxLTc33C6csuwrpkloBCU="; + sha256 = "sha256-Uy/t2ZPnVVRnH6o2zQTFgM7T+uCEJUp3mvu9iq8AVms="; }; + patches = [ + (fetchpatch { + # Fix test flakiness on Apple Silicon, remove after upgrade to 2.0.6. + url = "https://github.com/gorakhargosh/watchdog/commit/331fd7c2c819663be39bc146e78ce67553f265fa.patch"; + sha256 = "sha256-pLkZmbPN3qRNHs53OP0HIyDxqYCPPo6yOcBLD3aO2YE="; + }) + ]; + buildInputs = lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index c08c5541a61a6..9aca67e2ed8d3 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "winacl"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "05xhdhbvzs1hcd8lxmdr9mpr6ifx5flhlvk6jr0qi6h25imhqclp"; + sha256 = "sha256-V+W0WRtL4rJD1LeYgr0PtiKdWTDQYv2ulB1divaqKe4="; }; # Project doesn't have tests diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 13e9c56be9ffb..48182760dcae3 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.13.4"; + version = "0.14.0"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "sha256-+ZsefwH1hag2syWaEXkdxgmxk6JsxP7MvV+ILlo+Hy8="; + sha256 = "sha256-9oLVv0fCJzYyBApR4yzQKc25Uz9X5Rrvj638yD0JDMU="; }; meta = with lib; { diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 35c75d67da507..30df5daed6ff0 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1kvc7fkp45w48f0bxwbxvxkicnjrrydki0hllg294n1wrp80zzyk"; }; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; preBuild = '' patchShebangs bin/ diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 91f3f24d6f1fe..f7f933392ab4c 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -12,8 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; propagatedBuildInputs = with qt5; [ qt5.qtbase qtdeclarative diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 98a6bcd5bbccc..6b94ed0a93f4b 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.8.0"; + version = "10.9.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-zA0/5lpVefZD0m7g7SfqSRAFkQm2b+g/F3doCl9oAn8="; + sha256 = "sha256-IVbvBqp/7Y3La0pP6gbWl0ATfEvkCuR4J9ChTDPNhB0="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-t7PluxN6naDB35eC59Xus1hgZflgViWF2yFog9mkaOA="; + vendorSha256 = "sha256-mj1TvNuFFPJGAJCBTQtU5WWPhHbiXUxRiMZQ/XvEy0U="; doCheck = false; diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix index ba9412c286c49..3937992417807 100644 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ b/pkgs/development/tools/bazel-kazel/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "sha256-YWTWw5vDkDvIHOTqZM2xH8VPaVRuB2oyynvwWNmvPXs="; + sha256 = "sha256-g7jfuWe4UeAbNf+kOa0Y9BamUnGEbOGxZ+KdQWdWl48="; }; vendorSha256 = "sha256-1+7Mx1Zh1WolqTpWNe560PRzRYaWVUVLvNvUOysaW5I="; diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 182b8633aa015..93644caa5a4ec 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "ant"; inherit version; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index d88068c1c3ee3..d2ef8361ec0e3 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "ant"; inherit version; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 4658703f8b103..3a1866e0b3990 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1i9qlj3vy4j1yyf22nwisd0pg88n9qzp9ymfhwqabadka7br3b96"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; inherit jdk; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 5de894bd1b420..7c2e5372e7312 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation (rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.19.3"; + version = "3.19.4"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "sha256-P6ynwTFJSh401m6fiXL/U2nkjUGeqM6qPcFbTBE2dzI="; + sha256 = "sha256-fQIyufHFfo3oHzgHHvggPmgg/n7siuRqHfEl2I28wuE="; }; patches = [ diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index c73b7149a361f..da5e11cce2c86 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, git, pkg-config }: +{ lib, stdenv, python3, fetchFromGitHub, git, pkg-config, fetchpatch }: # Note: # Conan has specific dependency demands; check @@ -20,6 +20,13 @@ let newPython = python3.override { inherit version; sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j"; }; + patches = oldAttrs.patches or [] ++ [ + # Don't raise import error on non-linux os. Remove after upgrading to distro≥1.2.0 + (fetchpatch { + url = "https://github.com/nir0s/distro/commit/25aa3f8c5934346dc838387fc081ce81baddeb95.patch"; + sha256 = "0m09ldf75gacazh2kr04cifgsqfxg670vk4ypl62zv7fp3nyd5dc"; + }) + ]; }); node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec { version = "0.6.1"; @@ -69,7 +76,7 @@ in newPython.pkgs.buildPythonApplication rec { six tqdm urllib3 - ]; + ] ++ lib.optionals stdenv.isDarwin [ idna cryptography pyopenssl ]; checkInputs = [ pkg-config @@ -90,6 +97,9 @@ in newPython.pkgs.buildPythonApplication rec { substituteInPlace conans/requirements.txt \ --replace "PyYAML>=3.11, <3.14.0" "PyYAML" \ --replace "deprecation>=2.0, <2.1" "deprecation" \ + --replace "idna==2.6" "idna" \ + --replace "cryptography>=1.3.4, <2.4.0" "cryptography" \ + --replace "pyOpenSSL>=16.0.0, <19.0.0" "pyOpenSSL" \ --replace "six>=1.10.0,<=1.14.0" "six" ''; @@ -98,6 +108,5 @@ in newPython.pkgs.buildPythonApplication rec { description = "Decentralized and portable C/C++ package manager"; license = licenses.mit; maintainers = with maintainers; [ HaoZeke ]; - platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 93935e47b36b1..4c5d9a5df809e 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -33,7 +33,8 @@ rec { echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies ''; - buildInputs = [ unzip java makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip java ]; meta = { description = "Enterprise-grade build system"; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 488697033d91b..51b97b242d5c8 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ jdk ]; # the jar is not in share/java, because it's a standalone jar and should diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index d22f4bc487f88..093a825723c07 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0d3hz3vy5qmjr9r4f8a5cx9hikpzs8h8f0fsl3dpbialf4wck24g"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; sourceRoot = "."; installPhase = '' diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 06bf2c54678c2..a593ee72c8b79 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,36 +1,21 @@ -{ lib -, stdenv -, fetchFromGitHub -, which -, curl -, makeWrapper -, jdk -, writeScript -, common-updater-scripts -, cacert -, git -, nixfmt -, nix -, jq -, coreutils -, gnused -}: +{ lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript +, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused }: stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "830b72140583e2790bbd3649890ac8ef5371d0c6"; - version = "2021-02-04"; + rev = "f080234ba899bb49b0cf977b3683e6446b38c477"; + version = "2021-02-24"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "0wq2mf8s254ns0sss5q394c1j2rnvl42x9l6kkrav505hbx0gyq6"; + sha256 = "01n25s60ssxls8lkwrni91k35622lyaizymmprcqh243dg3g2qiv"; }; dontBuild = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 558940587949d..806eb7c5b0edc 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.8.1"; + version = "0.8.2"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "0lqfz097nyb6q6bn5mmfg6vl1nmgb6k4lmwxc8anza6zp8qh7wif"; + sha256 = "sha256-aPVroqpR4ynfHhjJ6jJX6y5cdgmoUny3A8GBhnooOeo="; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/development/tools/checkmake/default.nix new file mode 100644 index 0000000000000..c48dbe680238d --- /dev/null +++ b/pkgs/development/tools/checkmake/default.nix @@ -0,0 +1,49 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, git, pandoc, lib }: + +buildGoPackage rec { + pname = "checkmake"; + version = "0.1.0-2020.11.30"; + + goPackagePath = "github.com/mrtazz/checkmake"; + + src = fetchFromGitHub { + owner = "mrtazz"; + repo = pname; + rev = "575315c9924da41534a9d0ce91c3f0d19bb53ffc"; + sha256 = "121rsl9mh3wwadgf8ggi2xnb050pak6ma68b2sw5j8clmxbrqli3"; + }; + + nativeBuildInputs = [ pandoc ]; + + preBuild = + let + buildVars = { + version = version; + buildTime = "N/A"; + builder = "nix"; + goversion = "$(go version | egrep -o 'go[0-9]+[.][^ ]*')"; + }; + buildVarsFlags = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-X main.${k}=${v}") buildVars); + in + '' + buildFlagsArray+=("-ldflags=${buildVarsFlags}") + ''; + + postInstall = '' + pandoc -s -t man -o checkmake.1 go/src/${goPackagePath}/man/man1/checkmake.1.md + mkdir -p $out/share/man/man1 + mv checkmake.1 $out/share/man/man1/checkmake.1 + ''; + + meta = with lib; { + description = "Experimental tool for linting and checking Makefiles"; + homepage = https://github.com/mrtazz/checkmake; + license = licenses.mit; + maintainers = with maintainers; [ vidbina ]; + platforms = platforms.linux; + longDescription = '' + checkmake is an experimental tool for linting and checking + Makefiles. It may not do what you want it to. + ''; + }; +} diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index ae10c402945fe..0fb3ae81030bb 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; sha256 = "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out PREFIX=$out make install diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 32c606e0e218a..0be77237f4289 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-hOemDLfkjjPXQErKKCIMl8c5EPZe40B1HlNfvg7IZKU="; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; unpackPhase = '' tar xfz ${src} diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index c42197e13cf13..8fb7677f58454 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -49,7 +49,8 @@ in sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k"; }; - buildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; unpackCmd = "unzip $curSrc"; diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index bd8e71090c536..20185ff7d1374 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -9,11 +9,9 @@ assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysq let inherit (lib) optional optionals optionalString; - features = '' - ${optionalString sqliteSupport "sqlite"} \ - ${optionalString postgresqlSupport "postgres"} \ - ${optionalString mysqlSupport "mysql"} \ - ''; + features = optional sqliteSupport "sqlite" + ++ optional postgresqlSupport "postgres" + ++ optional mysqlSupport "mysql"; in rustPlatform.buildRustPackage rec { @@ -35,11 +33,12 @@ rustPlatform.buildRustPackage rec { ./allow-warnings.patch ]; - cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ]; + cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; cargoPatches = [ ./cargo-lock.patch ]; cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g"; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ optional stdenv.isDarwin Security ++ optional (stdenv.isDarwin && mysqlSupport) libiconv @@ -47,12 +46,7 @@ rustPlatform.buildRustPackage rec { ++ optional postgresqlSupport postgresql ++ optionals mysqlSupport [ mysql zlib ]; - # We must `cd diesel_cli`, we cannot use `--package diesel_cli` to build - # because --features fails to apply to the package: - # https://github.com/rust-lang/cargo/issues/5015 - # https://github.com/rust-lang/cargo/issues/4753 - preBuild = "cd diesel_cli"; - postBuild = "cd .."; + buildAndTestSubdir = "diesel_cli"; checkPhase = optionalString sqliteSupport '' (cd diesel_cli && cargo check --features sqlite) @@ -65,7 +59,7 @@ rustPlatform.buildRustPackage rec { # Fix the build with mariadb, which otherwise shows "error adding symbols: # DSO missing from command line" errors for libz and libssl. - NIX_LDFLAGS = lib.optionalString mysqlSupport "-lz -lssl -lcrypto"; + NIX_LDFLAGS = optionalString mysqlSupport "-lz -lssl -lcrypto"; meta = with lib; { description = "Database tool for working with Rust projects that use Diesel"; diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index d78b54b33e4fa..5ecaddc6f1bc5 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oS3ZGQkDSRdVLluLNg56VGp6MCrRDlgjk1va1+xocas="; + sha256 = "sha256-TAV+bdHURclrwM0ByfbM2S4GdAnHrwclStyUlGraOpw="; }; vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4="; @@ -16,12 +16,9 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; - buildFlagsArray = [ - "-ldflags=" - "-s" - "-w" - "-X main.version=${version}" - ]; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X main.version=${version}") + ''; preCheck = '' # Remove tests that use networking diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index a1759df945861..c83b6142b06d0 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.56.0"; + version = "1.57.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-rBUao5j4Bofn6uSB20TTN7G1JgKu3mQpISJp+hX28mw="; + sha256 = "sha256-waaBillxI7tKQAugyolAWQWf4CG+uIkjtvNXNNFpqRY="; }; meta = with lib; { diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index d82c288e5aad4..e74a6b9c3c6a4 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , docbook_xml_dtd_43 -, docbook_xsl +, docbook-xsl-nons , libxslt , gettext , gnome3 @@ -14,7 +14,9 @@ python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; - version = "1.33.1"; + version = "1.33.2"; + + outputDevdoc = "out"; format = "other"; @@ -23,15 +25,13 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "L9CjhZ60F42xbo50x7cdKfJrav/9mf38pff8S4xkEVo="; + sha256 = "A6OXpazrJ05SUIO1ZPVN0xHTXOSov8UnPvUolZAv/Iw="; }; patches = [ passthru.respect_xml_catalog_files_var_patch ]; - outputDevdoc = "out"; - nativeBuildInputs = [ pkg-config gettext @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons libxslt ] ++ lib.optionals withDblatex [ dblatex @@ -50,7 +50,6 @@ python3.pkgs.buildPythonApplication rec { pythonPath = with python3.pkgs; [ pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42 - (anytree.override { withGraphviz = false; }) lxml ]; @@ -79,8 +78,8 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tools to extract documentation embedded in GTK and GNOME source code"; - homepage = "https://www.gtk.org/gtk-doc"; - license = licenses.gpl2; - maintainers = with maintainers; [ pSub worldofpeace ]; + homepage = "https://gitlab.gnome.org/GNOME/gtk-doc"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ pSub ]); }; } diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index c8e6cafa27af8..68be931aa444f 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdsh"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "02xslf5ssmyklbfsif2d7yk5aaz08n5w0dqiid6v4vlr2mkqcpjl"; + sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy"; }; - cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g"; + cargoSha256 = "10iqypz8hfyzy1xd78r39z2waa728d97kfnf1bbx8fr4a4pzan7y"; meta = with lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix index eb9589f723da4..a387c14c0a5c9 100644 --- a/pkgs/development/tools/errcheck/default.nix +++ b/pkgs/development/tools/errcheck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "errcheck"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "kisielk"; repo = "errcheck"; rev = "v${version}"; - sha256 = "sha256-ZmocFXtg+Thdup+RqDYC/Td3+m1nS0FydZecfsWXIzI="; + sha256 = "sha256-Przf2c2jFNdkUq7IOUD7ChXHiSayAz4xTsNzajycYZ0="; }; vendorSha256 = "sha256-rluaBdW+w2zPThELlBwX/6LXDgc2aIk/ucbrsrABpVc="; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 0fd9cf1f06ddf..f581806433f69 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "7.5.3"; + version = "7.5.4"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-XDfY/OnXSmgF2u8DMr+WgzNJD3VYw/hQ8v3cr4/jhVY="; + sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 89b9f1464950f..3187f793127ee 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,11 +1,10 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchgit }: -buildGoPackage rec { +buildGoModule rec { pname = "lint"; - version = "20181026-${lib.strings.substring 0 7 rev}"; - rev = "c67002cb31c3a748b7688c27f20d8358b4193582"; + version = "20201208-${lib.strings.substring 0 7 rev}"; + rev = "83fdc39ff7b56453e3793356bcff3070b9b96445"; - goPackagePath = "golang.org/x/lint"; excludedPackages = "testdata"; # we must allow references to the original `go` package, as golint uses @@ -15,15 +14,15 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://go.googlesource.com/lint"; - sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; + sha256 = "sha256-g4Z9PREOxGoN7n/XhutawsITBznJlbz6StXeDYvOQ1c="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-dPadFoymYu2Uw2AXZfbaBfxsN8IWMuK1TrcknHco3Bo="; meta = with lib; { homepage = "https://golang.org"; description = "Linter for Go source code"; license = licenses.bsd3; - maintainers = with maintainers; [ jhillyerd ]; + maintainers = with maintainers; [ jhillyerd tomberek ]; }; } diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix deleted file mode 100644 index e26400989338f..0000000000000 --- a/pkgs/development/tools/golint/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "91f80e683c10fea00e7f965a1a7cac482ce52541"; - sha256 = "16a2vppy5hnp663f28yak6592l8p968ihsc91pigamxx3vk1qh5d"; - }; - } -] diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 4d572e070e76d..c20d7a2e49a6f 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp"; }; - buildInputs = [ python makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python ]; installPhase = '' mkdir -p $out/bin $out/share/ diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 4203564ae4a54..364117577bc3c 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "865" "884" "8103" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "865" "884" "8104" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 97d1c75368211..e14cfe874040c 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ripayv1vf4f4ylxr7h9kad2xhy3y98ca8s4p38z7dn8l47zg0qw"; }; - buildInputs = [ makeWrapper jre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index c41fb4c639f3b..c10fa46f67004 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.65.1"; + version = "0.66.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-Puddnem03RGORKkvcLy5o/eOzKzrOuRvqPk5FsjQ3Lw="; + sha256 = "sha256-D7xZbuxSdE1zcyVZ9hqNOgq1oZDSFjBeITNqKXEpjyU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index 233b393387606..15a3a68340348 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; - buildInputs = [ env makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ env ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 4695585533237..f9d109f33879d 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectx"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "1c7y5hj4w72bm6y3riw0acayn4w9x7bbf1vykqcprbyw3a3dvcsw"; + sha256 = "sha256-anTogloat0YJN6LR6mww5IPwokHYoDY6L7i2pMzI8/M="; }; - vendorSha256 = "168hfdc2rfwpz2ls607bz5vsm1aw4brhwm8hmbiq1n1l2dn2dj0y"; + vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg="; doCheck = false; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index a2707eb72e99e..10e701d1e9300 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.24.2"; + version = "0.25.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0hy13l1v2kcsn99dswlq1hl0ly18cal387zhnzjfqv51qng2q5kq"; + sha256 = "sha256-A4Nim1jnyMHd5hxyLu8oZkQ9nDWxTmaX/25WX714ry4="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index da387105cef50..186608cde3f1a 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1"; }; - buildInputs = [ makeWrapper perl openssh rsync ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl openssh rsync ]; doCheck = true; diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 0f7edeea812f2..62aa0ab5decf6 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./backslashes-quotes.diff ]; - buildInputs = [ tk makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ tk ]; installPhase = '' mkdir -p $out/bin $out/share/${name} diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix new file mode 100644 index 0000000000000..357e3e98f081a --- /dev/null +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -0,0 +1,46 @@ +{ lib, buildPythonApplication, fetchFromGitHub, cmake, flex +, clang-unwrapped, llvm, unifdef +, pebble, psutil, pytestCheckHook, pytest-flake8 +}: + +buildPythonApplication rec { + pname = "cvise"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "marxin"; + repo = "cvise"; + rev = "v${version}"; + sha256 = "0ljl0r5jqj6lrddrbxjkcphcz5p4njnn2hqz07jyh30jd9sm7dmj"; + }; + + patches = [ + # Refer to unifdef by absolute path. + ./unifdef.patch + ]; + + nativeBuildInputs = [ cmake flex ]; + buildInputs = [ clang-unwrapped llvm unifdef ]; + propagatedBuildInputs = [ pebble psutil ]; + checkInputs = [ pytestCheckHook pytest-flake8 unifdef ]; + + preCheck = '' + patchShebangs cvise.py + ''; + disabledTests = [ + # Needs gcc, fails when run noninteractively (without tty). + "test_simple_reduction" + ]; + + dontUsePipInstall = true; + dontUseSetuptoolsBuild = true; + dontUseSetuptoolsCheck = true; + + meta = with lib; { + homepage = "https://github.com/marxin/cvise"; + description = "Super-parallel Python port of C-Reduce"; + license = licenses.ncsa; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/cvise/unifdef.patch b/pkgs/development/tools/misc/cvise/unifdef.patch new file mode 100644 index 0000000000000..d15ca6dce0bde --- /dev/null +++ b/pkgs/development/tools/misc/cvise/unifdef.patch @@ -0,0 +1,8 @@ +--- a/cvise.py ++++ b/cvise.py +@@ -93,4 +93,5 @@ def find_external_programs(): + # Special case for clang-format + programs['clang-format'] = '@CLANG_FORMAT_PATH@' ++ programs['unifdef'] = '@UNIFDEF@' + + return programs diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 285805ccb02c6..6125143457855 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd"; }; - buildInputs = [ expect makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ expect ]; doCheck = true; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 6f9f5e113c06c..47716b5ea9e8d 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { sha256 = "11479ac436g8bwk0lfnmdms0cirv9k11pdvfrrg9jwkki1j1abkk"; }; - nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - buildInputs = [ gettext libtool makeWrapper texinfo ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [ gettext libtool texinfo ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 13437b7195362..f5298d685eba7 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ globalplatform pcsclite makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ globalplatform pcsclite ]; postFixup = '' wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6afc4415e1138..ba1fa720dd40a 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -6,11 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "help2man-1.47.16"; + name = "help2man-1.47.17"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1x586h7wvripcay35kdh2kvydx84y8yy93ffjah2rqw6bc65iy1y"; + sha256 = "sha256-2jo1xQseH4yPoyLWn6R8kBHORDqPuNHWcbHwG4sACOs="; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 3fa2d219fe3a3..9ba19c836b597 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ./disable-nodejs-version-check.patch ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/libexec/kibana $out/bin diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 7f46d6f651201..754559969d50e 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { ./disable-nodejs-version-check-7.patch ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/libexec/kibana $out/bin diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index c92d7b077983c..f37815081ee46 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index d86277993caa9..b26fbf75031d0 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { inherit name; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # The default build phase (`make`) runs the test code. It's difficult to do # the test in the build environment because it depends on the system package diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 8a5cbbcfdfae4..9dfa5955f5c98 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scc"; - version = "2.13.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - sha256 = "16p5g20n5jsbisbgikk9xny94xx6c0dxf19saa686ghh31jr2hh3"; + sha256 = "sha256-G5LYOtAUnu82cgDdtYzcfVx/WFg9/HvFQAlQtd6GaDE="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 9695c75a3c161..eb823904eed20 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0WbUJYNRBKixRFl+YM1uSEltQneB6FYPFHNVVhmdseA="; + sha256 = "sha256-p9q+cSnMN6Na+XZoYSHfE4SCNYOEavXE+eWIaxcD73k="; }; - vendorSha256 = "sha256-WYTn2QoI1Z3L4Wxjrq0YT++X9vMA1Wm3zgl08CYiU1Y="; + vendorSha256 = "sha256-XOIs5Ng0FYz7OfwbrNiVN3GTIABqxlO8ITKGfnC+kWo="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index fb85aa80dc355..63452728b91e8 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation { { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh"; sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } ); - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "installPhase" ]; # TODO: load generator / monitoring agent only builds diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 31358129821eb..475c08eb169fa 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { ln -s $out/share/nwjs/nwjc $out/bin ''; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; meta = with lib; { description = "An app runtime based on Chromium and node.js"; diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index 72177582919a1..67a86ca8dec59 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "1cly9lhrawnc42r31b7r0p0i6hcx8r00aa17gv7w9pcpj8ngb4v2"; }; - buildInputs = [ makeWrapper nim pcre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ nim pcre ]; patches = [ (fetchpatch { diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index d3490b2b9c999..1356bc46ced80 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { ln -s $out/share/nwjs/nw $out/bin ''; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; meta = with lib; { description = "An app runtime based on Chromium and node.js"; diff --git a/pkgs/development/tools/ocaml/crunch/default.nix b/pkgs/development/tools/ocaml/crunch/default.nix index e48707dcb9af6..07082b7f5d22d 100644 --- a/pkgs/development/tools/ocaml/crunch/default.nix +++ b/pkgs/development/tools/ocaml/crunch/default.nix @@ -1,10 +1,12 @@ -{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, opaline, ptime }: +{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, ptime }: buildDunePackage rec { pname = "crunch"; version = "3.1.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-v${version}.tbz"; sha256 = "0d26715a4h9r1wibnc12xy690m1kan7hrcgbb5qk8x78zsr67lnf"; @@ -15,7 +17,7 @@ buildDunePackage rec { outputs = [ "lib" "bin" "out" ]; installPhase = '' - ${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib/ + dune install --prefix=$bin --libdir=$lib/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = { diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index c03dbf7562373..c14cd7ddc041a 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocp-index"; - version = "1.2.1"; + version = "1.2.2"; useDune2 = true; src = fetchzip { url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; - sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8"; + sha256 = "0k4i0aabyn750f4wqbnk0yv10kdjd6nhjw2pbmpc4cz639qcsm40"; }; buildInputs = [ cppo cmdliner re ]; @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocp-indent ]; meta = { - homepage = "http://typerex.ocamlpro.com/ocp-index.html"; + homepage = "https://www.typerex.org/ocp-index.html"; description = "A simple and light-weight documentation extractor for OCaml"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index b12aa2e6d6deb..c3da3bc2327aa 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; - version = "3.5.0"; + version = "3.7.0"; buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec src = fetchzip { url = "https://github.com/besport/${pname}/archive/${version}.tar.gz"; - sha256 = "1qsgwfl64b53w235wm7nnchqinzgsvd2gb52xm0kra2wlwp69rfq"; + sha256 = "sha256-PmdDyn+MUcNFrZpP/KLGQzdXUFRr+dYRAZjTZxHSeaw="; }; meta = { diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 047246cd0a0da..5a4b55cc7fec1 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { patchFlags = [ "-p0" ]; patches = [ ./warn.patch ]; - buildInputs = [ ocaml makeWrapper ncurses ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ocaml ncurses ]; phases = "unpackPhase patchPhase buildPhase"; buildPhase = '' diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index a128f2144e9f3..610093af19ffd 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -47,7 +47,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip curl ncurses ocaml ]; src = srcs.opam; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b99880fe7f33e..30bc089ee0fec 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -63,7 +63,8 @@ in stdenv.mkDerivation { pname = "opam"; version = "2.0.8"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; src = srcs.opam; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 8090fc6ff1f04..764041b6ad4a4 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -17,7 +17,8 @@ buildGoModule rec { subPackages = [ "cmd/operator-sdk" ]; - buildInputs = [ go makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ go ]; # operator-sdk uses the go compiler at runtime allowGoReference = true; diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 4547012e2f325..597d680cc2bbc 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "out-of-tree"; version = "1.4.0"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; src = fetchgit { rev = "refs/tags/v${version}"; diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 662961ae46aaf..42c9ee872fed0 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.7.4"; + version = "3.7.5"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1qkp2rfi5njyp5c5avajab00aj74pkmkgzkvshv4p2ydkhswgazv"; + sha256 = "sha256-FRy18ScW4/6TonoxfNRIeDKWWfJ1s0J3m/rvSlJrv3A="; }; nativeBuildInputs = [ m4 perl ] ++ lib.optional stdenv.isSunOS help2man; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index c5d65a8239eae..641c1581b0519 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -37,7 +37,7 @@ let in runCommand "systemtap-${kernel.version}-${version}" { inherit stapBuild kernelBuildDir; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; meta = { homepage = "https://sourceware.org/systemtap/"; repositories.git = url; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 71cf10e63b91a..94b5e5a6dcc20 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri"; }; - buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl bash diffutils patch findutils diffstat ]; postInstall = '' wrapProgram $out/bin/quilt --prefix PATH : \ diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 9e4ac0b58ebee..8b5166272202e 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = ["installPhase"]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix new file mode 100644 index 0000000000000..931fb8fd984ec --- /dev/null +++ b/pkgs/development/tools/rust/cargo-criterion/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-criterion"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "bheisler"; + repo = pname; + rev = version; + sha256 = "0czagclrn4yhlvlh06wsyiybz69r7mmk3182fywzn9vd0xlclxpi"; + }; + + cargoSha256 = "sha256-XZuZ81hB/GQDopJyfSkxQiehSwJz7VWoJR6/m3WLil8="; + + meta = with lib; { + description = "Cargo extension for running Criterion.rs benchmarks"; + homepage = "https://github.com/bheisler/cargo-criterion"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index ea7f01ada7737..b328f32dc265f 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-LXc4PFJ1FbdF3yotqqOkhhe+MKGZ4sqJgxAvDml9GeA="; + sha256 = "sha256-8wmH9DeI+tm3c/6n7bwMe5SslGNCUg4d5BE0+wQ7KTU="; }; - cargoSha256 = "sha256-4FFyRhmMpzKmKrvU2bmGHWUnLAbTDU1bPv7RfhQfYeY="; + cargoSha256 = "sha256-f0Wisel7NQOyfbhhs0GwyTBiUfydPMSVAysrov/RxxI="; doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/development/tools/rust/cargo-play/default.nix new file mode 100644 index 0000000000000..5e12c1cae1d22 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-play/default.nix @@ -0,0 +1,25 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-play"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "fanzeyi"; + repo = pname; + rev = "v${version}"; + sha256 = "01r00akfmvpzp924yqqybd9s0pwiwxy8vklsg4m9ypzljc3nlv02"; + }; + + cargoSha256 = "0fvsdyivq5991ka6avh12aqdkjx0myk61kmzlr19p2vlfpg70q07"; + + # some tests require internet access + doCheck = false; + + meta = with lib; { + description = "Run your rust code without setting up cargo"; + homepage = "https://github.com/fanzeyi/cargo-play"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index a941d43bb9d81..9432c4fd85d3d 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/pkgs/development/tools/rust/crate2nix/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "kolloch"; repo = pname; rev = version; - sha256 = "sha256-pqg1BsEq3kGmUzt1zpQvXgdnRcIsiuIyvtUBi3VxtZ4="; + sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM="; } + "/crate2nix"; - cargoSha256 = "sha256-dAMWrGNMleQ3lDbG46Hr4qvCyxR+QcPOUZw9r2/CxV4="; + cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index addcab582f6ea..e9a5150befa35 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-02-22"; + rev = "2021-03-01"; version = "unstable-${rev}"; - sha256 = "sha256-QiVSwpTTOqR2WEm0nXyLLavlF2DnY9GY93HtpgHt2uI="; - cargoSha256 = "sha256-934ApOv/PJzkLc/LChckb/ZXKrh4kU556Bo/Zck+q8g="; + sha256 = "10x4fk1nxk548cfxrbfvz0kpa2r955d0bcnxxn8k8zmrdqxs3sph"; + cargoSha256 = "02s6qnq61vifx59hnbaalqmfvp8anfik62y6rzy3rwm1l9r85qrz"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix deleted file mode 100644 index 2449769e07f3a..0000000000000 --- a/pkgs/development/tools/scaff/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }: - -rustPlatform.buildRustPackage rec { - pname = "scaff"; - version = "0.1.2"; - - src = fetchFromGitLab { - owner = "jD91mZM2"; - repo = pname; - rev = version; - - sha256 = "01yf2clf156qv2a6w866a2p8rc2dl8innxnsqrj244x54s1pk27r"; - }; - - cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; - - meta = with lib; { - description = "Painless and powerful scaffolding of projects"; - license = licenses.mit; - maintainers = with maintainers; [ jD91mZM2 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index 00fda8bfc3682..c27d6e8a65f39 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -19,7 +19,8 @@ in stdenv.mkDerivation { name = "${baseName}-${version}"; - buildInputs = [ jdk makeWrapper deps ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk deps ]; doCheck = true; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index c25190cab74e9..b029e7711a3ed 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { dontUnpack = true; - buildInputs = [ jdk makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk ]; installPhase = '' mkdir -p $out/share/lib/selendroid diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 10893a9d17001..c4f8653794fe1 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -18,7 +18,8 @@ in stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; installPhase = '' mkdir -p $out/share/lib/${pname}-${version} diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index 46f097e5b60a8..7b06e720caabb 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -1,15 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook -, boost, qt5, llvmPackages, gcc, jdk, pythonPackages, desktop-file-utils -, shared-mime-info, imagemagick, which, coreutils, maven, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, fetchpatch, cmake +, wrapQtAppsHook, qt5, boost, llvmPackages, gcc, jdk, maven, pythonPackages +, coreutils, which, desktop-file-utils, shared-mime-info, imagemagick, libicns +}: let # TODO: remove when version incompatibility issue with python3Packages.jedi is # resolved - parso = pythonPackages.callPackage ./parso.nix {}; + parso = pythonPackages.callPackage ./parso.nix { }; jedi = pythonPackages.callPackage ./jedi.nix { inherit parso; }; - pythonIndexer = pythonPackages.callPackage ./python.nix { inherit jedi parso; }; - javaIndexer = callPackage ./java.nix {}; + pythonIndexer = + pythonPackages.callPackage ./python.nix { inherit jedi parso; }; + javaIndexer = callPackage ./java.nix { }; + + appPrefixDir = if stdenv.isDarwin then + "$out/Applications/Sourcetrail.app/Contents" + else + "$out/opt/sourcetrail"; + appBinDir = + if stdenv.isDarwin then "${appPrefixDir}/MacOS" else "${appPrefixDir}/bin"; + appResourceDir = if stdenv.isDarwin then + "${appPrefixDir}/Resources" + else + "${appPrefixDir}/share"; # Upstream script: # https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/update_java_indexer.sh @@ -17,7 +30,7 @@ let #!${stdenv.shell} cd "$(dirname "$0")/.." - dst="$out/opt/sourcetrail/share/data/java/lib" + dst="${appResourceDir}/data/java/lib" mkdir -p "$dst" cp "${javaIndexer}/target/java-indexer-1.0.jar" "$dst/java-indexer.jar" @@ -29,12 +42,12 @@ let installPythonIndexer = writeScript "download_python_indexer.sh" '' #!${stdenv.shell} - mkdir -p $out/opt/sourcetrail/share/data - ln -s "${pythonIndexer}/bin" "$out/opt/sourcetrail/share/data/python" + mkdir -p ${appResourceDir}/data + ln -s "${pythonIndexer}/bin" "${appResourceDir}/data/python" ''; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "sourcetrail"; + # NOTE: skip 2020.4.35 https://github.com/CoatiSoftware/Sourcetrail/pull/1136 version = "2020.2.43"; src = fetchFromGitHub { @@ -45,7 +58,8 @@ stdenv.mkDerivation rec { }; patches = let - url = commit: "https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch"; + url = commit: + "https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch"; in [ ./disable-updates.patch ./disable-failing-tests.patch # FIXME: 5 test cases failing due to sandbox @@ -69,21 +83,22 @@ stdenv.mkDerivation rec { desktop-file-utils imagemagick javaIndexer # the resulting jar file is copied by our install script - ] ++ lib.optionals doCheck testBinPath; - buildInputs = [ - boost pythonIndexer shared-mime-info - ] ++ (with qt5; [ qtbase qtsvg ]) - ++ (with llvmPackages; [ libclang llvm ]); + ] ++ lib.optional (stdenv.isDarwin) libicns + ++ lib.optionals doCheck testBinPath; + buildInputs = [ boost pythonIndexer shared-mime-info ] + ++ (with qt5; [ qtbase qtsvg ]) ++ (with llvmPackages; [ libclang llvm ]); binPath = [ gcc jdk.jre maven which ]; testBinPath = binPath ++ [ coreutils ]; cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" "-DBUILD_CXX_LANGUAGE_PACKAGE=ON" - "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" "-DBUILD_JAVA_LANGUAGE_PACKAGE=ON" "-DBUILD_PYTHON_LANGUAGE_PACKAGE=ON" - ]; + ] ++ lib.optional stdenv.isLinux + "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" + ++ lib.optional stdenv.isDarwin + "-DClang_DIR=${llvmPackages.clang-unwrapped}"; postPatch = let major = lib.versions.major version; @@ -112,6 +127,8 @@ stdenv.mkDerivation rec { ln -sf ${installPythonIndexer} script/download_python_indexer.sh ''; + # Directory layout for Linux: + # # Sourcetrail doesn't use the usual cmake install() commands and instead uses # its own bash script for packaging. Since we're not able to reuse the script, # we'll have to roll our own in nixpkgs. @@ -141,7 +158,7 @@ stdenv.mkDerivation rec { # # nixpkgs # ├── bin/ - # │  └── sourcetrail* (wrapper for opt/sourcetrail/bin/sourcetrail) + # │  └── sourcetrail@ (symlink to opt/sourcetrail/bin/sourcetrail) # └── opt/sourcetrail/ # ├── bin/ # │  └── sourcetrail* @@ -151,35 +168,76 @@ stdenv.mkDerivation rec { # Upstream install script: # https://github.com/CoatiSoftware/Sourcetrail/blob/master/setup/Linux/createPackages.sh installPhase = '' - mkdir -p $out/opt/sourcetrail/bin - cp app/Sourcetrail $out/opt/sourcetrail/bin/sourcetrail - cp app/sourcetrail_indexer $out/opt/sourcetrail/bin/sourcetrail_indexer + runHook preInstall + + mkdir -p ${appResourceDir} + cp -R ../bin/app/data ${appResourceDir} + cp -R ../bin/app/user/projects ${appResourceDir}/data/fallback + rm -r ${appResourceDir}/data/install ${appResourceDir}/data/*_template.xml + + mkdir -p "${appBinDir}" + cp app/Sourcetrail ${appBinDir}/sourcetrail + cp app/sourcetrail_indexer ${appBinDir}/sourcetrail_indexer + wrapQtApp ${appBinDir}/sourcetrail \ + --prefix PATH : ${lib.makeBinPath binPath} + + mkdir -p $out/bin + '' + lib.optionalString (stdenv.isLinux) '' + ln -sf ${appBinDir}/sourcetrail $out/bin/sourcetrail desktop-file-install --dir=$out/share/applications \ - --set-key Exec --set-value $out/bin/sourcetrail \ + --set-key Exec --set-value ${appBinDir}/sourcetrail \ ../setup/Linux/data/sourcetrail.desktop mkdir -p $out/share/mime/packages cp ../setup/Linux/data/sourcetrail-mime.xml $out/share/mime/packages/ - mkdir -p $out/opt/sourcetrail/share - cp -R ../bin/app/data $out/opt/sourcetrail/share - cp -R ../bin/app/user/projects $out/opt/sourcetrail/share/data/fallback - rm $out/opt/sourcetrail/share/data/*_template.xml - rm -r $out/opt/sourcetrail/share/data/install - for size in 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/ - convert app/data/gui/icon/logo_1024_1024.png -resize ''${size}x''${size} \ + convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \ + -resize ''${size}x''${size} \ $out/share/icons/hicolor/''${size}x''${size}/apps/sourcetrail.png done + '' + lib.optionalString (stdenv.isDarwin) '' + # change case (some people *might* choose a case sensitive Nix store) + mv ${appBinDir}/sourcetrail{,.tmp} + mv ${appBinDir}/{sourcetrail.tmp,Sourcetrail} + mv ${appBinDir}/sourcetrail_indexer ${appResourceDir}/Sourcetrail_indexer - mkdir -p $out/bin - makeQtWrapper $out/opt/sourcetrail/bin/sourcetrail $out/bin/sourcetrail \ - --prefix PATH : ${lib.makeBinPath binPath} + ln -sf ${appBinDir}/Sourcetrail $out/bin/sourcetrail + + cp app/bundle_info.plist ${appPrefixDir}/Info.plist + + mkdir -p ${appResourceDir}/icon.iconset + for size in 16 32 128 256 512; do + convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \ + -resize ''${size}x''${size} \ + ${appResourceDir}/icon.iconset/icon_''${size}x''${size}.png + convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \ + -resize $(( 2 * size ))x$(( 2 * size )) \ + ${appResourceDir}/icon.iconset/icon_''${size}x''${size}@2x.png + done + png2icns ${appResourceDir}/icon.icns \ + ${appResourceDir}/icon.iconset/icon_{16x16,32x32,128x128,256x256,512x512,512x512@2x}.png + + mkdir -p ${appResourceDir}/project.iconset + for size in 16 32 64 128 256 512; do + convert ${appResourceDir}/data/gui/icon/project_256_256.png \ + -resize ''${size}x''${size} \ + ${appResourceDir}/project.iconset/icon_''${size}x''${size}.png + convert ${appResourceDir}/data/gui/icon/project_256_256.png \ + -resize $(( 2 * size ))x$(( 2 * size )) \ + ${appResourceDir}/project.iconset/icon_''${size}x''${size}@2x.png + done + png2icns ${appResourceDir}/project.icns \ + ${appResourceDir}/project.iconset/icon_{16x16,32x32,128x128,256x256,512x512,512x512@2x}.png + '' + '' + runHook postInstall ''; checkPhase = '' + runHook preCheck + rm -rf ../bin/app/data/{python,java/lib} ln -s $out/opt/sourcetrail/share/data/python ../bin/app/data/python ln -s $out/opt/sourcetrail/share/data/java/lib ../bin/app/data/java/lib @@ -194,20 +252,24 @@ stdenv.mkDerivation rec { popd rm ../bin/app/data/{python,java/lib} + + runHook postCheck ''; # This has to be done manually in the installPhase because the actual binary # lives in $out/opt/sourcetrail/bin, which isn't covered by wrapQtAppsHook dontWrapQtApps = true; - # FIXME: some test cases are disabled in the patch phase - doCheck = true; + # FIXME: Some test cases are disabled in the patch phase. + # FIXME: Tests are disabled on some platforms because of faulty detection + # logic for libjvm.so. Should work with manual configuration. + doCheck = !stdenv.isDarwin && stdenv.isx86_64; meta = with lib; { homepage = "https://www.sourcetrail.com"; description = "A cross-platform source explorer for C/C++ and Java"; platforms = platforms.all; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ midchildan ]; }; } diff --git a/pkgs/development/tools/sourcetrail/python.nix b/pkgs/development/tools/sourcetrail/python.nix index 8ec9c9a2297f9..f9ea964632079 100644 --- a/pkgs/development/tools/sourcetrail/python.nix +++ b/pkgs/development/tools/sourcetrail/python.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { make -j $NIX_BUILD_CORES popd popd + '' + lib.optionalString stdenv.isDarwin '' + pushd SourcetrailDB/build/bindings_python + cp _sourcetraildb.dylib _sourcetraildb.so + popd ''; checkPhase = '' @@ -52,7 +56,7 @@ stdenv.mkDerivation rec { pushd SourcetrailDB/build/bindings_python cp sourcetraildb.py $out/libexec - cp _sourcetraildb* $out/libexec/_sourcetraildb.so + cp _sourcetraildb.so $out/libexec/_sourcetraildb.so popd wrapPythonProgramsIn "$out/libexec" "$pythonPath" @@ -64,7 +68,5 @@ stdenv.mkDerivation rec { description = "Python indexer for Sourcetrail"; homepage = "https://github.com/CoatiSoftware/SourcetrailPythonIndexer"; license = licenses.gpl3; - broken = stdenv.isDarwin; - # https://github.com/NixOS/nixpkgs/pull/107533#issuecomment-751063675 }; } diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index cdf2242bdbaa2..ef04725e562f8 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = [ perlPackages.perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; postInstall = '' wrapProgram $out/bin/sslmate --prefix PERL5LIB : \ diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index e8f52fa83345a..6d7fbef2f19b7 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-jTZso61Lyt6jprBxBAhvchgOsgM9y1qBleTxUx1jCnE="; checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ]; - cargoParallelTestThreads = false; + dontUseCargoParallelTests = true; postInstall = '' $out/bin/the-way config default tmp.toml diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index 44dfa1a4ba11c..02183282ce163 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -22,7 +22,8 @@ in stdenv.mkDerivation rec { sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc"; }; - buildInputs = [ thrustEnv makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ thrustEnv unzip ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 94ee6d3a1bac6..9c6d3ed8cb896 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -18,7 +18,11 @@ rustPlatform.buildRustPackage rec { sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr"; }; - cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s"; + cargoPatches = [ + ./update-deps.patch + ]; + + cargoSha256 = "0br7r8wz3knzgl3gjpq6z8w33my0yiaq711s1wih9jizhia02y5r"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/wasm-pack/update-deps.patch b/pkgs/development/tools/wasm-pack/update-deps.patch new file mode 100644 index 0000000000000..d61067438eebd --- /dev/null +++ b/pkgs/development/tools/wasm-pack/update-deps.patch @@ -0,0 +1,3625 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 9737a15..229ec35 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,2439 +1,2574 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.14.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" ++ + [[package]] + name = "adler32" +-version = "1.0.4" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + + [[package]] + name = "aho-corasick" +-version = "0.7.7" ++version = "0.7.15" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" + dependencies = [ +- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", + ] + + [[package]] + name = "ansi_term" + version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9", + ] + + [[package]] + name = "arrayref" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + + [[package]] + name = "arrayvec" +-version = "0.5.1" ++version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + + [[package]] + name = "assert_cmd" + version = "0.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" + dependencies = [ +- "escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "escargot", ++ "predicates", ++ "predicates-core", ++ "predicates-tree", + ] + + [[package]] + name = "atty" + version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" + dependencies = [ +- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", ++ "winapi 0.3.9", + ] + + [[package]] + name = "autocfg" + version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + + [[package]] + name = "autocfg" +-version = "1.0.0" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + + [[package]] + name = "backtrace" +-version = "0.3.43" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- +-[[package]] +-name = "backtrace-sys" +-version = "0.1.32" ++version = "0.3.56" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" + dependencies = [ +- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "addr2line", ++ "cfg-if 1.0.0", ++ "libc", ++ "miniz_oxide 0.4.3", ++ "object", ++ "rustc-demangle", + ] + + [[package]] + name = "base64" + version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" + dependencies = [ +- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", + ] + + [[package]] + name = "base64" +-version = "0.11.0" ++version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + + [[package]] + name = "binary-install" + version = "0.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b5bc5f8c50dd6a80d0b303ddab79f42ddcb52fd43d68107ecf622c551fd4cd4" + dependencies = [ +- "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "is_executable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", +- "zip 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl", ++ "dirs", ++ "failure", ++ "flate2", ++ "hex", ++ "is_executable", ++ "siphasher", ++ "tar", ++ "zip", + ] + + [[package]] + name = "bitflags" + version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + + [[package]] + name = "blake2b_simd" +-version = "0.5.10" ++version = "0.5.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" + dependencies = [ +- "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", + ] + + [[package]] + name = "byteorder" +-version = "1.3.2" ++version = "1.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" + + [[package]] + name = "bytes" + version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" + dependencies = [ +- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "either", ++ "iovec", + ] + + [[package]] + name = "bzip2" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" + dependencies = [ +- "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bzip2-sys", ++ "libc", + ] + + [[package]] + name = "bzip2-sys" +-version = "0.1.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- +-[[package]] +-name = "c2-chacha" +-version = "0.2.3" ++version = "0.1.10+1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c" + dependencies = [ +- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", ++ "pkg-config", + ] + + [[package]] + name = "cargo_metadata" + version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426" + dependencies = [ +- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver", ++ "serde", ++ "serde_derive", ++ "serde_json", + ] + + [[package]] + name = "cc" +-version = "1.0.50" ++version = "1.0.67" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" + + [[package]] + name = "cfg-if" + version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + + [[package]] +-name = "chrono" +-version = "0.4.10" ++name = "cfg-if" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] +-name = "clap" +-version = "2.33.0" ++name = "chrono" ++version = "0.4.19" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" + dependencies = [ +- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", ++ "winapi 0.3.9", + ] + + [[package]] +-name = "clicolors-control" +-version = "0.2.0" ++name = "clap" ++version = "2.33.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" + dependencies = [ +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", + ] + + [[package]] + name = "clicolors-control" +-version = "1.0.1" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1" + dependencies = [ +- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys", ++ "lazy_static 0.2.11", ++ "libc", ++ "winapi 0.3.9", + ] + + [[package]] + name = "cloudabi" + version = "0.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", + ] + + [[package]] + name = "console" + version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6" + dependencies = [ +- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty", ++ "clicolors-control", ++ "lazy_static 1.4.0", ++ "libc", ++ "parking_lot 0.11.1", ++ "regex", ++ "termios", ++ "unicode-width", ++ "winapi 0.3.9", + ] + + [[package]] + name = "console" +-version = "0.9.2" ++version = "0.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa" + dependencies = [ +- "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encode_unicode", ++ "lazy_static 1.4.0", ++ "libc", ++ "regex", ++ "terminal_size", ++ "unicode-width", ++ "winapi 0.3.9", + ] + + [[package]] + name = "constant_time_eq" + version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + + [[package]] + name = "cookie" + version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" + dependencies = [ +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time", ++ "url 1.7.2", + ] + + [[package]] + name = "cookie_store" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" + dependencies = [ +- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +- "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cookie", ++ "failure", ++ "idna 0.1.5", ++ "log", ++ "publicsuffix", ++ "serde", ++ "serde_json", ++ "time", ++ "try_from", ++ "url 1.7.2", + ] + + [[package]] + name = "core-foundation" +-version = "0.6.4" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" + dependencies = [ +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", + ] + + [[package]] + name = "core-foundation-sys" +-version = "0.6.2" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + + [[package]] + name = "crc32fast" +-version = "1.2.0" ++version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "crossbeam-deque" +-version = "0.7.2" ++version = "0.7.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" + dependencies = [ +- "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-epoch", ++ "crossbeam-utils 0.7.2", ++ "maybe-uninit", + ] + + [[package]] + name = "crossbeam-epoch" +-version = "0.8.0" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "cfg-if 0.1.10", ++ "crossbeam-utils 0.7.2", ++ "lazy_static 1.4.0", ++ "maybe-uninit", ++ "memoffset", ++ "scopeguard 1.1.0", + ] + + [[package]] + name = "crossbeam-queue" +-version = "0.1.2" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" + dependencies = [ +- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", ++ "crossbeam-utils 0.7.2", ++ "maybe-uninit", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.6.6" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "cfg-if 0.1.10", ++ "lazy_static 1.4.0", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.7.0" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bae8f328835f8f5a6ceb6a7842a7f2d0c03692adb5c889347235d59194731fe3" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "cfg-if 1.0.0", ++ "lazy_static 1.4.0", ++ "loom", + ] + + [[package]] + name = "curl" +-version = "0.4.25" ++version = "0.4.34" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e" + dependencies = [ +- "curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl-sys", ++ "libc", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "socket2", ++ "winapi 0.3.9", + ] + + [[package]] + name = "curl-sys" +-version = "0.4.25" ++version = "0.4.40+curl-7.75.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ffafc1c35958318bd7fdd0582995ce4c72f4f461a8e70499ccee83a619fd562" + dependencies = [ +- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++ "winapi 0.3.9", + ] + + [[package]] + name = "dialoguer" + version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ad1c29a0368928e78c551354dbff79f103a962ad820519724ef0d74f1c62fa9" + dependencies = [ +- "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "console 0.14.0", ++ "lazy_static 1.4.0", ++ "tempfile 2.2.0", + ] + + [[package]] + name = "difference" + version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + + [[package]] + name = "dirs" + version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" + dependencies = [ +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "redox_users", ++ "winapi 0.3.9", + ] + + [[package]] + name = "dtoa" +-version = "0.4.5" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" + + [[package]] + name = "either" +-version = "1.5.3" ++version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + + [[package]] + name = "encode_unicode" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + + [[package]] + name = "encoding_rs" +-version = "0.8.22" ++version = "0.8.28" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "env_logger" + version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" + dependencies = [ +- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty", ++ "humantime", ++ "log", ++ "termcolor", + ] + + [[package]] + name = "error-chain" +-version = "0.12.1" ++version = "0.12.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" + dependencies = [ +- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check", + ] + + [[package]] + name = "escargot" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0", ++ "log", ++ "serde", ++ "serde_json", + ] + + [[package]] + name = "failure" +-version = "0.1.6" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" + dependencies = [ +- "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace", ++ "failure_derive", + ] + + [[package]] + name = "failure_derive" +-version = "0.1.6" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" + dependencies = [ +- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.24", ++ "quote 1.0.9", ++ "syn 1.0.60", ++ "synstructure", + ] + + [[package]] + name = "filetime" +-version = "0.2.8" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "libc", ++ "redox_syscall 0.2.5", ++ "winapi 0.3.9", + ] + + [[package]] + name = "flate2" +-version = "1.0.13" ++version = "1.0.14" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", ++ "crc32fast", ++ "libc", ++ "miniz_oxide 0.3.7", + ] + + [[package]] + name = "float-cmp" +-version = "0.5.3" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" + dependencies = [ +- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits", + ] + + [[package]] + name = "fnv" +-version = "1.0.6" ++version = "1.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + + [[package]] + name = "foreign-types" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" + dependencies = [ +- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types-shared", + ] + + [[package]] + name = "foreign-types-shared" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "form_urlencoded" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" ++dependencies = [ ++ "matches", ++ "percent-encoding 2.1.0", ++] + + [[package]] + name = "fuchsia-cprng" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + + [[package]] + name = "fuchsia-zircon" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "fuchsia-zircon-sys", + ] + + [[package]] + name = "fuchsia-zircon-sys" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + + [[package]] + name = "futures" +-version = "0.1.29" ++version = "0.1.30" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" + + [[package]] + name = "futures-cpupool" + version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" + dependencies = [ +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures", ++ "num_cpus", ++] ++ ++[[package]] ++name = "generator" ++version = "0.6.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c" ++dependencies = [ ++ "cc", ++ "libc", ++ "log", ++ "rustversion", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", + ] + + [[package]] + name = "getrandom" +-version = "0.1.14" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.10.2+wasi-snapshot-preview1", + ] + ++[[package]] ++name = "gimli" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" ++ + [[package]] + name = "glob" + version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" + + [[package]] + name = "h2" + version = "0.1.26" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" + dependencies = [ +- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "bytes", ++ "fnv", ++ "futures", ++ "http", ++ "indexmap", ++ "log", ++ "slab", ++ "string", ++ "tokio-io", + ] + ++[[package]] ++name = "hashbrown" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++ + [[package]] + name = "heck" +-version = "0.3.1" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" + dependencies = [ +- "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation", + ] + + [[package]] + name = "hermit-abi" +-version = "0.1.6" ++version = "0.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" + dependencies = [ +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "hex" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + + [[package]] + name = "http" + version = "0.1.21" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" + dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "fnv", ++ "itoa", + ] + + [[package]] + name = "http-body" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" + dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "futures", ++ "http", ++ "tokio-buf", + ] + + [[package]] + name = "httparse" +-version = "1.3.4" ++version = "1.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" + + [[package]] + name = "human-panic" +-version = "1.0.1" ++version = "1.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "39f357a500abcbd7c5f967c1d45c8838585b36743823b9d43488f24850534e36" + dependencies = [ +- "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace", ++ "os_type", ++ "serde", ++ "serde_derive", ++ "termcolor", ++ "toml 0.5.8", ++ "uuid 0.8.2", + ] + + [[package]] + name = "humantime" + version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" + dependencies = [ +- "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error", + ] + + [[package]] + name = "hyper" +-version = "0.12.35" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++version = "0.12.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" ++dependencies = [ ++ "bytes", ++ "futures", ++ "futures-cpupool", ++ "h2", ++ "http", ++ "http-body", ++ "httparse", ++ "iovec", ++ "itoa", ++ "log", ++ "net2", ++ "rustc_version", ++ "time", ++ "tokio", ++ "tokio-buf", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-reactor", ++ "tokio-tcp", ++ "tokio-threadpool", ++ "tokio-timer", ++ "want", + ] + + [[package]] + name = "hyper-tls" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" + dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", +- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "futures", ++ "hyper", ++ "native-tls", ++ "tokio-io", + ] + + [[package]] + name = "idna" + version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", + ] + + [[package]] + name = "idna" +-version = "0.2.0" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", + ] + + [[package]] + name = "indexmap" +-version = "1.3.1" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" ++dependencies = [ ++ "autocfg 1.0.1", ++ "hashbrown", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" + dependencies = [ +- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", + ] + + [[package]] + name = "iovec" + version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" + dependencies = [ +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "is_executable" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "302d553b8abc8187beb7d663e34c065ac4570b273bc9511a50e940e99409c577" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9", + ] + + [[package]] + name = "itoa" +-version = "0.4.5" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + + [[package]] + name = "kernel32-sys" + version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" + dependencies = [ +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8", ++ "winapi-build", + ] + + [[package]] + name = "lazy_static" + version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" + + [[package]] + name = "lazy_static" + version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.66" ++version = "0.2.86" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" + + [[package]] + name = "libz-sys" +-version = "1.0.25" ++version = "1.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" + dependencies = [ +- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", + ] + + [[package]] + name = "lock_api" + version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" + dependencies = [ +- "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "owning_ref", ++ "scopeguard 0.3.3", + ] + + [[package]] + name = "lock_api" +-version = "0.3.3" ++version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" + dependencies = [ +- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 1.1.0", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" ++dependencies = [ ++ "scopeguard 1.1.0", + ] + + [[package]] + name = "log" +-version = "0.4.8" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "loom" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d44c73b4636e497b4917eb21c33539efa3816741a2d3ff26c6316f1b529481a4" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "generator", ++ "scoped-tls", + ] + + [[package]] + name = "matches" + version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + + [[package]] + name = "maybe-uninit" + version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + + [[package]] + name = "memchr" +-version = "2.3.0" ++version = "2.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + + [[package]] + name = "memoffset" +-version = "0.5.3" ++version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" + dependencies = [ +- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", + ] + + [[package]] + name = "mime" + version = "0.3.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + + [[package]] + name = "mime_guess" +-version = "2.0.1" ++version = "2.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" + dependencies = [ +- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime", ++ "unicase", + ] + + [[package]] + name = "miniz_oxide" +-version = "0.3.5" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" + dependencies = [ +- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "adler32", ++] ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" ++dependencies = [ ++ "adler", ++ "autocfg 1.0.1", + ] + + [[package]] + name = "mio" +-version = "0.6.21" ++version = "0.6.23" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", + ] + + [[package]] + name = "miow" +-version = "0.2.1" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" + dependencies = [ +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", + ] + + [[package]] + name = "native-tls" +-version = "0.2.3" ++version = "0.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile 3.2.0", + ] + + [[package]] + name = "net2" +-version = "0.2.33" ++version = "0.2.37" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", ++ "libc", ++ "winapi 0.3.9", + ] + + [[package]] + name = "normalize-line-endings" +-version = "0.2.2" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + + [[package]] + name = "num-integer" +-version = "0.1.42" ++version = "0.1.44" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" + dependencies = [ +- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "num-traits", + ] + + [[package]] + name = "num-traits" +-version = "0.2.11" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" + dependencies = [ +- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", + ] + + [[package]] + name = "num_cpus" +-version = "1.12.0" ++version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" + dependencies = [ +- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", + ] + ++[[package]] ++name = "object" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" ++ ++[[package]] ++name = "once_cell" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd" ++ + [[package]] + name = "openssl" +-version = "0.10.27" ++version = "0.10.32" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cfg-if 1.0.0", ++ "foreign-types", ++ "lazy_static 1.4.0", ++ "libc", ++ "openssl-sys", + ] + + [[package]] + name = "openssl-probe" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + + [[package]] + name = "openssl-src" +-version = "111.6.1+1.1.1d" ++version = "111.14.0+1.1.1j" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "055b569b5bd7e5462a1700f595c7c7d487691d73b5ce064176af7f9f0cbb80a9" + dependencies = [ +- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", + ] + + [[package]] + name = "openssl-sys" +-version = "0.9.54" ++version = "0.9.60" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6" + dependencies = [ +- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.1", ++ "cc", ++ "libc", ++ "openssl-src", ++ "pkg-config", ++ "vcpkg", + ] + + [[package]] + name = "os_type" + version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" + dependencies = [ +- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex", + ] + + [[package]] + name = "owning_ref" +-version = "0.4.0" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" + dependencies = [ +- "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "stable_deref_trait", + ] + + [[package]] + name = "parking_lot" + version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" + dependencies = [ +- "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lock_api 0.1.5", ++ "parking_lot_core 0.3.1", + ] + + [[package]] + name = "parking_lot" + version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" + dependencies = [ +- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lock_api 0.3.4", ++ "parking_lot_core 0.6.2", ++ "rustc_version", + ] + + [[package]] + name = "parking_lot" +-version = "0.10.0" ++version = "0.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" + dependencies = [ +- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "instant", ++ "lock_api 0.4.2", ++ "parking_lot_core 0.8.3", + ] + + [[package]] + name = "parking_lot_core" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" + dependencies = [ +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "rand 0.5.6", ++ "rustc_version", ++ "smallvec 0.6.14", ++ "winapi 0.3.9", + ] + + [[package]] + name = "parking_lot_core" + version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", ++ "cloudabi", ++ "libc", ++ "redox_syscall 0.1.57", ++ "rustc_version", ++ "smallvec 0.6.14", ++ "winapi 0.3.9", + ] + + [[package]] + name = "parking_lot_core" +-version = "0.7.0" ++version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "instant", ++ "libc", ++ "redox_syscall 0.2.5", ++ "smallvec 1.6.1", ++ "winapi 0.3.9", + ] + + [[package]] + name = "percent-encoding" + version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + + [[package]] + name = "percent-encoding" + version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + + [[package]] + name = "pkg-config" +-version = "0.3.17" +-source = "registry+https://github.com/rust-lang/crates.io-index" +- +-[[package]] +-name = "podio" +-version = "0.1.6" ++version = "0.3.19" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + + [[package]] + name = "ppv-lite86" +-version = "0.2.6" ++version = "0.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + + [[package]] + name = "predicates" +-version = "1.0.2" ++version = "1.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eeb433456c1a57cc93554dea3ce40b4c19c4057e41c55d4a0f3d84ea71c325aa" + dependencies = [ +- "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "difference", ++ "float-cmp", ++ "normalize-line-endings", ++ "predicates-core", ++ "regex", + ] + + [[package]] + name = "predicates-core" +-version = "1.0.0" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" + + [[package]] + name = "predicates-tree" +-version = "1.0.0" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" + dependencies = [ +- "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "predicates-core", ++ "treeline", + ] + + [[package]] + name = "proc-macro2" + version = "0.4.30" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" + dependencies = [ +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0", + ] + + [[package]] + name = "proc-macro2" +-version = "1.0.8" ++version = "1.0.24" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" + dependencies = [ +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.1", + ] + + [[package]] + name = "publicsuffix" + version = "1.5.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" + dependencies = [ +- "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "error-chain", ++ "idna 0.2.2", ++ "lazy_static 1.4.0", ++ "regex", ++ "url 2.2.1", + ] + + [[package]] + name = "quick-error" + version = "1.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + + [[package]] + name = "quote" + version = "0.6.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" + dependencies = [ +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30", + ] + + [[package]] + name = "quote" +-version = "1.0.2" ++version = "1.0.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" + dependencies = [ +- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.24", + ] + + [[package]] + name = "rand" + version = "0.3.23" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" + dependencies = [ +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "rand 0.4.6", + ] + + [[package]] + name = "rand" + version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" + dependencies = [ +- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.3.1", ++ "rdrand", ++ "winapi 0.3.9", + ] + + [[package]] + name = "rand" + version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" + dependencies = [ +- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.3.1", ++ "winapi 0.3.9", + ] + + [[package]] + name = "rand" + version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "libc", ++ "rand_chacha 0.1.1", ++ "rand_core 0.4.2", ++ "rand_hc 0.1.0", ++ "rand_isaac", ++ "rand_jitter", ++ "rand_os", ++ "rand_pcg", ++ "rand_xorshift", ++ "winapi 0.3.9", + ] + + [[package]] + name = "rand" +-version = "0.7.3" ++version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" + dependencies = [ +- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "rand_chacha 0.3.0", ++ "rand_core 0.6.2", ++ "rand_hc 0.3.0", + ] + + [[package]] + name = "rand_chacha" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "rand_chacha" +-version = "0.2.1" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" + dependencies = [ +- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", ++ "rand_core 0.6.2", + ] + + [[package]] + name = "rand_core" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" + dependencies = [ +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2", + ] + + [[package]] + name = "rand_core" + version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + + [[package]] + name = "rand_core" +-version = "0.5.1" ++version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" + dependencies = [ +- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.2.2", + ] + + [[package]] + name = "rand_hc" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "rand_hc" +-version = "0.2.0" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" + dependencies = [ +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.6.2", + ] + + [[package]] + name = "rand_isaac" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "rand_jitter" + version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" + dependencies = [ +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "rand_core 0.4.2", ++ "winapi 0.3.9", + ] + + [[package]] + name = "rand_os" + version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" + dependencies = [ +- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.4.2", ++ "rdrand", ++ "winapi 0.3.9", + ] + + [[package]] + name = "rand_pcg" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.4.2", + ] + + [[package]] + name = "rand_xorshift" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "rdrand" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "redox_syscall" +-version = "0.1.56" ++version = "0.1.57" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++dependencies = [ ++ "bitflags", ++] + + [[package]] + name = "redox_users" +-version = "0.3.4" ++version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" + dependencies = [ +- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.16", ++ "redox_syscall 0.1.57", ++ "rust-argon2", + ] + + [[package]] + name = "regex" +-version = "1.3.4" ++version = "1.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" + dependencies = [ +- "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", + ] + + [[package]] + name = "regex-syntax" +-version = "0.6.14" ++version = "0.6.22" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" + + [[package]] + name = "remove_dir_all" +-version = "0.5.2" ++version = "0.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9", + ] + + [[package]] + name = "reqwest" + version = "0.9.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)", +- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", +- "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" ++dependencies = [ ++ "base64 0.10.1", ++ "bytes", ++ "cookie", ++ "cookie_store", ++ "encoding_rs", ++ "flate2", ++ "futures", ++ "http", ++ "hyper", ++ "hyper-tls", ++ "log", ++ "mime", ++ "mime_guess", ++ "native-tls", ++ "serde", ++ "serde_json", ++ "serde_urlencoded", ++ "time", ++ "tokio", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-threadpool", ++ "tokio-timer", ++ "url 1.7.2", ++ "uuid 0.7.4", ++ "winreg", + ] + + [[package]] + name = "rust-argon2" +-version = "0.7.0" ++version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" + dependencies = [ +- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64 0.13.0", ++ "blake2b_simd", ++ "constant_time_eq", ++ "crossbeam-utils 0.8.2", + ] + + [[package]] + name = "rustc-demangle" +-version = "0.1.16" ++version = "0.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" + + [[package]] + name = "rustc_version" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" + dependencies = [ +- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver", + ] + ++[[package]] ++name = "rustversion" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" ++ + [[package]] + name = "ryu" +-version = "1.0.2" ++version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + + [[package]] + name = "same-file" + version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" + dependencies = [ +- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", + ] + + [[package]] + name = "schannel" +-version = "0.1.16" ++version = "0.1.19" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0", ++ "winapi 0.3.9", + ] + ++[[package]] ++name = "scoped-tls" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" ++ + [[package]] + name = "scopeguard" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" + + [[package]] + name = "scopeguard" +-version = "1.0.0" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + + [[package]] + name = "security-framework" +-version = "0.3.4" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" + dependencies = [ +- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", + ] + + [[package]] + name = "security-framework-sys" +-version = "0.3.3" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" + dependencies = [ +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", + ] + + [[package]] + name = "semver" + version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" + dependencies = [ +- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver-parser", ++ "serde", + ] + + [[package]] + name = "semver-parser" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + + [[package]] + name = "serde" +-version = "1.0.104" ++version = "1.0.123" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" + dependencies = [ +- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.104" ++version = "1.0.123" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" + dependencies = [ +- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.24", ++ "quote 1.0.9", ++ "syn 1.0.60", + ] + + [[package]] + name = "serde_ignored" + version = "0.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" + dependencies = [ +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", + ] + + [[package]] + name = "serde_json" +-version = "1.0.45" ++version = "1.0.62" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" + dependencies = [ +- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa", ++ "ryu", ++ "serde", + ] + + [[package]] + name = "serde_urlencoded" + version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" + dependencies = [ +- "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa", ++ "itoa", ++ "serde", ++ "url 1.7.2", + ] + + [[package]] + name = "serial_test" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0", + ] + + [[package]] + name = "serial_test_derive" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01" + dependencies = [ +- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13", ++ "syn 0.15.44", + ] + + [[package]] + name = "siphasher" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + + [[package]] + name = "slab" + version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + + [[package]] + name = "smallvec" +-version = "0.6.13" ++version = "0.6.14" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" + dependencies = [ +- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "maybe-uninit", + ] + + [[package]] + name = "smallvec" +-version = "1.2.0" ++version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + + [[package]] + name = "socket2" +-version = "0.3.11" ++version = "0.3.19" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "libc", ++ "winapi 0.3.9", + ] + + [[package]] + name = "stable_deref_trait" +-version = "1.1.1" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + + [[package]] + name = "string" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" + dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", + ] + + [[package]] + name = "strsim" + version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + + [[package]] + name = "structopt" + version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" + dependencies = [ +- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap", ++ "structopt-derive", + ] + + [[package]] + name = "structopt-derive" + version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" + dependencies = [ +- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck", ++ "proc-macro2 0.4.30", ++ "quote 0.6.13", ++ "syn 0.15.44", + ] + + [[package]] + name = "syn" + version = "0.15.44" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" + dependencies = [ +- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30", ++ "quote 0.6.13", ++ "unicode-xid 0.1.0", + ] + + [[package]] + name = "syn" +-version = "1.0.14" ++version = "1.0.60" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" + dependencies = [ +- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.24", ++ "quote 1.0.9", ++ "unicode-xid 0.2.1", + ] + + [[package]] + name = "synstructure" +-version = "0.12.3" ++version = "0.12.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" + dependencies = [ +- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.24", ++ "quote 1.0.9", ++ "syn 1.0.60", ++ "unicode-xid 0.2.1", + ] + + [[package]] + name = "tar" +-version = "0.4.26" ++version = "0.4.33" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228" + dependencies = [ +- "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- +-[[package]] +-name = "tempdir" +-version = "0.3.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "filetime", ++ "libc", ++ "xattr", + ] + + [[package]] + name = "tempfile" + version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" + dependencies = [ +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys", ++ "libc", ++ "rand 0.3.23", ++ "redox_syscall 0.1.57", ++ "winapi 0.2.8", + ] + + [[package]] + name = "tempfile" +-version = "3.1.0" ++version = "3.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 1.0.0", ++ "libc", ++ "rand 0.8.3", ++ "redox_syscall 0.2.5", ++ "remove_dir_all", ++ "winapi 0.3.9", + ] + + [[package]] + name = "termcolor" +-version = "0.3.6" ++version = "1.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" + dependencies = [ +- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", + ] + + [[package]] +-name = "termcolor" +-version = "1.1.0" ++name = "terminal_size" ++version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" + dependencies = [ +- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi 0.3.9", + ] + + [[package]] + name = "termios" +-version = "0.3.1" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" + dependencies = [ +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "textwrap" + version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" + dependencies = [ +- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" ++dependencies = [ ++ "proc-macro2 1.0.24", ++ "quote 1.0.9", ++ "syn 1.0.60", + ] + + [[package]] + name = "thread_local" +-version = "1.0.1" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "once_cell", + ] + + [[package]] + name = "time" +-version = "0.1.42" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" ++dependencies = [ ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" + dependencies = [ +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tinyvec_macros", + ] + ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ + [[package]] + name = "tokio" + version = "0.1.22" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" + dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "futures", ++ "mio", ++ "num_cpus", ++ "tokio-current-thread", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-reactor", ++ "tokio-tcp", ++ "tokio-threadpool", ++ "tokio-timer", + ] + + [[package]] + name = "tokio-buf" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" + dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "either", ++ "futures", + ] + + [[package]] + name = "tokio-current-thread" +-version = "0.1.6" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" + dependencies = [ +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures", ++ "tokio-executor", + ] + + [[package]] + name = "tokio-executor" +-version = "0.1.9" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" + dependencies = [ +- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.2", ++ "futures", + ] + + [[package]] + name = "tokio-io" +-version = "0.1.12" ++version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" + dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "futures", ++ "log", + ] + + [[package]] + name = "tokio-reactor" +-version = "0.1.11" ++version = "0.1.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" + dependencies = [ +- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.2", ++ "futures", ++ "lazy_static 1.4.0", ++ "log", ++ "mio", ++ "num_cpus", ++ "parking_lot 0.9.0", ++ "slab", ++ "tokio-executor", ++ "tokio-io", ++ "tokio-sync", + ] + + [[package]] + name = "tokio-sync" +-version = "0.1.7" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" + dependencies = [ +- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fnv", ++ "futures", + ] + + [[package]] + name = "tokio-tcp" +-version = "0.1.3" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" + dependencies = [ +- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes", ++ "futures", ++ "iovec", ++ "mio", ++ "tokio-io", ++ "tokio-reactor", + ] + + [[package]] + name = "tokio-threadpool" +-version = "0.1.17" ++version = "0.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" + dependencies = [ +- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque", ++ "crossbeam-queue", ++ "crossbeam-utils 0.7.2", ++ "futures", ++ "lazy_static 1.4.0", ++ "log", ++ "num_cpus", ++ "slab", ++ "tokio-executor", + ] + + [[package]] + name = "tokio-timer" +-version = "0.2.12" ++version = "0.2.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" + dependencies = [ +- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.2", ++ "futures", ++ "slab", ++ "tokio-executor", + ] + + [[package]] + name = "toml" + version = "0.4.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" + dependencies = [ +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++dependencies = [ ++ "serde", + ] + + [[package]] + name = "treeline" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" + + [[package]] + name = "try-lock" +-version = "0.2.2" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + + [[package]] + name = "try_from" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10", + ] + + [[package]] + name = "unicase" + version = "2.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" + dependencies = [ +- "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check", + ] + + [[package]] + name = "unicode-bidi" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", + ] + + [[package]] + name = "unicode-normalization" +-version = "0.1.12" ++version = "0.1.17" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" + dependencies = [ +- "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tinyvec", + ] + + [[package]] + name = "unicode-segmentation" +-version = "1.6.0" ++version = "1.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + + [[package]] + name = "unicode-width" +-version = "0.1.7" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + + [[package]] + name = "unicode-xid" + version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + + [[package]] + name = "unicode-xid" +-version = "0.2.0" ++version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + + [[package]] + name = "url" + version = "1.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" + dependencies = [ +- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna 0.1.5", ++ "matches", ++ "percent-encoding 1.0.1", + ] + + [[package]] + name = "url" +-version = "2.1.1" ++version = "2.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" + dependencies = [ +- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "form_urlencoded", ++ "idna 0.2.2", ++ "matches", ++ "percent-encoding 2.1.0", + ] + + [[package]] + name = "uuid" +-version = "0.6.5" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5", + ] + + [[package]] + name = "uuid" +-version = "0.7.4" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + dependencies = [ +- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.2.2", + ] + + [[package]] + name = "vcpkg" +-version = "0.2.8" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" + + [[package]] + name = "vec_map" +-version = "0.8.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +- +-[[package]] +-name = "version_check" +-version = "0.1.5" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + + [[package]] + name = "version_check" +-version = "0.9.1" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" + + [[package]] + name = "walkdir" + version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" + dependencies = [ +- "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "same-file", ++ "winapi 0.3.9", ++ "winapi-util", + ] + + [[package]] + name = "want" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" + dependencies = [ +- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures", ++ "log", ++ "try-lock", + ] + + [[package]] + name = "wasi" + version = "0.9.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + + [[package]] + name = "wasm-pack" + version = "0.9.1" + dependencies = [ +- "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "binary-install 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "dialoguer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", +- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", +- "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", +- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "assert_cmd", ++ "atty", ++ "binary-install", ++ "cargo_metadata", ++ "chrono", ++ "console 0.6.2", ++ "curl", ++ "dialoguer", ++ "dirs", ++ "env_logger", ++ "failure", ++ "glob", ++ "human-panic", ++ "lazy_static 1.4.0", ++ "log", ++ "openssl", ++ "parking_lot 0.6.4", ++ "predicates", ++ "reqwest", ++ "semver", ++ "serde", ++ "serde_derive", ++ "serde_ignored", ++ "serde_json", ++ "serial_test", ++ "serial_test_derive", ++ "siphasher", ++ "strsim", ++ "structopt", ++ "tempfile 3.2.0", ++ "toml 0.4.10", ++ "walkdir", ++ "which", + ] + + [[package]] + name = "which" + version = "2.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" + dependencies = [ +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure", ++ "libc", + ] + + [[package]] + name = "winapi" + version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + + [[package]] + name = "winapi" +-version = "0.3.8" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" + dependencies = [ +- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", + ] + + [[package]] + name = "winapi-build" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + + [[package]] + name = "winapi-i686-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.3" ++version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9", + ] + + [[package]] + name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +- +-[[package]] +-name = "wincolor" +-version = "0.1.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +-] ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "winreg" + version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.9", + ] + + [[package]] + name = "ws2_32-sys" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" + dependencies = [ +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8", ++ "winapi-build", + ] + + [[package]] + name = "xattr" + version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" + dependencies = [ +- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", + ] + + [[package]] + name = "zip" +-version = "0.5.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- +-[metadata] +-"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +-"checksum aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5f56c476256dc249def911d6f7580b5fc7e875895b5d7ee88f5d602208035744" +-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +-"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +-"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +-"checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" +-"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +-"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +-"checksum backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)" = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f" +-"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +-"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +-"checksum binary-install 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b5bc5f8c50dd6a80d0b303ddab79f42ddcb52fd43d68107ecf622c551fd4cd4" +-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +-"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +-"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +-"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +-"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" +-"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +-"checksum cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426" +-"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" +-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +-"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" +-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +-"checksum clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1" +-"checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" +-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +-"checksum console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6" +-"checksum console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0" +-"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +-"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" +-"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" +-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +-"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" +-"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" +-"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" +-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +-"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" +-"checksum curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283" +-"checksum curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "0c38ca47d60b86d0cc9d42caa90a0885669c2abc9791f871c81f58cdf39e979b" +-"checksum dialoguer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ad1c29a0368928e78c551354dbff79f103a962ad820519724ef0d74f1c62fa9" +-"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +-"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +-"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" +-"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +-"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +-"checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28" +-"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" +-"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" +-"checksum escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" +-"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +-"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +-"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" +-"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" +-"checksum float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e" +-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +-"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" +-"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" +-"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +-"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" +-"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" +-"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +-"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" +-"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" +-"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" +-"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" +-"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +-"checksum human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21638c5955a6daf3ecc42cae702335fc37a72a4abcc6959ce457b31a7d43bbdd" +-"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +-"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" +-"checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" +-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +-"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +-"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc" +-"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +-"checksum is_executable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "302d553b8abc8187beb7d663e34c065ac4570b273bc9511a50e940e99409c577" +-"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" +-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +-"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" +-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +-"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" +-"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +-"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" +-"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" +-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +-"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" +-"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" +-"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +-"checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" +-"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" +-"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" +-"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" +-"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" +-"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" +-"checksum normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e0a1a39eab95caf4f5556da9289b9e68f0aafac901b2ce80daaf020d3b733a8" +-"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" +-"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" +-"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" +-"checksum openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)" = "e176a45fedd4c990e26580847a525e39e16ec32ac78957dbf62ded31b3abfd6f" +-"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +-"checksum openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005" +-"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" +-"checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" +-"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" +-"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" +-"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" +-"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" +-"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" +-"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +-"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" +-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +-"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +-"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +-"checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" +-"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" +-"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4" +-"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" +-"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" +-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +-"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" +-"checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" +-"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +-"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" +-"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +-"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" +-"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +-"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +-"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +-"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +-"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +-"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +-"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +-"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +-"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +-"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +-"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +-"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" +-"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06" +-"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +-"checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" +-"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" +-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +-"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" +-"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +-"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" +-"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" +-"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" +-"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" +-"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" +-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +-"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" +-"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" +-"checksum serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" +-"checksum serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "eab8f15f15d6c41a154c1b128a22f2dfabe350ef53c40953d84e36155c91192b" +-"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" +-"checksum serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe" +-"checksum serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01" +-"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" +-"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +-"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +-"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" +-"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" +-"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" +-"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" +-"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +-"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" +-"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" +-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +-"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" +-"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +-"checksum tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3" +-"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +-"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" +-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +-"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" +-"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +-"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" +-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +-"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +-"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" +-"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" +-"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" +-"checksum tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab" +-"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" +-"checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146" +-"checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76" +-"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" +-"checksum tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c32ffea4827978e9aa392d2f743d973c1dfa3730a2ed3f22ce1e6984da848c" +-"checksum tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827" +-"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +-"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" +-"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" +-"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" +-"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +-"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +-"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +-"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" +-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +-"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +-"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +-"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" +-"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +-"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" +-"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +-"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" +-"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +-"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" +-"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +-"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" +-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +-"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" +-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +-"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" +-"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +-"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +-"checksum xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +-"checksum zip 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e41ff37ba788e2169b19fa70253b70cb53d9f2db9fb9aea9bcfc5047e02c3bae" ++version = "0.5.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a8977234acab718eb2820494b2f96cbb16004c19dddf88b7445b27381450997" ++dependencies = [ ++ "byteorder", ++ "bzip2", ++ "crc32fast", ++ "flate2", ++ "thiserror", ++ "time", ++] +diff --git a/Cargo.toml b/Cargo.toml +index 6e8c66f..3dba85e 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -21,7 +21,7 @@ failure = "0.1.2" + human-panic = "1.0.1" + glob = "0.2" + log = "0.4.6" +-openssl = { version = '0.10.11', optional = true } ++openssl = { version = '0.10.32', optional = true } + parking_lot = "0.6" + reqwest = "0.9.14" + semver = "0.9.0" diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 955bc35c5ab54..b2d0581c0541c 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "mikefarah"; rev = "v${version}"; repo = "yq"; - sha256 = "sha256-9D00I34pfoiI5cqXjsVLTT6XbFUYxgGit0ZuYeWSEyE="; + sha256 = "sha256-pP00y9auYeuz0NSA+QrnGybW5T7TfGFFw/FMPu/JXjM="; }; vendorSha256 = "sha256-66ccHSKpl6yB/NVhZ1X0dv4wnGCJAMvZhpKu2vF+QT4="; diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index f45ac2f015322..12b485764a5b1 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi"; }; - buildInputs = [ makeWrapper SDL SDL_image ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ SDL SDL_image ]; NIX_LDFLAGS = "-lm"; diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 5509d8a90caf2..f5677b142e284 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,14 +3,14 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.38"; + version = "2.1.40"; unpacked = stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "14zbz8k142djka3b5sld3368m98lj80c39m6xg87bz140h25ylz4"; + sha256 = "0zcvjm0dv3mjln2npv415yfaa1fykif738qkis52x3pq1by2aiam"; }; installPhase = '' @@ -49,7 +49,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "1krl014jhhby0zv4if9cgbcarmhcg6zccyhxw1yb6djiqap0zii7"; + sha256 = "14f0sp9h963qix4wa0kg7z8a2nhch9aybv736rm55aqk6mady6vi"; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/games/black-hole-solver/default.nix b/pkgs/games/black-hole-solver/default.nix new file mode 100644 index 0000000000000..e859e72d96b15 --- /dev/null +++ b/pkgs/games/black-hole-solver/default.nix @@ -0,0 +1,30 @@ +{ + stdenv, lib, fetchurl, + cmake, perl, pkg-config, python3, + rinutils, PathTiny, +}: + +stdenv.mkDerivation rec { + pname = "black-hole-solver"; + version = "1.10.1"; + + meta = with lib; { + homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/"; + description = "A solver for Solitaire variants Golf, Black Hole, and All in a Row."; + license = licenses.mit; + }; + + src = fetchurl { + url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz"; + sha256 = "1qhihmk4fwz6n16c7bnxnh3v7jhbb7xhkc9wk9484bp0k4x9bq9n"; + }; + + nativeBuildInputs = [ cmake perl pkg-config python3 ]; + + buildInputs = [ rinutils PathTiny ]; + + prePatch = '' + patchShebangs ./scripts + ''; + +} diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 656e4ab6add34..40f90e75ff823 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62"; }; - buildInputs = [ tcl tk libX11 makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ tcl tk libX11 ]; makeFlags = [ "BINDIR=$(out)/bin" diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 052982bf15d6b..26a0ba748ba4f 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ makeWrapper mono ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ mono ]; libraries = lib.makeLibraryPath [ gtk2 curl ]; diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index a657913aad769..cb51489de9c13 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "cockatrice"; - version = "2020-08-23-Release-2.7.5"; + version = "2021-01-26-Release-2.8.0"; src = fetchFromGitHub { owner = "Cockatrice"; repo = "Cockatrice"; rev = version; - sha256 = "1yaxm7q0ja3rgx197hh8ynjc6ncc4hm0qdn9v7f0l4fbv0bdpv34"; + sha256 = "0q8ffcklb2b7hcqhy3d2f9kz9aw22pp04pc9y4sslyqmf17pwnz9"; }; buildInputs = [ diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index bd75a66b4879d..7db79012ec658 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { paths = [ dwarf-therapist ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru = { inherit dwarf-fortress dwarf-therapist; }; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 356cedd3507e7..879bbfa2311f3 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -178,7 +178,8 @@ let headless = base; demo = base // { - buildInputs = [ makeWrapper libpulseaudio ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libpulseaudio ]; libPath = lib.makeLibraryPath [ alsaLib diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index a471b425f0c61..9d8d74921e54e 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -42,7 +42,8 @@ in stdenv.mkDerivation rec { cp -r ${library} gcs_library ''; - buildInputs = [ jdk8 jre8 ant makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk8 jre8 ant ]; buildPhase = '' cd apple_stubs ant diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index 8eb989a8f4745..fa901c14f8195 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { pname = "gogui"; inherit version; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip"; sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j"; diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index d0ddf43fe2a26..43b95bacefc8d 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0xzrkkmj0b1dw3yr0m9hml2y634cc4h61im6zwcq57s7285z8fn1"; }; - buildInputs = [ makeWrapper ncurses perl fortune ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ncurses perl fortune ] ++ lib.optional stdenv.isDarwin libiconv; preFixup = '' diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index c2b9718cd25bd..3d0b53035edd5 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.2.1867"; + version = "2.2.1441"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "1gpagrinam595153jbxwagcq20ij2dk8nn6zajy2iyqmj12y66ay"; + sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm"; }; icon = fetchurl { diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index c5b2b7d20eb09..ae7519c948ba7 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation { sha256 = "0kzahxrgpb4vsk9yavy7f8nc34d62d1jqjrpsxslmy9ywax4yfpi"; }; - nativeBuildInputs = [ lua love ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ lua love makeWrapper ]; phases = "installPhase"; diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index 0da6d9352e06a..0be3d9bf7a0e2 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs"; }; - buildInputs = [ makeWrapper freeglut libGL libGLU ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ freeglut libGL libGLU ]; patchPhase = '' sed -i "s;font24.raw;$out/share/font24.raw;g" display.c diff --git a/pkgs/games/nottetris2/default.nix b/pkgs/games/nottetris2/default.nix index 53e7dec08032b..42e5a33cad796 100644 --- a/pkgs/games/nottetris2/default.nix +++ b/pkgs/games/nottetris2/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { sha256 = "17iabh6rr8jim70n96rbhif4xq02g2kppscm8l339yqx6mhb64hs"; }; - nativeBuildInputs = [ zip ]; - buildInputs = [ love_0_7 makeWrapper ]; + nativeBuildInputs = [ zip makeWrapper ]; + buildInputs = [ love_0_7 ]; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 7bea330e1cc7f..5bffe2a49054a 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.220.0"; + version = "2021.226.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "XGwG/1cWSUNniCrUY1/18KHRtumxIWjfW5x+aYQ6RKU="; + sha256 = "sK7FFyOb3JdsqIqvDNexhg3ZPNRpCE4hH0BADYeFHoU="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 519d7b4179e75..a1bbc6d0519e5 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -395,14 +395,9 @@ sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb"; }) (fetchNuGet { - name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; - version = "3.3.2"; - sha256 = "02apz67f1gbp4p0wy7r593m10mhjm0rwp9q1n96p9avhdc3dwmv5"; - }) - (fetchNuGet { - name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer"; - version = "3.3.2"; - sha256 = "1wxfkn16bqay7z64yxx50y9qkyznbfrv269h19fd60dy0vflwlfv"; + name = "Microsoft.CodeAnalysis.NetAnalyzers"; + version = "5.0.3"; + sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; @@ -415,11 +410,6 @@ sha256 = "1ag78ls51s88znv4v004sbklrx3qnbphpdngjq196188a3vljww7"; }) (fetchNuGet { - name = "Microsoft.CodeQuality.Analyzers"; - version = "3.3.2"; - sha256 = "0hfsjqg4kz5ylx461ssvbx64wgaiy8gcalb760jc53lvbd8qrq5r"; - }) - (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; @@ -580,11 +570,6 @@ sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { - name = "Microsoft.NetCore.Analyzers"; - version = "3.3.2"; - sha256 = "1h1bjiiw64qncs61p2idwxswv4kzq06bbl2rlghiagv6sbjk4pnq"; - }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.0"; sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; @@ -620,11 +605,6 @@ sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { - name = "Microsoft.NetFramework.Analyzers"; - version = "3.3.2"; - sha256 = "0samfc6c3mm7c4g6b0m01c8c37ip5ywy1i2my02xsbf9vygkal89"; - }) - (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; @@ -726,8 +706,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.220.0"; - sha256 = "0lsv1xl4wav9wv50d1aba56sf6dgqa5qsx4lfn81azy3lzpcbzpp"; + version = "2021.226.0"; + sha256 = "0875lcd28vmx4f40k8m957lcpg0ilkzm3da12j94xaqk88mx4j7c"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index ef535991c23b4..108d81815faa5 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -1,5 +1,5 @@ { lib, callPackage, python3Packages, fetchFromGitLab, cacert, - rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip, + rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip, jre, makeWrapper, tr-patcher, tes3cmd }: let @@ -29,7 +29,7 @@ let python3Packages.virtualenv tr-patcher tes3cmd - imagemagick7 + imagemagick ]; in diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index b81f1814ac9b8..a966731725d32 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -7,16 +7,16 @@ stdenv.mkDerivation rec { pname = "r2mod_cli"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "Foldex"; repo = "r2mod_cli"; rev = "v${version}"; - sha256 = "1g64f8ms7yz4rzm6xb93agc08kh9sbwkhvq35dpfhvi6v59j3n5m"; + sha256 = "0as3nl9qiyf9daf2n78lyish319qclf2gbhr20mdd5wnqmxpk276"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index dfbe9bc45e1fe..16507fa219e02 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { } else throw "System not supported"; - - buildInputs = [ allegro libjpeg makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ allegro libjpeg ]; prePatch = '' sed -i s,/usr/local,$out, Makefile src/HGFX.cpp src/STDH.cpp diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index df8a5c3e8dcd7..e9e77e275dc76 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { startupNotify = null; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # colon is bash form of no-op (do nothing) dontUnpack = true; diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index f0fdef8e62e5e..7b1a15c0a5515 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0zb5qp04x8w4gn2kvfdfq2p44kmzfcqn7v167dixz6nlyxg41hrw"; }; - buildInputs = [ tcl tk libX11 zlib makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ tcl tk libX11 zlib ]; prePatch = '' sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \ diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index eea8d5650be17..3639eb46ffebc 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -2,7 +2,7 @@ , makeWrapper , fetchFromGitHub , nixosTests -, gradle_5 +, gradle , perl , jre , libpulseaudio @@ -10,13 +10,15 @@ let pname = "shattered-pixel-dungeon"; - version = "0.9.1d"; + version = "0.9.2"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; - rev = "v${version}"; - sha256 = "0f9vi1iffh477zi03hi07rmfbkb8i4chwvv43vs70mgjh4qx7247"; + # NOTE: always use the commit sha, not the tag. Tags _will_ disappear! + # https://github.com/00-Evan/shattered-pixel-dungeon/issues/596 + rev = "5be9ee815f1fc6e3511a09a367d3f9d8dc55c783"; + sha256 = "0wknrf7jjnkshj4gmb1ksqiqif1rq53ffi3y29ynhcz68sa0frx6"; }; postPatch = '' @@ -31,7 +33,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit version src postPatch; - nativeBuildInputs = [ gradle_5 perl ]; + nativeBuildInputs = [ gradle perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) # https://github.com/gradle/gradle/issues/4426 @@ -52,7 +54,7 @@ let in stdenv.mkDerivation rec { inherit pname version src postPatch; - nativeBuildInputs = [ gradle_5 perl makeWrapper ]; + nativeBuildInputs = [ gradle perl makeWrapper ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -86,4 +88,3 @@ in stdenv.mkDerivation rec { broken = stdenv.isDarwin; }; } - diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index 3128ed5358b25..5f589ede2bc45 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { stripRoot=false; }; - buildInputs = [ makeWrapper ncurses libX11 libXaw libXt libXext libXmu ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ncurses libX11 libXaw libXt libXext libXmu ]; sourceRoot = "source/Sil/src"; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index effb999e02c35..2a916094af418 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0xn403fxz6ay5lv8whyfdq611kvxj5q309bj317yw5cxbb08w1yb"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin $out/share/vassal $out/doc diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index b07db62aa1570..6c48caf8756aa 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ]; NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; diff --git a/pkgs/misc/drivers/spacenavd/configure-socket-path.patch b/pkgs/misc/drivers/spacenavd/configure-socket-path.patch new file mode 100644 index 0000000000000..03eb329f4b6eb --- /dev/null +++ b/pkgs/misc/drivers/spacenavd/configure-socket-path.patch @@ -0,0 +1,118 @@ +diff --git a/src/proto_unix.c b/src/proto_unix.c +index 998f234..d38452c 100644 +--- a/src/proto_unix.c ++++ b/src/proto_unix.c +@@ -36,11 +36,14 @@ enum { + + static int lsock = -1; + ++static char *spath = NULL; ++ + int init_unix(void) + { + int s; + mode_t prev_umask; + struct sockaddr_un addr; ++ char *sock_path; + + if(lsock >= 0) return 0; + +@@ -49,16 +52,18 @@ int init_unix(void) + return -1; + } + +- unlink(SOCK_NAME); /* in case it already exists */ ++ sock_path = socket_path(); ++ ++ unlink(sock_path); /* in case it already exists */ + + memset(&addr, 0, sizeof addr); + addr.sun_family = AF_UNIX; +- strcpy(addr.sun_path, SOCK_NAME); ++ strcpy(addr.sun_path, sock_path); + + prev_umask = umask(0); + + if(bind(s, (struct sockaddr*)&addr, sizeof addr) == -1) { +- logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", SOCK_NAME, strerror(errno)); ++ logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", sock_path, strerror(errno)); + close(s); + return -1; + } +@@ -68,7 +73,7 @@ int init_unix(void) + if(listen(s, 8) == -1) { + logmsg(LOG_ERR, "listen failed: %s\n", strerror(errno)); + close(s); +- unlink(SOCK_NAME); ++ unlink(sock_path); + return -1; + } + +@@ -82,7 +87,7 @@ void close_unix(void) + close(lsock); + lsock = -1; + +- unlink(SOCK_NAME); ++ unlink(socket_path()); + } + } + +@@ -173,3 +178,19 @@ int handle_uevents(fd_set *rset) + + return 0; + } ++ ++char *socket_path(void) ++{ ++ char *xdg_runtime_dir; ++ if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) { ++ if ( spath == NULL ) { ++ spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1); ++ if ( spath != NULL ) { ++ sprintf(spath, "%s/spnav.sock", xdg_runtime_dir); ++ } ++ }; ++ return spath; ++ } else { ++ return DEFAULT_SOCK_NAME; ++ } ++} +diff --git a/src/proto_unix.h b/src/proto_unix.h +index 045b379..ec4509c 100644 +--- a/src/proto_unix.h ++++ b/src/proto_unix.h +@@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + #include "event.h" + #include "client.h" + ++char *socket_path(void); + int init_unix(void); + void close_unix(void); + int get_unix_socket(void); +diff --git a/src/spnavd.c b/src/spnavd.c +index cbea191..03080da 100644 +--- a/src/spnavd.c ++++ b/src/spnavd.c +@@ -344,7 +344,7 @@ static int find_running_daemon(void) + } + memset(&addr, 0, sizeof addr); + addr.sun_family = AF_UNIX; +- strncpy(addr.sun_path, SOCK_NAME, sizeof addr.sun_path); ++ strncpy(addr.sun_path, socket_path(), sizeof addr.sun_path); + + if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) { + close(s); +diff --git a/src/spnavd.h b/src/spnavd.h +index fa0a916..deea4e0 100644 +--- a/src/spnavd.h ++++ b/src/spnavd.h +@@ -26,7 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + #define DEF_CFGFILE "/etc/spnavrc" + #define DEF_LOGFILE "/var/log/spnavd.log" + +-#define SOCK_NAME "/var/run/spnav.sock" ++#define DEFAULT_SOCK_NAME "/run/spnav.sock" ++#define SOCK_NAME_ENV "SPNAVD_SOCK_LOCATION" + #define PIDFILE "/var/run/spnavd.pid" + #define SYSLOG_ID "spnavd" + diff --git a/pkgs/misc/drivers/spacenavd/default.nix b/pkgs/misc/drivers/spacenavd/default.nix new file mode 100644 index 0000000000000..1051d469f6136 --- /dev/null +++ b/pkgs/misc/drivers/spacenavd/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, libX11 }: + +stdenv.mkDerivation rec { + version = "0.8"; + pname = "spacenavd"; + + src = fetchFromGitHub { + owner = "FreeSpacenav"; + repo = "spacenavd"; + rev = "v${version}"; + sha256 = "1zz0cm5cgvp9s5n4nzksl8rb11c7sw214bdafzra74smvqfjcjcf"; + }; + + buildInputs = [ libX11 ]; + + patches = [ + # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock + # to allow for a user service + ./configure-socket-path.patch + ]; + + configureFlags = [ "--disable-debug"]; + + meta = with lib; { + homepage = "http://spacenav.sourceforge.net/"; + description = "Device driver and SDK for 3Dconnexion 3D input devices"; + longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index eba646e2f20f1..a2dc86449d9e4 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation { url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz"; sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r"; }; - buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm ]; preBuild = '' patchShebangs img2tiles.py ''; diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index c0e54e48db329..62820f2c96bac 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdsk"; - version = "1.5.12"; + version = "1.5.14"; src = fetchurl { url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; - sha256 = "0s2k9vkrf95pf4ydc6vazb29ysrnhdpcfjnf17lpk4nmlv1j3vyv"; + sha256 = "sha256-fQc6QAj160OskhAo1zQsQKiLgDgZRInU/derP2pEw54="; }; meta = with lib; { diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 7d0d6c6f68e33..8a11b633d28e6 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mednaffe"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; rev = version; - sha256 = "sha256-BS/GNnRYj9klc4RRj7LwNikgApNttv4IyWPL694j+gM="; + sha256 = "sha256-YU8PHnQHAsY90LN/WDugi4WhsuZGBj/z3BS4o69qMS4="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index 08ebf8ea85444..40d9f07846b71 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "retroarch"; version = lib.getVersion retroarch; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/lib diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix index d23129eba7e5c..6b20984016998 100644 --- a/pkgs/misc/emulators/sameboy/default.nix +++ b/pkgs/misc/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.13.6"; + version = "0.14.1"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "04w8lybi7ssnax37ka4qw7pmcm7cgnmk90p9m73zbyp5chgpqqzc"; + sha256 = "0h42cixbf0m2qiwrqzygh0x166h9ikxa5dzi3jbqld2dygk932n7"; }; enableParallelBuilding = true; @@ -16,20 +16,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rgbds glib wrapGAppsHook ]; buildInputs = [ SDL2 ]; - makeFlags = "CONF=release DATA_DIR=$(out)/share/sameboy/"; + makeFlags = [ + "CONF=release" + "FREEDESKTOP=true" + "PREFIX=$(out)" + ]; - patchPhase = '' - sed 's/-Werror //g' -i Makefile - sed 's@"libgtk-3.so"@"${gtk3}/lib/libgtk-3.so"@g' -i OpenDialog/gtk.c - ''; - - installPhase = '' - pushd build/bin/SDL - install -Dm755 sameboy $out/bin/sameboy - rm sameboy - mkdir -p $out/share/sameboy - cp -r * $out/share/sameboy - popd + postPatch = '' + substituteInPlace OpenDialog/gtk.c \ + --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"' ''; meta = with lib; { diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index d69f38dececc9..1bcd08e6f4046 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.2"; + version = "6.3"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-tmCWCaOrzGrZJ83WXHQL4BFiuAFSPg97qf1mkYALvxk="; + sha256 = "sha256-aCp3wf0S9WNHyiCA2F/hfe8bZV0yQdlFgvh1kdnQzDs="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-swhd5gTIWTz8eEk6f78iXG8bmA3y4ynO0/wBm0/Kimk="; + sha256 = "sha256-Fok0jdGBQtH84PL6LVnuCR7ZVSUIHECqPUI/2lLXs44="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 24d2b5e135cf4..9dd973674412e 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -48,6 +48,9 @@ stdenv.mkDerivation rec { --replace /bin/bash ${bash}/bin/bash ''; + PKGCONFIG = "${stdenv.cc.targetPrefix}pkg-config"; + + dontAddWafCrossFlags = "true"; wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 2f3a95a33022e..47cbb59f2f01c 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -7,7 +7,8 @@ lib.appendToName "with-fonts" (symlinkJoin { paths = [ lilypond ] ++ openlilylib-fonts.all; - buildInputs = [ makeWrapper lndir ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ lndir ]; postBuild = '' for p in $out/bin/*; do diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 11d85e5977656..be605192acce4 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir $out -p diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index f3e5ae251aec9..981db782c7c92 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: +{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick6, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libGLU libGL xlibsWrapper imagemagick libtiff bzip2 ]; + buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ]; - NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; + NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; meta = { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1ca828fc37a3c..ad33bd7473a0b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-02-23"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "76965615558e9398ef4cc79991632a7b68a6c7bc"; - sha256 = "06djm6di95sci45gwm1mrvd8hhiwxh59lix1p34ky0k7yjb6vygk"; + rev = "826878c41e546a93919aba08e5a134433222b3a5"; + sha256 = "00nfjxrakl6p1knz8gy0n4flm537acj66nxvnb5hq3isn8h06gbw"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -89,12 +89,12 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-02-07"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "4fbb34ccc09354ec09033719133c32d531111934"; - sha256 = "0blpw88d0b7arxnz18glppwwgs0gynq0l7yd2a2jm45wqvlfh8ld"; + rev = "984d84a1bda7208587feb3d62cfec5bcab404af2"; + sha256 = "00gf2xm20wg0p1ik55jwhzlbd5sz06k3hk30415xayfa6flgh0n4"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -161,12 +161,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2021-01-28"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "4be3c16b33c27fce5372bf8bc74e42126c76fe61"; - sha256 = "1y5xlisby7a41naas7r09ins3k9arn5xc5bb6w8k7am6xz3vc3r6"; + rev = "f7f017e24277266984b54a9829adf51ba13f085d"; + sha256 = "0kp8z1pwn057hm6bccp0v94mvvm2dcpdw6qlhjp1pzs8prgvp0nl"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -233,12 +233,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-02-21"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "d41cf6a68af44dd74bd4a1af0b2c7f33f4475730"; - sha256 = "1ibj1drcj56gjsqhkid3la58jj7y32ygiib3sjsw35091yamcqc2"; + rev = "1ed59bff2a84e48e1a243a7e5d336a395f610e2a"; + sha256 = "1acz9zwb9mwyhfckpzv22dy5c4bq83jrmvvbd22z9k0hm5py2538"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-02-23"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "30b987585d83389e05fde6443160f570aa39e1e7"; - sha256 = "1snz1wskla014cxk3dw290bpd0krznhwpm341a9v5vcidhciaprx"; + rev = "a43d2124a6b994df18b26a8a783f16534bac14cf"; + sha256 = "0pqd4593wnlr7x6rb4lmj3vz4j41rrlkmbd4a18lq8ivp9q6faa0"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -473,48 +473,48 @@ let coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2021-01-14"; + version = "2021-02-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "819b0e334431a9e914d69f3fedf68122799fcab9"; - sha256 = "02zy4ip7m1jivqzs67c8bzc8lis8wxkm38nvk6nngz2790xpfywc"; + rev = "37016bc170014e36fc8212b2dc7ce7adda48bbe3"; + sha256 = "0kpw2gfkpdfsi2kwm6rbzmz3diyinc3lcf91rxm8wyw486sp0s10"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-02-19"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "e4409b415a7c299282556422c71a070ad33c8c71"; - sha256 = "19j0p6ar0kr97xw5sxyywhy4r3wgyzplb482s23rglgxzcdfvp4c"; + rev = "62206b3cf8e06137919e8cbdcb52c474fe1dbd95"; + sha256 = "0y1j2qmncp0n2piiayfbfk39rj0nivjx0wfjh9wnq0s1y2ijcg91"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-02-22"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "087ab5582607fca8e35e8afd5121b3b39b7cdb32"; - sha256 = "0vpzhhnyybyq90c525263dan2mha64hwrmbc22kw6rwm1n9smxx8"; + rev = "3c8ca6127af51768cad8ff1074db5a9713d7fe13"; + sha256 = "17988plg3zrfnfzp4pr292qbk5zi8qgjldkhqsv5w9w38a02gxqj"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-02-22"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "228e27dd3118703b4d169b134b458635a3043918"; - sha256 = "1wxz1bljg7p1gyasf71gm3953pkrmaafw84bmwghfgrp8l3914h2"; + rev = "6f5b03b5d0ea59d73f809cb2a26317be6b0e14b8"; + sha256 = "1vcqm994i8d985k2fp09s3y1db87yk6pa4mnywzg561nk00rm5vh"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -545,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-02-23"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "2bec473a4d8eab4b6a933fc4d2c564a323fb34f8"; - sha256 = "1a6i7mlylpbvj7dbqpd6mcfw8r7cjdjb1mdvk7snaizh7ahl2cc9"; + rev = "70e5a383cd1c5e39505ef016e8507e7daa4bc7dc"; + sha256 = "0mgaj8d1jl2rh56a5mgl0wwwjmgmyk4vcxh19yyvpji73gpkywxh"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -618,24 +618,24 @@ let compe-conjure = buildVimPluginFrom2Nix { pname = "compe-conjure"; - version = "2021-02-23"; + version = "2021-02-02"; src = fetchFromGitHub { owner = "tami5"; repo = "compe-conjure"; rev = "809853ff8098dffcf8ba5ac89bcf07806eb8f981"; sha256 = "0p7p4bgkh05zy0gzmq0g9nn9npykh1l17cvfzjyhcb3n1sczpjzf"; }; - meta.homepage = "https://github.com/tami5/compe-conjure"; + meta.homepage = "https://github.com/tami5/compe-conjure/"; }; compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-02-21"; + version = "2021-02-24"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "d717a953dbb745289ea794e86e32deb3750a3a18"; - sha256 = "1d8nqcfarcwxyz7cwn200g118v0gky0snvzhc22xl766pacgvslk"; + rev = "b1521bb52a9ddeacc2a7db56aa26d45dc91e6277"; + sha256 = "1dknyar320rpaqq8l5kwq0n3lvmgw4qpjybg4dnz69ms54xijpr7"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -702,12 +702,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-02-10"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "88e7865b97737809d963b81b10737c41e90b4377"; - sha256 = "075rm1s1y1cklnsqf7845s3knfwyiqs1wd82d9rvbvc3gs12xlpf"; + rev = "4dc7c745618a24799af44797c51af7cc308e42a4"; + sha256 = "1p0bck7gh1alybfz14s0yaawx056mfqjc8hba1wappch4jp07si6"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -738,12 +738,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-02-16"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "309b5ca4386e0a191168c2a4a7e6a0e8ddcb0317"; - sha256 = "07fhi1wsa8p3hqrkr56is4ijpc879npqfnhkv6cfi01aagp8kz9h"; + rev = "7f6509ab9d405c9ba7a1f06cb9533bfe570becf5"; + sha256 = "088iy90rsxskaalqagw54w159gy0wlcq751b989bf5knz2f1d3c5"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -858,14 +858,14 @@ let dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2021-02-23"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "7cdd2288d5aaf986f6f23c58fa27c50311636142"; - sha256 = "1rg63sl4q4qlxdllmrmi3x54zz2xqgf6l56zi3wv83x3zd5lj2c9"; + rev = "3957e4d25c9625812d9d47ea448c68015b1092e8"; + sha256 = "15jbszl0ip5hjf9nfvs9y90shqz0ix04za1l96kfik1p47y7wjd8"; }; - meta.homepage = "https://github.com/glepnir/dashboard-nvim"; + meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; defx-git = buildVimPluginFrom2Nix { @@ -894,12 +894,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-02-07"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "4d2353619262fe487a052288859f3eea64cd229c"; - sha256 = "1nxh1pqrnvzdw02fb8bncb8gswfr3p2n1h8yfnfjlljqiapkvhdq"; + rev = "f4e082b3e4a62ca2cd5dfe041288f4acf3b2031f"; + sha256 = "1lm4x0skg9mm776bm7s34sjmxjjvcsy7gjn95qhplg7r6799xsn0"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -942,12 +942,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-02-20"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "2b5360f3f2965ee5a6f82e09648d0c18e78142f3"; - sha256 = "09bya9rqzk809s5i1xda94f64jnzm3vkh8kiziclgyg42sv6in9b"; + rev = "4eb4327162c4ec885446b349149b5d25b7307bc7"; + sha256 = "0h4f1axd53lc5k5c6kv2zcsxhh3pjbl7hmi7y15qnvbgr8xa8s4x"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1136,12 +1136,12 @@ let deoplete-tabnine = buildVimPluginFrom2Nix { pname = "deoplete-tabnine"; - version = "2021-01-15"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "tbodt"; repo = "deoplete-tabnine"; - rev = "80a329eca215f48de8a4e575af55607700ddc93e"; - sha256 = "1i23ajbkx3yrll4mnqzf17g66c9x5g6ih3hk3acjq7h3m6ifgfyi"; + rev = "6997d621f6bd10351041be8e9dfbc6874009bf1b"; + sha256 = "17xxxk75w852qj89b1283pff1rsv6qd3siy14sxrz4455x4j1sj5"; }; meta.homepage = "https://github.com/tbodt/deoplete-tabnine/"; }; @@ -1184,12 +1184,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-02-08"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "27af4ab2de157f80c8a8391aebb60061318814ea"; - sha256 = "12gjf3pcds7ms568pxmwrlnfijrm18h3pnb1x1a1gmf7bwj7xyfc"; + rev = "a4683be7c58c346458e2cdb1f8b244e14fe35a8e"; + sha256 = "0ph4mj4s2gklr8rz8ny80i91r7fcivh9kb5q0y20c19mmyjsvifm"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1268,12 +1268,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2021-01-28"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "c805de7e9811cd298861c7bc6ef455093dcdfaf5"; - sha256 = "1jhhscldckydzzjnl1jki3025brmlbmr7czhw1s30jx5wr00zc5w"; + rev = "af235aaaa74f41cd83181a16b9f17c16e56afc47"; + sha256 = "1jzn7w6rv2bl1m4aqm716flg28jdjsgkikfjjjiz4if5vjsfj0lw"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; @@ -1402,12 +1402,12 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-02-06"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "b71eaccd050f4f6422cf09594cd69067cacadd4c"; - sha256 = "0c8j6qd0aaa6cva1ca36rdybrv7zrvxip2k9w44f37gakrzgmh50"; + rev = "c09eb24de7a647a2b4878f8dc86b3d3565b3e8af"; + sha256 = "0mqrrb899bgf13r2klkqh4ycz167fx98kjnrhdg2jhq8gg85i0ih"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1595,12 +1595,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-02-23"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "bac4f07c9c70aeed25d2a3f5173b782f4efe7c17"; - sha256 = "00m9j6lvg96xaxnzg0vwridhk1m9zaxna2qcki4y2cr083bsc0vd"; + rev = "b79422434a419b97c5817d9ff645216952152443"; + sha256 = "0xwz4kw5mwqrh6s9vyzzx4fdl7335n9qjxzhm1c41hh1j2ikwqa9"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1619,12 +1619,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-02-18"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "a0f08c700313947e554a1933a9e7d06c0e3d2f42"; - sha256 = "0zfzh1nhxmrfxa97kfyl1cdx3c186ig3p61sfxm4w1phz0r44lch"; + rev = "cdf8e98ca16521138e1376279772dfcf60008ec8"; + sha256 = "0f4lw019qdsxj9rqpcjc5rr9wgabwbp1af0r2p56zx2cy9iyz4y6"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1703,12 +1703,12 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-02-13"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "8b29832551088fd7ecc1241c2576c8cf89f0842c"; - sha256 = "0447iplif457yyd6d7xanvrrizfl9jlwim16i31vwnrlrb3s0r4x"; + rev = "deb4e40e4f26b0ca9db81e5463110c060f24635a"; + sha256 = "1l1bji23vgxgs23a2gpywnq9q03bd44lh159da54pdk69fngj3lk"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -1787,14 +1787,14 @@ let hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-02-23"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "be919d61d4136d2092f42c922f545bb8c8723fb8"; - sha256 = "0swslw4g7i8xzzcnz5rxdr0a2g3wm471vg35drynr2r18q2hqqd1"; + rev = "b844a533d654271c66cea44182522a56b2d0c8c1"; + sha256 = "0v54q2dz98k9qivsmcj3l41gxc1abdfvvgkksclqjg8qcqq1pl6w"; }; - meta.homepage = "https://github.com/phaazon/hop.nvim"; + meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; i3config-vim = buildVimPluginFrom2Nix { @@ -1991,12 +1991,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2021-01-30"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "5d4615707fc7bce8a4f1fdaa5f7f07c11637bc30"; - sha256 = "0m8dafwz76glmgi7jvc3sxsxill5a3prf5qi0r9266swdw4v8ah3"; + rev = "088469a8eeffe421d522e953c4b49de486a0cbce"; + sha256 = "0vwz33ffawazdk6dsmd6m2fiygi9sn7xn601bzfcgf73z1sc41gh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -2040,12 +2040,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-02-22"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "b2bda998c0e141ee9215ccc123fb7d8ddc8c9d16"; - sha256 = "1lrhydjjriczcf05sj1gzs8yasnixar40mlbzph5fnx4d044jsk4"; + rev = "6db659027d6a5ba6b11b1a3333b0bd301dd01574"; + sha256 = "0c7qcafjk0chdxg027lihrypxlr10nvk1xzs82icqis0ija3yppg"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2196,12 +2196,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2021-01-06"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "65614730a667144a444fbd4a028a81171481c537"; - sha256 = "1vxm3ym51qa63zbrkdz2pvwafr3kmdxgpxrdwb1g8i7qsxjsvgl1"; + rev = "7afb5525addfab7c177c2912a7aa98053c79e495"; + sha256 = "18jwc65q0k1q7nd2w31gi476cg4h7bfrr7z39is3s3qw0z2nprp9"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2220,12 +2220,12 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-01-31"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "936598633d19a2f171347494c3240e72da6db78a"; - sha256 = "0j0swcbvhhy5gajl42z6g1dwr62b68l4c913fdfvdhjngq26wbyw"; + rev = "9cec4e2329324366801e1272305be907d141d77c"; + sha256 = "1xz36jrm3iql6xgznycwf8mxlaw05f788k4p9xbvcrh3i0zck1za"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2304,24 +2304,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-02-23"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "1fb30cb0334a0b12aa1dbf40a00e7a06c9539f44"; - sha256 = "0kvfbcck0f3nj5fb08yr2yfpp0cszxxp556jix59g3y6drah6bnn"; + rev = "1fabedb8d93896abda55660c8fd6c8ad7d953af0"; + sha256 = "0lib7ly88isbz1kqj172fjycw71a9rl2zhffipkkgwlcz5i5hkm9"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-02-22"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "e59ac51ca90fe1b914e94be2f38292c81388912c"; - sha256 = "0v1ijxmqyjk05xzcx2nycrpqbyahai8y380qd9xyl4gmgyfmhvs9"; + rev = "8c8a4896125e9d01063bbf906af77c9d8faf39b4"; + sha256 = "0zz2b5ph7jadfk6kw14s38w4nch4wyrvm24qyijpan67k7nz1qpy"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2388,12 +2388,12 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-02-22"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "fcf8aa05f3a3c128011236147b4cd1ced718b671"; - sha256 = "1ya5scd3rwiypiwj3xgwr153n3a1d4mg9r5m1wbj3cb7x0s6ddjk"; + rev = "3fe7878d83156cc9351fa94e25b0de854bcd6f8d"; + sha256 = "1l9di7q0mlbcgs4xbqg2ias3hy5qib72zi1nwjw06snxlffz2hpq"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -2700,12 +2700,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-02-08"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "53f22813fb3e60a4175ee44de55732b93c2903de"; - sha256 = "0441hafqkqz11666cwkrgp90zmxgx7pjcl6n4bshyp82x3glw1nj"; + rev = "61a1e55394124d66288ecd1b963ad91e6304e463"; + sha256 = "15s8glj9i72n1ckfrffbd7w0widc1vgnppir9n3qn9niwxby24xa"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2832,24 +2832,24 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-02-18"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "1c7b57608e653b55731d5971ba11c4c691b14c8c"; - sha256 = "0ax3f1gyg0gqc2wmv11icsc5ykjq7b3cgk49hxla8zyf84rhdnn2"; + rev = "16ecc429ec2792ba5c972f0a920dc14223b7bd4a"; + sha256 = "03hfkfw34scbw127gmihxa6x9f02y979ig2204br508rz75qqfaw"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-02-13"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "a1fa4a33bf16b6661e502080fc97788bb98afd35"; - sha256 = "1qi2jzrps2c2h8c91rxma445yj8knl41sb5yfg37wjnsbig6jcxl"; + rev = "f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2"; + sha256 = "1lm4dqp8rxr5sl6faxyncz5jibkgzjwjxadvgcja81wnm71sr0xa"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2928,16 +2928,28 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-01-10"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "7ed43362582c7c202f9a3edc2293dbb87d96e5fc"; - sha256 = "1bcl2cdsvafvlsh5d4a2cr3v1nzpdlh9whaasq2ac192a6hs0c3x"; + rev = "536f99f6c5aa27f3362be6c7bc61e5251c9bdbcc"; + sha256 = "1n0xrzvplsrrc17jyqnyapwx2vj7b39d2ma0pd40qjf97rsvv4a4"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; + nvim-ale-diagnostic = buildVimPluginFrom2Nix { + pname = "nvim-ale-diagnostic"; + version = "2021-03-01"; + src = fetchFromGitHub { + owner = "nathunsmitty"; + repo = "nvim-ale-diagnostic"; + rev = "0d1d7a7ba78e9ad0b57060ba7372c486cb341139"; + sha256 = "0pd47yxac81dxp3w3a5pf5k16pc5j9m2pqwdf5nnxwy0by94nak9"; + }; + meta.homepage = "https://github.com/nathunsmitty/nvim-ale-diagnostic/"; + }; + nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; @@ -2952,12 +2964,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-02-23"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "c1764beef2ceba2adb62de5ed89475c71f183a57"; - sha256 = "0h8b2hnqn21lyzla8w79sl8r702702dyi0q8jr1kpqny0s57s0jg"; + rev = "7a998c5716c2bb9a25276cf1ce7076f99582a45a"; + sha256 = "0hhznddyy3a8k7vlqhwm6fg8hsyy88ifg7a7rcxd6q8zffm66r1i"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -2976,12 +2988,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-02-14"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "273890967e76322f726405e6c6c79d4fc69ae068"; - sha256 = "0azk7n06kn2n4l0xdyvbhvmgzq0rp24dng7vlkairl0sm3bnb3x9"; + rev = "6dbb5924dfecb28127171648115f2a9d8675bf0e"; + sha256 = "1vwra4bf7q5vy2f80fc4cj78i2jnwpci2yclqwy3df5fn3ldri74"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3000,24 +3012,24 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-02-20"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "b70aa802940db871b6a6b1e9668c5a3052327134"; - sha256 = "0ihij29p38669bdkc5mpbrdszs6iijsbm835n5qp6gj16768jasw"; + rev = "5a95e50556deebf45d771abc58c7cd440fd6390a"; + sha256 = "187yxnjxb9pp98yzvkpssmdcfqwvggzg5fpc20jwa7fvq8cdl0a0"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-02-10"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "aa8e36bd4f34dd0157d725c74874dfa44841a5e7"; - sha256 = "1zrqd3ndlv3393xjmf1n3w6im24fyqmnpldqvph5ix9lfrrf5vzh"; + rev = "c70b96f4a385f3d6dd0e96ad59382e0834be8eab"; + sha256 = "0kr45hrqvxl81hvbqr7w4zn0yw01qwnaq0bd60v0ibr8q79zck5m"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3048,12 +3060,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-01-30"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "a35ce80f0e618da0eceb0d5f6874608d58d3ec26"; - sha256 = "1m87v27721zdplpfk0dd8mag416dxmnqja2smwb7z29n18qh81sn"; + rev = "fa2d4af6127c646ae1f2b68b3ae2abe495cdc6a1"; + sha256 = "1f67k8c0rq9wbk9alvcc1py0rw6rrvas8wc25ngscwcnvp3ksyw8"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3072,12 +3084,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-02-20"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "a21a509417aa530fb7b54020f590fa5ccc67de77"; - sha256 = "1xlksbcv6va3ih9zg6yw5x6q2d76pr5cs942lh5gcypkx9m2f6r5"; + rev = "470b0cf45a7e60243e97628c21b05804088dfbf5"; + sha256 = "1qw5psrcxl154qgqf9w6sqhv8y92nwjryz3fcqc6n2jl2p4fszv0"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3096,24 +3108,24 @@ let nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2021-02-23"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "dde78e4adba0192c3986b20de28d26eca315dec6"; - sha256 = "1hmdrw60glr0lgixwblns73xzc6l5i1yfl7g64lp9plm8gkzb48b"; + rev = "c8be830b8b594480cac5ae2ab1af94cce1e85029"; + sha256 = "1l09xaw7xlsh1rk0amq9n22lg44wa5sn2hhmkmxyzrn3h80kg432"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-02-23"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "ae7b979a87ff284c2381e6b6d36ac35ac0bbfd84"; - sha256 = "0dh2wspygagcxzscl2626nhb8pnwqyjzsgivy162xmmy3g0sbppw"; + rev = "da24e049457ddd1f3e1b9305693bee70c8d1567b"; + sha256 = "0g17x5kl2ifhfl62wapb5aazv2w502r072k604q7wbc64kjg62sk"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3132,24 +3144,24 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-02-22"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "905afba20900caea1e6f0f541c2ed7302de9f598"; - sha256 = "1hcqplvlk2cymxv7lx0yv7m5gc8p4281q1s3rhizvf4jvv973g59"; + rev = "1984c125100247f79e1aaa4de335032ea6092d63"; + sha256 = "081vcbasmhki7hshfaimbv1wgim15h6vagcxc4fkjgbmpl621s49"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-02-22"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "2d82a7fe07f3e4959219e231a58e0707d577262e"; - sha256 = "0qzv0vr89mj58aas30bqh3w479njd84qw7c965f9489p5sg9wg8x"; + rev = "d162a83d824fcb7ec44472288af2d7379b4bd8b0"; + sha256 = "0b1qqy32lcjgfkq9s570g0248qff1901l2hadkaqv5i2az3dgp96"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3276,12 +3288,12 @@ let onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2020-12-14"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "94ff495eac89cea2532d8e0022f67c79a24d9649"; - sha256 = "0x4wdmk28r85g14xv1acc0fimh4bsvm30mrgsws7dm8lqx3ws8g3"; + rev = "b70ed293f3c3adaea23f9fcd84ef942015664756"; + sha256 = "0wz4kmbgc9rlvbxj8s8xg1sx53w0v94r6qicq3ggs9raca51ywfg"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -3420,12 +3432,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-02-22"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "116aedc7fb327eda6e7c05915f3d97088569c0e8"; - sha256 = "1mnf12bzdcpy0sgwl45sjxvzzifyy9k8mx7ffr7q8ddxwvbmmakp"; + rev = "4cc823c409b1e6e2c4cc6ec02ee7ec404aaa7f94"; + sha256 = "02mw8qc9i3ncdv49qjpg0d8mqh6xfk64bpkgfbqx05aq1xs1cvi4"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3625,12 +3637,12 @@ let Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2020-04-20"; + version = "2021-02-24"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "c84f07260f1e839bc7bfc2ab69bf4f3f4aaa423d"; - sha256 = "1q87n2xz6p879ihijvhxs1iv9iyrqcbx7z8dkql0ivbf572q9iwh"; + rev = "f019bb0bc15093da74ef0bd1a9356dedf13ba885"; + sha256 = "1v23k4wfiazvkm9iaqw987cs69fwf230a7i15x3rv68azw63fl2b"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; @@ -3853,24 +3865,24 @@ let snippets-nvim = buildVimPluginFrom2Nix { pname = "snippets-nvim"; - version = "2021-02-23"; + version = "2020-09-09"; src = fetchFromGitHub { owner = "norcalli"; repo = "snippets.nvim"; rev = "7b5fd8071d4fb6fa981a899aae56b55897c079fd"; sha256 = "1fdsx7d5nyhhklwidgh387ijd485g2836rwd5i1r0di777mp7w80"; }; - meta.homepage = "https://github.com/norcalli/snippets.nvim"; + meta.homepage = "https://github.com/norcalli/snippets.nvim/"; }; sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-02-14"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "522571a37d78afe13538a22cfecb8ed9cccb21a3"; - sha256 = "14jhx428lk4q0s6qgj97q4s03msqhnli8l71rw6541m7gcdhjvjj"; + rev = "86298232f4f5ab418d5d9d18a336d7ab8b167b68"; + sha256 = "060k664gm4857nfmxaj0v6sz50mb3y9v8489jnv1bhqplzqf8gmy"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4203,12 +4215,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-02-22"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "d7c02e3b52b5a13265e071d0de2d6a989110a515"; - sha256 = "1xd080ysfi9mvxhv717cgsah7qk5z7ci0gxmq9sls6rsjrk8dykv"; + rev = "678494e503d3c717df8295f55a6f3c7d3309b7fa"; + sha256 = "04vazlzfx9ab016mgnw0mazg3nvfvf81b947c70vzl1jdyn5d73w"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4984,12 +4996,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-02-19"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "b6d82bc748a80577a31f2a40eb36947d70197a67"; - sha256 = "0w7yhqzdiknqm2y2cyx04sqmyr0sixfk1lrxbmra01d4sv4p7lis"; + rev = "8b618fcbbee7cf30ce9d05be00706ddb558f96af"; + sha256 = "19x69jhn0j5qa1hz46piv54v2nq3g14pqbdvap2h8w9bb62a3yh6"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5020,12 +5032,12 @@ let vim-closer = buildVimPluginFrom2Nix { pname = "vim-closer"; - version = "2020-10-24"; + version = "2021-02-24"; src = fetchFromGitHub { owner = "rstacruz"; repo = "vim-closer"; - rev = "c61667d27280df171a285b1274dd3cf04cbf78d4"; - sha256 = "1dgcag4dibckpvsm8hr28yw10z81ic52sdm5narcwr1k6hjidxpn"; + rev = "c34636e104e8731d4a414d6500303442ff7ed94e"; + sha256 = "07ap62n10dfvw9q71q8zkms8z3jl279a99shr7scyf8q4ngsj024"; }; meta.homepage = "https://github.com/rstacruz/vim-closer/"; }; @@ -5224,12 +5236,12 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-01-25"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "fb543e602de2fe74a7928c78e152bb964abb7a9a"; - sha256 = "05fwa2v0fz1rgfyp2f47hcr7vzgwfrw14flr43d7a88d8qka9lqs"; + rev = "28c3b294c9f1d88078eeebfa62a8533e6ea97f87"; + sha256 = "0myj7ng62sjxhrq0lfk142dzr637rfl0ll6khrd0a3hrwxjjnb2x"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -5416,12 +5428,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-11-26"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "1ad996e64dadf0d2a65c8a079d55a0ad057c08b4"; - sha256 = "1f4g7m09x67xfajanm9aw4z6rl1hcp24c5a01m1avn9594qgnh2c"; + rev = "527e6fd8798638a79621e0b5c788b67b2b4b4dbc"; + sha256 = "02ncqbxlncm9gz7dvxv6lv9zsnfhqmqq05m95lh95l3lm0gs44ph"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -5668,12 +5680,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-02-22"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "6c4c7c9aebc4c65c13f94597e4c9352dbba21fa5"; - sha256 = "09q6ijr3f6aaki17cpidn02lxk00gficsclg1zcprxcq8fp8v8d1"; + rev = "9cba97f4db4e0af4275f802c2de977f553d26ec6"; + sha256 = "182z25fv3lqhsh926p24fq1lwldbdq8bqbmivpv4ylq2c5b6xisz"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5932,12 +5944,12 @@ let vim-hexokinase = buildVimPluginFrom2Nix { pname = "vim-hexokinase"; - version = "2021-01-31"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-hexokinase"; - rev = "9f7f4bad24f23d5284543a02349a5114e8b8f032"; - sha256 = "1i435avz23mclf1ag7v273xmpbgp66msvmi7mljkbs8k6xxygaks"; + rev = "969d6362bd0ba09e97fefdb694a59e48eb028e9c"; + sha256 = "02a96vaj7a9limd99b8fvhfmz1b4nzf0z48jdj98f9d5psfyx7cv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; @@ -6065,12 +6077,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-02-05"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "1ce3c4de54d2f0115129b50c4b056620953336f4"; - sha256 = "1g6lfxvs4nqlkyj0f7gd5f297r20cjxs6m6mza3bymivl9lwbj8p"; + rev = "7dbacfb73f56b84d14fff993ff4869dfd4610443"; + sha256 = "0msz6ip67saw9scxmdqgws3sy5hb4ihlhv72m7p5347fmm1cdh43"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -6438,24 +6450,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-02-04"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "25d625aa0274b4c9845afd49a5c8f21aceb25073"; - sha256 = "0pdmzv3rxdawxy4qy5p283nzrjs4lc0ki2j7xxiz5bhdgnznbkcc"; + rev = "801572d71ad05683a4ef57c1d35305f566c09bf5"; + sha256 = "02qj2svrdhhazyr8id0crw1qk0030pivdna28xnm9l7v24g7h9hl"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-02-22"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "a78536ad745852c73cdf2d0defffd6b81bc377f0"; - sha256 = "06xpv6k80jyrd6psjhrwq84a4dm2kn7c1a89yhql7jqkrsx0iyy2"; + rev = "ca2b527dc5f8cc4e6fbccda735e179ff19e388a1"; + sha256 = "02qpmhd4hzvdg743r9j8fjrzr2mdbvhypyvkb3ph9sdrzc4kwpvd"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6535,12 +6547,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-02-23"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "b131a5b35707eb0bf0cf088d85a8f100b4609332"; - sha256 = "0j8pryc4g0w329d27likagxg6ww9lll4fj653i3ka0cffb01jjri"; + rev = "69208b080114be6d038fcdca4a70adb24b6539be"; + sha256 = "12m46f4h5ia16gyj6yv7al813qmwxbsj5ddfmdz03mxa373fwwlm"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6907,12 +6919,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-11-07"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "0aeed75603a55887c2b492d1fe19ac8065dae671"; - sha256 = "13xjpkq9lbb04igwif23zmb3395awk48kdyfshsga2gbv5h1i9fn"; + rev = "94b6a23b4c0fb3268408a38badd480d974b0919f"; + sha256 = "1dv33anir1pfnnbvj9alf4g13q58hdppry0hspy1d5kqsr5wfpix"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -7051,12 +7063,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-01-14"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "4c10562d2cc9b084518284c49a158558da5180a7"; - sha256 = "0avrjy1mxzkpsrbblzqx81ml08gm7n4bd4ihxm4qbvcdbg8n5chx"; + rev = "cc63193ce82c1e7b9ee2ad7d0ddd14e8394211ef"; + sha256 = "0and9148l36m8bhnzlyjirl1bd2ynswwzjc22605if82az9j55m8"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -7291,12 +7303,12 @@ let vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2020-09-18"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "45ea40da3f223fff83fce0a643875e560ed20aae"; - sha256 = "1bm8hpnm02pbivcvjn20qr6hk3yyb3flfkv7pk66sffhiyj44rh2"; + rev = "67d51540a4b173d7c77bcf1db9742b3d50e4bf45"; + sha256 = "0a86qb39c5k1h2mi5qsn03zv598776gcvlsrkgw53f3g23xm6rk5"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -7567,12 +7579,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-02-09"; + version = "2021-02-25"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "8426857c1b8d1c00bbe0faa6dfff99acb1521042"; - sha256 = "16lvwd22813k38dbkfx4w46gmvbkfla4a0zyklpz7qa658phfprw"; + rev = "24a9bf959211bb0ba9ada17d6425ff167adf7bd9"; + sha256 = "0jwjhpw1g0hy935vzslbhcw9n5sfbpcc7hs1bvvvir05619hr21y"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7916,12 +7928,12 @@ let vim-tmux-focus-events = buildVimPluginFrom2Nix { pname = "vim-tmux-focus-events"; - version = "2020-10-05"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; - rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941"; - sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1"; + rev = "9cb40a1e0c8cfad2e2180e5225d3880109cb9fc4"; + sha256 = "0prh8zphcacn9w19s82v58km7jsdgxg0gbrq5d3sf1p82p13r5z5"; }; meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; @@ -8096,12 +8108,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-02-11"; + version = "2021-02-28"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "d840e1af9e680b384e8a28e62b46ad5148907fdd"; - sha256 = "0d6gmw38829ln6mvn5j3gyy6by3ks5g62qiyzapz3vw67zyblyjz"; + rev = "925fb3d0163e4c50b8d639029837696ead0f5a56"; + sha256 = "06ssm3m64mcfzasf2sx09nrk8rizgjm9dgl36nm7qk2vchrcbg33"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -8360,12 +8372,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-02-23"; + version = "2021-02-27"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "6fac220ee55af66c0c2ab3dae630086da5b0263f"; - sha256 = "0q7zj8wmg88wzhjr4xz2rkcvw091jdi3mfyv8rn09plf2w4bkszy"; + rev = "5bd83d3e37403d8cc7ad3378a58d58f06a53d318"; + sha256 = "114bpbb82w9q79c7qq51c2w00qyagbj0l8jasr0giwhfxcxys1nb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8373,24 +8385,24 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-02-22"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "d99f8ff57a13323d5d2fe7f3163679848bca334e"; - sha256 = "12h180awhpaj6x0aq8vfzdxp5w474lgncb1yl0ccj6kblkr1pp32"; + rev = "eb6b84315f7d8d698d8839f9685283e6ec9adbbd"; + sha256 = "1hgpx95hpwdvldhv9k1a7p9acd5ppp8z2fl9brq3fs8h5ci272x0"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-02-19"; + version = "2021-02-23"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "3bfe0ea285031f40f1a1e8e00f57a933eb8a8325"; - sha256 = "1jl9a1fms4vaq5fhi40dvk5nwfy7n0gzj75dmfyfyb41j0c2a5hl"; + rev = "5b1791673c1a089a78be16187f7532f95e50580b"; + sha256 = "17m7hh02q9myfpa8z1scnakcl25fasnns1gxgfpx544rky5pd3mc"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -8421,12 +8433,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-02-17"; + version = "2021-02-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "30bf0bdaf33d942d35a0e767cf2387ced755d0e0"; - sha256 = "1bs4v3ym6mhczmzg7z6np7myziyp3n40xz2xdhcalbzwkdz5k43j"; + rev = "9c97b935cb941a9fddcbbdc0eaf3e5e190f4847e"; + sha256 = "10jsqi5jipvaa8dbckrjacqz32iy0i9mx1a4m3jk3gainx9a9xmq"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -8603,12 +8615,12 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-02-20"; + version = "2021-03-01"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "79c05946ade40f211ca058e5c4678b438f6242e1"; - sha256 = "0p41dmhasl1xlsi2wvng35nb3rdz4yw36gdn5n6m744dha0z9khm"; + rev = "58e31c89350d50e16f52911e60bb3b66160255b5"; + sha256 = "1yyv9grk2wdp308wc3g227iq4rrflv443z8hxi66wknjffjs51wr"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bfe9006506b3d..c216d2a7d4461 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -373,6 +373,7 @@ nanotech/jellybeans.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides nathangrigg/vim-beancount +nathunsmitty/nvim-ale-diagnostic@main navicore/vissort.vim nbouscal/vim-stylish-haskell ncm2/float-preview.nvim diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 644309813ca56..7224e302f1317 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -365,8 +365,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.196"; - sha256 = "1l4f290018f2p76q6hn2b2injps6wz65as7dm537wrsvsivyg2qz"; + version = "0.0.198"; + sha256 = "0riy2k8dbsnpk8vkv814fr8zh87y425s24nklcx4b7mfrszv7xbn"; }; meta = with lib; { license = licenses.mit; diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index 0809eb7164e87..bdaee22a480ee 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -3,7 +3,7 @@ "version": "0.4.0-dev", "dependencies": { "node-fetch": "^2.6.1", - "vscode-languageclient": "^7.1.0-next.1", + "vscode-languageclient": "^7.1.0-next.4", "@rollup/plugin-commonjs": "^17.0.0", "@rollup/plugin-node-resolve": "^11.0.0", "@types/glob": "^7.1.3", @@ -20,7 +20,7 @@ "tslib": "^2.0.3", "typescript": "^4.1.2", "typescript-formatter": "^7.2.2", - "vsce": "^1.81.1", - "vscode-test": "^1.4.1" + "vsce": "^1.85.0", + "vscode-test": "^1.5.1" } } diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 602d427818366..09dbdbc9b6fba 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libogg ] ++ lib.optional (libpulseaudio != null) libpulseaudio - # https://github.com/NixOS/nixpkgs/issues/96548 - ++ lib.optional (libjack2 != null && (stdenv.buildPlatform == stdenv.hostPlatform)) libjack2; + ++ lib.optional (libjack2 != null) libjack2; meta = with lib; { description = "Various plugins for ALSA"; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index da365fb7d99a7..dd747bbbf6fca 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "09m4dnn4kplawprd2bl15nwa0b4r1brab3x44ga7f1fyk7aw5zwq"; }; - nativeBuildInputs = [ gettext ]; - buildInputs = [ makeWrapper alsaLib ncurses libsamplerate fftw ]; + nativeBuildInputs = [ gettext makeWrapper ]; + buildInputs = [ alsaLib ncurses libsamplerate fftw ]; configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 6cee603664db3..bd52f37e62f89 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.335"; + version = "0.344"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "0f8ikwfrs6xd5sywypd9rq9cln8a0rf3vj6nm0adwzn1p8mgmrb2"; + sha256 = "0rsnm94r814shr86jk6f2323i1n4p58inkgkx7362yz9k4a8ir7a"; }; preConfigure = "patchShebangs ./configure"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "101lppd1805drwd038b4njr5czzjnqqxf3xlf6v3l22wfwr2cn3l"; + outputHash = "011lyldzskfb4sfn4i7qyyq3i4gaf1v9yfbc82889cabka0n4nfz"; meta = { homepage = "https://github.com/vcrhonek/hwdata"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 7a81d9434e343..a2a63e2bcab2a 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -69,12 +69,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.10.9"; in + linuxHeaders = let version = "5.11"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz"; + sha256 = "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 186d112e81dff..0d93dd485a40f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -252,11 +252,17 @@ let DRM_AMDGPU_SI = whenAtLeast "4.9" yes; # (stable) amdgpu support for bonaire and newer chipsets DRM_AMDGPU_CIK = whenAtLeast "4.9" yes; - # amdgpu support for RX6000 series - DRM_AMD_DC_DCN3_0 = whenBetween "5.9.12" "5.11" yes; - DRM_AMD_DC_DCN = whenAtLeast "5.11" yes; # Allow device firmware updates DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes; + # amdgpu display core (DC) support + DRM_AMD_DC_DCN1_0 = whenBetween "4.15" "5.6" yes; + DRM_AMD_DC_PRE_VEGA = whenBetween "4.15" "4.18" yes; + DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes; + DRM_AMD_DC_DCN2_1 = whenBetween "5.4" "5.6" yes; + DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes; + DRM_AMD_DC_DCN = whenAtLeast "5.11" yes; + DRM_AMD_DC_HDCP = whenAtLeast "5.5" yes; + DRM_AMD_DC_SI = whenAtLeast "5.10" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { # Intel GVT-g graphics virtualization supports 64-bit only DRM_I915_GVT = whenAtLeast "4.16" yes; @@ -410,6 +416,8 @@ let NLS_ISO8859_1 = module; # VFAT default for the iocharset= mount option DEVTMPFS = yes; + + UNICODE = whenAtLeast "5.2" yes; # Casefolding support for filesystems }; security = { @@ -640,7 +648,12 @@ let XZ_DEC_TEST = option no; }; - criu = optionalAttrs (features.criu or false) ({ + criu = if (versionAtLeast version "4.19") then { + # Unconditionally enabled, because it is required for CRIU and + # it provides the kcmp() system call that Mesa depends on. + CHECKPOINT_RESTORE = yes; + } else optionalAttrs (features.criu or false) ({ + # For older kernels, CHECKPOINT_RESTORE is hidden behind EXPERT. EXPERT = yes; CHECKPOINT_RESTORE = yes; } // optionalAttrs (features.criu_revert_expert or true) { diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 000d6e64d778e..6c595d75c8fa2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.1"; + version = "5.11.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1gmrckvl3039z80rr740c0d5knwgj6p1dmhw4x9gwc7rxli6az85"; + sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 8cbc8466a916c..046bba5dda0fd 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - ]; + ] ++ lib.optional stdenv.hostPlatform.isStatic "ENABLE_SHARED=0"; hardeningDisable = lib.optional (stdenv.isi686) "stackprotector"; diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index ab148af72f234..bcc86b72de04e 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-gC1Q+kG/oKfYvuHVKstpRWfL/thsemULrimPrV/eeaI="; }; - nativeBuildInputs = [ pkg-config help2man autoreconfHook ]; - buildInputs = [ fuse makeWrapper ]; + nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ]; + buildInputs = [ fuse ]; preConfigure = lib.optionalString enableDebugBuild '' sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index de2c1afb06587..b20632be334c7 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "173"; + version = "175"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1ili11kqacn6jkjpk11vhycgygdl92mymgb1sx22lcwq2x0d248m"; + sha256 = "sha256-Xzbck/nRdTR9H5o2XVFlFdNLz2ve65KEcefKAKe0eW8="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 63d8114ac77ab..3310692b31dc1 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -16,6 +16,11 @@ let sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71"; }; + stack_chk_fail_local_c = fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/musl/__stack_chk_fail_local.c?h=3.10-stable"; + sha256 = "1nhkzzy9pklgjcq2yg89d3l18jif331srd3z3vhy5qwxl1spv6i9"; + }; + # iconv tool, implemented by musl author. # Original: http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f # We use copy from Alpine which fixes error messages, see: @@ -87,6 +92,16 @@ stdenv.mkDerivation rec { NIX_DONT_SET_RPATH = true; + preBuild = '' + ${if (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) then + "# the -x c flag is required since the file extension confuses gcc + # that detect the file as a linker script. + $CC -x c -c ${stack_chk_fail_local_c} -o __stack_chk_fail_local.o + $AR r libssp_nonshared.a __stack_chk_fail_local.o" + else "" + } + ''; + postInstall = '' # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do. # Apparently glibc provides scsi itself? @@ -96,6 +111,13 @@ stdenv.mkDerivation rec { $STRIP -S $out/lib/libc.a mkdir -p $out/bin + + ${if (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) then + "install -D libssp_nonshared.a $out/lib/libssp_nonshared.a + $STRIP -S $out/lib/libssp_nonshared.a" + else "" + } + # Create 'ldd' symlink, builtin ln -rs $out/lib/libc.so $out/bin/ldd diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index f90c796619075..2541055348664 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -18,8 +18,8 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ util-linux openssl libcap_ng pythonEnv perl procps which ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index ddb5eff972303..f379633e19843 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -19,9 +19,8 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - nativeBuildInputs = [ autoconf libtool automake pkg-config ]; - buildInputs = [ makeWrapper util-linux openssl libcap_ng python2 - perl procps which ]; + nativeBuildInputs = [ autoconf libtool automake pkg-config makeWrapper ]; + buildInputs = [ util-linux openssl libcap_ng python2 perl procps which ]; preConfigure = "./boot.sh"; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 14d1eb8599807..e58b97654af25 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "ae42f1b5fef82b3bc23fe93c95c345e7af65fef3"; sha256 = "0c342m0bpq6ranr7dsxk9qi5mg3j5aw9wv85ql8gprdb2pz59qy8"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D pipework $out/bin/pipework wrapProgram $out/bin/pipework --prefix PATH : \ diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 1b2415dd80521..0f69cb13fcd9a 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation { touch gnu-efi/inc/ia32/gnu/stubs-32.h ''; - nativeBuildInputs = [ nasm perl python3 ]; - buildInputs = [ libuuid makeWrapper ]; + nativeBuildInputs = [ nasm perl python3 makeWrapper ]; + buildInputs = [ libuuid ]; enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' hardeningDisable = [ "pic" "stackprotector" "fortify" ]; diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 476ebe06e70f2..3e40385c3bb76 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,24 +1,23 @@ -From 6ede8baac88aba769030f5bc5f5b2070098c7428 Mon Sep 17 00:00:00 2001 +From 95e4533f1eeb6e0d509f9129d0133f0b849cc3c5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/18] Add some NixOS-specific unit directories -Look in `/nix/var/nix/profiles/default/lib/systemd` for units provided -by packages installed into the default profile via -`nix-env -iA nixos.$package`, and into `/etc/systemd-mutable/system` for -persistent, mutable units (used for Dysnomia). +Look in `/nix/var/nix/profiles/default/lib/systemd/{system,user}` for +units provided by packages installed into the default profile via +`nix-env -iA nixos.$package`. Also, remove /usr and /lib as these don't exist on NixOS. --- - src/basic/path-lookup.c | 20 +++++--------------- + src/basic/path-lookup.c | 17 ++--------------- src/core/systemd.pc.in | 5 +++-- - 2 files changed, 8 insertions(+), 17 deletions(-) + 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 96b82170d0..b9fbed5c61 100644 +index 96b82170d0..bf66bd6b77 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c -@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { +@@ -94,11 +94,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { } static const char* const user_data_unit_paths[] = { @@ -30,18 +29,10 @@ index 96b82170d0..b9fbed5c61 100644 NULL }; - static const char* const user_config_unit_paths[] = { - USER_CONFIG_UNIT_DIR, - "/etc/systemd/user", -+ "/etc/systemd-mutable/user", - NULL - }; - -@@ -616,15 +613,14 @@ int lookup_paths_init( +@@ -616,15 +612,13 @@ int lookup_paths_init( persistent_config, SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", -+ "/etc/systemd-mutable/system", + "/nix/var/nix/profiles/default/lib/systemd/system", STRV_IFNOTNULL(persistent_attached), runtime_config, @@ -55,11 +46,10 @@ index 96b82170d0..b9fbed5c61 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -640,14 +636,12 @@ int lookup_paths_init( +@@ -640,14 +634,11 @@ int lookup_paths_init( persistent_config, USER_CONFIG_UNIT_DIR, "/etc/systemd/user", -+ "/etc/systemd-mutable/user", + "/nix/var/nix/profiles/default/lib/systemd/user", runtime_config, "/run/systemd/user", @@ -72,7 +62,7 @@ index 96b82170d0..b9fbed5c61 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -797,7 +791,6 @@ char **generator_binary_paths(UnitFileScope scope) { +@@ -797,7 +788,6 @@ char **generator_binary_paths(UnitFileScope scope) { case UNIT_FILE_SYSTEM: add = strv_new("/run/systemd/system-generators", "/etc/systemd/system-generators", @@ -80,7 +70,7 @@ index 96b82170d0..b9fbed5c61 100644 SYSTEM_GENERATOR_DIR); break; -@@ -805,7 +798,6 @@ char **generator_binary_paths(UnitFileScope scope) { +@@ -805,7 +795,6 @@ char **generator_binary_paths(UnitFileScope scope) { case UNIT_FILE_USER: add = strv_new("/run/systemd/user-generators", "/etc/systemd/user-generators", @@ -88,7 +78,7 @@ index 96b82170d0..b9fbed5c61 100644 USER_GENERATOR_DIR); break; -@@ -844,12 +836,10 @@ char **env_generator_binary_paths(bool is_system) { +@@ -844,12 +833,10 @@ char **env_generator_binary_paths(bool is_system) { if (is_system) add = strv_new("/run/systemd/system-environment-generators", "/etc/systemd/system-environment-generators", @@ -102,7 +92,7 @@ index 96b82170d0..b9fbed5c61 100644 if (!add) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index f2c045511d..ccb382e421 100644 +index f2c045511d..d38a3a0302 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir} @@ -110,11 +100,11 @@ index f2c045511d..ccb382e421 100644 systemduserconfdir=${systemd_user_conf_dir} -systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system -+systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} ++systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} systemdsystemunitpath=${systemd_system_unit_path} -systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user -+systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} ++systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} + systemduserunitpath=${systemd_user_unit_path} diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 421fc5986af32..7e3c6d1fe51f4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,3 +1,5 @@ +# NOTE: Make sure to (re-)format this file on changes with `nixpkgs-fmt`! + { stdenv , lib , fetchFromGitHub @@ -111,7 +113,7 @@ assert withCryptsetup -> let wantCurl = withRemote || withImportd; - version = "247.2"; + version = "247.3"; in stdenv.mkDerivation { inherit version pname; @@ -122,7 +124,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "091pwrvxz3gcf80shlp28d6l4gvjzc6pb61v4mwxmk9d71qaq7ry"; + sha256 = "0zn0b74iwz3vxabqsk4yydwpgky3c5z4dl83wxbs1qi5d2dnbqa7"; }; # If these need to be regenerated, `git am path/to/00*.patch` them into a @@ -160,83 +162,87 @@ stdenv.mkDerivation { --replace \ "find_program('objcopy'" \ "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" - '' + (let - - # The folllowing dlopen patches ensure that all the features that are - # implemented via dlopen(3) are available (or explicitly deactivated) by - # pointing dlopen to the absolute store path instead of relying on the - # linkers runtime lookup code. - # - # All of the dlopen calls have to be handled. When new ones are introduced - # by upstream (or one of our patches) they must be explicitly declared, - # otherwise the build will fail. - # - # As of systemd version 247 we've seen a few errors like `libpcre2.… not - # found` when using e.g. --grep with journalctl. Those errors should - # become less unexpected now. - # - # There are generally two classes of dlopen(3) calls. Those that we want to - # support and those that should be deactivated / unsupported. This change - # enforces that we handle all dlopen calls explicitly. Meaning: There is - # not a single dlopen call in the source code tree that we did not - # explicitly handle. - # - # In order to do this we introduced a list of attributes that maps from - # shared object name to the package that contains them. The package can be - # null meaning the reference should be nuked and the shared object will - # never be loadable during runtime (because it points at an invalid store - # path location). - # - # To get a list of dynamically loaded libraries issue something like - # `grep -ri 'dlopen("lib' $src` and update the below list. - dlopenLibs = [ - # We did never provide support for libxkbcommon & qrencode - { name = "libxkbcommon.so.0"; pkg = null; } - { name = "libqrencode.so.4"; pkg = null; } - - # We did not provide libpwquality before so it is safe to disable it for - # now. - { name = "libpwquality.so.1"; pkg = null; } - - # Only include cryptsetup if it is enabled. We might not be able to - # provide it during "bootstrap" in e.g. the minimal systemd build as - # cryptsetup has udev (aka systemd) in it's dependencies. - { name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; } - - # We are using libidn2 so we only provide that and ignore the others. - # Systemd does this decision during configure time and uses ifdef's to - # enable specific branches. We can safely ignore (nuke) the libidn "v1" - # libraries. - { name = "libidn2.so.0"; pkg = libidn2; } - { name = "libidn.so.12"; pkg = null; } - { name = "libidn.so.11"; pkg = null; } - - # journalctl --grep requires libpcre so lets provide it - { name = "libpcre2-8.so.0"; pkg = pcre2; } - ]; - - patchDlOpen = dl: let - library = "${lib.makeLibraryPath [dl.pkg]}/${dl.name}"; - in if dl.pkg == null then '' - # remove the dependency on the library by replacing it with an invalid path - for file in $(grep -lr 'dlopen("${dl.name}"' src); do - echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…" - substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' - done - '' else '' - # ensure that the library we provide actually exists - if ! [ -e ${library} ]; then - echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`' - exit 1 - fi - # make the path to the dependency explicit - for file in $(grep -lr 'dlopen("${dl.name}"' src); do - echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…" - substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"' - done - ''; - in # patch all the dlopen calls to contain absolute paths to the libraries - lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs) + '' + ( + let + # The folllowing dlopen patches ensure that all the features that are + # implemented via dlopen(3) are available (or explicitly deactivated) by + # pointing dlopen to the absolute store path instead of relying on the + # linkers runtime lookup code. + # + # All of the dlopen calls have to be handled. When new ones are introduced + # by upstream (or one of our patches) they must be explicitly declared, + # otherwise the build will fail. + # + # As of systemd version 247 we've seen a few errors like `libpcre2.… not + # found` when using e.g. --grep with journalctl. Those errors should + # become less unexpected now. + # + # There are generally two classes of dlopen(3) calls. Those that we want to + # support and those that should be deactivated / unsupported. This change + # enforces that we handle all dlopen calls explicitly. Meaning: There is + # not a single dlopen call in the source code tree that we did not + # explicitly handle. + # + # In order to do this we introduced a list of attributes that maps from + # shared object name to the package that contains them. The package can be + # null meaning the reference should be nuked and the shared object will + # never be loadable during runtime (because it points at an invalid store + # path location). + # + # To get a list of dynamically loaded libraries issue something like + # `grep -ri 'dlopen("lib' $src` and update the below list. + dlopenLibs = [ + # We did never provide support for libxkbcommon & qrencode + { name = "libxkbcommon.so.0"; pkg = null; } + { name = "libqrencode.so.4"; pkg = null; } + + # We did not provide libpwquality before so it is safe to disable it for + # now. + { name = "libpwquality.so.1"; pkg = null; } + + # Only include cryptsetup if it is enabled. We might not be able to + # provide it during "bootstrap" in e.g. the minimal systemd build as + # cryptsetup has udev (aka systemd) in it's dependencies. + { name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; } + + # We are using libidn2 so we only provide that and ignore the others. + # Systemd does this decision during configure time and uses ifdef's to + # enable specific branches. We can safely ignore (nuke) the libidn "v1" + # libraries. + { name = "libidn2.so.0"; pkg = libidn2; } + { name = "libidn.so.12"; pkg = null; } + { name = "libidn.so.11"; pkg = null; } + + # journalctl --grep requires libpcre so lets provide it + { name = "libpcre2-8.so.0"; pkg = pcre2; } + ]; + + patchDlOpen = dl: + let + library = "${lib.makeLibraryPath [ dl.pkg ]}/${dl.name}"; + in + if dl.pkg == null then '' + # remove the dependency on the library by replacing it with an invalid path + for file in $(grep -lr 'dlopen("${dl.name}"' src); do + echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…" + substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' + done + '' else '' + # ensure that the library we provide actually exists + if ! [ -e ${library} ]; then + echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`' + exit 1 + fi + # make the path to the dependency explicit + for file in $(grep -lr 'dlopen("${dl.name}"' src); do + echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…" + substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"' + done + ''; + in + # patch all the dlopen calls to contain absolute paths to the libraries + lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs + ) # finally ensure that there are no left-over dlopen calls that we didn't handle + '' if grep -qr 'dlopen("[^/]' src; then diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index ee8b26c384d97..d9767cbdd9345 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { url = "https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch"; sha256 = "19f4hx0p547mdx8y8arb3vclwyy4w9c8a6a40ryj7q33730mrmn4"; }) + # P2P: Fix a corner case in peer addition based on PD Request (https://w1.fi/security/2021-1/) + (fetchurl { + name = "CVE-2021-27803.patch"; + url = "https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch"; + sha256 = "04cnds7hmbqc44jasabjvrdnh66i5hwvk2h2m5z94pmgbzncyh3z"; + }) ]; # TODO: Patch epoll so that the dbus actually responds @@ -118,7 +124,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://hostap.epitest.fi/wpa_supplicant/"; + homepage = "https://w1.fi/wpa_supplicant/"; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; maintainers = with maintainers; [ marcweber ]; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 826e952376c73..4bd50653d52c9 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { inherit sha256; }; - buildInputs = [ jre makeWrapper bash gnugrep gnused coreutils ps ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre bash gnugrep gnused coreutils ps ]; installPhase = '' mkdir -p $out diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index e1cf49099324f..4a5846d01160e 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "18yvp56b8l074qfkgr4afirgd43g8b023n9ija6dnk6p6dib1f4j"; }; - buildInputs = [ jre makeWrapper bash ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre bash ]; installPhase = '' cp -R $confluentCli confluent-cli diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index cdfc78d622293..188c3f77cb633 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-F4YiLjWrAjCNorR5dHQ2nzEBVWvJVuDDmAbUXruaPYQ="; + sha256 = "sha256-aE+kw854/wjFJqiRC/1gLzRpaVa6EPJPJaKqXtFM+Sw="; }; - vendorSha256 = "sha256-QvT1vnvF+gvABh2SzR6vUsj3KCD8ABqZwXQUm3NldM0="; + vendorSha256 = "sha256-1+WgBsknyPcZhvQLffhlWBH1o0pYTFoOG5BviUJYxyA="; doCheck = false; diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index dc9fc0898dffc..f533b4537ad36 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -2,10 +2,10 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.14"; + version = "3.4.15"; deleteVendor = true; - vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc"; + vendorSha256 = "sha256-1q5tYNDmlgHdPgL2Pn5BS8z3SwW2E3OaZkKPAtnhJZY="; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "0s6xwc8yczjdf6xysb6m0pp31hxjqdqjw24bliq08094jprhj31f"; + sha256 = "sha256-jJC2+zv0io0ZulLVaPMrDD7qkOxGfGtFyZvJ2hTmU24="; }; buildPhase = '' diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 0b92aca74c75b..5636f51a16998 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { # (given the state of Maven support in Nix). We're not actually building any java # source here. pomFileDir = "exhibitor-standalone/src/main/resources/buildscripts/standalone/maven"; - nativeBuildInputs = [ maven ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ maven makeWrapper ]; buildPhase = '' cd ${pomFileDir} mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 10d517179c2f7..e1cb2e29a05ab 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -69,6 +69,7 @@ in with builtins; { patches = [ ./patches/ldflags-6.0.patch + ./patches/include-fixes-6.0.patch ]; }; diff --git a/pkgs/servers/foundationdb/patches/include-fixes-6.0.patch b/pkgs/servers/foundationdb/patches/include-fixes-6.0.patch new file mode 100644 index 0000000000000..93959def44f82 --- /dev/null +++ b/pkgs/servers/foundationdb/patches/include-fixes-6.0.patch @@ -0,0 +1,137 @@ +diff --git a/fdbrpc/ContinuousSample.h b/fdbrpc/ContinuousSample.h +index 54ff1b109..577c228ae 100644 +--- a/fdbrpc/ContinuousSample.h ++++ b/fdbrpc/ContinuousSample.h +@@ -26,6 +26,7 @@ + #include "flow/IRandom.h" + #include <vector> + #include <algorithm> ++#include <cmath> + + template <class T> + class ContinuousSample { +diff --git a/fdbrpc/Smoother.h b/fdbrpc/Smoother.h +index 3ed8e6e98..f3e4504b6 100644 +--- a/fdbrpc/Smoother.h ++++ b/fdbrpc/Smoother.h +@@ -23,6 +23,7 @@ + #pragma once + + #include "flow/flow.h" ++#include <cmath> + + struct Smoother { + // Times (t) are expected to be nondecreasing +@@ -50,7 +51,7 @@ struct Smoother { + double elapsed = t - time; + if(elapsed) { + time = t; +- estimate += (total-estimate) * (1-exp( -elapsed/eFoldingTime )); ++ estimate += (total-estimate) * (1-std::exp( -elapsed/eFoldingTime )); + } + } + +@@ -83,11 +84,11 @@ struct TimerSmoother { + void update(double t) { + double elapsed = t - time; + time = t; +- estimate += (total-estimate) * (1-exp( -elapsed/eFoldingTime )); ++ estimate += (total-estimate) * (1-std::exp( -elapsed/eFoldingTime )); + } + + double eFoldingTime; + double time, total, estimate; + }; + +-#endif +\ No newline at end of file ++#endif +diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp +index a924bc905..0dc70e7ac 100644 +--- a/fdbserver/Knobs.cpp ++++ b/fdbserver/Knobs.cpp +@@ -20,6 +20,7 @@ + + #include "Knobs.h" + #include "fdbrpc/Locality.h" ++#include <cmath> + + ServerKnobs const* SERVER_KNOBS = new ServerKnobs(); + +diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp +index 2d706dddd..5dbe08861 100644 +--- a/flow/Knobs.cpp ++++ b/flow/Knobs.cpp +@@ -20,6 +20,7 @@ + + #include "Knobs.h" + #include "flow/flow.h" ++#include <cmath> + + FlowKnobs const* FLOW_KNOBS = new FlowKnobs(); + +@@ -128,7 +129,7 @@ FlowKnobs::FlowKnobs(bool randomize, bool isSimulated) { + init( MAX_METRICS, 600 ); + init( MAX_METRIC_SIZE, 2500 ); + init( MAX_METRIC_LEVEL, 25 ); +- init( METRIC_LEVEL_DIVISOR, log(4) ); ++ init( METRIC_LEVEL_DIVISOR, std::log(4) ); + init( METRIC_LIMIT_START_QUEUE_SIZE, 10 ); // The queue size at which to start restricting logging by disabling levels + init( METRIC_LIMIT_RESPONSE_FACTOR, 10 ); // The additional queue size at which to disable logging of another level (higher == less restrictive) + +diff --git a/flow/Platform.cpp b/flow/Platform.cpp +index a754c8747..4d47fad32 100644 +--- a/flow/Platform.cpp ++++ b/flow/Platform.cpp +@@ -98,6 +98,8 @@ + #include <sys/resource.h> + /* Needed for crash handler */ + #include <signal.h> ++/* Needed for major() and minor() with recent glibc */ ++#include <sys/sysmacros.h> + #endif + + #ifdef __APPLE__ +diff --git a/flow/Profiler.actor.cpp b/flow/Profiler.actor.cpp +index 4603dcb77..78eda7278 100644 +--- a/flow/Profiler.actor.cpp ++++ b/flow/Profiler.actor.cpp +@@ -35,8 +35,6 @@ + + extern volatile int profilingEnabled; + +-static uint64_t gettid() { return syscall(__NR_gettid); } +- + struct SignalClosure { + void (* func)(int, siginfo_t*, void*, void*); + void *userdata; +diff --git a/flow/TDMetric.actor.h b/flow/TDMetric.actor.h +index 306352c39..fc63e12f9 100755 +--- a/flow/TDMetric.actor.h ++++ b/flow/TDMetric.actor.h +@@ -35,6 +35,7 @@ + #include "genericactors.actor.h" + #include "CompressedInt.h" + #include <algorithm> ++#include <cmath> + #include <functional> + + struct MetricNameRef { +@@ -799,7 +800,7 @@ struct EventMetric : E, ReferenceCounted<EventMetric<E>>, MetricUtil<EventMetric + if (x == 0.0) + l = FLOW_KNOBS->MAX_METRIC_LEVEL-1; + else +- l = std::min(FLOW_KNOBS->MAX_METRIC_LEVEL-1, (int64_t)(::log(1.0/x) / FLOW_KNOBS->METRIC_LEVEL_DIVISOR)); ++ l = std::min(FLOW_KNOBS->MAX_METRIC_LEVEL-1, (int64_t)(std::log(1.0/x) / FLOW_KNOBS->METRIC_LEVEL_DIVISOR)); + + if(!canLog(l)) + return 0; +@@ -1274,7 +1275,7 @@ public: + l = std::min( + FLOW_KNOBS->MAX_METRIC_LEVEL-1, + (int64_t)( +- log((toggleTime - tv.time) / x) / ++ std::log((toggleTime - tv.time) / x) / + FLOW_KNOBS->METRIC_LEVEL_DIVISOR + ) + ); diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 9890f4ac06c6d..a5028159b04f5 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -2,19 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IapgDqRZ7VMWerusWcv++Ky4yWgGLMaq8rFhbPshFjE="; + sha256 = "sha256-EhIBkAPy+sZ629yxJ8GCVhEQx7gQypMFYquGpQJkke0="; }; - cargoSha256 = "sha256-+Ch6nEGxYm2L4S9FkIkenDQovMZvQUJGOu5mR9T8r/Y="; + cargoSha256 = "sha256-nRrFC/6CgXZR78aJQVw2y2sKUmRpz8Rofo0N4vgeekg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/agate --help + $out/bin/agate --version 2>&1 | grep "agate ${version}" + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; changelog = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index 7736ed1a01468..c7e560f9e6190 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -20,13 +20,13 @@ let optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "0vkgbw2ibvfr0zffnmmws7389msyqsiw8anfad6awvkda3z3rxjm"; + sha256 = "sha256-unBToiLSpTtnung77z65iuUqiQHwfMVgmFZMUtKU7fQ="; }; cmakeFlags = [ diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index b7d507193055a..62b711af67a09 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "gpsd"; - version = "3.21"; + version = "3.22"; src = fetchurl { - url = "https://download-mirror.savannah.gnu.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "14gyqrbrq6jz4y6x59rdpv9d4c3pbn0vh1blq3iwrc6kz0x4ql35"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + sha256 = "18rplv1cd76ndb2wc91jarjmfm2nk508pykv1hir79bqbwmdygvq"; }; nativeBuildInputs = [ @@ -46,15 +46,12 @@ stdenv.mkDerivation rec { ./sconstruct-env-fixes.patch ]; - postPatch = '' - sed -i -e '17i#include <sys/sysmacros.h>' serial.c - ''; - # - leapfetch=no disables going online at build time to fetch leap-seconds # info. See <gpsd-src>/build.txt for more info. preBuild = '' patchShebangs . - sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct + sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConscript + export TAR=noop sconsFlags+=" udevdir=$out/lib/udev" sconsFlags+=" python_libdir=$out/lib/${python3Packages.python.libPrefix}/site-packages" @@ -104,7 +101,8 @@ stdenv.mkDerivation rec { diagnostic monitoring and profiling of receivers and feeding location-aware applications GPS/AIS logs for diagnostic purposes. ''; - homepage = "http://catb.org/gpsd/"; + homepage = "https://gpsd.gitlab.io/gpsd/index.html"; + changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor rasendubi ]; diff --git a/pkgs/servers/gpsd/sconstruct-env-fixes.patch b/pkgs/servers/gpsd/sconstruct-env-fixes.patch index e90bd04b6342e..d11ad1299f0ef 100644 --- a/pkgs/servers/gpsd/sconstruct-env-fixes.patch +++ b/pkgs/servers/gpsd/sconstruct-env-fixes.patch @@ -1,6 +1,7 @@ ---- SConstruct.orig 2020-12-03 12:39:40.759793977 -0600 -+++ gpsd-3.21/SConstruct 2020-12-03 12:44:30.858761753 -0600 -@@ -516,9 +516,11 @@ +diff -Naur gpsd-3.22.orig/SConscript gpsd-3.22/SConscript +--- gpsd-3.22.orig/SConscript 2021-01-09 05:35:30.000000000 +0300 ++++ gpsd-3.22/SConscript 2021-02-25 21:06:47.921044438 +0300 +@@ -518,9 +518,11 @@ 'CWRAPPERS_CONFIG_DIR', # pkgsrc # Variables used in testing 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index be28578bcb0f2..d05232193d78f 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pdvbnx7nqfqs7x1zkwz2q34331l55jknpk6arf6dksvnd71hinj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = let diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 09600082633d6..32d2c09de97fb 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0kz72wqsii09v9hxkw10mzyvjhji5sx3l6aijjalgbybavpcxglb"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out cp -R * $out diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b2427bb69f595..85891544a5dd3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -63,7 +63,7 @@ "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ avea ]; "avion" = ps: with ps; [ avion ]; - "awair" = ps: with ps; [ ]; # missing inputs: python_awair + "awair" = ps: with ps; [ python-awair ]; "aws" = ps: with ps; [ aiobotocore ]; "axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ]; "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops @@ -338,7 +338,7 @@ "hassio" = ps: with ps; [ aiohttp-cors pillow ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; - "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC + "hdmi_cec" = ps: with ps; [ pycec ]; "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 "heos" = ps: with ps; [ ]; # missing inputs: pyheos "here_travel_time" = ps: with ps; [ ]; # missing inputs: herepy @@ -480,7 +480,7 @@ "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; "media_source" = ps: with ps; [ aiohttp-cors ]; - "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom + "mediaroom" = ps: with ps; [ pymediaroom ]; "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate "meraki" = ps: with ps; [ aiohttp-cors ]; @@ -731,7 +731,7 @@ "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 "sigfox" = ps: with ps; [ ]; - "sighthound" = ps: with ps; [ pillow ]; # missing inputs: simplehound + "sighthound" = ps: with ps; [ pillow simplehound ]; "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python @@ -740,7 +740,7 @@ "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control "sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] - "skybell" = ps: with ps; [ ]; # missing inputs: skybellpy + "skybell" = ps: with ps; [ skybellpy ]; "slack" = ps: with ps; [ ]; # missing inputs: slackclient "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api @@ -751,7 +751,7 @@ "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg - "sms" = ps: with ps; [ ]; # missing inputs: python-gammu + "sms" = ps: with ps; [ python-gammu ]; "smtp" = ps: with ps; [ ]; "snapcast" = ps: with ps; [ snapcast ]; "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; @@ -801,7 +801,7 @@ "swiss_public_transport" = ps: with ps; [ python-opendata-transport ]; "swisscom" = ps: with ps; [ ]; "switch" = ps: with ps; [ ]; - "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot + "switchbot" = ps: with ps; [ pyswitchbot ]; "switcher_kis" = ps: with ps; [ aioswitcher ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru @@ -817,7 +817,7 @@ "tag" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ tahoma-api ]; "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility - "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig + "tankerkoenig" = ps: with ps; [ pytankerkoenig ]; "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ aiohttp-cors hatasmota paho-mqtt ]; "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli @@ -870,7 +870,7 @@ "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; - "twinkly" = ps: with ps; [ ]; # missing inputs: twinkly-client + "twinkly" = ps: with ps; [ twinkly-client ]; "twitch" = ps: with ps; [ python-twitch-client ]; "twitter" = ps: with ps; [ twitterapi ]; "ubus" = ps: with ps; [ ]; @@ -903,7 +903,7 @@ "version" = ps: with ps; [ pyhaversion ]; "vesync" = ps: with ps; [ pyvesync ]; "viaggiatreno" = ps: with ps; [ ]; - "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare + "vicare" = ps: with ps; [ pyvicare ]; "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek "vizio" = ps: with ps; [ pyvizio ]; @@ -924,7 +924,7 @@ "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; - "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv + "webostv" = ps: with ps; [ aiopylgtv ]; "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ python-whois ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d5f609eed9dc7..2ddd4a45323ca 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -87,6 +87,7 @@ in with py.pkgs; buildPythonApplication rec { --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \ --replace "awesomeversion==21.2.2" "awesomeversion>=21.2.2" \ --replace "cryptography==3.2" "cryptography" \ + --replace "httpx==0.16.1" "httpx>=0.16.1" \ --replace "pip>=8.0.3,<20.3" "pip" \ --replace "pytz>=2020.5" "pytz>=2020.4" \ --replace "pyyaml==5.4.1" "pyyaml" \ diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index fd8b1202fd004..40c129296356d 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.17.311"; + version = "0.17.598"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-hYOjKWtClhiU3rXzcPW7rkVqSNhA02bpONMcZ1s1ZYE="; + sha256 = "sha256-G66P/sYodD15OxuFD+peF92jSeog70Rh10mkjYRhnl0="; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "API Support for your favorite torrent trackers"; homepage = "https://github.com/Jackett/Jackett/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; platforms = platforms.all; }; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 5aab96d1bc048..c3680d76b96ea 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontUnpack = true; diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 138051e13c03d..35cd6906012df 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index a016c8e7f099d..ad67cdf4348cb 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "livepeer"; - version = "0.5.13"; + version = "0.5.14"; runVend = true; - vendorSha256 = "sha256-wAjGgYDyBWqE8KCQ6TQ+LGDDZqF+5XY+NzU74RwPuRE="; + vendorSha256 = "sha256-StkgU11VLEKg89kn3zPcdC8HBw9MmJrfDPGk1SUQO64="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; rev = "v${version}"; - sha256 = "sha256-b4O8Hc8A8TN5KFcQ7KYvFPVFgposDgPw06WowrXzpAs="; + sha256 = "sha256-GxgpGI1ymhbYhzCP2Bs5wJ5kq5rHHkClXcAsYlaQ/AM="; }; # livepeer_cli has a vendoring problem diff --git a/pkgs/servers/mail/mailman/wrapped.nix b/pkgs/servers/mail/mailman/wrapped.nix index 2a620763d876b..c244af10e7835 100644 --- a/pkgs/servers/mail/mailman/wrapped.nix +++ b/pkgs/servers/mail/mailman/wrapped.nix @@ -8,7 +8,7 @@ in runCommand "${mailman.name}-wrapped" { inherit (mailman) meta; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru = mailman.passthru // { unwrapped = mailman; }; } '' mkdir -p "$out/bin" diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index ff96f0e7c8275..71bcc3fc68785 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -9,7 +9,8 @@ perlPackages.buildPerlPackage rec { sha256 = "0ga5mi2nv2v91kakk9xakkg71rnxnddlzv76ca13vfyd4jgcfasf"; }; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable Socket6 diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 9fce836326e80..29f2bad76ea90 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.27.0"; + version = "1.28.0"; src = fetchPypi { inherit pname version; - sha256 = "1kpkxgyzz35ga4ld7cbjr0pfbhrcbrfmp9msnwjqllmsmy0g5bas"; + sha256 = "sha256-KWEpgizOdil7dXIxug7xT3dEYEHi/IEPX/6aT7qW6C8="; }; patches = [ diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index 3abb728bec1d3..fd950cb635579 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "matterircd"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "0rnkzxf953nd67w33ghmrfjfg099cd21nldm31q8pk7fs1mgjnld"; + sha256 = "sha256-0HeqKnFOrXcoXKEkWxNfoRv77As86aLUAgH/+ZUymAs="; }; goPackagePath = "github.com/42wim/matterircd"; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 10105e3b27b04..4fa8620503b3f 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-02-19T04-38-02Z"; + version = "2021-02-24T18-44-45Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Swm8gQeSN84SYE0M03Se9n/clYVT/W/v0GAmRRsL674="; + sha256 = "sha256-htrIRZXpr3V7GoeldeULndSfJNMmLKPVOimg3l+UisA="; }; - vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc="; + vendorSha256 = "sha256-m2Nv3OcPq/qc+4Cu/JUut59fZTDZwJn9gyG4jQ5n6Pg="; doCheck = false; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 0034c253c7745..02841c6acb968 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -24,7 +24,8 @@ perlPackages.buildPerlPackage rec { ''; buildTools = []; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ CGI DataStructureUtil FileCopyRecursive diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 1d5715176caea..7ad518308df5d 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-kWl6wkyN/ytnct2MseZ5FQgOL2WeGJDFPPGJxkdcDX8="; + sha256 = "sha256-wm+WoOvYVa29lMMnXatlQ4gcCLsz+uQZ7D/hUxNjIPc="; }; vendorSha256 = null; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 96048005cb143..5d05dfd1ebb67 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { --replace /etc/linode /run/longview ''; - buildInputs = [ perl makeWrapper glibc ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl glibc ] ++ (with perlPackages; [ LWP LWPProtocolHttps diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index 0c5aa7d8a438e..e6505857bf579 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -14,7 +14,8 @@ in stdenv.mkDerivation { sha256 = "1pvqphrirq48xhmx0aa6vkxz6qy1cx2q6jxsh7rin432iap7j62f"; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; phases = "installPhase"; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 1d26afad3d8be..4dd90cacb8bfa 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { phases = ["installPhase"]; - buildInputs = [ makeWrapper jre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; installPhase = '' mkdir -p "$out"/bin diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index 121b31e46eb8c..a871bf87db2d4 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin $out/public diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index e84c422ea6463..9395c3c61c191 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar"; sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 9af9ddd66eda2..3e1f810000467 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -114,13 +114,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.5"; + version = "0.22.6"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-CKNw3K/z5UrTIp9ryWq7UaTz768AigaoCIcoJ4iW1j4="; + sha256 = "sha256-Xu+MxMxR5u++R3lZHe6UQ+mEmRnWbN6173ZX39KS1A8="; }; buildInputs = [ @@ -149,8 +149,6 @@ let doCheck = true; - enableParallelBuilding = true; - mesonAutoFeatures = "disabled"; outputs = [ "out" "doc" ] @@ -173,7 +171,7 @@ let meta = with lib; { description = "A flexible, powerful daemon for playing music"; homepage = "https://www.musicpd.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ]; platforms = platforms.unix; diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index e6a9f95a1b921..5726786e5b402 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.19.0"; + version = "0.20.0"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "1wa2xby7v45f9idnhbkglknipm24wqx7mxmkyqz3amq17j4xfy7c"; + sha256 = "sha256-vhUj3CVBM5jbwEtnzdgQD3eLguiHQguK01O69JZIUUk="; }; meta = { diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 684cdbe287c53..d9c9ddf8752bf 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zjb6cgk2lpzx6pq1cs5fh65in6b5ccpl1cgfiglgpjc948mnhzv"; }; - buildInputs = [ makeWrapper jre8 which gawk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre8 which gawk ]; installPhase = '' diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 558fdad9841f1..4c5be92e765b5 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { makeFlags = [ "rethinkdb" ]; - buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ] + buildInputs = [ protobuf boost zlib curl openssl icu ] ++ lib.optional (!stdenv.isDarwin) jemalloc ++ lib.optional stdenv.isDarwin libtool; - nativeBuildInputs = [ which m4 python2Packages.python ]; + nativeBuildInputs = [ which m4 python2Packages.python makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 64cf975ac4539..6261e2f9bfab5 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.4.4054-bab510e86"; + version = "1.21.4.4079-1b7748a7b"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1vxh9yihwxv610q10sak3n8jrq7il6ryhqi6j10nmm7mxn1nkqcx"; + sha256 = "0843sdl9c6382vjj3ykvcl6rizs2jnb4jqx19ah3phbcvsnjlhdb"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0dxch4m3ywndrwys2rfvh34p6nsx0w2f6k7xvs7hi20biz6bd344"; + sha256 = "02v4jf6jajm5gvsilllln1vvnxx30gi2b8ljsby5d3xhhca6kmqx"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 4ea79ffe468e0..1cb5e37cb9470 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+odGLuUU6KWcSukt/WpZnO1KMRTGY2fzPsXTL1xhlrk="; + sha256 = "sha256-pnMUUxV4DM2YClwc24l+5Ehh5zc+qEOLTtiqh7c+8PI="; }; - vendorSha256 = "sha256-P8NYnTItayuWLQpwl5D6I8K5MVm2Qh1hWl2c78n8CJo="; + vendorSha256 = "sha256-oWWUEPEpMLqXucQwUvM6fyGCwttTIV6ZcCM2VZXnKuM="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 5f1f8e6230edd..4533e3138a7a5 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -30,7 +30,8 @@ in stdenv.mkDerivation rec { sha256 = "0m39r2il7d014kf2p6v28lw2hzshm6bhhdchqa8wzyvvmygqmwf2"; }; - buildInputs = [ pythonEnv makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonEnv ]; installPhase = '' mkdir -p $out diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 86230e11cb98d..b3ad305687afa 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation (rec { "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; - buildInputs = [ makeWrapper jre_headless util-linux ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre_headless util-linux ] ++ optional enableUnfree zlib; installPhase = '' diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 6a51e5ea62f82..ffe8a75412bdf 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -46,7 +46,8 @@ stdenv.mkDerivation (rec { "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; - buildInputs = [ makeWrapper jre_headless util-linux ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre_headless util-linux ] ++ optional enableUnfree zlib; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 27345616f8951..3dd811b51fa75 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -35,12 +35,12 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl libxml2 makeWrapper ] + [ zlib readline openssl libxml2 ] ++ lib.optionals icuEnabled [ icu ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; - nativeBuildInputs = lib.optionals icuEnabled [ pkg-config ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals icuEnabled [ pkg-config ]; enableParallelBuilding = !stdenv.isDarwin; @@ -192,54 +192,54 @@ let in self: { postgresql_9_5 = self.callPackage generic { - version = "9.5.24"; + version = "9.5.25"; psqlSchema = "9.5"; - sha256 = "0an2k4m1da96897hyxlff8p4p63wg4dffwsfg57aib7mp4yzsp06"; + sha256 = "00yny0sskxrqk4ji2phgv3iqxd1aiy6rh660k73s4s1pn9gcaa3n"; this = self.postgresql_9_5; thisAttr = "postgresql_9_5"; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.20"; + version = "9.6.21"; psqlSchema = "9.6"; - sha256 = "1dkv916y7vrfbygrfbfvs6y3fxaysnh32i5j88nvcnnl16jcn21x"; + sha256 = "0d0ngpadf1i7c0i2psaxcbmiwx8334ibcsn283n9fp4853pyl3wk"; this = self.postgresql_9_6; thisAttr = "postgresql_9_6"; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.15"; + version = "10.16"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0zhzj9skag1pgqas2rnd217vj41ilaalqna17j47gyngpvhbqmjr"; + sha256 = "1cvv8qw0gkkczqhiwx6ns7w88dwkvdz4cvb2d4ff14363f5p2p53"; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.10"; + version = "11.11"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "16bqp6ds37kbwqx7mk5gg3y6gv59wq6xz33iqwxldzk20vwd5rhk"; + sha256 = "0v0qk298nxmpzpgsxcsxma328hdkyzd7fwjs0zsn6zavl5zpnq20"; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.5"; + version = "12.6"; psqlSchema = "12"; - sha256 = "15gzg778da23sbfmy7sqg443f9ny480301lm7i3vay4m3ls2a3dx"; + sha256 = "028asz92mi3706zabfs8w9z03mzyx62d1l71qy9zdwfabj6xjzfz"; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.1"; + version = "13.2"; psqlSchema = "13"; - sha256 = "07z6zwr58dckaa97yl9ml240z83d1lhgaxw9aq49i8lsp21mqd0j"; + sha256 = "1z5d847jnajcfr3wa6jn52a8xjhamvwzmz18xlm5nvxqip8grmsz"; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index 83416af317727..184c54ba9ca86 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "swego"; - version = "0.91"; + version = "0.92"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "sha256-cNsVRYKnzsxYnTkPRfX3ga0eGd09uJ0dyJj1doxfCrg="; + sha256 = "sha256-SiB0Z6Eqbn/6VGDTt5bQtgcT4V4AjRIIYYk98EW7ss4="; }; vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI="; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index eb47593c5966d..32c5a23a9a794 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-zrKkBbsvIqJkPysKx3nJ3EIbePWMZCX9eegekAoqMqk="; + sha256 = "sha256-PMBlvres95UIbd3uqZWPE3OzyrEAGEXit/Z7X1p46GY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 61bb815892adb..3d4e4fdf51dc6 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' cp -a . $out/ diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 20f8aa91ab656..6ad8288871b18 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, docutils }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils }: stdenv.mkDerivation rec { version = "0.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; - nativeBuildInputs = [ pkg-config docutils autoreconfHook varnish.python ]; + nativeBuildInputs = [ pkg-config docutils autoreconfHook269 varnish.python ]; buildInputs = [ varnish ]; postPatch = '' substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 5336df42cbe9a..69b55a6f3c29b 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -32,9 +32,9 @@ in stdenv.mkDerivation rec { sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ="; }; - nativeBuildInputs = [ fakegit ]; + nativeBuildInputs = [ fakegit makeWrapper ]; - buildInputs = [ erlang openssl expat libyaml gd makeWrapper ] + buildInputs = [ erlang openssl expat libyaml gd ] ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index cfa6e2269557b..a83da568126ac 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -15,7 +15,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.11.7"; # also update communityModules + version = "0.11.8"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "0iw73ids6lv09pg2fn0cxsm2pvi593md71xk48zbcp28advc1zr8"; + sha256 = "1y38a33wab2vv9pz04blmn6m66wg4pixilh8x60jsx6mk0xih3w3"; }; # A note to all those merging automated updates: Please also update this @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "7678b4880719"; - sha256 = "1rpk3jcfhsa9hl7d7y638kprs9in0ljjp1nqxg30w1689v5h85d2"; + rev = "f210f242cf17"; + sha256 = "0ls45zfhhv8k1aywq3fvrh4ab7g4g1z1ma9mbcf2ch73m6aqhbyl"; }; buildInputs = [ diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 526a8d2956b34..c2315999b3caa 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha512 = "caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199"; }; - buildInputs = [ makeWrapper jre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; phases = ["unpackPhase" "installPhase"]; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 4463d70cf5262..a84e2e14677c9 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "1.12.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; rev = "v${version}"; - sha256 = "0vlwwkdbkxjsjcfmcspmq3f163kf0x4mwa8svxkzgnn2g4kl41ja"; + sha256 = "sha256-+qNH4Df0wCI3KE6LT3YWKpp7yzJcedmVlm/f1Myz108="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index b48eda0a728a6..fafb4a5057489 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "unstable-2021-01-24"; + version = "unstable-2021-02-14"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; - rev = "78b4cefb27dc2bef5e4c9ac3bf2bd28413620fcd"; - sha256 = "1f5m7vf7wxzczis2nzvhgqaqnphhp3a0wv8b612m7g4fnvk3lnkn"; + rev = "8cebb8f01ca57076c3c7cd66365270d989bcaa89"; + sha256 = "119m84g2c4z9xdr22j401p09n3cpiyj61dw5m7xkm6309nd7zz0a"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index b92344bf9c4bf..022111e4b3141 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "NX X server based on Xnest"; homepage = "https://github.com/ArcticaProject/nx-libs"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ jD91mZM2 ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix index bae91bbc46497..012eedf077914 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1ma4ax7ydq4xvyzrc4zapihmf7v3d9zl9mbi8bgpps7nlgz544ys"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index ec40e0b06db47..bdade93329b71 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "xbindkeys-config"; version = "0.1.3"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ gtk ]; src = fetchurl { url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${version}.orig.tar.gz"; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 6d0c46e52e926..207c052686f86 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"; }; - buildInputs = [ libxslt docbook_xsl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libxslt docbook_xsl ]; preFixup = '' # fallback values need to be last diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index a3470214964f1..a513b3587f7e5 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.12"; # N.B: if you change this, change botocore to a matching version too + version = "1.19.17"; # N.B: if you change this, change botocore and boto3 o a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-Tj9+UtYSL5yls7AxV7shABcOMhS12VXlpDNdxz8Ns5w="; + sha256 = "sha256-YdkkeE2POxeHgaGjp0ufzbP/Lqvt4ytStHkRZ+2KsTs="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 202f576633ad7..6e1da0b591e34 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-QMJKrM5IBDqNfdxYAaEzmZ8YFMPu2hB6jvl6R/7ORl8="; + sha256 = "sha256-mq1/e9FW0jP6dY6zCBlPz5dBidKLS6IROBKESfHDvPI="; }; - vendorSha256 = "sha256-VTKnkMe0SB6sWRJTC4p6BMjH5qZ6LsSQnjuPFfOP/Eg="; + vendorSha256 = "sha256-ANOeU3cFSwLcpdbpApM+j4r296ZGj/tuDV8oiMA7kMo="; doCheck = false; diff --git a/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch b/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch new file mode 100644 index 0000000000000..aec4be2ec19ae --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/cloud_sql_proxy_path.patch @@ -0,0 +1,36 @@ +diff --git a/lib/googlecloudsdk/api_lib/sql/instances.py b/lib/googlecloudsdk/api_lib/sql/instances.py +index 0d88ffe..814a436 100644 +--- a/lib/googlecloudsdk/api_lib/sql/instances.py ++++ b/lib/googlecloudsdk/api_lib/sql/instances.py +@@ -86,18 +86,19 @@ def GetRegionFromZone(gce_zone): + def _GetCloudSqlProxyPath(): + """Determines the path to the cloud_sql_proxy binary.""" + sdk_bin_path = config.Paths().sdk_bin_path +- if not sdk_bin_path: +- # Check if cloud_sql_proxy is located on the PATH. +- proxy_path = file_utils.FindExecutableOnPath('cloud_sql_proxy') +- if proxy_path: +- log.debug( +- 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) +- return proxy_path +- else: +- raise exceptions.ToolException( +- 'A Cloud SQL Proxy SDK root could not be found. Please check your ' +- 'installation.') +- return os.path.join(sdk_bin_path, 'cloud_sql_proxy') ++ if sdk_bin_path and os.path.isfile(os.path.join(sdk_bin_path, 'cloud_sql_proxy')): ++ return os.path.join(sdk_bin_path, 'cloud_sql_proxy') ++ ++ # Check if cloud_sql_proxy is located on the PATH. ++ proxy_path = file_utils.FindExecutableOnPath('cloud_sql_proxy') ++ if proxy_path: ++ log.debug( ++ 'Using cloud_sql_proxy found at [{path}]'.format(path=proxy_path)) ++ return proxy_path ++ ++ raise exceptions.ToolException( ++ 'A Cloud SQL Proxy SDK root could not be found. Please check your ' ++ 'installation.') + + + def _RaiseProxyError(error_msg=None): diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 644bdedffe57e..1d585514f7e03 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -45,6 +45,8 @@ in stdenv.mkDerivation rec { ./gcloud-path.patch # Disable checking for updates for the package ./gsutil-disable-updates.patch + # Try to use cloud_sql_proxy from SDK only if it actually exists, otherwise, search for one in PATH + ./cloud_sql_proxy_path.patch ]; installPhase = '' diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/tools/admin/netplan/default.nix new file mode 100644 index 0000000000000..b9dc2c070731a --- /dev/null +++ b/pkgs/tools/admin/netplan/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, glib +, pandoc +, systemd +, libyaml +, python3 +, libuuid +, bash-completion +, lib +}: + +stdenv.mkDerivation rec { + pname = "netplan"; + version = "0.101"; + + src = fetchFromGitHub { + owner = "CanonicalLtd"; + repo = "netplan"; + rev = version; + hash = "sha256-bCK7J2pCQUwjZu8c1n6jhF6T/gvUGwydqAXpxUMLgMc="; + fetchSubmodules = false; + }; + + nativeBuildInputs = [ + pkg-config + glib + pandoc + ]; + + buildInputs = [ + systemd + glib + libyaml + (python3.withPackages (p: with p; [ pyyaml netifaces ])) + libuuid + bash-completion + ]; + + postPatch = '' + substituteInPlace netplan/cli/utils.py --replace "/lib/netplan/generate" "$out/lib/netplan/generate" + substituteInPlace netplan/cli/utils.py --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\"" + + substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \ + --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \ + --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= ' + ''; + + makeFlags = [ + "PREFIX=" + "DESTDIR=$(out)" + "SYSTEMD_GENERATOR_DIR=lib/systemd/system-generators/" + "SYSTEMD_UNIT_DIR=lib/systemd/units/" + "BASH_COMPLETIONS_DIR=share/bash-completion/completions" + ]; + + meta = with lib; { + description = "Backend-agnostic network configuration in YAML"; + homepage = "https://netplan.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 0498b56dcf567..6d8a068d48ba4 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,178 +1,178 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.19.0"; + version = "2.21.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-linux-x64.tar.gz"; - sha256 = "0641inzkbgrjarc7jdmi0iryx4swjh1ayf0j15ais3yij7jq4da2"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.21.2-linux-x64.tar.gz"; + sha256 = "1zspkrfrrgkk8yhsa8lccky9as1v0nmz7wqxkfnx707nc986w5a3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz"; - sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.8.1-linux-amd64.tar.gz"; + sha256 = "0yzz24fhkd1ij3gvsgi48czpm30lwbzdswsfir1mdq0a6wwhll4w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-linux-amd64.tar.gz"; - sha256 = "0yfrpih5q2hfj2555y26l1pqs22idh4hqn20gy310kg12r303hwk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.30.1-linux-amd64.tar.gz"; + sha256 = "1ml980mxhah193k4w75nvh7yzlc0j4k1sm9f51pvihxzmq5hjzgz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz"; - sha256 = "18gyan0dszfvx8fhvi8r2msbf8n9lbh10pnvcaqvdk8cr79lnzl9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.13.1-linux-amd64.tar.gz"; + sha256 = "12f6knxnpkdh00w0s9a9fqk934n5ry7k473sk42gz024j253pq8g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-linux-amd64.tar.gz"; - sha256 = "05nmdjgwhm1pi5zljq33812wgkz1rpisjrvdn8lcsapwz3fchbjd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.8.1-linux-amd64.tar.gz"; + sha256 = "1g1rbvi3yizxs007hp0zgfysbam20gfg4xkc69gpwishy0j0m14q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-linux-amd64.tar.gz"; - sha256 = "12wjh0w7i1f6rd5r4pqc98ix4mkrkqwnvpv7hkcsn90rsxrlfysk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.16.1-linux-amd64.tar.gz"; + sha256 = "1v4zf3z6vcz074yay97kczh5dv9ii5mmkas57j6jqgpfm1lqymil"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-linux-amd64.tar.gz"; - sha256 = "19cpq6hwj862wmfcfx732j66wjkfjnxjrqj4bgxpgah62hrl5lh2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.5.1-linux-amd64.tar.gz"; + sha256 = "02angr4bimgir42n0jdf69005fzkikknfvyxgdh8kpr555lbb17a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-linux-amd64.tar.gz"; - sha256 = "0mb6ddidyk3g1ayk8y0ypb262fyv584w5cicvjc5r9670a1d2rcv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.8.1-linux-amd64.tar.gz"; + sha256 = "13987spi37vb7b6cd12axyvc2r2lvy1if1lwssxxj7jl95bss1d9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-linux-amd64.tar.gz"; - sha256 = "1b5m2620s4bqq6zlagki3w4fzph3lc5192falv8ick4rgbv714nb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.12.0-linux-amd64.tar.gz"; + sha256 = "0srdmga79r2jh3mv4vcb0gnhmkky666v902vd20bbr1r2fmi8wji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-linux-amd64.tar.gz"; - sha256 = "10cmnsxpiy7bfxyrpwfqn5kgpijlkxrhfah40wd82j3j2b7wy33j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.2.0-linux-amd64.tar.gz"; + sha256 = "07qg1vmbmjc6shz2nw37vcrccd7m6ghb0h9zjp0gvzks1b2fz32i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-linux-amd64.tar.gz"; - sha256 = "10d5gmhax02906jpr9nmb80xfxvy2ym8vjyj31sz2mcl9jnadk4z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.7.0-linux-amd64.tar.gz"; + sha256 = "19d83ydqh6fi7rl3j1gkmrnnbkijw4pj4rvkk1w3s842jsiqxlr9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-linux-amd64.tar.gz"; - sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.6.2-linux-amd64.tar.gz"; + sha256 = "01kyqw5x2jv0il8w4mg0man2dzikghdz4kirk3nabkm6fwncngk1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-linux-amd64.tar.gz"; - sha256 = "0ah0yhwf79dgk7biifnapz0366mm5a54rlqf8hffn13czqnc3qbq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.2-linux-amd64.tar.gz"; + sha256 = "01jcilqw1z7klk8xa0z3c5rh6fi5c2xxr6sqw9qmmwgh1ncpdmhi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz"; - sha256 = "1c39fk37kx093n0ldk8szblgcx0hviyyd7mxzp7nb97s4rvmf48l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.4.1-linux-amd64.tar.gz"; + sha256 = "1ayjs4s6zv5lsr74y1zjicngqj111hp8zb5gmlr4x2qs5cxnz02n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-linux-amd64.tar.gz"; - sha256 = "0c2aypx8y6s892y2gygc8116rlarlcw1s2m39gkcdjjbfkmf8za0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.4.1-linux-amd64.tar.gz"; + sha256 = "11l6xsn42dr2mx8ayimdc19gn2vsiwq3h1qd716y9snnzkrsiyw7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-linux-amd64.tar.gz"; - sha256 = "0iqimhqh853jx6zd53z1r98ky0qhxfby9w519xpdlvxxq5aqb6kb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.15.0-linux-amd64.tar.gz"; + sha256 = "1xraydxazx620y4m54qwjacmf5vs6x5ci9jymj52vrpd5c4lpw5p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-linux-amd64.tar.gz"; - sha256 = "1rh14rngpcbqly5i3cgwfgi90drkg6fa0gkgpfa7f9mkm4wpgla8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.7.2-linux-amd64.tar.gz"; + sha256 = "1lx4yk7wcnbn419zqjyp2aw81q5bg5dqjy74ghbc74qhbbxjz6q0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-linux-amd64.tar.gz"; - sha256 = "0jpv94kzsa794ds5bjj6j3pj1wxqicavpxjnycfa5cm8w71kmlsh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.3-linux-amd64.tar.gz"; + sha256 = "0par5cpp787iwxy1dbv9kw946bnvgd4qnzrh0hc4y6468w9k3kbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-linux-amd64.tar.gz"; - sha256 = "069sq8lkw4n7ykh2b2fsaggxxr4731riyy9i15idffa52d1kkiq6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.4.1-linux-amd64.tar.gz"; + sha256 = "0w8l0py337msdh0w9czbydznchl1h22pkzp2yrj6lx1p9vl4qbmq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-linux-amd64.tar.gz"; - sha256 = "0lyvpfmjsjxpwq1b74j2jipp36n7zczlxgy0pr6j7c027d26sym6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.12.2-linux-amd64.tar.gz"; + sha256 = "1clhdj8jlmhfykirdfp8lkg9grhyyamjimxcy2mxshm6mwlaajcm"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-darwin-x64.tar.gz"; - sha256 = "02wd0h5aq53zjy18xzbkv7nnl097ja0m783gsgrs1wdlqblwpqyw"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.21.2-darwin-x64.tar.gz"; + sha256 = "0wijdxlhinjmn2rf7k02iwg1i14xd1v3cxvxssik56yk0mhkm42b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz"; - sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.8.1-darwin-amd64.tar.gz"; + sha256 = "00d66lmsd9ph7dpyrsdini8phlc197ssinfnkl3cj3j5v6hnzah1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-darwin-amd64.tar.gz"; - sha256 = "1j4czx1iqfm95y14isl1sqwvsw690h9y0xf2jpynp2ygmc3szrkr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.30.1-darwin-amd64.tar.gz"; + sha256 = "1p3rp2fq7lfqj03w1y8p21arvrvbbdwcd1nxnnqjnjwq3ahfvwnm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz"; - sha256 = "0dqyd8aywmxrsvipndwrwq5pxv7avzf8kpk6rdyip4j8hp156lbz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.13.1-darwin-amd64.tar.gz"; + sha256 = "0scx1vwpfan98cx6n2k06bph9xlpc41viirs34lf4mqdm2c2m3k5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-darwin-amd64.tar.gz"; - sha256 = "0xbbaphd0lypyzq262rapr42lmyz3wr14xab09qc156rjasr8w64"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.8.1-darwin-amd64.tar.gz"; + sha256 = "1nzrqm3rbqdl4q12ln87p78hfpnmbliavavhbqn3jr2kchfgy9j1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-darwin-amd64.tar.gz"; - sha256 = "10izly9m7847rsb533ch3n8rkhbfb3q6lcx80dk5ia8bfdlvc3cn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.16.1-darwin-amd64.tar.gz"; + sha256 = "0y3qadiyqa5krknkabfy60gjd7kmqjx8w72w8jrv5821bmxs3kzm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "0kyw1csyzvkbzqxrgpf4d2zgydysd4mfb07igjv19m3f7gs8jhr9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.5.1-darwin-amd64.tar.gz"; + sha256 = "1ksv79cglb6fifx4mrjk32lh25hq2n8yigphsk54lppvhvp9ynyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-darwin-amd64.tar.gz"; - sha256 = "122cf7v12vzv1szi9adcccakbs3hs23qsjbykjrhwmk8hw21g4kb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.8.1-darwin-amd64.tar.gz"; + sha256 = "1i1kf0mj8pagcm1q2sjlfqc42qv9pgchq8a8qxs1xllxcv2nqp96"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-darwin-amd64.tar.gz"; - sha256 = "11w4ykh846byg05jxnddm6ln901pms8n5g0q5gj3ldfjrfl1cn2q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.12.0-darwin-amd64.tar.gz"; + sha256 = "1m02w4szp3dq9klwvi26fdxxdr3pqw77afcxarfxc92dhdq8rp2g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-darwin-amd64.tar.gz"; - sha256 = "1apaaa76dq53ppnmh4xi55zsrx1mwbnnsby63ymjw9xhdkc1sah6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "128j5vrvgqzvn2cfdvnw89328fydahaj3i4pmbpk2swgqmn0kac8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-darwin-amd64.tar.gz"; - sha256 = "0xfkdmnax10zkgpipxaxfi0lgfgijnvssbwmfsaxxisdxscw2ig9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.7.0-darwin-amd64.tar.gz"; + sha256 = "1f9scgzzlcq6inl1z9b0xvcd9prr6w8acr20mnki5j1fn0m67sa5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-darwin-amd64.tar.gz"; - sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.6.2-darwin-amd64.tar.gz"; + sha256 = "099paln0sh7kp8393k264zz0bvrv2p7k7rywgj9ym9dncqq9za2r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-darwin-amd64.tar.gz"; - sha256 = "01xspqk3hzvrhka9nsxal8pwji3hm5qgkn49jjnk1cy01hy7s78q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.2-darwin-amd64.tar.gz"; + sha256 = "0afy6aphq14i7ww3a35ybzhwqwlxaybbxbhsa6w63hv3s4fw7wpa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz"; - sha256 = "19v60l2djvigf60zacchfr98kfb8wxk1rmhdswyhhhz41jh30qhl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.4.1-darwin-amd64.tar.gz"; + sha256 = "1nngzlvx06kphxayqkyn0xrh22dv2pcpb9b0gvlicancbn01ql5w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-darwin-amd64.tar.gz"; - sha256 = "15w72087frbx6wyngi20bsssnr7si1bk1h94jav3d4cgm6nhpnwk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.4.1-darwin-amd64.tar.gz"; + sha256 = "041ml1yx7wk4whq6gfsb1zc49kkdws06dqpr5i910ln5avnhslvq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-darwin-amd64.tar.gz"; - sha256 = "05hap76yzss5bsgr20rm8sxb6r3iiwvq75lhf11laaxq2hnb7qdp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.15.0-darwin-amd64.tar.gz"; + sha256 = "13sy891ff4y53yw7h0p3cynycrxd8hq5pfmdnl7332ll7kls37p3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-darwin-amd64.tar.gz"; - sha256 = "033262l7yylw9y8ifrag2fsdpfvqjmmrxmmhksvysjmz9slb60kg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.7.2-darwin-amd64.tar.gz"; + sha256 = "0c83zdnx12g2dmvi98v7w3739x91d9lhqx5j6cvq8c24y7lxga78"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-darwin-amd64.tar.gz"; - sha256 = "0d578hqkhwlhx50k9qpw7ixjyy1p2fd6cywj86s870jzgl8zh4fv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.3-darwin-amd64.tar.gz"; + sha256 = "1b4y5apgkd2k9yfx3f7p0vs5l0gqhgccbszgnzqq465i0970b6r7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "1qkh8hg7nplv0slq2xark57l547z63fy1l6zvrcblrqsqfw5zybv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.4.1-darwin-amd64.tar.gz"; + sha256 = "1q00jmjprhnxgvjc4a50jdgd90zj71ymfhkl1w1bkqlrva9spiws"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-darwin-amd64.tar.gz"; - sha256 = "11c1d1jw0z4ybwvqfvmjcx3gkpwnvi5vcq01bc7a2wg374mkhj62"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.12.2-darwin-amd64.tar.gz"; + sha256 = "0wpqk93ns9z3yvpas9aix345jm38hffssnz1dn5cxl6y0d5scjd8"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index c1a0e6310166f..061f3b1438ec2 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,31 +3,31 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="2.19.0" +VERSION="2.21.2" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=1.5.2" - "aws=3.25.1" - "cloudflare=2.11.1" - "consul=2.7.0" - "datadog=2.15.0" - "digitalocean=3.3.0" - "docker=2.7.0" - "gcp=4.9.0" - "github=2.5.1" - "gitlab=3.5.0" - "hcloud=0.5.1" - "kubernetes=2.7.8" - "mailgun=2.3.2" - "mysql=2.3.3" - "openstack=2.11.0" + "auth0=1.8.1" + "aws=3.30.1" + "cloudflare=2.13.1" + "consul=2.8.1" + "datadog=2.16.1" + "digitalocean=3.5.1" + "docker=2.8.1" + "gcp=4.12.0" + "github=3.2.0" + "gitlab=3.7.0" + "hcloud=0.6.2" + "kubernetes=2.8.2" + "mailgun=2.4.1" + "mysql=2.4.1" + "openstack=2.15.0" "packet=3.2.2" - "postgresql=2.5.3" - "random=3.0.1" - "vault=3.3.0" - "vsphere=2.11.4" + "postgresql=2.7.2" + "random=3.0.3" + "vault=3.4.1" + "vsphere=2.12.2" ) function genMainSrc() { @@ -56,7 +56,8 @@ function genSrcs() { done } -cat <<EOF > data.nix +{ + cat <<EOF # DO NOT EDIT! This file is generated automatically by update.sh { }: { @@ -64,14 +65,14 @@ cat <<EOF > data.nix pulumiPkgs = { x86_64-linux = [ EOF -genMainSrc "linux" >> data.nix -genSrcs "linux" >> data.nix -echo " ];" >> data.nix - -echo " x86_64-darwin = [" >> data.nix -genMainSrc "darwin" >> data.nix -genSrcs "darwin" >> data.nix -echo " ];" >> data.nix -echo " };" >> data.nix -echo "}" >> data.nix + genMainSrc "linux" + genSrcs "linux" + echo " ];" + echo " x86_64-darwin = [" + genMainSrc "darwin" + genSrcs "darwin" + echo " ];" + echo " };" + echo "}" +} > data.nix diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index ad0cae6ecde6e..592f4cc764869 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3002.2"; + version = "3002.5"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "vW0pYhzo4JlBJ3fNOWrzVHSqESuwmZtdqAQ4fYcpAHU="; + sha256 = "1bqranhanxcxjc1qcc6cm95f4xxag0ic9g61dq352hqh6m1l1ay8"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix index b6ca3135f5615..031bb316ca55f 100644 --- a/pkgs/tools/admin/ssh-import-id/default.nix +++ b/pkgs/tools/admin/ssh-import-id/default.nix @@ -2,22 +2,24 @@ , lib , fetchgit , requests +, distro , makeWrapper , extraHandlers ? [] }: buildPythonPackage rec { pname = "ssh-import-id"; - version = "5.8"; + version = "5.11"; src = fetchgit { url = "https://git.launchpad.net/ssh-import-id"; rev = version; - sha256 = "0l9gya1hyf2qfidlmvg2cgfils1fp9rn5r8sihwvx4qfsfp5yaak"; + sha256 = "sha256-tYbaJGH59qyvjp4kwo3ZFVs0EaE0Lsd2CQ6iraFkAdI="; }; propagatedBuildInputs = [ requests + distro ] ++ extraHandlers; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix new file mode 100644 index 0000000000000..df45e6f10b86f --- /dev/null +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -0,0 +1,111 @@ +{ lib +, stdenv +, fetchFromGitHub + +# Dependencies +, cmake +, libjpeg_turbo +, makeWrapper +, mesa # for built-in 3D software rendering using swrast +, openjdk # for the client with Java GUI +, openjdk_headless # for the server +, openssh +, openssl +, pam +, perl +, which +, xkbcomp +, xkeyboard_config +, xorg +}: + +stdenv.mkDerivation rec { + pname = "turbovnc"; + version = "2.2.5"; + + src = fetchFromGitHub { + owner = "TurboVNC"; + repo = "turbovnc"; + rev = version; + sha256 = "0r2lk5lza7a9h02g4z5j59d8qj0x1q1my665d1x1plny4g46vam0"; + }; + + # TODO: + # * Build outputs that are unclear: + # * `-- FONT_ENCODINGS_DIRECTORY = /var/empty/share/X11/fonts/encodings` + # Maybe relevant what the tigervnc and tightvnc derivations + # do with their `fontDirectories`? + # * `SERVER_MISC_CONFIG_PATH = /var/empty/lib64/xorg` + # * The thing about xorg `protocol.txt` + # * Does SSH support require `openssh` on PATH? + # * Add `enableClient ? true` flag that disables the client GUI + # so that the server can be built without openjdk dependency. + # * Perhaps allow to build the client on non-Linux platforms. + + nativeBuildInputs = [ + cmake + makeWrapper + openjdk_headless + ]; + + buildInputs = [ + libjpeg_turbo + openssl + pam + perl + ] ++ (with xorg; [ + libSM + libX11 + libXext + libXi + xorgproto + ]); + + cmakeFlags = [ + # For the 3D software rendering built into TurboVNC, pass the path + # to the swrast dri driver in Mesa. + # Can also be given at runtime to its `Xvnc` as: + # -dridir /nix/store/...-mesa-20.1.10-drivers/lib/dri/ + "-DDRI_DRIVER_PATH=${mesa.drivers}/lib/dri" + # The build system doesn't find these files automatically. + "-DTJPEG_JAR=${libjpeg_turbo.out}/share/java/turbojpeg.jar" + "-DTJPEG_JNILIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" + "-DXKB_BASE_DIRECTORY=${xkeyboard_config}/share/X11/xkb" + "-DXKB_BIN_DIRECTORY=${xkbcomp}/bin" + ]; + + postInstall = '' + # turbovnc dlopen()s libssl.so depending on the requested encryption. + wrapProgram $out/bin/Xvnc \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl ]} + + # `twm` is the default window manager that `vncserver` tries to start, + # and it has minimal dependencies (no non-Xorg). + # (This default is written by `vncserver` to `~/.vnc/xstartup.turbovnc`, + # see https://github.com/TurboVNC/turbovnc/blob/ffdb57d9/unix/vncserver.in#L201.) + # It checks for it using `which twm`. + wrapProgram $out/bin/vncserver \ + --prefix PATH : ${lib.makeBinPath [ which xorg.twm ]} + + # Patch /usr/bin/perl + patchShebangs $out/bin/vncserver + + # vncserver needs `xauth` + wrapProgram $out/bin/vncserver \ + --prefix PATH : ${lib.makeBinPath (with xorg; [ xauth ])} + + # The viewer is in Java and requires `JAVA_HOME`. + # For SSH support, `ssh` is required on `PATH`. + wrapProgram $out/bin/vncviewer \ + --prefix JAVA_HOME : "${lib.makeLibraryPath [ openjdk ]}/openjdk" \ + --prefix PATH : ${lib.makeBinPath [ openssh ]} + ''; + + meta = { + homepage = "https://turbovnc.org/"; + license = lib.licenses.gpl2Plus; + description = "High-speed version of VNC derived from TightVNC"; + maintainers = with lib.maintainers; [ nh2 ]; + platforms = with lib.platforms; linux; + }; +} diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index 2322ad4d986c0..571798fcd2e56 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -3,7 +3,7 @@ , libgcrypt, e2fsprogs, util-linux, libgpgerror }: let - version = "0.8.5"; + version = "0.8.6"; in stdenv.mkDerivation { pname = "fsarchiver"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "fdupoux"; repo = "fsarchiver"; rev = version; - sha256 = "1rvwq5v3rl14bqxjm1ibfapyicf0sa44nw7451v10kx39lp56ylp"; + sha256 = "sha256-7AfCI4abcUijobEl6FO+5A/FRwxPkNko44u85WbTwuc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index 34f8cb1c40e6d..c63ec008d678d 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { pname = "unp"; version = "2.0-pre7"; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; src = fetchurl { # url = "http://http.debian.net/debian/pool/main/u/unp/unp_2.0~pre7+nmu1.tar.bz2"; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index 3b5d901daf0c6..97870d5dedde4 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goPackagePath = "github.com/dop251/diskrsync"; goDeps = ./deps.nix; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; preFixup = '' wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index 5330ca60a4dc7..2d9124d6f51ae 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { stripRoot = false; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/{bin,share/${pname}-${version}} diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 15ac5acbe8484..82d6bd5c601ff 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-I1KkblFnZVOCvcWEarGsSXnzlod2+yZ4okaTpckLFbE="; }; - buildInputs = [ txt2man makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ txt2man ]; postPatch = "patchShebangs ."; diff --git a/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch b/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch new file mode 100644 index 0000000000000..148b9a1a95794 --- /dev/null +++ b/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch @@ -0,0 +1,25 @@ +From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f Mon Sep 17 00:00:00 2001 +From: Simon Bruder <simon@sbruder.de> +Date: Thu, 25 Feb 2021 09:20:51 +0100 +Subject: [PATCH] Skip testing restore with permission failure + +The test fails in sandboxed builds. +--- + cmd/restic/integration_test.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmd/restic/integration_test.go b/cmd/restic/integration_test.go +index 7d198d33..1588ccb1 100644 +--- a/cmd/restic/integration_test.go ++++ b/cmd/restic/integration_test.go +@@ -1170,6 +1170,7 @@ func TestRestoreLatest(t *testing.T) { + } + + func TestRestoreWithPermissionFailure(t *testing.T) { ++ t.Skip("Skipping testing restore with permission failure") + env, cleanup := withTestEnvironment(t) + defer cleanup() + +-- +2.29.2 + diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 3317ada541a57..65ff53bf677df 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,16 +3,21 @@ buildGoModule rec { pname = "restic"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "13zmx9wzv29z0np3agx4rsz1j9pgrvlnngjsb971i1dnzwv5l3hf"; + sha256 = "07gxf56g45gj2arvdnrr9656i9ykhy1y6k6zdlni1sa3aa2x2bbf"; }; - vendorSha256 = "09sa5jpdj73w595c063mib14132zacswh54nmjqp2n440cflmwjh"; + patches = [ + # The TestRestoreWithPermissionFailure test fails in Nix’s build sandbox + ./0001-Skip-testing-restore-with-permission-failure.patch + ]; + + vendorSha256 = "14z22lmdd681rn61alpqbn3i9fn0kcc74321vjvhz2ix2mch3c1z"; subPackages = [ "cmd/restic" ]; diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index d0ca5324cabdd..026a3141fedee 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; src = fetchurl { url = "https://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2"; diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index f3c415f3cd0f9..de7f678fde8ac 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -17,7 +17,10 @@ buildGoModule rec { subPackages = [ "main/pg" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" ]; + buildFlagsArray = [ + "-tags=brotli" + "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" + ]; postInstall = '' mv $out/bin/pg $out/bin/wal-g diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index eac55d6beaec1..600967e996c0f 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.13.0"; + version = "0.13.1"; src = fetchurl { url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "0zivlcw1f3zwnrwvbhwq6gg781hh72g2bhc2cxcsb2zmg7q8in65"; + sha256 = "1yjni0mr3rqrrk4ynwb8i0whpqhd56cck4mxd97qmxn7wbr826i9"; }; patches = [ diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index ec9cd7ca61ae2..c55c1bc1c5d14 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.10"; + version = "5.10.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-5xoNbdUE86XZV/zpowKB62Hs+ZHIrzFf4AYaG5eh0CE="; + sha256 = "sha256-E3nMcx/q5/RzrZ43yEW7+4czge9ns0Dxoi+8qaTaA0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 61cc4573693da..aaa5806d402a9 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -9,10 +9,11 @@ , babeltrace, gperf , gtest , cunit, snappy -, rocksdb, makeWrapper +, makeWrapper , leveldb, oathToolkit , libnl, libcap_ng , rdkafka +, nixosTests # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -146,7 +147,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka + snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 @@ -171,12 +172,10 @@ in rec { cmakeFlags = [ "-DWITH_PYTHON3=ON" - "-DWITH_SYSTEM_ROCKSDB=OFF" + "-DWITH_SYSTEM_ROCKSDB=OFF" # breaks Bluestore "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib" - "-DWITH_SYSTEM_BOOST=ON" - "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_SYSTEM_GTEST=ON" "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" "-DWITH_SYSTEMD=OFF" @@ -201,6 +200,7 @@ in rec { meta = getMeta "Distributed storage system"; passthru.version = version; + passthru.tests = { inherit (nixosTests) ceph-single-node ceph-multi-node ceph-single-node-bluestore; }; }; ceph-client = runCommand "ceph-client-${version}" { diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix index 8621298275e4c..d448b0f67b5f7 100644 --- a/pkgs/tools/filesystems/e2tools/default.nix +++ b/pkgs/tools/filesystems/e2tools/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, e2fsprogs }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, e2fsprogs }: stdenv.mkDerivation rec { pname = "e2tools"; - version = "0.0.16"; + version = "0.1.0"; - src = fetchurl { - url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${pname}-${version}.tar.gz"; - sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f"; + src = fetchFromGitHub { + owner = "e2tools"; + repo = "e2tools"; + rev = "6ee7c2d9015dce7b90c3388096602e307e3bd790"; + sha256 = "0nlqynrhj6ww7bnfhhfcx6bawii8iyvhgp6vz60zbnpgd68ifcx7"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ e2fsprogs ]; enableParallelBuilding = true; meta = { - homepage = "http://home.earthlink.net/~k_sheff/sw/e2tools/"; + homepage = "https://e2tools.github.io/"; description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index aaffc70e10dda..8a0671957c354 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse autoconf automake makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ fuse autoconf automake ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index e9248fface10e..e39a3d33dacb7 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.33.0"; + version = "0.33.2"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-BZOKZMSUpMSoxmgk/S2MOJfKeYSuqw9YdS3v+Jy/kaU="; + sha256 = "sha256-y40JWfD6selBo2IP7VgASmlNUDhXwOdQIRlRHPi3Nh0="; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index 96d950e74ff18..1d8ced17aae05 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0j1ayncw1nnmgna7vyx44vwinh4ah1b0l5y8agc7i4s8clbvy3h0"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D ${src}/rmount.man $out/share/man/man1/rmount.1 diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 4ff36e3b1d87d..e80e65303719b 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s3fs-fuse"; - version = "1.88"; + version = "1.89"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "sha256-LxqTKu9F8FqHnjp1a9E/+WbH1Ol6if/OpY7LGsVE9Bw="; + sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k="; }; buildInputs = [ curl openssl libxml2 ] diff --git a/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch b/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch new file mode 100644 index 0000000000000..0d6804a647b21 --- /dev/null +++ b/pkgs/tools/filesystems/squashfs/0001-Mksquashfs-add-no-hardlinks-option.patch @@ -0,0 +1,76 @@ +From d925c9a11ee2e88ac8aac03f51892746f2bcf8cd Mon Sep 17 00:00:00 2001 +From: Phillip Lougher <phillip@squashfs.org.uk> +Date: Thu, 25 Feb 2021 23:12:10 +0000 +Subject: [PATCH] Mksquashfs: add -no-hardlinks option + +Normally Mksquashfs will detect hardlinks (multiple files with the +same inode) and hardlink them in the Squashfs image. + +But often hardlinks are used in the original filesystem +to save space, when files are discovered to be duplicate. +In this special case the only reason the files are +hardlinked is to save space, and where the filesystem +doesn't handle duplicate files (different inode, same +data). + +Squashfs does handle duplicate files, and so add +an option to ignore hardlinks and instead +store them as duplicates. + +Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk> +--- + squashfs-tools/mksquashfs.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +index a45b77f..d4dc359 100644 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -312,6 +312,9 @@ struct dir_info *root_dir; + FILE *log_fd; + int logging=FALSE; + ++/* Should Mksquashfs detect hardlinked files? */ ++int no_hardlinks = FALSE; ++ + static char *read_from_disk(long long start, unsigned int avail_bytes); + void add_old_root_entry(char *name, squashfs_inode inode, int inode_number, + int type); +@@ -3093,11 +3096,11 @@ struct inode_info *lookup_inode3(struct stat *buf, int pseudo, int id, + + /* + * Look-up inode in hash table, if it already exists we have a +- * hard-link, so increment the nlink count and return it. +- * Don't do the look-up for directories because we don't hard-link +- * directories. ++ * hardlink, so increment the nlink count and return it. ++ * Don't do the look-up for directories because Unix/Linux doesn't ++ * allow hard-links to directories. + */ +- if ((buf->st_mode & S_IFMT) != S_IFDIR) { ++ if ((buf->st_mode & S_IFMT) != S_IFDIR && !no_hardlinks) { + for(inode = inode_info[ino_hash]; inode; inode = inode->next) { + if(memcmp(buf, &inode->buf, sizeof(struct stat)) == 0) { + inode->nlink ++; +@@ -5447,7 +5450,9 @@ int main(int argc, char *argv[]) + comp = lookup_compressor(COMP_DEFAULT); + + for(i = source + 2; i < argc; i++) { +- if(strcmp(argv[i], "-mkfs-time") == 0 || ++ if(strcmp(argv[i], "-no-hardlinks") == 0) ++ no_hardlinks = TRUE; ++ else if(strcmp(argv[i], "-mkfs-time") == 0 || + strcmp(argv[i], "-fstime") == 0) { + if((++i == argc) || !parse_num_unsigned(argv[i], &mkfs_time)) { + ERROR("%s: %s missing or invalid time value\n", argv[0], argv[i - 1]); +@@ -5893,6 +5898,7 @@ printOptions: + "files larger than block size\n"); + ERROR("-no-duplicates\t\tdo not perform duplicate " + "checking\n"); ++ ERROR("-no-hardlinks\t\tdo not hardlink files, instead store duplicates\n"); + ERROR("-all-root\t\tmake all files owned by root\n"); + ERROR("-root-mode <mode>\tset root directory permissions to octal <mode>\n"); + ERROR("-force-uid <uid>\tset all file uids to <uid>\n"); +-- +2.30.0 + diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index c833cfe10adaf..7e55bcf6e0e43 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation { # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch + # Add -no-hardlinks option. This is a rebased version of + # c37bb4da4a5fa8c1cf114237ba364692dd522262, can be removed + # when upgrading to the next version after 4.4 + ./0001-Mksquashfs-add-no-hardlinks-option.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd lz4 ]; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index d8d4145007938..9c49c4677d2a5 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { pname = "XtreemFS"; version = "1.5.1.81"; - buildInputs = [ which attr makeWrapper python ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which attr python ]; patches = [ (fetchpatch { diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index 3422b9a53bdc9..9337d5cca23bb 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { name = "diagrams-builder"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = with lib; concatStrings (intersperse "\n" (map exeWrapper backends)); diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index a22f0bc60d47a..4ab54593ed8d8 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -1,30 +1,33 @@ -{lib, stdenv, fetchurl, libdmtx, pkg-config, imagemagick}: -let - s = # Generated upstream information - rec { - baseName="dmtx-utils"; - version="0.7.4"; - name="${baseName}-${version}"; - hash="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; - url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz"; - sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; - }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libdmtx imagemagick - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit nativeBuildInputs buildInputs; - src = fetchurl { - inherit (s) url sha256; +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libdmtx +, imagemagick +}: + +stdenv.mkDerivation rec { + pname = "dmtx-utils"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "dmtx"; + repo = "dmtx-utils"; + rev = "v${version}"; + sha256 = "06m3qncqdlcnmw83n95yrx2alaq6bld320ax26z4ndnla41yk0p4"; }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libdmtx imagemagick ]; + meta = { - inherit (s) version; description = "Data matrix command-line utilities"; - license = lib.licenses.lgpl2 ; - maintainers = [lib.maintainers.raskin]; + homepage = "https://github.com/dmtx/dmtx-utils"; + changelog = "https://github.com/dmtx/dmtx-utils/blob/v${version}/ChangeLog"; + license = lib.licenses.lgpl2; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/dmtx-utils/default.upstream b/pkgs/tools/graphics/dmtx-utils/default.upstream deleted file mode 100644 index 2bb7fe31bf7c9..0000000000000 --- a/pkgs/tools/graphics/dmtx-utils/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/libdmtx/files/libdmtx/ -SF_version_dir -version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$' -SF_redirect diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 40308ffa1a9a9..865e0f141ff0d 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; - buildInputs = [ unzip makeWrapper ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]); + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]); installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 704c3a2db526c..9fe41d91db21c 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; - buildInputs = [ makeWrapper libpng perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libpng perl ]; propagatedBuildInputs = [ perlPackages.LWP ]; patchPhase = '' diff --git a/pkgs/tools/graphics/ldgallery/default.nix b/pkgs/tools/graphics/ldgallery/default.nix index 77acafcb81252..6291dc9d64230 100644 --- a/pkgs/tools/graphics/ldgallery/default.nix +++ b/pkgs/tools/graphics/ldgallery/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick7 }: +{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick }: with lib; with haskell.lib; @@ -29,7 +29,7 @@ justStaticExecutables (overrideCabal ldgallery-compiler (oldAttrs: { # wrapper for runtime dependencies registration wrapProgram "$out/bin/ldgallery" \ - --prefix PATH : ${lib.makeBinPath [ imagemagick7 ]} + --prefix PATH : ${lib.makeBinPath [ imagemagick ]} # bash completion mkdir -p "$out/share/bash-completion/completions" diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index abe560c81feb5..6201b2d5888e7 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; }; - buildInputs = [ unzip python makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip python ]; broken = true; # Not found. diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index ded9967418641..99b9e3e0e487f 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin -, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat +, openexr, zlib, imagemagick6, libGLU, libGL, freeglut, fftwFloat , fftw, gsl, libexif, perl, opencv2, qtbase, netpbm }: @@ -27,7 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - openexr zlib imagemagick fftwFloat + openexr zlib imagemagick6 fftwFloat fftw gsl libexif perl opencv2 qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index ec2cb359a5e01..a4772cad3c49f 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; - buildInputs = [ qt4 unzip libGLU makeWrapper ]; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 unzip libGLU ]; + nativeBuildInputs = [ qmake4Hook makeWrapper ]; # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: patches = [ ./gcc47.patch ]; diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 53e7378bd3beb..2f9c43373bbeb 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sourceRoot = "welkin-r9638/tags/${version}"; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; installPhase = '' mkdir -p $out/{bin,share} diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 35683101918d6..e9d7f0765b7b7 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -2,7 +2,7 @@ , libxml2, enchant2, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , dbus, gtk2, gtk3, qt4, extra-cmake-modules -, xkeyboard_config, pcre, libuuid +, xkeyboard_config, pcre, libuuid, xorg, makeWrapper , withPinyin ? true , fetchFromGitLab }: @@ -68,7 +68,12 @@ stdenv.mkDerivation rec { patchShebangs cmake/ ''; - nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre ]; + postInstall = '' + wrapProgram $out/bin/fcitx \ + --prefix PATH : "${xorg.xmodmap}/bin" + ''; + + nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre makeWrapper ]; buildInputs = [ xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix index 17501d5f36220..020e829f0987c 100644 --- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ fcitx5 fcitx5-configtool fcitx5-lua fcitx5-qt fcitx5-gtk ] ++ addons; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/fcitx5 \ diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index e0f84329b8976..39cfcefaee8af 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1qpylyxrisy3p2lyirfarfj5yzrdjgsgxwf8gqwljpcjn207hr72"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm755 0x0 $out/bin/0x0 diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index e25543b5145ab..720b0a875a802 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { URI ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ perlPackages.perl libpcap makeWrapper ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ perlPackages.perl libpcap ]; postInstall = '' for name in get-{oui,iab}; do diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 4c5622fab09c4..a50bc311f2479 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.9.4"; + version = "1.9.5"; pname = "aspcud"; src = fetchzip { url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; - sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; + sha256 = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index d6e1e9e5d7745..d72b0fdef1fa8 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1kbziqm00skj65gpjq6m83hmfk9g3xyx88gai1r80pzsx8g239w1"; + sha256 = "113i11sgna82i4c4zk66qmbypmnmzh0lzp4kkgqnxxcdvyj00rb8"; }; - cargoSha256 = "1pdja5jhk036hpgv77xc3fcvra1sw0z5jc1ry53i0r7362lnwapz"; + cargoSha256 = "12z7y303fmga91daf2w356qiqdqa7b8dz6nrrpnjdf0slyz0w3x4"; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; @@ -39,11 +39,14 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${lib.makeBinPath [ less ]}" ''; + checkFlags = [ "--skip=pager_more" "--skip=pager_most" ]; + passthru.tests = { inherit (nixosTests) bat; }; meta = with lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = "https://github.com/sharkdp/bat"; + changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir lilyball zowoq ]; }; diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index 96c2d00ffa826..bb5ed84e7d729 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -3,9 +3,10 @@ }: stdenv.mkDerivation rec { - name = "bc-1.07.1"; + pname = "bc"; + version = "1.07.1"; src = fetchurl { - url = "mirror://gnu/bc/${name}.tar.gz"; + url = "mirror://gnu/bc/${pname}-${version}.tar.gz"; sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"; }; @@ -30,10 +31,10 @@ stdenv.mkDerivation rec { # masss-rebuild. strictDeps = true; - meta = { + meta = with lib; { description = "GNU software calculator"; homepage = "https://www.gnu.org/software/bc/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; + license = licenses.gpl3Plus; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index c647d3b390287..ffe3fd0fe1621 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ perl makeWrapper gettext ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl gettext ]; propagatedBuildInputs = [ textual-window-manager screen ]; postPatch = '' diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index d0e6c16734977..d858e0fbc4612 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0zyyg4mvrny7cc2xgvfip97b6yc75ka5ni39rwls93971jbk83d6"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm755 src/capture.sh $out/bin/capture diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index f196bb5af03f9..51fbba8d706c0 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.6.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "13vv2xmfh0dr949bh75448lidvzwxks6f1mjawdg1q8qwzxhzry4"; + sha256 = "sha256-GaXVMM23U3M+qNJrWYR+DLiCmILcuX5EIkQqzwN/l1Y="; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index f518c1b8e3f22..3e18d3f4b54ee 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */Unix) ''; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ - perl AlgorithmDiff ParallelForkManager RegexpCommon - ]); + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ perl AlgorithmDiff ParallelForkManager RegexpCommon ]); makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ]; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 8de7cc99336d2..cbeede0cc305f 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -16,7 +16,8 @@ in stdenv.mkDerivation rec { sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; - buildInputs = [ unzip xz dpkg libxslt python setuptools makeWrapper curl gnupg diffutils ] ++ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip xz dpkg libxslt python setuptools curl gnupg diffutils ] ++ (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]); preConfigure = '' diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index afce1429e69b1..78f49d9e589da 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.14"; + version = "1.18"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "0p5pj8d761gz95ar35s8q6lrybrg9jik33kwnsxvb14n990kya0p"; + sha256 = "sha256-n1KfzxK1F1dji1/HG40vubNQ+R270+Ss0WCQivuVweE="; }; dontBuild = true; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 581b39f3c4ce6..5d8d0d9420101 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.7"; + version = "4.8"; src = fetchurl { - url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "sha256-tsGrdkTYO7Kiadx0Fghno74PXfEWx+tFPCUFMXNTRCk="; + url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; + sha256 = "1bi5fhr93n72pkap4mqsjd1pwnqjf6czg359c5xwczavfk6mamgh"; }; postPatch = '' @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - homepage = "http://entrproject.org/"; + homepage = "https://eradman.com/entrproject/"; description = "Run arbitrary commands when files change"; + changelog = "https://github.com/eradman/entr/raw/${version}/NEWS"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ pSub synthetica ]; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index a923dbf651f44..f0ed87bcc22ba 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "flameshot"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191"; + sha256 = "sha256-E5J61k1tVpbwlzYHbCY1rf9+GODcJRRAQwb0jR4s7BU="; }; nativeBuildInputs = [ cmake qttools qtsvg ]; diff --git a/pkgs/tools/misc/gammy/default.nix b/pkgs/tools/misc/gammy/default.nix index 374f93fb0ae1c..e06d20eb2ff7c 100644 --- a/pkgs/tools/misc/gammy/default.nix +++ b/pkgs/tools/misc/gammy/default.nix @@ -2,7 +2,7 @@ let pname = "gammy"; - version = "0.9.63"; + version = "0.9.64"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Fushko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KG9XoE8Ja+P/Z311D1Vfio7QVT8EPCylEbLTT4Ln+OU="; + sha256 = "sha256-NPvkT7jSbDjcZDHpMIOik9fNsz7OJXQ3g9OFxkpA3pk="; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 5be309be582fb..8ebb2924b0360 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontStrip = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ]; passthru.tests = { inherit (nixosTests) graylog; }; diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index d127bc25c3c69..5373c64d647c3 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -4,11 +4,15 @@ , fixDarwinDylibNames , cmake , libjpeg +, uselibtirpc ? stdenv.isLinux , libtirpc , zlib , szip ? null +, javaSupport ? false +, jdk }: -let uselibtirpc = stdenv.isLinux; +let + javabase = "${jdk}/jre/lib/${jdk.architecture}"; in stdenv.mkDerivation rec { pname = "hdf"; @@ -52,9 +56,9 @@ stdenv.mkDerivation rec { libjpeg szip zlib - ] ++ lib.optionals uselibtirpc [ - libtirpc - ]; + ] + ++ lib.optional javaSupport jdk + ++ lib.optional uselibtirpc libtirpc; preConfigure = lib.optionalString uselibtirpc '' # Make tirpc discovery work with CMAKE_PREFIX_PATH @@ -75,6 +79,11 @@ stdenv.mkDerivation rec { "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" "-DHDF4_BUILD_FORTRAN=OFF" "-DJPEG_DIR=${libjpeg}" + ] ++ lib.optionals javaSupport [ + "-DHDF4_BUILD_JAVA=ON" + "-DJAVA_HOME=${jdk}" + "-DJAVA_AWT_LIBRARY=${javabase}/libawt.so" + "-DJAVA_JVM_LIBRARY=${javabase}/server/libjvm.so" ] ++ lib.optionals (szip != null) [ "-DHDF4_ENABLE_SZIP_ENCODING=ON" "-DHDF4_ENABLE_SZIP_SUPPORT=ON" diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index fc7bb635040a1..e97a6dbdd1897 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -8,6 +8,8 @@ , mpiSupport ? false , mpi , enableShared ? !stdenv.hostPlatform.isStatic +, javaSupport ? false +, jdk }: # cpp and mpi options are mutually exclusive @@ -17,11 +19,11 @@ assert !cpp || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.10.6"; + version = "1.10.7"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"; + sha256 = "0pm5xxry55i0h7wmvc7svzdaa90rnk7h78rrjmnlkz2ygsn8y082"; }; passthru = { @@ -35,7 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [] ++ optional (gfortran != null) gfortran - ++ optional (szip != null) szip; + ++ optional (szip != null) szip + ++ optional javaSupport jdk; propagatedBuildInputs = [] ++ optional (zlib != null) zlib @@ -46,7 +49,8 @@ stdenv.mkDerivation rec { ++ optional (gfortran != null) "--enable-fortran" ++ optional (szip != null) "--with-szlib=${szip}" ++ optionals mpiSupport ["--enable-parallel" "CC=${mpi}/bin/mpicc"] - ++ optional enableShared "--enable-shared"; + ++ optional enableShared "--enable-shared" + ++ optional javaSupport "--enable-java"; patches = [ ./bin-mv.patch diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix deleted file mode 100644 index 70a2f091116b5..0000000000000 --- a/pkgs/tools/misc/hdfjava/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, javac }: - -stdenv.mkDerivation rec { - pname = "hdf-java"; - version = "3.3.2"; - - src = fetchurl { - url = "http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfjni-${version}/src/CMake-hdfjava-${version}.tar.gz"; - sha256 = "0m1gp2aspcblqzmpqbdpfp6giskws85ds6p5gz8sx7asyp7wznpr"; - }; - - nativeBuildInputs = [ cmake javac ]; - - dontConfigure = true; - buildPhase = "./build-hdfjava-unix.sh"; - installPhase = '' - mkdir -p $out - cp -r build/_CPack_Packages/Linux/TGZ/HDFJava-3.3.2-Linux/HDF_Group/HDFJava/${version}/* $out/ - ''; - - meta = { - description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form"; - license = lib.licenses.free; # BSD-like - homepage = "https://support.hdfgroup.org/products/java/index.html"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index dc13bb52791fb..8537e5748c30a 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,39 +1,58 @@ -{ lib, stdenv, fetchurl, ant, javac, hdf_java }: +{ lib, stdenv, fetchurl, ant, jdk, nettools, hdf4, hdf5, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "hdfview"; - version = "2.14"; + version = "3.1.2"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pname}-${version}.tar.gz"; - sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz"; + sha256 = "0kyw9i3f817z71l0ak7shl0wqxasz9h5fl05mklyapa7cj27637c"; }; - nativeBuildInputs = [ ant javac ]; + nativeBuildInputs = [ + ant jdk + nettools # "hostname" required + copyDesktopItems + ]; - HDFLIBS = hdf_java; + HDFLIBS = (hdf4.override { javaSupport = true; }).out; + HDF5LIBS = (hdf5.override { javaSupport = true; }).out; buildPhase = '' - ant run - ant package + runHook preBuild + + ant createJPackage + + runHook postBuild ''; + desktopItem = makeDesktopItem rec { + name = "HDFView"; + desktopName = name; + exec = name; + icon = name; + comment = meta.description; + categories = "Science;DataVisualization;"; + }; + installPhase = '' - mkdir $out - # exclude jre - cp -r build/HDF_Group/HDFView/*/{lib,share} $out/ - mkdir $out/bin - cp -r build/HDF_Group/HDFView/*/hdfview.sh $out/bin/hdfview - chmod +x $out/bin/hdfview - substituteInPlace $out/bin/hdfview \ - --replace "@JAVABIN@" "${javac}/bin/" \ - --replace "@INSTALLDIR@" "$out" + runHook preInstall + + mkdir -p $out/bin $out/lib + cp -a build/dist/HDFView/bin/HDFView $out/bin/ + cp -a build/dist/HDFView/lib/app $out/lib/ + ln -s ${jdk}/lib/openjdk $out/lib/runtime + + mkdir -p $out/share/applications $out/share/icons/hicolor/32x32/apps + cp src/HDFView.png $out/share/icons/hicolor/32x32/apps/ + + runHook postInstall ''; meta = { description = "A visual tool for browsing and editing HDF4 and HDF5 files"; license = lib.licenses.free; # BSD-like - homepage = "https://support.hdfgroup.org/products/java/index.html"; + homepage = "https://portal.hdfgroup.org/display/HDFVIEW/HDFView"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix index ed47e477854c0..83d8a77041927 100644 --- a/pkgs/tools/misc/ix/default.nix +++ b/pkgs/tools/misc/ix/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 49b3ffbb7dde9..61abb3eee105d 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; - buildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; installPhase = '' mkdir -p $out/{bin,share/man/man1} diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index d33cdbacb15e5..fd8b805743aca 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; - buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ goobook perl ConvertASN1 perlldap AuthenSASL ] ++ optional (!stdenv.isDarwin) finger_bsd ++ optional (abook != null) abook ++ optional (gnupg != null) gnupg diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index ec002ae4232b6..7ec9d0d407a48 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "20"; + version = "21"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "056g2g503ppbqqbq5nk90sl8ki1q4fixdc25a6wv15gm1inxrb4b"; + sha256 = "0j7c21lsgcc39ng9ni94y3zfcqwyf9jc52fi8mcpkp0lpcx5ava9"; }; - vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg"; + vendorSha256 = "15fl9v69wkzwzpq6x4xhcd5g6xyck3mlpbz1bbb61l75jjzg913m"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 44cb6962b8e67..4ac11aa62c1ba 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.9.3"; + name = "man-db-2.9.4"; src = fetchurl { url = "mirror://savannah/man-db/${name}.tar.xz"; - sha256 = "1f4palf5bdyf3f8sa0981cqxn9cjcr2pz53ngrrsybb9n0da2nps"; + sha256 = "sha256-tmyZ7frRatkoyIn4fPdjgCY8FgkyPCgLOp5pY/2xZ1Y="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 7fb66e22e98d4..81437378c327b 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -8,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "0hskb72gnp66vkyxsqnxhjcqgvjj7wbd2nm5wxp94abc5l1fiigv"; + sha256 = "sha256-/vtiHRHsbF7lfn9tfgfKhm5YwofjSJniNNnKahphHFg="; }; - cargoSha256 = "0s1gdngpf6gxz2lyapblxxmc6aydg2i9kmrfvngkbmqh4as1a2vl"; + cargoSha256 = "sha256-gwy/LeVznZyawliXnkULyyVSXATk0sjSTUZPHO2K+9o="; nativeBuildInputs = [ pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 26056364b7740..9d2e64d6b705b 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -3,7 +3,7 @@ , gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let - version = "1.23.0"; + version = "1.24.6"; rpath = lib.makeLibraryPath [ alsaLib @@ -49,7 +49,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "1kmhki4kq28z8h249p4imcpb0nz2dx5bmpv8ldhhqh3rcq5vzxsv"; + sha256 = "sha256-GTMJ3Mu0vym2u4uZcq5LnbOod1yanCWHbGLXjVq30Hc="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 05149fb7a3f75..5a1452007af21 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook ''; - buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ] ++ optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index c5ac32af3be4e..0c021591e5e58 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; libPath = lib.makeLibraryPath [ xorg.libX11 diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 168eda1cf3d52..678c2607b6140 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; }; - buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ autoconf automake curl jdk nettools python git ]; preConfigure = '' patchShebangs ./build-aux/ diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 07279400fc4d3..bc5dbe4672e81 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' # executables install -Dt $out/bin os-prober linux-boot-prober diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 7c7a611b97c5d..e954bfbe5e4db 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "parted-3.3"; + name = "parted-3.4"; src = fetchurl { url = "mirror://gnu/parted/${name}.tar.xz"; - sha256 = "0i1xp367wpqw75b20c3jnism3dg3yqj4a7a22p2jb1h1hyyv9qjp"; + sha256 = "sha256-4SmAIkctpVibfyvh1e48G2bsPZbfutA9xkKv0AnaU0I="; }; outputs = [ "out" "dev" "man" "info" ]; diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix index eacbc0d6bd2d4..48b819d5bfdd6 100644 --- a/pkgs/tools/misc/pb_cli/default.nix +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0w6a789zffvz4ixsb92q45n5s4xyx7s2l2f07972i3dajaaai8z7"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; liveDeps = [ jq curl ] ++ lib.optional screenshots maim ++ lib.optional video capture diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 7ffbd8ded1ca9..009d841bf5579 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 ''; - buildInputs = [ libusb-compat-0_1 makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libusb-compat-0_1 ]; meta = { homepage = "https://www.microchip.com/pickit2"; diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index d9c208510fc68..0b5005b9c82a1 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1p8s60dlzaldp006yj710s371aan915asyjhd99188vrj4jj1x79"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index b94ca6cfea342..113c2b05ff59a 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; }; - buildInputs = [ python3 texinfo makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 texinfo ]; inherit python3; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index c8a2b338817de..77f865a6a168e 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' PREFIX=\"\" DESTDIR=$out make install diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index a943f94a1827b..64cc91f170ba0 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 = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-r6qD7KyuBj67c+nhaRLHP5B46JV8VP9MKCloqYLua+Q="; + sha256 = "sha256-564ZHrok5RVFR9OYPpd6WjSZKieNFhnvUbBklayGOb0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index 0edec63c8c927..e98323b75eeae 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "pws-${(import ./gemset.nix).pws.version}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = ["installPhase"]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index f9fc3a110eae2..8d8e587879b76 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -18,8 +18,8 @@ in stdenv.mkDerivation rec { }; pythonPaths = [ pycrypto pyyaml requests ]; - buildInputs = [ python perl nose mock makeWrapper python-dateutil setuptools ] ++ pythonPaths; - nativeBuildInputs = [ gitMinimal zip ]; + buildInputs = [ python perl nose mock python-dateutil setuptools ] ++ pythonPaths; + nativeBuildInputs = [ gitMinimal zip makeWrapper ]; postPatch = '' substituteInPlace scripts/run-tests.sh \ diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/tools/misc/tmux-cssh/default.nix index f3f5362795665..830c365fa4032 100644 --- a/pkgs/tools/misc/tmux-cssh/default.nix +++ b/pkgs/tools/misc/tmux-cssh/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "473e27f3b69864b905d1340d97917cd202705c761611eb3aec4c24521f69b52c"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix index 0393ca356dc6c..a94c58368a4f2 100644 --- a/pkgs/tools/misc/vsh/default.nix +++ b/pkgs/tools/misc/vsh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vsh"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "16q0pkmdzhq0bqy4lnnlxrc29gszca6vwajj2bg6sylcvi94x80d"; + sha256 = "0dhn2aqd52fgasy4j3ar67fzwzcxfi1vl09kni8jwcna8rjgg3fj"; }; # vendor directory is part of repository diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index a0392bf4754cf..05750b962f00f 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation { name = "xvfb-run"; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin cp ${xvfb_run} $out/bin/xvfb-run diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 497d928516ab4..4879bd9b04280 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.02.22"; + version = "2021.03.02"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "19j4kfqln1yk47dpid9j4z3zvgxy6xar1mpfsadifikfdgbmsq7x"; + sha256 = "0g3fmbxbixi92vbjjy5dabz538yvfzdp649kafs09n55iw29s3f8"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index 0976a764a6f2d..374a76871cb09 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -42,7 +42,8 @@ let in stdenv.mkDerivation { inherit name version src; - buildInputs = [ makeWrapper nodejs ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ nodejs ]; dontBuild = true; diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 0038a5e2e7f85..0e76cb94346b7 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; }; - buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ readline tcp_wrappers pcre gcc ]; # Expects pre-GCC5 inline semantics NIX_CFLAGS_COMPILE = "-std=gnu89"; diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index 39728f7e9a079..112a95eccc6ed 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n"; }; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = with pythonPackages; [ requests vobject lxml ]; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index b918516f926c2..f0aecf7363a8e 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.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1so9EMry7U6GfpxgqLpcqC+ZaWAn4qAsnyDZvo0FAZY="; + sha256 = "sha256-IaS2QU9DBupv06AMzJXBM2iZkNVw31Pt1bOMQNBEiq0="; }; - vendorSha256 = "sha256-d8JPsHBGkZ/MeoHTCLxi6JeNomER/0veWjqmqGal8eE="; + vendorSha256 = "sha256-RuwrnuTNfiYpIuohw7OQv95hjOAeWCMuajsZVUUDxBQ="; doCheck = false; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index a3b43e0bd2e07..2091a4aa5498d 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clash"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yTj3kXG7xB1+PhaiGgQR4bUcKkdk5eiF4bGXmxuMMsg="; + sha256 = "sha256-T6oBdhBX850GXb19MTOFVo9LRfOgCyMW3GIljMMeGmg="; }; vendorSha256 = "sha256-HqlHUVWwvO15nitpwIh/u0GfF8wqJqkviyxOp7QHYz8="; @@ -23,7 +23,7 @@ buildGoModule rec { meta = with lib; { description = "A rule-based tunnel in Go"; homepage = "https://github.com/Dreamacro/clash"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ contrun Br1ght0ne ]; }; } diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 4a4578a735620..79f78c8fff4cc 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.6.7"; + version = "8.6.8"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+Hsxu/gqMKRWBJT7JqOw8Ck+5fQG0D3wSJBb9fgkPsw="; + sha256 = "sha256-ierNKZ14F3EKtQRdOd7D4jhaA7M6zwnFVSk6aUh4VPc="; }; - vendorSha256 = "sha256-ULXC8lVu/TTSzYJ4EpAQvDwntRV0+Vmr8VPaEe54qdA="; + vendorSha256 = "sha256-F/Vxl9Z5LgAmnRt/FOdW9eVN7IVb1ZEKiYOSpT9+L0E="; doCheck = false; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index c56ba5a4a6617..751dd2c8c1f9c 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { ./set-hostname.patch ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl makeWrapper ]; - buildInputs = [ makeWrapper openldap ]; + buildInputs = [ openldap ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index d92408b366907..d8f4285e0b810 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "dnsmasq"; - version = "2.83"; + version = "2.84"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; - sha256 = "1sjamz1v588qf35m8z6wcqkjk5w12bqhj7d7p48dj8jyn3lgghgz"; + sha256 = "sha256-YDGVxktzE3YJsH4QJK4LN/ZSsvX+Rn3OZphbPRhQBQw="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 68a6660db9f30..6668d6e986a7e 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.34.1"; + version = "0.35.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XwXGhFyPsJWHWea3Cj3X6mOV/oseaRAMaEHoppX+WRw="; + sha256 = "sha256-+k8dGVYyCY+CI8+8OPBqoICu0KO2eM+6Hy8E+KyOqPs="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index d32c2f5cc57b2..064aa162fba56 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.8.2"; + version = "1.9.3"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0f8x1blfmbcak0cd21jm1zpz4w8iimldhjilwkwgvmmrxnmsfv28"; + sha256 = "sha256-gEuEbqvy/YpXfNkeNcaobI5gH2AvlL6E/lm2HfPATZ8="; }; patches = [ ./dont-create-var.patch ]; diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 18ae090f2119b..f34b43f3c32b3 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "1qc7k83zpcq27hpjv1lmgrj4la2zy1gspwk5jas43j49siwr3xqx"; + sha256 = "sha256-mNIA524w9iYsSkSTFIwYQIJ4mDKRRqV6NPjw+SjKPe8="; }; configureFlags = [ diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 5ddbf24bb6a97..92c241967ae0b 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ protobuf ncurses zlib makeWrapper openssl bash-completion ] + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; + buildInputs = [ protobuf ncurses zlib openssl bash-completion ] ++ (with perlPackages; [ perl IOTty ]) ++ lib.optional withUtempter libutempter; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index bc7db4fc6f368..f486c903c5d6c 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-QrMFCOhXoihTXGMeqsk2hi2G7KaMFLXAvzh7oXa5G5c="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; configurePhase = '' diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index 16e97bab21460..2120679fef3e9 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42"; }; - buildInputs = [ makeWrapper coreutils gawk util-linux ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ coreutils gawk util-linux ]; installPhase = '' install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 4ab93b7574a7f..075d60038d8ec 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -2,11 +2,8 @@ , enableDaemon ? false # build amule daemon , httpServer ? false # build web interface for the daemon , client ? false # build amule remote gui -, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null -, autoreconfHook, pkg-config, makeWrapper, libX11 ? null }: - -assert httpServer -> libpng != null; -assert client -> libX11 != null; +, fetchFromGitHub, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng +, autoreconfHook, pkg-config, makeWrapper, libX11 }: stdenv.mkDerivation rec { pname = "amule"; @@ -78,5 +75,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom ]; platforms = platforms.unix; + # Could not find crypto++ installation or sources. + broken = true; }; } diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index efb57e7d247d7..85a8cd5d76842 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "3.0.31"; + version = "3.0.32"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "sha256-B3cpo6rHkiKk6NiKZQ2QKNFv1LDWA42o9fXkcSDQBOs="; + sha256 = "sha256-xh3kAIxiRF7Bjx8nBAfL8jcuq6k76szcnjI4uy3v7tc="; }; hardeningEnable = [ "pie" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.privoxy.org/"; description = "Non-caching web proxy with advanced filtering capabilities"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.phreedom ]; }; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 06d081b745c0c..cf761c8ca2738 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.23"; + version = "1.9.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1ylasv33478cgwmr8wrd4705azfzrw495w629ncynamv7z17w3k3"; + sha256 = "1lxx9xzkv3y2qjffa5dmwv0ygka71dx3c2995ggcgy5fb19yrghc"; }; - cargoSha256 = "060k2dil38bx4zb5nnkr3mj6aayginbhr3aqjv0h071q0vlvp05p"; + cargoSha256 = "0p93dv4nlwl5167dmp160l09wqba5d40gaiwc6vbzb4iqdicgwls"; - SODIUM_USE_PKG_CONFIG = 1; + RUSTC_BOOTSTRAP = 1; - buildInputs = [ openssl libsodium ] - ++ lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + checkFlags = [ "--skip=http_proxy" "--skip=udp_tunnel" ]; meta = with lib; { homepage = "https://github.com/shadowsocks/shadowsocks-rust"; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index bda3d36c24551..4a0b3c133942d 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "06813k8a1gpakgykz5h75qpdlhrci9r39309n3qqh34ynbjil468"; + sha256 = "sha256-jUxAkC9nMiDiHKyKtmdtOEyb9jqOEiy5D3NqymluX28="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index f65f97ed91d00..9ee014396530c 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1sas9d9kk92mc2wrwgmm0xxz7ycmh388dwvyxf1hy183yvin1nac"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index fb822177725a4..49ef0afc0603c 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0c2sx4nrh4whsqzj6m5ay8d7yqan3aqgg436p8jb25bs91ykn2pv"; }; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 71fea1c2e830d..c98a3417d1c4f 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; }; - buildInputs = [ makeWrapper perlPackages.perl perlPackages.LWP perlPackages.URI perlPackages.HTMLParser ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl perlPackages.LWP perlPackages.URI perlPackages.HTMLParser ]; checkInputs = [ perlPackages.HTTPServerSimple perlPackages.Parent ]; configurePhase = '' diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index a077ddb3de465..5d1966114b78a 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -31,7 +31,7 @@ in pythonPackages.buildPythonPackage rec { sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/telepresence \ diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 13c7f6a1d5bd4..b97c49dd9c968 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,22 +2,24 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.7"; + version = "0.34.8"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nucfxQYjUKm9c1vn7c4w0Mxkf+rU1qEZ1bjzcL258MQ="; + sha256 = "sha256:03k44w23167az2kk6ccp3139kykzkhack4w2vy0wvs2lb67xiqd9"; }; vendorSha256 = "sha256-0Y9QDBVNYE2x3nY3loRKTCtYWXRnK7v+drRVvTMY4Dg="; - doCheck = false; - subPackages = [ "cmd/tendermint" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/tendermint/tendermint/version.GitCommit=${src.rev}" ]; + preBuild = '' + makeFlagsArray+=( + "-ldflags=-s -w -X github.com/tendermint/tendermint/version.GitCommit=${src.rev}" + ) + ''; meta = with lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short"; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index f250b8d6b65ef..0b682fa97c14a 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -21,14 +21,6 @@ buildRustPackage rec { SODIUM_USE_PKG_CONFIG = "yes"; - installPhase = '' - runHook preInstall - - install -D $releaseDir/tox-node $out/bin/tox-node - - runHook postInstall - ''; - doCheck = false; cargoSha256 = "sha256-kCT2ulB+c2OlsABkyXyzrHfD/G92EPCdTO34FR5oSws="; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 24b17af3d3e96..232e049e456ae 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -18,6 +18,9 @@ # , withSystemd ? false , systemd ? null + # optionally support DNS-over-HTTPS as a server +, withDoH ? false +, libnghttp2 }: stdenv.mkDerivation rec { @@ -31,7 +34,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ]; + buildInputs = [ openssl nettle expat libevent ] + ++ lib.optionals withSystemd [ pkg-config systemd ] + ++ lib.optionals withDoH [ libnghttp2 ]; configureFlags = [ "--with-ssl=${openssl.dev}" @@ -47,6 +52,8 @@ stdenv.mkDerivation rec { "--disable-flto" ] ++ lib.optionals withSystemd [ "--enable-systemd" + ] ++ lib.optionals withDoH [ + "--with-libnghttp2=${libnghttp2.dev}" ]; installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index a754e7e9937c3..edb50559fc0f8 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { # `ifconfig' as found in net-tools (not GNU Inetutils). propagatedBuildInputs = [ nettools ]; - buildInputs = [libgcrypt perl makeWrapper openssl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [libgcrypt perl openssl ]; preConfigure = '' sed -i 's|^#OPENSSL|OPENSSL|g' Makefile diff --git a/pkgs/tools/networking/webwormhole/default.nix b/pkgs/tools/networking/webwormhole/default.nix new file mode 100644 index 0000000000000..8fbaf3159a22e --- /dev/null +++ b/pkgs/tools/networking/webwormhole/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "webwormhole"; + version = "unstable-2021-01-16"; + + src = fetchFromGitHub { + owner = "saljam"; + repo = pname; + rev = "c85e196c8a8a885815136aa8aee1958ad80a3bb5"; + sha256 = "D10xmBwmEbeR3nU4CmppFBzdeE4Pm2+o/Vb5Yd+pPtM="; + }; + + vendorSha256 = "sha256-yK04gjDO6JSDcJULcbJBBuPBhx792JNn+B227lDUrWk="; + + meta = with lib; { + description = "Send files using peer authenticated WebRTC"; + homepage = "https://github.com/saljam/webwormhole"; + license = licenses.bsd3; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index 668a623ee2a5a..f171a15004543 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -8,24 +8,26 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.24.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "mmstick"; repo = pname; - rev = "b49351f6770aa7aeb053dd1d4a02d6b086caad2a"; - sha256 = "1hs96yv0awgi7ggpxp7k3n21jpv642sm0529b21hs9ib6kp4vs8s"; + rev = "v${version}"; + sha256 = "sha256-oWivGy2azF9zpeZ0UAi7Bxm4iXFWAjcBG0pN7qtkSU8="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1vqnnqn6rzkdi239bh3lk7gaxr7w6v3c4ws4ya1ah04g6v9hkzlw"; - - checkType = "debug"; + cargoSha256 = "0j9frvcmy9hydw73v0ffr0bjvq2ykylnpmiw700z344djpaaa08y"; preCheck = '' substituteInPlace tests/command.rs \ - --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/debug" + --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/release" + + # This is an FHS specific assert depending on glibc location + substituteInPlace src/dependencies.rs \ + --replace 'assert!(deps.iter().any(|d| d.starts_with("libc")));' '// no libc assert here' ''; meta = with lib; { diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 5a5b1458113e5..798601d1a5b42 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FO3N5Dyk87GzPEhQDX2QVDulw15BnpsljawY2RFy2Qk="; + sha256 = "sha256-vA+Y4j9Flcrizqh61+4X70FzF5/wK2WVHQRsAUQzKnU="; }; - cargoSha256 = "sha256-/XZ88ChOCLP5/pZ9UkAAWqO/jFUwbo5FJQ2GZip1gP4="; + cargoSha256 = "sha256-zGdjMpB7h+/RdM+wXffUuAyHnks6umyJmzUrANmqAS8="; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/tools/package-management/licensee/Gemfile.lock b/pkgs/tools/package-management/licensee/Gemfile.lock index 9f1a24337b815..b6ac2fe182edf 100644 --- a/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/pkgs/tools/package-management/licensee/Gemfile.lock @@ -4,29 +4,35 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) dotenv (2.7.6) - faraday (1.0.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) - licensee (9.14.1) + ruby2_keywords + faraday-net_http (1.0.1) + licensee (9.15.0) dotenv (~> 2.0) - octokit (~> 4.17) + octokit (~> 4.20) reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.18.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) public_suffix (4.0.6) + racc (1.5.2) reverse_markdown (1.4.0) nokogiri + ruby2_keywords (0.0.4) rugged (1.1.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - thor (1.0.1) + thor (1.1.0) PLATFORMS ruby diff --git a/pkgs/tools/package-management/licensee/gemset.nix b/pkgs/tools/package-management/licensee/gemset.nix index 281f9376e178a..3c48ad8f9bbfc 100644 --- a/pkgs/tools/package-management/licensee/gemset.nix +++ b/pkgs/tools/package-management/licensee/gemset.nix @@ -21,12 +21,22 @@ version = "2.7.6"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + type = "gem"; + }; + version = "1.3.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; type = "gem"; }; version = "1.0.1"; @@ -37,20 +47,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5"; + sha256 = "1di15x50kpqdhw1fvba4c1j6b106nfld85jxdc72xj4iyj1l6vi1"; type = "gem"; }; - version = "9.14.1"; + version = "9.15.0"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; multipart-post = { groups = ["default"]; @@ -63,15 +73,15 @@ version = "2.1.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -79,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.18.0"; + version = "4.20.0"; }; public_suffix = { groups = ["default"]; @@ -94,6 +104,16 @@ }; version = "4.0.6"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; reverse_markdown = { dependencies = ["nokogiri"]; groups = ["default"]; @@ -105,6 +125,16 @@ }; version = "1.4.0"; }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; + }; rugged = { groups = ["default"]; platforms = []; @@ -131,9 +161,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; } diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index bd19f30f1c123..f231e5e9bba26 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nfpm"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EIHEdU1H5XhhzuWJUEvnKNsuNV8CBJrHBlaZlSfrSro="; + sha256 = "sha256-B8bXZ5PjlZIly25jK23ODa+RYGDfxHR0Z2fpAjptgP8="; }; vendorSha256 = "sha256-aSoryidfAfqPBpOtAXFJsq1ZcqJqpGiX3pZz5GpkKqQ="; diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index 41ce0967b2e3c..7b52f2585f35e 100644 --- a/pkgs/tools/package-management/nix-bundle/default.nix +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0hdvdjm467w37clkhbifn54hbdmnxlbk66cj88lwaz26j4s2ik5g"; }; + nativeBuildInputs = [ makeWrapper ]; + # coreutils, gnutar is actually needed by nix for bootstrap - buildInputs = [ nix coreutils makeWrapper gnutar gzip bzip2 ]; + buildInputs = [ nix coreutils gnutar gzip bzip2 ]; binPath = lib.makeBinPath [ nix coreutils gnutar gzip bzip2 ]; diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index 0e4005022ff93..4dc0098316c66 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -9,7 +9,8 @@ let self = stdenv.mkDerivation rec { rev = "version-${version}"; sha256 = "1pccvc0iqapms7kidrh09g5fdx44x622r5l9k7bkmssp3v4c68vy"; }; - buildInputs = [ python3 mypy makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 mypy ]; checkPhase = '' mypy bin/* ''; diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index c4fc804b80f7d..7f06cbbd3c205 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.4.4"; pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "06278gmb26b9nl8l328cc2c2mhfi0dhac65syws17kf09f2m596x"; + sha256 = "sha256-IhesxYuOsxMAYx66514iLrxwDJwc9kCAiHBdGaRyyDk="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index 25b9aecb8e0ec..d7f8e30e182de 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, medusa }: +{ lib +, stdenv +, python3 +, fetchFromGitHub +, makeWrapper +, medusa +}: stdenv.mkDerivation rec { pname = "brutespray"; - version = "1.6.8"; + version = "1.7.0"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = pname; - rev = "brutespray-${version}"; - sha256 = "1pi4d5vcvvjsby39dq995dlhpxdicmfhqsiw23hr25m38ccfm3rh"; + rev = "${pname}-${version}"; + sha256 = "0lkm3fvx35ml5jh4ykjr2srq8qfajkmxwp4qfcn9xi58khk3asq3"; }; postPatch = '' @@ -33,7 +39,11 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/x90skysn3k/brutespray"; - description = "Brute-Forcing from Nmap output - Automatically attempts default creds on found services"; + description = "Tool to do brute-forcing from Nmap output"; + longDescription = '' + This tool automatically attempts default credentials on found services + directly from Nmap output. + ''; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index f3aabb4a9f349..6c48dd380b773 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.22.1"; + version = "3.23.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-f0kj9JgF49WsZm+c3oFA2+bDI5hTPRGRr1Ts4zdcutI="; + sha256 = "sha256-5IoWeFcIzhgWcYjT/BZfNQXsi9F/6WfOJLiv/5rP4Cs="; }; - vendorSha256 = "sha256-rQrlnIYYnRc+cqyiyJoh1YqxD61doyjte7ehrX4RDTI="; + vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 569b83feb9aeb..cd90342738ed8 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; - nativeBuildInputs = [ pkg-config ] + nativeBuildInputs = [ pkg-config makeWrapper ] # if python2 support is requested, it is needed at builtime as well as runtime. ++ lib.optionals (enablePython) [ python2 ] ; - buildInputs = [ perl nss nspr pam intltool makeWrapper ] + buildInputs = [ perl nss nspr pam intltool ] ++ lib.optionals (enablePython) [ python2 ] ; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index ecd12a2738d82..bd558b7ab66db 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { phases = [ "installPhase" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin installPhase = '' diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 7e2c0fcdb338f..107bf56cf8282 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -59,7 +59,8 @@ let maintainers = with maintainers; [ ewok ]; }; - buildInputs = [makeWrapper dpkg]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [dpkg]; phases = [ "unpackPhase" "installPhase" ]; unpackPhase = "dpkg -X $src ."; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 72c0bc204f8a0..0ae04ddb30f29 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab -, fetchpatch , pkg-config +, gobject-introspection , meson , ninja , perl @@ -11,9 +11,10 @@ , libxslt , docbook-xsl-nons , docbook_xml_dtd_412 +, fetchurl , glib +, gusb , dbus -, dbus-glib , polkit , nss , pam @@ -24,52 +25,41 @@ stdenv.mkDerivation rec { pname = "fprintd"; - version = "1.90.1"; + version = "1.90.9"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libfprint"; repo = pname; - rev = version; - sha256 = "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg"; + rev = "v${version}"; + sha256 = "rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; }; - patches = [ - # Fixes issue with ":" when there is multiple paths (might be the case on NixOS) - # https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/50 - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/d7fec03f24d10f88d34581c72f0eef201f5eafac.patch"; - sha256 = "0f88dhizai8jz7hpm5lpki1fx4593zcy89iwi4brsqbqc7jp9ls0"; - }) - - # Fix locating libpam_wrapper for tests - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/40.patch"; - sha256 = "0qqy090p93lzabavwjxzxaqidkcb3ifacl0d3yh1q7ms2a58yyz3"; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f401f399a85dbeb2de165b9b9162eb552ab6eea7.patch"; - sha256 = "1bc9g6kc95imlcdpvp8qgqjsnsxg6nipr6817c1pz5i407yvw1iy"; - }) - ]; - nativeBuildInputs = [ pkg-config meson ninja - perl + perl # for pod2man gettext gtk-doc libxslt - dbus + # TODO: apply this to D-Bus so that other packages can benefit. + # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/202 + (dbus.overrideAttrs (attrs: { + postInstall = attrs.postInstall or "" + '' + ln -s ${fetchurl { + url = "https://gitlab.freedesktop.org/dbus/dbus/-/raw/b207135dbd8c09cf8da28f7e3b0a18bb11483663/doc/catalog.xml"; + sha256 = "1/43XwAIcmRXfM4OXOPephyQyUnW8DSveiZbiPvW72I="; + }} $out/share/xml/dbus-1/catalog.xml + ''; + })) docbook-xsl-nons docbook_xml_dtd_412 ]; buildInputs = [ glib - dbus-glib polkit nss pam @@ -78,11 +68,13 @@ stdenv.mkDerivation rec { ]; checkInputs = with python3.pkgs; [ + gobject-introspection # for setup hook python-dbusmock dbus-python pygobject3 pycairo pypamtest + gusb # Required by libfprint’s typelib ]; mesonFlags = [ @@ -103,13 +95,15 @@ stdenv.mkDerivation rec { doCheck = true; postPatch = '' - patchShebangs po/check-translations.sh + patchShebangs \ + po/check-translations.sh \ + tests/unittest_inspector.py ''; meta = with lib; { homepage = "https://fprint.freedesktop.org/"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar elyhaka ]; }; diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index 20ee69eeaea23..19e5f16924a53 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/tools/security/gitjacker/default.nix index 0b8c087eccd0b..53350f01317e2 100644 --- a/pkgs/tools/security/gitjacker/default.nix +++ b/pkgs/tools/security/gitjacker/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gitjacker"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "liamg"; repo = "gitjacker"; rev = "v${version}"; - sha256 = "0fg95i2y8sj7dsvqj8mx0k5pps7d0h1i4a3lk85l8jjab4kxx8h9"; + sha256 = "sha256-cMjjVjHGTVT33bknAo2DVH/qPSeazVIIw3RpXGDxF5E="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 982774612759b..66d4c23defbe0 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -1,21 +1,25 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "gitleaks"; - version = "7.2.0"; + version = "7.2.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "1pdbkjx8h6ijypsxyv34lykymaqf8wnfyjk3ldp49apbx01bl34y"; + sha256 = "sha256-G/7Ezyfp9vkG1QHTG9Xg6mZ3qhQpx952i7rsSr3fFwY="; }; vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9"; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}") + ''; + meta = with lib; { description = "Scan git repos (or files) for secrets"; longDescription = '' diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 9f6a65962ff37..0ffcad117f476 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -60,7 +60,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ andir rvolosatovs ]; changelog = "https://github.com/gopasspw/gopass/blob/v${version}/CHANGELOG.md"; - platforms = platforms.unix; longDescription = '' gopass is a rewrite of the pass password manager in Go with the aim of diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix new file mode 100644 index 0000000000000..fb0da2c1a0936 --- /dev/null +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -0,0 +1,41 @@ +{ lib +, makeWrapper +, buildGoModule +, fetchFromGitHub +, gopass +}: + +buildGoModule rec { + pname = "git-credential-gopass"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "gopasspw"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-IvYxpUMclDAKJ/EkRbNrX8eIFyhtY9Q0B0RipweieZA="; + }; + + vendorSha256 = "sha256-N6eU6KsnUrYBK90ydwUH8LNkR9KRjgc4ciGOGvy7pw8="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; + + preBuild = '' + buildFlagsArray+=( + "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" + ) + ''; + + postFixup = '' + wrapProgram $out/bin/git-credential-gopass --prefix PATH : "${lib.makeBinPath [ gopass ]}" + ''; + + meta = with lib; { + description = "Manage git credentials using gopass"; + homepage = "https://github.com/gopasspw/git-credential-gopass"; + license = licenses.mit; + maintainers = with maintainers; [ benneti ]; + }; +} diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index 5070cbe3f0d9e..e060adbf5bcf9 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -38,6 +38,5 @@ buildGoModule rec { homepage = "https://www.gopass.pw/"; license = licenses.mit; maintainers = with maintainers; [ maxhbr ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 081e26e34abb9..62b335ef5c7cb 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -5,13 +5,13 @@ let honggfuzz = stdenv.mkDerivation rec { pname = "honggfuzz"; - version = "2.3.1"; + version = "2.4"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33"; + sha256 = "sha256-sU5lmlfmvVWo4K96sI+xQsPfTMd1wsLbihcKI4aTj6g="; }; postPatch = '' diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index a5b0fe8d92899..d1c56beb08164 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sourceRoot = "."; unpackCmd = "${dpkg}/bin/dpkg-deb -x $src ."; - buildInputs = [ makeWrapper jdk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk ]; installPhase = '' mkdir -p $out/share diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index d0e260bb6775d..37af42e33ccf6 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1"; }; - buildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 2268bcc5d3d38..a0fa76e9c7f6d 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-wt7VeS8NnmJHMhry/68W1S1f9jUnsSHnhUSrCQN1qNM="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontPatchELF = true; # stay away from exploit executables diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index c46d5b65cd8ef..5c07add90563c 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { phases = "installPhase"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; desktopItem = makeDesktopItem { name = appName; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index b6547deb560ab..3b5aedf81a80c 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "131jpcwyyzgzjn9lx4k1zn95pd68pjw4i41jfzcp9z9fnazyln5n"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 1d874a16da64c..3d966c575cf2f 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pcsclite"; - version = "1.9.0"; + version = "1.9.1"; outputs = [ "bin" "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; - sha256 = "1y9f9zipnrmgiw0mxrvcgky8vfrcmg6zh40gbln5a93i2c1x8j01"; + sha256 = "sha256-c8R4m3h2qDOnD0k82iFlXf6FaJ2bfilwHCQyduVeaDo="; }; patches = [ ./no-dropdir-literals.patch ]; diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 3724637c60476..d248fb19a2769 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XSDfAsXfwSoe5JMdJtZlC324Sra+4fVJhE3/k2TthEc="; + sha256 = "sha256-oYCARqG5YwKO0b73aEMLr/xzXl6xBEMCvE1HMCtMq20="; }; - cargoSha256 = "sha256-GPr5zxeODAjD+ynp/nned9gZUiReYcdzosuEbLIKZSs="; + cargoSha256 = "sha256-vadXIdqfmol4thHIwpkQCn7HsXdxo0l+6CBm3QIJmeA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index f4cc65f5d8e7d..c602ec622cd23 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "18zgr1bjzz8v6rckz2q2hx9f2ssbv8qfwclzpbyjaz0c1c9lqqar"; + sha256 = "sha256-kmi1FtJYPBUdMfJlzEsQkTwcYB99isP3yzH1EYlk54g="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index 2ca92c909b3eb..e2a895f0747a8 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "teler"; - version = "1.0.2-dev"; + version = "1.0.3"; src = fetchFromGitHub { owner = "kitabisa"; repo = "teler"; rev = "v${version}"; - sha256 = "sha256-Hmoj44/rprM9oSFAsRWLszew0RvCTjdHISUSrx/4IPs="; + sha256 = "sha256-6OeGlpimQtw4w26HRzw2wmd3wjASY199p8XXPD/JMy8="; }; vendorSha256 = "sha256-L+wjurURpesCA2IK0r1sxvOUvNJT1wiRp75kpe6LH5s="; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 512617685501d..0b6c95cafd2ac 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1g6fz6dl90cb5pnvvmkndqgncfjy50j9jw3xzn8s91yzvvld8ds7"; + sha256 = "0ffynqk16bnc4nqnffbid4v72mxafzi0fy4cbrzfs9qfi56vcbm9"; }; goPackagePath = "github.com/hashicorp/vault"; @@ -32,6 +32,6 @@ buildGoPackage rec { changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ]; + maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man ]; }; } diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index b30f8d1af13d2..59082c89f7d5f 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip }: let - version = "1.6.2"; + version = "1.6.3"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1vcxnky8qnn2ib33r9604cbjrgm939ddrhwqcjylbv217cmc9alf"; + sha256 = "0ijc80r9rbbbblmf5s3j5b2kk6zsriyxwhsijhgy86rr6bvdljl4"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0mcav36dcmvky8v4y65jvh837i72aqz7arv2ivjpajym3gf7qrq1"; + sha256 = "1blma0ywkmv8ykqc4sgcbk1g9jb9rjxqk2b6kmp5z31lilg4a7my"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "1is7s445jc4ll2lyfxgjwwl89fly1l8kskqp2p8z179d8hhgd0ms"; + sha256 = "1mzkj7ixpzfhn9i4092qw8g38dx4lh3kzp6g4fr5x84sbs6anl3j"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0i5d87a393464r68rjv83bjhg51yaysccqbwaaydmzk1m45icg7x"; + sha256 = "14l8ic5hgsbq4q1b6832ss1wyrgqwyvgkrvcxbw5nqy5la95fl8i"; }; }; diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index efcce36866b0e..f10c3f628b869 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5KTqiPqYBDI1KFQ+2WN7QZFL/YSb+MPPWbKzJTUa8Zw="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = with python3Packages; [ python psutil ]; dontBuild = true; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index c26db13300baa..9202b31709ef5 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -6,27 +7,35 @@ buildGoModule rec { pname = "gdu"; - version = "4.6.4"; + version = "4.6.5"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d7rUvRHijBoot6OKsKjASNoSbuE7YIGXbRsIRZG7CFQ="; + sha256 = "sha256-pky6YY0K4pilPcUY3sJSf4cEF10obZOHd9Jih9Igu6M="; }; - vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; - - buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ]; + vendorSha256 = "1aw9cgm9m3bflncpfk2qsid2aqs710nn2bpxx46n54kw9jkvj8s2"; nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X github.com/dundee/gdu/v${lib.versions.major version}/build.Version=${version}" + ]; + + postPatch = '' + substituteInPlace cmd/app/app_test.go --replace "development" "${version}" + ''; + postInstall = '' installManPage gdu.1 ''; - # tests fail if the version is set - doCheck = false; + doCheck = !(stdenv.isAarch64 || stdenv.isDarwin); meta = with lib; { description = "Disk usage analyzer with console interface"; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index b941c5f7275bc..1cceb5b009cc6 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -31,7 +31,8 @@ in stdenv.mkDerivation rec { sha256 = "sha256-wY9wsxBByxqy9qk/7UoKiUSpFGS1rFpdyTs3ig6OJRs="; }; - buildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index e91cd6da6b97e..f8f3cabdb9c02 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "logrotate"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "133k4y24p918v4dva6dh70bdfv13jvwl2vlhq0mybrs3ripvnh4h"; + sha256 = "sha256-OFGXwaTabyuIgeC2ON68m83rzVxomk8QL6xwyrVV654="; }; # Logrotate wants to access the 'mail' program; to be done. diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 3460020618fda..8a2a3406c3e88 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "http://mmonit.com/monit/"; description = "Monitoring system"; license = lib.licenses.agpl3; - maintainers = with lib.maintainers; [ raskin wmertens ]; + maintainers = with lib.maintainers; [ raskin wmertens ryantm ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 09050868826ca..bd360a242610a 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -15,14 +15,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.29.2"; + version = "1.29.3"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-Y949jHIX3VOwaxeaBqqTZUx66Sd0s27kMCCjcnJORO4="; + sha256 = "sha256-GWIQZEC5agJ+Zw7l58IIAJhXP6dxirCmWVBJulzBO5Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 20a9631117659..8c017c42d7a38 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, zlib, kmod, which +, hwdata , static ? stdenv.hostPlatform.isStatic , IOKit }: @@ -30,8 +31,15 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-lib" ]; - # Get rid of update-pciids as it won't work. - postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; + postInstall = '' + # Remove update-pciids as it won't work on nixos + rm $out/sbin/update-pciids $out/man/man8/update-pciids.8 + + # use database from hwdata instead + # (we don't create a symbolic link because we do not want to pull in the + # full closure of hwdata) + cp --reflink=auto ${hwdata}/share/hwdata/pci.ids $out/share/pci.ids + ''; meta = with lib; { homepage = "http://mj.ucw.cz/pciutils.html"; diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix index 4a2e14edc91fa..f64a84c550958 100644 --- a/pkgs/tools/system/rofi-systemd/default.nix +++ b/pkgs/tools/system/rofi-systemd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0lgffb6rk1kf91j4j303lzpx8w2g9zy2gk99p8g8pk62a30c5asm"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix index e700d7c486e52..951f236d04a5d 100644 --- a/pkgs/tools/text/jsawk/default.nix +++ b/pkgs/tools/text/jsawk/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0z3vdr3c8nvdrrxkjv9b4xg47mdb2hsknxpimw6shgwbigihapyr"; }; dontBuild = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin cp $src/jsawk $out/bin/ diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index dbfb85fc5831d..5989750ea952c 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mark"; - version = "5.2"; + version = "5.2.1"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-bjDQwtIsY+Dvv270DACvyU+MNPyI7EZcob6F/aebVac="; + sha256 = "sha256-eRKUoRr0FPVNUZV5WenA7GlpYPAVRNKe0uRxOzFjhVE="; }; vendorSha256 = "sha256-l6zHsis2fais5HQJQdfsSC0sPdcF4BeWoUznpl3Fh1g="; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index ef945235a9040..e2f5952077f31 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { stripRoot = false; }; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ ## These are all taken from the popfile documentation as applicable to Linux ## http://getpopfile.org/docs/howtos:allplatformsrequireperl perl diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index bbefa94637db3..b37928fc7c5b2 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = let env = bundlerEnv { diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index 6f484bed8bcfe..c9e8b04698694 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -3,12 +3,12 @@ let pname = "rst2html5"; version = "1.10.6"; -in python3Packages.buildPythonPackage { - inherit pname version; format = "wheel"; +in python3Packages.buildPythonPackage { + inherit pname version format; src = python3Packages.fetchPypi { - inherit pname version; + inherit pname version format; sha256 = "sha256-jmToDFLQODqgTycBp2J8LyoJ1Zxho9w1VdhFMzvDFkg="; }; diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index 97a3b4d725ee4..9f3375c7e41c5 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1akx64686in8j8arl6vsgp2n3bv770q48pfv283c6fz6wf9p8fvr"; }; - buildInputs = [ asciidoc makeWrapper ]; + nativeBuildInputs = [ asciidoc makeWrapper ]; preBuild = '' makeFlags=prefix="$out" diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index 91d8f6f8d32f2..affa12c40190a 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; }; - buildInputs = [ perlPackages.perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; installPhase = '' mkdir -p "$out/bin/" diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index fdfa05f20c1f7..4b9e571c0ad31 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { # writes its output to stdout instead of creating a file. patches = [ ./db2x_texixml-to-stdout.patch ]; - buildInputs = [ texinfo groff libxml2 libxslt makeWrapper opensp libiconv ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ texinfo groff libxml2 libxslt opensp libiconv ] ++ (with perlPackages; [ perl XMLSAX XMLParser XMLNamespaceSupport ]); postConfigure = '' diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index 10f8525da0840..755ac6bb32a3f 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6"; }; - buildInputs = [ ocaml perl makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ocaml perl ]; installPhase = '' mkdir -p $out/bin cp -p pdfsandwich $out/bin diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index 07c972420ab54..8a5b4811d7705 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kaah8is74zba9373xccmsxmnnn6kh0isr4qpg21x3qhdzhlxl7q"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = let binPath = lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index 937e3ffd7d718..07e89f9f8eddc 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -58,7 +58,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; meta = with lib; { description = "An easy rich text processor"; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index fd1815efa9454..d2858a90885e2 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -270,8 +270,8 @@ dvipng = stdenv.mkDerivation { inherit (common) src; - nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript makeWrapper ]; + nativeBuildInputs = [ perl pkg-config makeWrapper ]; + buildInputs = [ core/*kpathsea*/ zlib libpng freetype gd ghostscript ]; preConfigure = '' cd texk/dvipng diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index eafd740b0650b..00df6bd97e11a 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation rec { version = "1.5.7"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; src = fetchurl { url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip"; diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 8e3ab0d9f28a0..0c3aec2aadf91 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5"; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip ]; installPhase = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 812f5cf49b44b..1349ce993411c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -286,6 +286,9 @@ mapAliases ({ icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 idea = jetbrains; # added 2017-04-03 + imagemagick7_light = imagemagick_light; # added 2021-02-22 + imagemagick7 = imagemagick; # added 2021-02-22 + imagemagick7Big = imagemagickBig; # added 2021-02-22 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; @@ -615,6 +618,7 @@ mapAliases ({ saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 sapic = throw "sapic was deprecated on 2019-1-19: sapic is bundled with 'tamarin-prover' now"; + scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01 scim = sc-im; # added 2016-01-22 scollector = bosun; # added 2018-04-25 sdlmame = mame; # added 2019-10-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00fbbf42eaafb..47ccb83d400c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -517,7 +517,7 @@ in makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out - makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; } + makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; }; } ../build-support/setup-hooks/make-wrapper.sh; makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: @@ -1416,6 +1416,8 @@ in gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gospider = callPackage ../tools/security/gospider { }; browserpass = callPackage ../tools/security/browserpass { }; @@ -2556,6 +2558,8 @@ in lief = callPackage ../development/libraries/lief {}; + libnbd = callPackage ../development/libraries/libnbd { }; + libndtypes = callPackage ../development/libraries/libndtypes { }; libxnd = callPackage ../development/libraries/libxnd { }; @@ -3147,6 +3151,8 @@ in checkinstall = callPackage ../tools/package-management/checkinstall { }; + checkmake = callPackage ../development/tools/checkmake { }; + chit = callPackage ../development/tools/chit { }; chkrootkit = callPackage ../tools/security/chkrootkit { }; @@ -3293,6 +3299,8 @@ in netevent = callPackage ../tools/inputmethods/netevent { }; + netplan = callPackage ../tools/admin/netplan { }; + skktools = callPackage ../tools/inputmethods/skk/skktools { }; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; @@ -5135,13 +5143,7 @@ in hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; - hdfview = callPackage ../tools/misc/hdfview { - javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 - }; - - hdf_java = callPackage ../tools/misc/hdfjava { - javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 - }; + hdfview = callPackage ../tools/misc/hdfview { }; hecate = callPackage ../applications/editors/hecate { }; @@ -7865,7 +7867,7 @@ in shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { }; shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices; }; shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { }; @@ -8967,6 +8969,11 @@ in ttwatch = callPackage ../tools/misc/ttwatch { }; + turbovnc = callPackage ../tools/admin/turbovnc { + # fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; + libjpeg_turbo = libjpeg_turbo.override { enableJava = true; }; + }; + udunits = callPackage ../development/libraries/udunits { }; uftp = callPackage ../servers/uftp {}; @@ -8989,6 +8996,11 @@ in withSystemd = true; }; + unbound-full = unbound.override { + withSystemd = true; + withDoH = true; + }; + unicorn = callPackage ../development/libraries/unicorn { }; units = callPackage ../tools/misc/units { @@ -9926,6 +9938,9 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + isl = if stdenv.isDarwin then null else if stdenv.targetPlatform.isRedox @@ -9942,6 +9957,9 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -9954,6 +9972,9 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -10848,6 +10869,7 @@ in cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10901,6 +10923,7 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -11366,9 +11389,10 @@ in # # Set default PHP interpreter, extensions and packages php = php74; - phpExtensions = php74Extensions; - phpPackages = php74Packages; + phpExtensions = php.extensions; + phpPackages = php.packages; + # Import PHP80 interpreter, extensions and packages php80 = callPackage ../development/interpreters/php/8.0.nix { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; @@ -11417,38 +11441,46 @@ in # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override { self = pythonFull; + pythonAttr = "pythonFull"; x11Support = true; }; python2Full = python2.override { self = python2Full; + pythonAttr = "python2Full"; x11Support = true; }; python27Full = python27.override { self = python27Full; + pythonAttr = "python27Full"; x11Support = true; }; python3Full = python3.override { self = python3Full; + pythonAttr = "python3Full"; bluezSupport = true; x11Support = true; }; python36Full = python36.override { self = python36Full; + pythonAttr = "python36Full"; bluezSupport = true; x11Support = true; }; python37Full = python37.override { self = python37Full; + pythonAttr = "python37Full"; bluezSupport = true; x11Support = true; }; python38Full = python38.override { self = python38Full; + pythonAttr = "python38Full"; bluezSupport = true; x11Support = true; }; python39Full = python39.override { self = python39Full; + pythonAttr = "python39Full"; bluezSupport = true; x11Support = true; }; @@ -12118,6 +12150,10 @@ in csslint = callPackage ../development/web/csslint { }; + cvise = python3Packages.callPackage ../development/tools/misc/cvise { + inherit (llvmPackages_11) llvm clang-unwrapped; + }; + libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -12573,9 +12609,7 @@ in massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + maven3 = callPackage ../development/tools/build-managers/apache-maven { }; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; @@ -12827,8 +12861,6 @@ in sauce-connect = callPackage ../development/tools/sauce-connect { }; - scaff = callPackage ../development/tools/scaff { }; - sd-local = callPackage ../development/tools/sd-local { }; selenium-server-standalone = callPackage ../development/tools/selenium/server { }; @@ -14431,8 +14463,13 @@ in } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu68 = callPackage ../development/libraries/icu/68.nix ({ + nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; }; + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); - icu = icu67; + icu = icu68; id3lib = callPackage ../development/libraries/id3lib { }; @@ -14686,7 +14723,7 @@ in libbacktrace = callPackage ../development/libraries/libbacktrace { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages_4_07) bap ocaml findlib ctypes; + inherit (ocaml-ng.ocamlPackages) bap ocaml findlib ctypes; }; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; @@ -15011,7 +15048,9 @@ in liblscp = callPackage ../development/libraries/liblscp { }; - libe-book = callPackage ../development/libraries/libe-book {}; + libe-book = callPackage ../development/libraries/libe-book { + icu = icu67; + }; libechonest = callPackage ../development/libraries/libechonest { }; @@ -15226,6 +15265,8 @@ in libspectre = callPackage ../development/libraries/libspectre { }; + libspnav = callPackage ../development/libraries/libspnav { }; + libgsf = callPackage ../development/libraries/libgsf { }; # GNU libc provides libiconv so systems with glibc don't need to build @@ -15740,6 +15781,8 @@ in libx86 = callPackage ../development/libraries/libx86 {}; + libxcrypt = callPackage ../development/libraries/libxcrypt { }; + libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; libxkbcommon = libxkbcommon_8; @@ -16016,7 +16059,9 @@ in notify-sharp = callPackage ../development/libraries/notify-sharp { }; - notcurses = callPackage ../development/libraries/notcurses { }; + notcurses = callPackage ../development/libraries/notcurses { + readline = readline80; + }; ncurses5 = ncurses.override { abiVersion = "5"; @@ -16233,7 +16278,6 @@ in openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_0 libressl_3_1; # Please keep this pointed to the latest version. See also @@ -16584,6 +16628,8 @@ in readosm = callPackage ../development/libraries/readosm { }; + rinutils = callPackage ../development/libraries/rinutils { }; + kissfft = callPackage ../development/libraries/kissfft { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { @@ -22793,9 +22839,7 @@ in herbe = callPackage ../applications/misc/herbe { }; - herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { - asciidoc = asciidoc-full; - }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hercules = callPackage ../applications/virtualization/hercules { }; @@ -23041,7 +23085,7 @@ in imagej = callPackage ../applications/graphics/imagej { }; - imagemagick_light = imagemagick.override { + imagemagick6_light = imagemagick6.override { bzip2 = null; zlib = null; libX11 = null; @@ -23064,14 +23108,14 @@ in libde265 = null; }; - imagemagick = callPackage ../applications/graphics/ImageMagick { + imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; ghostscript = null; }; - imagemagickBig = imagemagick.override { inherit ghostscript; }; + imagemagick6Big = imagemagick6.override { inherit ghostscript; }; - imagemagick7_light = lowPrio (imagemagick7.override { + imagemagick_light = lowPrio (imagemagick.override { bzip2 = null; zlib = null; libX11 = null; @@ -23093,11 +23137,11 @@ in libheif = null; }); - imagemagick7 = lowPrio (imagemagick7Big.override { + imagemagick = lowPrio (imagemagickBig.override { ghostscript = null; }); - imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { + imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }); @@ -24004,6 +24048,8 @@ in stdenv = stdenv_32bit; }; + pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { }; + polybar = callPackage ../applications/misc/polybar { }; polybarFull = callPackage ../applications/misc/polybar { @@ -24529,6 +24575,8 @@ in plugin-torture = callPackage ../applications/audio/plugin-torture { }; + poke = callPackage ../applications/editors/poke { }; + polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; poezio = python3Packages.poezio; @@ -24609,10 +24657,7 @@ in qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { }; - eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { - lua5 = lua5_1; - miniupnpc = miniupnpc_1; - }; + eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {}; @@ -25123,10 +25168,13 @@ in libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {}); - sourcetrail = libsForQt5.callPackage ../development/tools/sourcetrail { - jdk = jdk8; + sourcetrail = let llvmPackages = llvmPackages_10; + in libsForQt5.callPackage ../development/tools/sourcetrail { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + jdk = jdk8; pythonPackages = python3Packages; + inherit llvmPackages; }; spotifywm = callPackage ../applications/audio/spotifywm { }; @@ -25596,7 +25644,7 @@ in vimv = callPackage ../tools/misc/vimv/default.nix { }; - qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; @@ -26629,6 +26677,10 @@ in lua = lua5; }; + black-hole-solver = callPackage ../games/black-hole-solver { + inherit (perlPackages) PathTiny; + }; + blackshades = callPackage ../games/blackshades { }; blobby = callPackage ../games/blobby { }; @@ -29481,6 +29533,10 @@ in hasktags = haskellPackages.hasktags; }; + spacenavd = callPackage ../misc/drivers/spacenavd { }; + + spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { }; + splix = callPackage ../misc/cups/drivers/splix { }; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; @@ -29648,9 +29704,6 @@ in wasmer = callPackage ../development/interpreters/wasmer { }; wasm-pack = callPackage ../development/tools/wasm-pack { - # Wasm-pack depends on a version of rust-openssl which is incompatible with - # LibreSSL 3.1, so we explicitly opt for the older version. - libressl = libressl_3_0; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -30079,6 +30132,8 @@ in nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy {}; + webwormhole = callPackage ../tools/networking/webwormhole { }; + wifi-password = callPackage ../os-specific/darwin/wifi-password {}; qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5f250d79af22f..0b2c548c1e033 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -917,6 +917,8 @@ let inherit (pkgs) postgresql; }; + ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; + ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; @@ -1415,7 +1417,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_12 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.12.nix { }); - ocamlPackages_latest = ocamlPackages_4_11; + ocamlPackages_latest = ocamlPackages_4_12; ocamlPackages = ocamlPackages_4_10; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 88d1ddd873a6c..95dc9011aa926 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8498,10 +8498,10 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.48"; + version = "0.49"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "077jnf5a07x0p30iqcw3kh53xh3dplhb0jyyyq9b4c79ira3ds6r"; + sha256 = "0cm7cgfjrqs7jazl0f9q6lgkhz6k8qbawin1z36nrwh2ywc94zjb"; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseSublike ]; @@ -9142,6 +9142,10 @@ let }; buildInputs = [ pkgs.gtk3 ]; propagatedBuildInputs = [ Readonly Gtk3 ]; + # Tests are broken with PerlMagick and imagemagick version 7 as of 2021-02-22. + # See https://github.com/carygravel/gtk3-imageview/issues/19 and + # https://github.com/NixOS/nixpkgs/pull/114007#issuecomment-783595659. + doCheck = false; checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; checkPhase = '' ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ @@ -16739,19 +16743,18 @@ let }; }; - PerlMagick = buildPerlPackage { + PerlMagick = buildPerlPackage rec { pname = "PerlMagick"; - version = "6.89-1"; + version = "7.0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.89-1.tar.gz"; - sha256 = "0n9afy1z5bhf9phrbahnkwhgcmijn8jggpbzwrivw1zhliliiy68"; + url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-${version}.tar.gz"; + sha256 = "1x05hdb3b6qs36x958b4w46qanvkqm6rpc44rlq4rd2w3gbp4lhx"; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = '' sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL ''; - doCheck = false; }; PerlTidy = buildPerlPackage rec { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3df697d3d560e..3c8738565f60e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -16,7 +16,7 @@ lib.makeScope pkgs.newScope (self: with self; { # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { - pname = "php-${pname}"; + pname = "php-${php.version}-${pname}"; }); pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; @@ -29,7 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; { composer = callPackage ../development/php-packages/composer { }; - composer2 = callPackage ../development/php-packages/composer/2.0.nix { }; + composer1 = callPackage ../development/php-packages/composer/1.x.nix { }; php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e63738aeecf52..59243211937ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -284,6 +284,8 @@ in { aiopulse = callPackage ../development/python-modules/aiopulse { }; + aiopylgtv = callPackage ../development/python-modules/aiopylgtv { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; aioredis = callPackage ../development/python-modules/aioredis { }; @@ -878,7 +880,7 @@ in { bandit = callPackage ../development/python-modules/bandit { }; - bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_07.bap; }; + bap = callPackage ../development/python-modules/bap { inherit (pkgs.ocaml-ng.ocamlPackages) bap; }; baron = callPackage ../development/python-modules/baron { }; @@ -1281,6 +1283,8 @@ in { chevron = callPackage ../development/python-modules/chevron { }; + chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; + ci-info = callPackage ../development/python-modules/ci-info { }; ci-py = callPackage ../development/python-modules/ci-py { }; @@ -2043,6 +2047,8 @@ in { ed25519 = callPackage ../development/python-modules/ed25519 { }; + editdistance = callPackage ../development/python-modules/editdistance { }; + editorconfig = callPackage ../development/python-modules/editorconfig { }; edward = callPackage ../development/python-modules/edward { }; @@ -2061,6 +2067,8 @@ in { eliot = callPackage ../development/python-modules/eliot { }; + elmax = callPackage ../development/python-modules/elmax { }; + emailthreads = callPackage ../development/python-modules/emailthreads { }; email_validator = callPackage ../development/python-modules/email-validator { }; @@ -2808,6 +2816,8 @@ in { graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; + graphtage = callPackage ../development/python-modules/graphtage { }; + graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; }; grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; @@ -3373,6 +3383,8 @@ in { jsmin = callPackage ../development/python-modules/jsmin { }; + json5 = callPackage ../development/python-modules/json5 { }; + jsondate = callPackage ../development/python-modules/jsondate { }; jsondiff = callPackage ../development/python-modules/jsondiff { }; @@ -5321,6 +5333,8 @@ in { pycdio = callPackage ../development/python-modules/pycdio { }; + pycec = callPackage ../development/python-modules/pycec { }; + pycfdns = callPackage ../development/python-modules/pycfdns { }; pychannels = callPackage ../development/python-modules/pychannels { }; @@ -5698,6 +5712,8 @@ in { pymediainfo = callPackage ../development/python-modules/pymediainfo { }; + pymediaroom = callPackage ../development/python-modules/pymediaroom { }; + pymeeus = callPackage ../development/python-modules/pymeeus { }; pymemoize = callPackage ../development/python-modules/pymemoize { }; @@ -6091,6 +6107,8 @@ in { inherit (pkgs) bash subversion apr aprutil expat neon openssl; }; + pyswitchbot = callPackage ../development/python-modules/pyswitchbot { }; + pysychonaut = callPackage ../development/python-modules/pysychonaut { }; pysyncobj = callPackage ../development/python-modules/pysyncobj { }; @@ -6101,6 +6119,8 @@ in { pytaglib = callPackage ../development/python-modules/pytaglib { }; + pytankerkoenig = callPackage ../development/python-modules/pytankerkoenig { }; + pyte = callPackage ../development/python-modules/pyte { }; pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; @@ -6309,6 +6329,8 @@ in { python3-openid = callPackage ../development/python-modules/python3-openid { }; + python-awair = callPackage ../development/python-modules/python-awair { }; + python-axolotl = callPackage ../development/python-modules/python-axolotl { }; python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; @@ -6361,6 +6383,8 @@ in { python-frontmatter = callPackage ../development/python-modules/python-frontmatter { }; + python-gammu = callPackage ../development/python-modules/python-gammu { }; + python-gitlab = callPackage ../development/python-modules/python-gitlab { }; python-gnupg = callPackage ../development/python-modules/python-gnupg { }; @@ -6610,6 +6634,8 @@ in { pyvex = callPackage ../development/python-modules/pyvex { }; + pyvicare = callPackage ../development/python-modules/pyvicare { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; pyvizio = callPackage ../development/python-modules/pyvizio { }; @@ -7284,6 +7310,8 @@ in { simplegeneric = callPackage ../development/python-modules/simplegeneric { }; + simplehound = callPackage ../development/python-modules/simplehound { }; + simplejson = callPackage ../development/python-modules/simplejson { }; simplekml = callPackage ../development/python-modules/simplekml { }; @@ -7316,6 +7344,8 @@ in { skorch = callPackage ../development/python-modules/skorch { }; + skybellpy = callPackage ../development/python-modules/skybellpy { }; + slack-sdk = callPackage ../development/python-modules/slack-sdk { }; slackclient = callPackage ../development/python-modules/slackclient { }; @@ -8037,6 +8067,8 @@ in { twine = callPackage ../development/python-modules/twine { }; + twinkly-client = callPackage ../development/python-modules/twinkly-client { }; + twisted = callPackage ../development/python-modules/twisted { }; twitch-python = callPackage ../development/python-modules/twitch-python { }; |