diff --git a/lib/customisation.nix b/lib/customisation.nix index c74708fbe4e2..0d023aa361cf 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -281,11 +281,11 @@ rec { /* backward compatibility with old uncurried form; deprecated */ makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: extra: f: - makeScopeWithSplicing' { - inherit splicePackages newScope otherSplices keep extra f; - }; + makeScopeWithSplicing' + { inherit splicePackages newScope; } + { inherit otherSplices keep extra f; }; - /* Like the above, but aims to support cross compilation. It's still ugly, but + /* Like makeScope, but aims to support cross compilation. It's still ugly, but hopefully it helps a little bit. */ makeScopeWithSplicing' = { splicePackages diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index e2ef350ba4e5..5f42f42a9af9 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.netbox; pythonFmt = pkgs.formats.pythonVars {}; @@ -17,7 +15,7 @@ let pkg = (cfg.package.overrideAttrs (old: { installPhase = old.installPhase + '' ln -s ${configFile} $out/opt/netbox/netbox/netbox/configuration.py - '' + optionalString cfg.enableLdap '' + '' + lib.optionalString cfg.enableLdap '' ln -s ${cfg.ldapConfigPath} $out/opt/netbox/netbox/netbox/ldap_config.py ''; })).override { @@ -31,7 +29,7 @@ let in { options.services.netbox = { - enable = mkOption { + enable = lib.mkOption { type = lib.types.bool; default = false; description = lib.mdDoc '' @@ -66,18 +64,18 @@ in { }; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "[::1]"; description = lib.mdDoc '' Address the server will listen on. ''; }; - package = mkOption { - type = types.package; - default = if versionAtLeast config.system.stateVersion "23.05" then pkgs.netbox else pkgs.netbox_3_3; - defaultText = literalExpression '' + package = lib.mkOption { + type = lib.types.package; + default = if lib.versionAtLeast config.system.stateVersion "23.05" then pkgs.netbox else pkgs.netbox_3_3; + defaultText = lib.literalExpression '' if versionAtLeast config.system.stateVersion "23.05" then pkgs.netbox else pkgs.netbox_3_3; ''; description = lib.mdDoc '' @@ -85,18 +83,18 @@ in { ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8001; description = lib.mdDoc '' Port the server will listen on. ''; }; - plugins = mkOption { - type = types.functionTo (types.listOf types.package); + plugins = lib.mkOption { + type = with lib.types; functionTo (listOf package); default = _: []; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' python3Packages: with python3Packages; []; ''; description = lib.mdDoc '' @@ -104,23 +102,23 @@ in { ''; }; - dataDir = mkOption { - type = types.str; + dataDir = lib.mkOption { + type = lib.types.str; default = "/var/lib/netbox"; description = lib.mdDoc '' Storage path of netbox. ''; }; - secretKeyFile = mkOption { - type = types.path; + secretKeyFile = lib.mkOption { + type = lib.types.path; description = lib.mdDoc '' Path to a file containing the secret key. ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = lib.mdDoc '' Additional lines of configuration appended to the `configuration.py`. @@ -128,8 +126,8 @@ in { ''; }; - enableLdap = mkOption { - type = types.bool; + enableLdap = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' Enable LDAP-Authentication for Netbox. @@ -138,8 +136,8 @@ in { ''; }; - ldapConfigPath = mkOption { - type = types.path; + ldapConfigPath = lib.mkOption { + type = lib.types.path; default = ""; description = lib.mdDoc '' Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`. @@ -173,15 +171,17 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.netbox = { - plugins = mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); + plugins = lib.mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); settings = { STATIC_ROOT = staticDir; MEDIA_ROOT = "${cfg.dataDir}/media"; REPORTS_ROOT = "${cfg.dataDir}/reports"; SCRIPTS_ROOT = "${cfg.dataDir}/scripts"; + GIT_PATH = "${pkgs.gitMinimal}/bin/git"; + DATABASE = { NAME = "netbox"; USER = "netbox"; @@ -264,39 +264,39 @@ in { RestartSec = 30; }; in { - netbox-migration = { - description = "NetBox migrations"; - wantedBy = [ "netbox.target" ]; - - environment = { - PYTHONPATH = pkg.pythonPath; - }; - - serviceConfig = defaultServiceConfig // { - Type = "oneshot"; - ExecStart = '' - ${pkg}/bin/netbox migrate - ''; - PrivateTmp = true; - }; - }; - netbox = { description = "NetBox WSGI Service"; documentation = [ "https://docs.netbox.dev/" ]; wantedBy = [ "netbox.target" ]; - after = [ "network-online.target" "netbox-migration.service" ]; + after = [ "network-online.target" ]; wants = [ "network-online.target" ]; + environment.PYTHONPATH = pkg.pythonPath; + preStart = '' + # On the first run, or on upgrade / downgrade, run migrations and related. + # This mostly correspond to upstream NetBox's 'upgrade.sh' script. + versionFile="${cfg.dataDir}/version" + + if [[ -e "$versionFile" && "$(cat "$versionFile")" == "${cfg.package.version}" ]]; then + exit 0 + fi + + ${pkg}/bin/netbox migrate ${pkg}/bin/netbox trace_paths --no-input ${pkg}/bin/netbox collectstatic --no-input ${pkg}/bin/netbox remove_stale_contenttypes --no-input - ''; + # TODO: remove the condition when we remove netbox_3_3 + ${lib.optionalString + (lib.versionAtLeast cfg.package.version "3.5.0") + "${pkg}/bin/netbox reindex --lazy"} + ${pkg}/bin/netbox clearsessions + ${pkg}/bin/netbox clearcache - environment.PYTHONPATH = pkg.pythonPath; + echo "${cfg.package.version}" > "$versionFile" + ''; serviceConfig = defaultServiceConfig // { ExecStart = '' @@ -331,7 +331,7 @@ in { wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" ]; + after = [ "network-online.target" "netbox.service" ]; wants = [ "network-online.target" ]; environment.PYTHONPATH = pkg.pythonPath; @@ -351,7 +351,7 @@ in { wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" ]; + after = [ "network-online.target" "netbox.service" ]; wants = [ "network-online.target" ]; timerConfig = { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6f17bd2cdd3b..23a4e41bb3f4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -525,6 +525,7 @@ in { networking.scripted = handleTest ./networking.nix { networkd = false; }; netbox = handleTest ./web-apps/netbox.nix { inherit (pkgs) netbox; }; netbox_3_3 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_3; }; + netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix {}; # TODO: put in networking.nix after the test becomes more complete networkingProxy = handleTest ./networking-proxy.nix {}; nextcloud = handleTest ./nextcloud {}; diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix new file mode 100644 index 000000000000..602cf8d889d4 --- /dev/null +++ b/nixos/tests/web-apps/netbox-upgrade.nix @@ -0,0 +1,85 @@ +import ../make-test-python.nix ({ lib, pkgs, ... }: let + oldNetbox = pkgs.netbox_3_3; +in { + name = "netbox-upgrade"; + + meta = with lib.maintainers; { + maintainers = [ minijackson ]; + }; + + nodes.machine = { config, ... }: { + services.netbox = { + enable = true; + package = oldNetbox; + secretKeyFile = pkgs.writeText "secret" '' + abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + ''; + }; + + services.nginx = { + enable = true; + + recommendedProxySettings = true; + + virtualHosts.netbox = { + default = true; + locations."/".proxyPass = "http://localhost:${toString config.services.netbox.port}"; + locations."/static/".alias = "/var/lib/netbox/static/"; + }; + }; + + users.users.nginx.extraGroups = [ "netbox" ]; + + networking.firewall.allowedTCPPorts = [ 80 ]; + + specialisation.upgrade.configuration.services.netbox.package = lib.mkForce pkgs.netbox; + }; + + testScript = { nodes, ... }: + let + apiVersion = version: lib.pipe version [ + (lib.splitString ".") + (lib.take 2) + (lib.concatStringsSep ".") + ]; + oldApiVersion = apiVersion oldNetbox.version; + newApiVersion = apiVersion pkgs.netbox.version; + in + '' + start_all() + machine.wait_for_unit("netbox.target") + machine.wait_for_unit("nginx.service") + machine.wait_until_succeeds("journalctl --since -1m --unit netbox --grep Listening") + + def api_version(headers): + header = [header for header in headers.splitlines() if header.startswith("API-Version:")][0] + return header.split()[1] + + def check_api_version(version): + headers = machine.succeed( + "curl -sSfL http://localhost/api/ --head -H 'Content-Type: application/json'" + ) + assert api_version(headers) == version + + with subtest("NetBox version is the old one"): + check_api_version("${oldApiVersion}") + + # Somehow, even though netbox-housekeeping.service has After=netbox.service, + # netbox-housekeeping.service and netbox.service still get started at the + # same time, making netbox-housekeeping fail (can't really do some house + # keeping job if the database is not correctly formed). + # + # So we don't check that the upgrade went well, we just check that + # netbox.service is active, and that netbox-housekeeping can be run + # successfully afterwards. + # + # This is not good UX, but the system should be working nonetheless. + machine.execute("${nodes.machine.system.build.toplevel}/specialisation/upgrade/bin/switch-to-configuration test >&2") + + machine.wait_for_unit("netbox.service") + machine.succeed("systemctl start netbox-housekeeping.service") + + with subtest("NetBox version is the new one"): + check_api_version("${newApiVersion}") + ''; +}) diff --git a/pkgs/applications/graphics/oculante/Cargo.lock b/pkgs/applications/graphics/oculante/Cargo.lock index 065f9705cd8c..4b71b4662fd9 100644 --- a/pkgs/applications/graphics/oculante/Cargo.lock +++ b/pkgs/applications/graphics/oculante/Cargo.lock @@ -46,9 +46,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -61,9 +61,9 @@ checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "aom-decode" @@ -84,7 +84,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -161,15 +161,15 @@ dependencies = [ "polling", "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -188,9 +188,9 @@ dependencies = [ [[package]] name = "atomic_refcell" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" +checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905" [[package]] name = "atty" @@ -265,7 +265,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.7.1", "object", "rustc-demangle", ] @@ -301,9 +301,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitreader" @@ -393,7 +393,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", ] [[package]] @@ -446,11 +446,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -461,9 +462,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -950,9 +951,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" @@ -1015,9 +1016,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1050,7 +1051,7 @@ version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -1085,7 +1086,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.1", "rayon-core", "smallvec", "zune-inflate", @@ -1129,7 +1130,7 @@ version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc789a40040e11bbe4ba31ca319406805a12fe3f8d71314bbc4bd076602ad55a" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.16", "thiserror", ] @@ -1142,6 +1143,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "fdeflate" version = "0.3.0" @@ -1164,12 +1171,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -1184,7 +1191,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -1218,9 +1225,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab2e12762761366dcb876ab8b6e0cfa4797ddcd890575919f008b5ba655672a" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" dependencies = [ "roxmltree", ] @@ -1266,7 +1273,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", ] [[package]] @@ -1379,7 +1386,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1396,7 +1403,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", ] [[package]] @@ -1613,9 +1620,9 @@ dependencies = [ [[package]] name = "glutin" -version = "0.30.9" +version = "0.30.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b0385782048be65f0a9dd046c469d6a758a53fe1aa63a8111dea394d2ffa2f" +checksum = "8fc93b03242719b8ad39fb26ed2b01737144ce7bd4bfc7adadcef806596760fe" dependencies = [ "bitflags 1.3.2", "cfg_aliases", @@ -1648,9 +1655,9 @@ dependencies = [ [[package]] name = "glutin_egl_sys" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3bcbddc51573b977fc6dca5d93867e4f29682cdbaf5d13e48f4fa4346d4d87" +checksum = "af784eb26c5a68ec85391268e074f0aa618c096eadb5d6330b0911cf34fe57c5" dependencies = [ "gl_generator", "windows-sys 0.45.0", @@ -1744,9 +1751,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1851,9 +1858,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1878,7 +1885,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1917,9 +1924,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -1928,10 +1935,10 @@ dependencies = [ "gif", "jpeg-decoder", "num-rational", - "num-traits 0.2.15", + "num-traits 0.2.16", "png", "qoi", - "tiff 0.8.1", + "tiff", ] [[package]] @@ -1940,6 +1947,17 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +[[package]] +name = "img-parts" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b19358258d99a5fc34466fed27a5318f92ae636c3e36165cf9b1e87b5b6701f0" +dependencies = [ + "bytes", + "crc32fast", + "miniz_oxide 0.5.4", +] + [[package]] name = "imgref" version = "1.9.4" @@ -1968,9 +1986,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", "instant", @@ -2026,7 +2044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.4", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -2041,9 +2059,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -2348,9 +2366,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libwebp-sys" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2a79bd4556d1b538c76e59147768b2d63f97e2dfb185c896548136af408e58" +checksum = "a5df1e76f0acef0058aa2164ccf74e610e716e7f9eeb3ee2283de7d43659d823" dependencies = [ "cc", "glob", @@ -2370,9 +2388,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -2399,9 +2417,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lyon" @@ -2420,7 +2438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" dependencies = [ "lyon_path", - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -2431,17 +2449,17 @@ checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" dependencies = [ "arrayvec 0.7.4", "euclid", - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] name = "lyon_path" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8358c012e5651e4619cfd0b5b75c0f77866181a01b0909aab4bae14adf660" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" dependencies = [ "lyon_geom", - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -2547,6 +2565,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", +] + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -2586,7 +2613,7 @@ dependencies = [ "nalgebra-macros", "num-complex", "num-rational", - "num-traits 0.2.15", + "num-traits 0.2.16", "simba", "typenum", ] @@ -2973,16 +3000,16 @@ dependencies = [ [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", "num-integer", "num-iter", "num-rational", - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -2993,16 +3020,16 @@ checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -3024,7 +3051,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", ] [[package]] @@ -3034,7 +3061,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -3045,7 +3072,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -3057,7 +3084,7 @@ dependencies = [ "autocfg", "num-bigint", "num-integer", - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -3066,14 +3093,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -3192,7 +3219,7 @@ dependencies = [ [[package]] name = "oculante" -version = "0.6.69" +version = "0.7.2" dependencies = [ "anyhow", "arboard", @@ -3209,6 +3236,7 @@ dependencies = [ "gif", "gif-dispose", "image", + "img-parts", "jxl-oxide", "kamadak-exif", "lexical-sort", @@ -3231,7 +3259,7 @@ dependencies = [ "serde_json", "strum", "strum_macros", - "tiff 0.9.0", + "tiff", "tiny-skia 0.9.1", "turbojpeg", "usvg", @@ -3255,11 +3283,11 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "3.7.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +checksum = "126d3e6f3926bfb0fb24495b4f4da50626f547e54956594748e3d8882a0320b4" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.16", ] [[package]] @@ -3298,9 +3326,9 @@ dependencies = [ [[package]] name = "palette" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1641aee47803391405d0a1250e837d2336fdddd18b27f3ddb8c1d80ce8d7f43" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" dependencies = [ "approx", "fast-srgb8", @@ -3310,13 +3338,13 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", ] [[package]] @@ -3357,14 +3385,14 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "percent-encoding" @@ -3437,7 +3465,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", ] [[package]] @@ -3466,29 +3494,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -3516,15 +3544,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -3545,9 +3573,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" [[package]] name = "ppv-lite86" @@ -3597,9 +3625,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -3661,9 +3689,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3722,7 +3750,7 @@ dependencies = [ "new_debug_unreachable", "noop_proc_macro", "num-derive 0.3.3", - "num-traits 0.2.15", + "num-traits 0.2.16", "once_cell", "paste", "rand", @@ -3816,9 +3844,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -3828,9 +3856,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.2" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -3845,9 +3873,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" dependencies = [ "base64", "bytes", @@ -3879,7 +3907,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg 0.10.1", + "winreg 0.50.0", ] [[package]] @@ -4030,22 +4058,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.5" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", @@ -4064,9 +4092,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.1" +version = "0.101.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" dependencies = [ "ring", "untrusted", @@ -4074,9 +4102,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" @@ -4096,9 +4124,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arch" @@ -4111,9 +4139,9 @@ dependencies = [ [[package]] name = "safe_arch" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -4141,9 +4169,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -4187,38 +4215,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.171" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -4287,16 +4315,16 @@ checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "num-complex", - "num-traits 0.2.15", + "num-traits 0.2.16", "paste", "wide", ] [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simd_helpers" @@ -4375,6 +4403,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "spin" version = "0.5.2" @@ -4445,15 +4483,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.25", + "syn 2.0.29", ] [[package]] @@ -4489,9 +4527,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.25" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -4513,21 +4551,20 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.9" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if 1.0.0", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.37.23", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -4548,33 +4585,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", -] - -[[package]] -name = "tiff" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", + "syn 2.0.29", ] [[package]] @@ -4667,18 +4693,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "windows-sys 0.48.0", ] @@ -4738,9 +4763,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.12" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "serde", @@ -4795,9 +4820,9 @@ checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" [[package]] name = "turbojpeg" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22d317e50cdcd80f9b5e9e23f931357973596fb0cdd469ef260d27dcb55dc779" +checksum = "0b72653c4d8f295945ea47c1782cb640f7268f52232b7925f9a3589b971d786f" dependencies = [ "image", "libc", @@ -4869,9 +4894,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -4919,9 +4944,9 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" @@ -4985,14 +5010,14 @@ dependencies = [ [[package]] name = "v_frame" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec8189c996a12ac77c50065f9c9f64961e56eb940d0ae1a4ccc7bea238bb4bc" +checksum = "85db69f33d00031c1b07f7292e56317d5aa9475bdbd3d27ef18f3633438a697e" dependencies = [ "cfg-if 1.0.0", "noop_proc_macro", "num-derive 0.4.0", - "num-traits 0.2.15", + "num-traits 0.2.16", "rust_hawktracer", ] @@ -5072,7 +5097,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -5106,7 +5131,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5214,9 +5239,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ "core-foundation", "home", @@ -5229,24 +5254,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "weezl" @@ -5256,12 +5268,12 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wide" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40018623e2dba2602a9790faba8d33f2ebdebf4b86561b83928db735f8784728" +checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" dependencies = [ "bytemuck", - "safe_arch 0.7.0", + "safe_arch 0.7.1", ] [[package]] @@ -5341,7 +5353,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -5361,17 +5373,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -5382,9 +5394,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -5400,9 +5412,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -5418,9 +5430,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -5436,9 +5448,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5454,9 +5466,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -5466,9 +5478,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5484,9 +5496,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windres" @@ -5533,9 +5545,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.4.9" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" +checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" dependencies = [ "memchr", ] @@ -5552,11 +5564,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -5627,9 +5640,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] name = "xmlparser" @@ -5649,7 +5662,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "157c9233496247738a5417ce7e8ecf953c3d4e1931374d16b0c6a95636572be4" dependencies = [ - "num-traits 0.2.15", + "num-traits 0.2.16", "rgb", ] @@ -5659,7 +5672,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ca36c2e02af0d8d7ee977542bfe33ed1c516be73d3c1faa4420af46e96ceee" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", ] [[package]] diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index 5b758aaa1acf..271a9dba8827 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -21,13 +21,13 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.6.69"; + version = "0.7.2"; src = fetchFromGitHub { owner = "woelper"; repo = pname; rev = version; - hash = "sha256-xiZyI4TGXtpMoiX6KartjOO+BgbUht22Kg1FIp39m/o="; + hash = "sha256-OJKmnH1uJvVnHiuieveDaR+lybpWHC3MZvis0iAKiZU="; }; cargoLock = { diff --git a/pkgs/applications/misc/cambrinary/default.nix b/pkgs/applications/misc/cambrinary/default.nix new file mode 100644 index 000000000000..67e325cbce02 --- /dev/null +++ b/pkgs/applications/misc/cambrinary/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, aiohttp +, beautifulsoup4 +}: + +buildPythonApplication rec { + pname = "cambrinary"; + version = "unstable-2023-07-16"; + format = "flit"; + + src = fetchFromGitHub { + owner = "xueyuanl"; + repo = "cambrinary"; + rev = "f0792ef70654a48a7677b6e1a7dee454b2c0971c"; + hash = "sha256-wDcvpKAY/6lBjO5h3qKH3+Y2G2gm7spcKCXFMt/bAtE="; + }; + + propagatedBuildInputs = [ + aiohttp + beautifulsoup4 + ]; + + pythonImportsCheck = [ "cambrinary" ]; + + meta = with lib; { + description = "Cambridge dictionary in a terminal"; + homepage = "https://github.com/xueyuanl/cambrinary"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/applications/misc/gimoji/default.nix b/pkgs/applications/misc/gimoji/default.nix index 726965afec1a..24fd6cf2ea18 100644 --- a/pkgs/applications/misc/gimoji/default.nix +++ b/pkgs/applications/misc/gimoji/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "gimoji"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "zeenix"; repo = "gimoji"; rev = version; - hash = "sha256-8aMm6OHDYBGvLYrQmQh33SI3jap6fS7lgOYDn9lWS18="; + hash = "sha256-7UzdZsidLHLZBj7mpRJQhvr3VP7HtkKPfAc7dnxS7kE="; }; - cargoHash = "sha256-IENW19FlqWLk7K0+r9IUhXkS7C/wmik2bGDZdRk0jzA="; + cargoHash = "sha256-oWImiIUFgy/pKHlZPPd1IWDG5l5LYCWTYJjgEqiXzLA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index eca16f3d7dbd..6b087c26b97b 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -44,7 +44,7 @@ , cavaSupport ? true , evdevSupport ? true -, hyprlandSupport ? false +, hyprlandSupport ? true , inputSupport ? true , jackSupport ? true , mpdSupport ? true @@ -89,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: { popd ''; - # Patch for workspaces support in wlr/workspaces - # See https://wiki.hyprland.org/Useful-Utilities/Status-Bars/#waybar - patches = lib.optional hyprlandSupport [ ./hyprland.diff ]; - nativeBuildInputs = [ meson ninja @@ -120,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { wayland wlroots ] - ++ lib.optionals cavaSupport [ + ++ lib.optionals cavaSupport [ SDL2 alsa-lib fftw @@ -166,8 +162,7 @@ stdenv.mkDerivation (finalAttrs: { "tests" = runTests; "upower_glib" = upowerSupport; "wireplumber" = wireplumberSupport; - }) - ++ lib.optional hyprlandSupport (lib.mesonBool "experimental" true); + }); preFixup = lib.optionalString withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py @@ -189,6 +184,7 @@ stdenv.mkDerivation (finalAttrs: { minijackson rodrgz synthetica + khaneliman ]; inherit (wlroots.meta) platforms; }; diff --git a/pkgs/applications/misc/waybar/hyprland.diff b/pkgs/applications/misc/waybar/hyprland.diff deleted file mode 100644 index d3febdae4a1f..000000000000 --- a/pkgs/applications/misc/waybar/hyprland.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/modules/wlr/workspace_manager.cpp -+++ b/src/modules/wlr/workspace_manager.cpp -@@ -523,7 +523,8 @@ - if (action.empty()) - return true; - else if (action == "activate") { -- zext_workspace_handle_v1_activate(workspace_handle_); -+ const std::string command = "hyprctl dispatch workspace " + name_; -+ system(command.c_str()); - } else if (action == "close") { - zext_workspace_handle_v1_remove(workspace_handle_); - } else { diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index b2ea58eac2d8..6ffc939e23f3 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.8"; + version = "3.4.10"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-cN1uLy0QHABks99BJqEpLDf2VbYUzLM2iCTTBvcY0es="; + hash = "sha256-uhXwCaAVFLlGeqkBbeA5DINo9CjNMzU9rRmOYoYJASI="; }; - vendorHash = "sha256-kO4ME0r3MoOjn+83X+8bbkgF7zL/Id2+hKabQjEob+Y="; + vendorHash = "sha256-0563OHMNkKZcmLY1nHS70pbtrufY1d1WNXrxcCl6MKY="; doCheck = false; diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index f3658c5e3507..481113682bce 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-sW2yO6aZqhiyrIT4B8iBmum+36vcQMg4NsFxInJm7hM="; + sha256 = "sha256-JUAlDc2mp8M0vjiWcDoyBw/sKCmd4J8e9wEwZoiW0AE="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1c8d40091098..6288154f43a1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.28"; ptb = "0.0.44"; - canary = "0.0.163"; + canary = "0.0.166"; development = "0.0.217"; } else { stable = "0.0.273"; @@ -24,7 +24,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-QLQCv3hlCNZ8Ii/+GWHAZs4enBh+gOUEt+wlrkUP91Q="; + sha256 = "sha256-bUbJpaHUf0ALJ1+4ACcVz0kpZpoXi0S4QO5yLiUZSgs="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 6b2d7b380b9d..5defcf1b699f 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib +{ stdenv, fetchurl, fetchpatch, lib , ncurses, openssl, aspell, gnutls, gettext , zlib, curl, pkg-config, libgcrypt , cmake, libobjc, libresolv, libiconv @@ -46,6 +46,13 @@ let hash = "sha256-iA29zo5zs/SAKggsShp8YZQ9vFhn16lWleTkY8ZTWpI="; }; + patches = lib.optional (perlSupport && lib.versionAtLeast perl.version "5.38") (fetchpatch { + name = "perl538-locale.patch"; + url = "https://github.com/weechat/weechat/commit/c5eb982424150894959b978d98dcf6a005eb6c9f.patch"; + excludes = [ "ChangeLog.adoc" ]; + sha256 = "sha256-SSDZy4/c12LOxjvFMuJSv6gJEX298wF62/gQLQ/geiU="; + }); + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix index 9ecd846b930c..900d770ba41e 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/applications/radio/abracadabra/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - sha256 = "sha256-hK7mRDJqn0ETgHlvZl3m6lRDbsp5v7a8eGBFdm7ihdA="; + sha256 = "sha256-VFV2eHBvBdKrI4Zt+GCtAOSZt0++hYDWYR7AN42p85I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index db066ea46317..4cfcb6debbe7 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,7 +1,7 @@ { lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }: let pname = "geogebra"; - version = "6-0-785-0"; + version = "6-0-794-0"; srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; @@ -32,7 +32,7 @@ let "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" "https://web.archive.org/web/20230627211859/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" ]; - hash = "sha256-Yv8pTCKkyM7XMUNV2Pcn/YxWo1MbOTNMQBFuJFhB/uE="; + hash = "sha256-sNCq1Xcx/Y5r+SIRiqQYcG9dVsfIC2Ef5KJf+tgfxC8="; }; dontConfigure = true; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index a350f1d91edd..84de388ca604 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.32.1"; + version = "2.33.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-DfcafkgauO0mlMEJTfR7hjnkY1QJ4dUyrWv/bqJlVAo="; + hash = "sha256-BvGZS0n9S3a/QCbzpP2539wj7hN54G5VlJnQVtqdSTk="; }; vendorHash = "sha256-7Izhqma/zukH9M7EvV9I4axefVaTDoNVXQmLx+GjAt0="; diff --git a/pkgs/applications/version-management/sapling/gen-deps.py b/pkgs/applications/version-management/sapling/gen-deps.py index e3fe56f73221..ddab0080f640 100755 --- a/pkgs/applications/version-management/sapling/gen-deps.py +++ b/pkgs/applications/version-management/sapling/gen-deps.py @@ -1,18 +1,47 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" +#!nix-shell -i python3 -p cargo -p "python3.withPackages (ps: with ps; [ requests ])" import json +import pathlib import re +import tempfile +import os +import shutil from hashlib import sha1 from struct import unpack from subprocess import run +import subprocess from requests import get # Fetch the latest stable release metadata from GitHub -latestTag = get("https://api.github.com/repos/facebook/sapling/releases/latest").json()[ - "tag_name" -] +releaseMetadata = get("https://api.github.com/repos/facebook/sapling/releases/latest").json() +latestTag = releaseMetadata["tag_name"] +latestTarballURL = releaseMetadata["tarball_url"] +[_tarballHash, sourceDirectory] = run( + ["nix-prefetch-url", "--print-path", "--unpack", latestTarballURL], + check=True, + text=True, + stdout=subprocess.PIPE, +).stdout.rstrip().splitlines() + +def updateCargoLock(): + with tempfile.TemporaryDirectory() as tempDir: + tempDir = pathlib.Path(tempDir) + + # NOTE(strager): We cannot use shutil.tree because it copies the + # read-only permissions. + for dirpath, dirnames, filenames in os.walk(sourceDirectory): + relativeDirpath = os.path.relpath(dirpath, sourceDirectory) + for filename in filenames: + shutil.copy(os.path.join(dirpath, filename), tempDir / relativeDirpath / filename) + for dirname in dirnames: + os.mkdir(tempDir / relativeDirpath / dirname) + + run(["cargo", "fetch"], check=True, cwd=tempDir / "eden" / "scm") + shutil.copy(tempDir / "eden" / "scm" / "Cargo.lock", "Cargo.lock") + +updateCargoLock() def nixPrefetchUrl(url): return run( @@ -25,9 +54,7 @@ def nixPrefetchUrl(url): # Fetch the `setup.py` source and look for instances of assets being downloaded # from files.pythonhosted.org. -setupPy = get( - f"https://github.com/facebook/sapling/raw/{latestTag}/eden/scm/setup.py" -).text +setupPy = (pathlib.Path(sourceDirectory) / "eden/scm/setup.py").read_text() foundUrls = re.findall(r'(https://files\.pythonhosted\.org/packages/[^\s]+)"', setupPy) dataDeps = { diff --git a/pkgs/applications/version-management/ungit/default.nix b/pkgs/applications/version-management/ungit/default.nix new file mode 100644 index 000000000000..2702859893c6 --- /dev/null +++ b/pkgs/applications/version-management/ungit/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "ungit"; + version = "1.5.24"; + + src = fetchFromGitHub { + owner = "FredrikNoren"; + repo = "ungit"; + rev = "v${version}"; + hash = "sha256-4hDg153CVZidmnIGUwxfzL45Yt+GlMyepfMLJbcjdqo="; + }; + + npmDepsHash = "sha256-Z/vPqJ70NqjABKKa8r24t0sWoPYRVwxH02BNr1yCVNQ="; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = true; + PUPPETEER_SKIP_DOWNLOAD = true; + }; + + meta = { + changelog = "https://github.com/FredrikNoren/ungit/blob/${src.rev}/CHANGELOG.md"; + description = "Git made easy"; + homepage = "https://github.com/FredrikNoren/ungit"; + license = lib.licenses.mit; + mainProgram = "ungit"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index a7fa69b96c7f..950c611ca2ce 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.20.2"; + version = "2.20.3"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-i2/cydp3ZLnmutWW3lpoP2jPQIJ8M6nUTgfhOiz6SPk="; + sha256 = "sha256-dCcCtQTow8S0dyAD8UT6p64erSAl7oiZdbpYsO4/Z/s="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-Njv2wzVQN4ySdU6NFrOwqS+V5f3/b5AMwgv1/vWnlz0="; + vendorHash = "sha256-pNCAEuaF4FkSCmW1JcDMxOtVM6mL7dYLtVu4oUBqoS8="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 586af56bd98f..09b43063fb96 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -87,9 +87,6 @@ let runHook preConfigure export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" - # fixes 'GOPROXY list is not the empty string, but contains no entries' - # "https://proxy.golang.org,direct" is the go default - export GOPROXY="''${GOPROXY:-"https://proxy.golang.org,direct"}" # respect impureEnvVars cd "${modRoot}" runHook postConfigure ''; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 4897a9f3772b..c09cb562b763 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "26.2.0"; + version = "26.2.1"; 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 7046fb8db017..507f342725b4 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1hbh2s718c2abp404rginas3bqlddgw3bl4k3hv6yi76sdd5wmkw"; - iosevka-aile = "08l7hidkfc9xwavmcvwis7zma1shyqb9p6n2bcwnrs22826hgn0f"; - iosevka-curly = "0sm77rfhqjf5iwvn8fc7cqr8g7q6nyycal8bqx8h4wyin8mac6ss"; - iosevka-curly-slab = "1kvakcscpsfkwfgk8j1pk44xzq5lkhp1m6f6q75cpcrbakmfdw0y"; - iosevka-etoile = "0vgf3jigdysxhp24kzyhhxmi84sxmnvy99r4l4vjk9fhnpzkhv28"; - iosevka-slab = "127w2ysvv2cnc5zdyz5znwawfmnvpm4by35igkzlcyplgsygdi16"; - iosevka-ss01 = "0gl79saa0k1x9b01khxip7wmw2lvaf1glcpsj5733ywwiy381k7d"; - iosevka-ss02 = "0rc4lf7bx61zs17rd9chnszlbzjpdh867mxvv9gwcm5biyn56zxv"; - iosevka-ss03 = "0vpz5djxbjca1hq233bl78bbaw7wnky3mjgk5va4mbwvscszpq7d"; - iosevka-ss04 = "06zf1mccd5082a3cqga46g82dm14asv4x7ljnv21nxqwqb54xrar"; - iosevka-ss05 = "1r5pxm2gyj1s7qvdsnydczqlpwdqc4c27wfh70gj83s6sn0xaszr"; - iosevka-ss06 = "08cm7zb0ha16ldh7cy337c226s9vjkr14w9b6v025wq2f7l0axv4"; - iosevka-ss07 = "1qcc19i5m3hkgkp89a02g2xcyx3xbgwdav88fw3cn5cq9cd32nvg"; - iosevka-ss08 = "1cd2f3aagikdhh8zh54ijfy0qkmkadpxx9ikc65i0mdwqvrq66qs"; - iosevka-ss09 = "04gwpk1blrhlakg9253l69d2n5xp7bvy6s1va535z08yln6m2zzq"; - iosevka-ss10 = "1cxazjh94p4dqsfhs7xb0jfdxyg17w0fi6kvns62scprl11spbah"; - iosevka-ss11 = "1jgxc03vg45hj2y61kp0hplz4b3v13i9x98j3v5m07m5w4pvz92v"; - iosevka-ss12 = "0i2h2kdrhq610ca8clsmpfn4c71qvm23fpn389c0kxls8wg5z7h4"; - iosevka-ss13 = "0mxkxa68krhwlpxn00msir4za5zldhqilnzb2rhsbgwsla5vx0y4"; - iosevka-ss14 = "0fhg8jdkin4m9fj1d96n9521cx7ffz230abcrkgffas8404x4c6l"; - iosevka-ss15 = "17fxkh3vl9wb7ajyda6dhwzym71i5gn1qzarnaalabqrrg9vg8aq"; - iosevka-ss16 = "0w3j91963hh6nlnfy6igz5bj7k81gw4grcsvl58p81z3fb4n4wcc"; - iosevka-ss17 = "04fmk1wwhh9snmpz9k07acjyjibi7d2l7yjlpbzzc0kwy3i7x37z"; - iosevka-ss18 = "0k90yhz9a44h8r9kiknnxhm94f9s7xk0m074g4wh07ngc80npaqb"; - sgr-iosevka = "0hiz1a3gjl684m0wq0i328j0ryrpa5436j6g5agfvdsima60dknv"; - sgr-iosevka-aile = "18jbnig6shvqcvwmpjc9z14z9am9wsl8ybm7mrw7b237jkfy9839"; - sgr-iosevka-curly = "1ljs1k0xrd91n1n8chcb0jmcpgjjvgc9qwdxnk1i2zbds515hbsh"; - sgr-iosevka-curly-slab = "1iqngf3a0mkx52ljmxwsd0088x6zpac6dyz9502wfmp5wrp7y4wf"; - sgr-iosevka-etoile = "0w8zs73xl4arkksb9xd4g8nyf8n90ya0hb0yg35dqzqqdsf9b5mp"; - sgr-iosevka-fixed = "1j62gdc1d8rcakg1a46q2bhnnlyzvfnmiz0gp8ia91vz51j9s8vy"; - sgr-iosevka-fixed-curly = "1sdvbyi7h486drvqi1nccz05nn93wzhi6wwn889kgxawrimpbars"; - sgr-iosevka-fixed-curly-slab = "1q96b285kxih0lrqrmy16hiwniq7vx6f07l3h9xqhinln8g2mvi8"; - sgr-iosevka-fixed-slab = "14j718phwai25fwgva3xhz816h9gkds3lhnfmrdxmlj1z5rnsk5z"; - sgr-iosevka-fixed-ss01 = "1gi9hhzsfrjl5bykyswi882blndggb28b0isdhyhvv5rsjpl6vrq"; - sgr-iosevka-fixed-ss02 = "1l9k878199nclzmfhc52qcll7x7i4fq71mj495sr4024vm7dgns1"; - sgr-iosevka-fixed-ss03 = "1vpn6sfz8ps64ysxcviwziw2qhazjj94vx962pvahwd991lgdila"; - sgr-iosevka-fixed-ss04 = "11847shnrdzfgj4rryk22ba16bxmdsj2qf9vah6qnivsdaw9ymc1"; - sgr-iosevka-fixed-ss05 = "1n2whdxrlmxgvdqhxgq0qyxrnidgbaw2mmw8s3a06qpcpqi20d3v"; - sgr-iosevka-fixed-ss06 = "15lhkka5slax5c0vawprfdbdhbbiqapv4d2b02w7fp9g8p0s1ljc"; - sgr-iosevka-fixed-ss07 = "0ijhsmlp66a1la299w5jvrfnykasznybb22fhq7lkjzdn1blgim9"; - sgr-iosevka-fixed-ss08 = "1q8d54a7a1xq5a1jkc0c8qns6nq3gyldabjaplczq5p79s2j2fca"; - sgr-iosevka-fixed-ss09 = "1p86b22v8mn5xs9vxyary8jz1jfy0hy1g7yc4lwmslkvxndjvfld"; - sgr-iosevka-fixed-ss10 = "1y3rlr3b5bfx97mr7kpg2x2wgk88z7jhx0vh3b33d9q4sd626vcr"; - sgr-iosevka-fixed-ss11 = "0i6zajhdnfml9ja613jmy3gb6als2chrigkjyzxm0aih4wfm7lly"; - sgr-iosevka-fixed-ss12 = "0f4p7gmb2g991v1858y53wlxvsnd7fmrsp8d9jxj4nlzpl7giazj"; - sgr-iosevka-fixed-ss13 = "1230ss6fxk5py0fkn3mcdc1ky1jfp31hz8fqlvkwz3vf954yfqj1"; - sgr-iosevka-fixed-ss14 = "0hhpmby5jzb839yldzlaj90h1d0d53agxcdiphp9vbmrr3mp3ycd"; - sgr-iosevka-fixed-ss15 = "1dq7f72zi094hvgpdm912f5ijp8nrcxsd78wsk35nllv4cggswma"; - sgr-iosevka-fixed-ss16 = "0jlbc0xx3pf3bnlw5p7rpjw6a7hj75lhh78c9qldhdxpiyks2jwk"; - sgr-iosevka-fixed-ss17 = "0vbqwvn604njd09lc8g4nxq6isjpzv984345l76cpz3hhn22a986"; - sgr-iosevka-fixed-ss18 = "1xznqj1wwvk9rclgr0nx0p5wx1p3a9sbdbigirmifhjn77mrji9c"; - sgr-iosevka-slab = "0wmh2dg12gd05vsr8jsx4mflczpyw6prvlap173yll0rif80dwxd"; - sgr-iosevka-ss01 = "0h93n0v2xzph0j2xq289ssi69dvlbqqz0f9yb41khq6bfz2y6ra7"; - sgr-iosevka-ss02 = "0vk3h1wxdrgjhy999ikmpkakd8xwsad06q3bbk74q2m9ld3m48jl"; - sgr-iosevka-ss03 = "0bs4nrvzfmmbh7f8liyd94d47kqgz3iw3mbi5q0cavh4vylhlz6c"; - sgr-iosevka-ss04 = "0dhz9a2nl4ydj0gdxa9xhvbqf68h3d3yr81zh8gxkj2c84g3lyrn"; - sgr-iosevka-ss05 = "1q9fvi4kpgjxz03c2jlxbxcw8qvj7h20xdmkgk7kgbvkvvrgmyam"; - sgr-iosevka-ss06 = "09hf8g8hrw2q6lc60x5fdq0xvic0hx2g7y200p5jj2ghdw6jb7zr"; - sgr-iosevka-ss07 = "09pn58i1gprrvrq1b5i5sc83ly8gpcxds35kj1l4p8x0h5zz5ffr"; - sgr-iosevka-ss08 = "19lr6zp4j9wrn9xwffqyrrdy35gfl6fk27i03w07gx4hbl1x45nn"; - sgr-iosevka-ss09 = "06654zmjf406lzbn3q9f1212r5raw56npii5cc0mn6cfka8lhiyb"; - sgr-iosevka-ss10 = "0qi00x4vmxvzqyh1556f0fgc9cplapnri3vn10ky7pmmypwlzicf"; - sgr-iosevka-ss11 = "105l97zm4kmacacqdasac601r04cxj2w6vbciamb3id4yjkr5lqq"; - sgr-iosevka-ss12 = "1sd02jb4wpw0ax7yd0l2lzkdgl6sv7j64myfzmpgf79n38ik3x6c"; - sgr-iosevka-ss13 = "0jyizpqxbnkf8ac299brahacjxp0h0hzwhaz5bd11439gkwjpff4"; - sgr-iosevka-ss14 = "02p2fscj5zvypb1mcnhx7cr09dx4d0gmyhnyvlxw3d8l7r600x7k"; - sgr-iosevka-ss15 = "0ihmgn49i13xki0ikw1acj0p8vg8siyrgr48apq0vfj9d8yb1fnq"; - sgr-iosevka-ss16 = "0ggaqg0z63x9x1jp4dw4zi3nm44bfq5v3z22fi2fmkrd9w2l3sl8"; - sgr-iosevka-ss17 = "1bdk2rwqs68738acl1g5afz1vpaq11qfck54vdphidmppg6fflib"; - sgr-iosevka-ss18 = "0s336j7wi8rys4kc7zpz9xfq3fcvhajlmpjzkb1qhjxwrsxzk2g9"; - sgr-iosevka-term = "0329698yx6nagmc9pjil5g3bcd4chng4685bllgzwn6751y3w74p"; - sgr-iosevka-term-curly = "16p82qiqkimy1przl7hxyd9lh7qkff8q8k1y8339gf35drjs0yii"; - sgr-iosevka-term-curly-slab = "0vqbhaq107ka798jz84r2ipmf68j511dimkrzqwxcy223nmwh5wm"; - sgr-iosevka-term-slab = "0gb8vk3hf7fj1wj0n14ha01cxwg767xwhklraq8iz4hj71axj9n2"; - sgr-iosevka-term-ss01 = "1gnbza11zs4c4zalmpf7yz4wqhx322vd7gsaz1c97hszh11az9hl"; - sgr-iosevka-term-ss02 = "12hfn784lwz7ldw3siqxk47b2j9yrd4lx9xs56cd9p44wdvspiaq"; - sgr-iosevka-term-ss03 = "0h56ch2hhp70djbp13a9zr99imr6jincqqwkmpn3pm5z9kr82y9b"; - sgr-iosevka-term-ss04 = "1nnf8pzdra4xqvvwi487f83blpapyfmpjzm0mqpndws11chl6ndw"; - sgr-iosevka-term-ss05 = "0g3znbjjh1kjm02bmaf28gqdgk7b0l9sx3hcg0pfyfs9iv05fh8a"; - sgr-iosevka-term-ss06 = "1v7w15k7s0qrm307lkkrmzy3g09q20d6ws7jmbp7xswxvibfhxkl"; - sgr-iosevka-term-ss07 = "1i3cg20xz230chw3l3q4bzlp6m62563bgy599cfjjp1si2inx734"; - sgr-iosevka-term-ss08 = "1jspdgrkszgqzzm04q5l21583j6vfh01qv6f0jr2z9235877f2xw"; - sgr-iosevka-term-ss09 = "0gc201k5z4kfpsdbkn7kn163cpvxasg01gx9brwypkydsr5m8imz"; - sgr-iosevka-term-ss10 = "0k4q749vgyz1wpxdg2hg7np52h9b1nx50pw9s0k73fl2n45g7559"; - sgr-iosevka-term-ss11 = "1s2gqdac7ckw574vwbryfab8hgkjr72yf3s2pc4gr5gcyd97863a"; - sgr-iosevka-term-ss12 = "0js64ad31vi0zcr07qyamyv7my1cz1dym3jiw3dkcrm3lmi6b65d"; - sgr-iosevka-term-ss13 = "0kz3166n81h7fzif89mad2g2blvm8hd69ww76k3zivx3rzxvl6m6"; - sgr-iosevka-term-ss14 = "15nah0qmrp0z0x159yyh848yy2874yx9ijyfwy6cvs7ildzd0fkv"; - sgr-iosevka-term-ss15 = "05p8is5qwji723gxjffx6si1rcsfspizpn0gr6cvdkz9cwcv0sqv"; - sgr-iosevka-term-ss16 = "0dp22hbvxj4sjmz1hw4qiqf70fj95zr0mw6f38wvy79813101c14"; - sgr-iosevka-term-ss17 = "1nbv2p8ddajrymm8a5556xjcx5aia6f1zqrgpjsf6pq0qs06x3di"; - sgr-iosevka-term-ss18 = "115s4lvh3ml374815w3c2649js29ba5vpq375fd24vlysr147zxd"; + iosevka = "05kmsx5nfllnynq85m4s9smdq0zqxv2gg3k5xd67ba9c0gkyxx17"; + iosevka-aile = "11qbl5np9wf5n5yy2y6vf830bal96a2lkdhd6xv65b1kqsz6n5bp"; + iosevka-curly = "1hdr93lfm8mmm3rr6s13vvacp5h4xqyqkr2a6zl18dgm27rhp7gn"; + iosevka-curly-slab = "0yp06p379n6x9zkh9ljg1n6ia1ydm93cnp5mw8yapnhk604f4cn3"; + iosevka-etoile = "1yn743abmyifci72jsmr71swkqdy35whcs36b0a3ypakm7qlgkl9"; + iosevka-slab = "0d7972ja8flg09q28qh36v4xfavnffn2g4zjkgrzm8pxgz3skzwb"; + iosevka-ss01 = "0ir5dgw8qqzzlihvicmzplvhd4hhlja2986ppyrj8kwkbhjrczry"; + iosevka-ss02 = "0j5vrhd48hrql1jz9bdf1lqzdg7cv4nb7snl82sh4f19h2k2f2a2"; + iosevka-ss03 = "15n5kin4p31czns8l3g29hia17c8x61b55n27qbknfb17yici7g9"; + iosevka-ss04 = "1zaba7z85k75lrh8x46x77c0hp6145dpg1shh05lmgvmgzyx3s02"; + iosevka-ss05 = "1ybwb3k9gj5icc8qngzlwxvk306xssz3ax7nqlgr1kij1wawbcd7"; + iosevka-ss06 = "0d7p2kvpr3x4mlh28y13ph8v7xmziyvrksy7m4zkpll0mkxxrcc1"; + iosevka-ss07 = "1pbvikwa1nrr91aq2an9bav4allxks29ghpss6plm01c2czkjqs3"; + iosevka-ss08 = "1ilmlqbrxaz9rpparyq7lhg4c6i0hmd4az049js7rq7nif071dhb"; + iosevka-ss09 = "0f9fycpsq6fqg7x451bca5cfwwnbswmv39sl2i7ia36kmmlsbarm"; + iosevka-ss10 = "02k9kra2wqjylvblngv1v9qxfw82yhbrk5vx96bfc16jllw6pk69"; + iosevka-ss11 = "135v3i6am7hd4iwpf1yj3jszpfyzv4n900wgiqy46ld4qdlvyj0b"; + iosevka-ss12 = "032slrybd0bdnbsrsz2k7p153dcfi6064zhg292n5fk0whv712vg"; + iosevka-ss13 = "1qm8gk23ix98ciw1xn6kmwq8x3fcrg9yq1rn71v219n0jyria053"; + iosevka-ss14 = "1s34fva3bq0m0chib56bj085rwgm4d21grhnf9ca4af01i91lvdh"; + iosevka-ss15 = "0ikd1lfq8xiyqyppxf8hbvsvqdf0fg2g0056qxqa2w6nvw3f70cf"; + iosevka-ss16 = "0baada586j23mxjl6ail4fdp9p9swrnwi8q5w6gh25kgbr2gf3lp"; + iosevka-ss17 = "143ydszlic3byk5ps4ysaql72d7pmdzlhds9dcpy6bcv2m5b1bc2"; + iosevka-ss18 = "1vrpa1ah718jn5xn72r7j26mka656ik1bb31fah3vlridzkjqyxx"; + sgr-iosevka = "1f2d9d7pyq916frhr5qlzr5hjwjkfpsqcpgp1p0f2g7z4qw8rr2z"; + sgr-iosevka-aile = "01aym5ykddkypafsj2186plfp9qm0nm5lbj5vra6yiwxmac3s0fi"; + sgr-iosevka-curly = "13nklbij304vch9xcqgvcwcdchzrf010iln5022am23ny1ip13aw"; + sgr-iosevka-curly-slab = "0x2n86ysvph7cv2r5m8lm3xwhq4wds2dv2mjcs8nz66n88hvwk8i"; + sgr-iosevka-etoile = "0c3pfgwlj5nw4xpbvigwjx8z47xxkpikzyaq8a8klabymyvjg0nj"; + sgr-iosevka-fixed = "1bvy9dv70ywkdhv6jj12mqbi95ljgr6068dmi31ds5rx7cflfrbq"; + sgr-iosevka-fixed-curly = "0lcizhf935an59hrr71nrk6x0aqy0rw4xcb7n583gm8svkpkhrfc"; + sgr-iosevka-fixed-curly-slab = "0fz6q3wnk0yniyhpsm07z94s61jc46rps4925wg1nxriyl16fd21"; + sgr-iosevka-fixed-slab = "05p989w89arj8fylqdjkby9c7jdadnm6yc8xjjwj81wpmlv5is02"; + sgr-iosevka-fixed-ss01 = "0krq1wamxxcqcfk13fsdi1n2wcxvrx5kcfr95dwmddyhr46f6c8g"; + sgr-iosevka-fixed-ss02 = "0n9pfa8lfisbz0cgrii2d18sq7bfrg4gbmj4d4ncq2zxcq63y52k"; + sgr-iosevka-fixed-ss03 = "0xybkybnmqqjkrapm7sm6nr3n7f68chss1rbxp966l7bnq17zlwn"; + sgr-iosevka-fixed-ss04 = "0hs0jhfnc68xvvzmmhmc32rv4b16qiy21dv0lnrpjwc8hwqww661"; + sgr-iosevka-fixed-ss05 = "1kxcadk3z362paqian2pi9nv64k35xhhqd6jw52837g4gmq2l6cn"; + sgr-iosevka-fixed-ss06 = "0d3lx7s99j5bcdkc4a3w0axv1arlj4xrcfffa3a0z1yvj587c1gs"; + sgr-iosevka-fixed-ss07 = "06cr5h81vzchg2kx980rnw9g8a0iyxs89p15xai1fwjz8v18b6q1"; + sgr-iosevka-fixed-ss08 = "1ygni8kdnr72m4dlm0inj49x00gj6m09569sk7x1v2q840hlbka4"; + sgr-iosevka-fixed-ss09 = "0n96481gn66cs7fy43l172f0f5llysny5a8vn9p1gqr30pkjsb1c"; + sgr-iosevka-fixed-ss10 = "1dd4jwnv8s8h2r4rrsdr3fzhck86rbxz2n3cmqk8ns0ysi81a9j7"; + sgr-iosevka-fixed-ss11 = "0xaxzl5wv37dypp97wvi4pv3dzlln6pw5y7lf9jqyfxlj9nkx14m"; + sgr-iosevka-fixed-ss12 = "1lisn7jrfm444309hbf6cyag54hs7gxbdvcs8z92c3v3xl8382j1"; + sgr-iosevka-fixed-ss13 = "1lvkla942w36plh5bzwi45zw3a8cixa61kyw5q6pj69yybp6hp49"; + sgr-iosevka-fixed-ss14 = "11racg8i508dgap2pq0rvzc20612d7px7yajsqd7y3mlf8311920"; + sgr-iosevka-fixed-ss15 = "0vnhp6rm1gd7g9140lgjbpckl6ysaf4cza2h3p2i1m2mxyq8yfi3"; + sgr-iosevka-fixed-ss16 = "1xkr6afpjqgjj55a8lmzzhfld66iqszh1dig8balg5s95gm6ylnz"; + sgr-iosevka-fixed-ss17 = "06q9w6vx6dhlfnjs9hsa9k8fzd9zb9v65d9jfwfdzp54i2asrac9"; + sgr-iosevka-fixed-ss18 = "13vcnny1a0yikimajqjvc9yadrh2l98qm1bnpmpc9fny158n5nks"; + sgr-iosevka-slab = "15pj76l27g8n93f1bdn5fs3csfhlvcig11hz0x85ffwc8i8dgx60"; + sgr-iosevka-ss01 = "0x09g6hz70jrijw86s4l2cpff8ln5aljs7p8675wjc2a3lwj3d3j"; + sgr-iosevka-ss02 = "10dsvi9k65ijkhrxkm2zwmipsq74yh0wgxham70bc3rb323w5vzq"; + sgr-iosevka-ss03 = "1zccin0dj2w7rykhqb7w30rvi96gp086wln0zd40i10ah8yqw8x7"; + sgr-iosevka-ss04 = "1hky2b7ls5n3pb0jzgrxfsly126f770jysvfkcq37bpb0f14wrhj"; + sgr-iosevka-ss05 = "076v20qzcf063hdnx145iwapn884hwcim5ws0qx9qh7l3im9s5w2"; + sgr-iosevka-ss06 = "1z2qi8crsvxryn3gxn63zw67hm9fz8rygkjypw8nvbz2p64axif5"; + sgr-iosevka-ss07 = "0v2cgifv6ic2cn1c6rd8lsjiz34rmp6n3flwiq38px9pra0yh7rz"; + sgr-iosevka-ss08 = "1s7nhfznyz3hqwjh6xs1bkph9s0g7kwd54h2hx5mkagk0cg2xya6"; + sgr-iosevka-ss09 = "0j3ny30fnbr1vgcfjssln9ry8kpn8yq2nn9gi2x55cxi1gwgnbpl"; + sgr-iosevka-ss10 = "0wksbv2fj4nw452h7d5nw8gq4vwjhxrw4hxr44xrk4skkwwaakzn"; + sgr-iosevka-ss11 = "1azscl182xgfx6993rwwbhxbx4pswwwmwbarxmc775668ydifb73"; + sgr-iosevka-ss12 = "199qf4vmyjql2f1gnqdwsvxgyf8c4nyr5rwyb6d3zwz5kbqdk9cv"; + sgr-iosevka-ss13 = "0n9s94x5j3gkzcgw2w3lqphm487xs8x10nklwlz24wh6mxp6azza"; + sgr-iosevka-ss14 = "0dmnd7cfdxv9hbz3q0bir0csblkzpwfqwcz05y4b79f1fjjahiag"; + sgr-iosevka-ss15 = "036syp2d0w4gy5j7dr813amvaw2b0kr3v6175vv8y9xgy266ldv0"; + sgr-iosevka-ss16 = "1hcalq0bvpzd6jq37pqxqjmnh2wmwvmc54fajl03rkw0spf8c4j1"; + sgr-iosevka-ss17 = "154fg69nadpjd5pmnlxf6bbg86w6zpk1nvm9h604017llgz8iwqa"; + sgr-iosevka-ss18 = "0ywrj6hmhk0hp5kcdy3i6989glbd1g62s8lr2kixbjm4g27d83hd"; + sgr-iosevka-term = "12v6im4q77cs6c2ff0dfsis2zlcphcxwqjsbpvl9x9cziznv7lnv"; + sgr-iosevka-term-curly = "1999vm3y28xm6bcp3s1fksvhs8rggra6i5rfxrsh69fy4i5l7z8q"; + sgr-iosevka-term-curly-slab = "00xjqkilsrykq7my2rh046q1qdcb110dd2lyz0kq40wl1ipxxyy3"; + sgr-iosevka-term-slab = "174kyc58rb5zrrxqhkmn5ili6vlbffa4n8g68faygajmjqajnr52"; + sgr-iosevka-term-ss01 = "01l0siyzrwz56m9w8zxf9n09rv1mh0j4l6jqr6vdzqqvgj6h7k5z"; + sgr-iosevka-term-ss02 = "19rl3pxhs1g2mwfsp64krnfcfkx5x7qfja3fx5h74r1jm3p8insv"; + sgr-iosevka-term-ss03 = "04vzrfbrpb0xssr6y1cyysfra2z3g9hm4jn65rzcavmd3i1azj7d"; + sgr-iosevka-term-ss04 = "08zwnsb1d1x5rmbssyknf1fxcc14bpvcjr6qcl8igpi03bpwag27"; + sgr-iosevka-term-ss05 = "0ichgg8vfifpnd4sjj2f1snphgxk4cqpd7p3w8dbzn1bp7633jna"; + sgr-iosevka-term-ss06 = "1kdrbq0m1bdfbxwqlfnmvi98dzplc27p10jgbh877b300dpzwmap"; + sgr-iosevka-term-ss07 = "099aicmxxa3criq768ycgkcm00b6mssxjavwzc3lkq37vic55y80"; + sgr-iosevka-term-ss08 = "125m0rs16nnvxkldk8vdc7g04lb29ha0a9ip9kway460wvmjqv9x"; + sgr-iosevka-term-ss09 = "12r3dqm4y19fyd8dqxli1y8wg5cs2qmmngqbkwb66kxbx1hhgpbs"; + sgr-iosevka-term-ss10 = "0xyfllwx2m5ngr82wn2fvlbz7kj3qwcnqz43l3cfvafl54zppl4z"; + sgr-iosevka-term-ss11 = "0sa5pp8fz2fb0d4k8rln0d4l0h1mqz6rvhrcfg49ds84g28380ls"; + sgr-iosevka-term-ss12 = "08ni5rgj4gfpmalqblz5ip36a8wffk9b9igaj6grmhc8q16i88sl"; + sgr-iosevka-term-ss13 = "0zmzjzhrk2y18jk3m5pb7f2mz1dr9sdrs0pbw20kfsr70km3mv54"; + sgr-iosevka-term-ss14 = "049yr8s9adawgrqi4z5qy3xz6pbcafvsw9sd6kb0nrgv8w5y6gd1"; + sgr-iosevka-term-ss15 = "1cyzj976697m452ifvr6yh8ng9wzfs38xlqwcmy26kk5n4dm2xy8"; + sgr-iosevka-term-ss16 = "0lg9sz029hw54v6qmbv5z80gxgic6zlva4yb0jpnajn8jj9zcdam"; + sgr-iosevka-term-ss17 = "0lpynm823jrlbs3qvf5apvnzk4h8bc8axqn3cifcd419hq25n55y"; + sgr-iosevka-term-ss18 = "12bx1d9lmdv9ljqqjmkq2rjpl4hh77c616xyjx4x2q79apznf56n"; } diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index 6db01f41eff1..d2f4816e0ae5 100644 --- a/pkgs/development/interpreters/expr/default.nix +++ b/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.14.1"; + version = "1.14.3"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-X55l2pSlwrcxM4JFcd25yfc5AQJPzNrZRHEHPWPevHw="; + hash = "sha256-4BYFFuoKI5EdxBrgMi33PgjXL6TI7jOQ8H7jLlNKfks="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-pX8Yk/md6I27PPmdwoixSMMbopDjXOOnXyUxq0D97YA="; + vendorHash = "sha256-vQmQdPmfZtudnFqqNeMRdbRVytpbcCt/wH1xSTO+cMQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix index 1d48ebf8ff43..70eba2c3a384 100644 --- a/pkgs/development/libraries/geographiclib/default.nix +++ b/pkgs/development/libraries/geographiclib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geographiclib"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "geographiclib"; repo = "geographiclib"; rev = "v${version}"; - hash = "sha256-W2YbeUYr6rjzdufVGzJ1k56uHHMzq8eidDZbRxTyzAU="; + hash = "sha256-FVA2y1q0WjRSCltCN2qntWC//Zj94TXO/fTebFfQ9NY="; }; nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index a128975652ac..6a7b3f489af4 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchFromGitHub , cmake @@ -13,26 +14,26 @@ let url = "https://download.fcitx-im.org/data/table.tar.gz"; sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; }; - arpaVer = "20220810"; + arpaVer = "20230712"; arpa = fetchurl { url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz"; - sha256 = "sha256-oRvJfSda2vGV+brIVDaK4GzbSg/h7s9Z21rlgGFdtPo="; + hash = "sha256-ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI="; }; - dictVer = "20220810"; + dictVer = "20230412"; dict = fetchurl { url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.xz"; - sha256 = "sha256-lxdS9BMYgAfo0ZFYwRuFyVXiXXsyHsInXEs69tioXSY="; + hash = "sha256-8F/Mr/loeQCqw9mtWoGyCIi1cyAUA/vNm7x5B9npdQc="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.17"; + version = "1.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-mc0Mknqki0pY4oKf8B6H67N+1eMu7wbqF7wES22Kw1A="; + sha256 = "sha256-r1Px93Ly7FzcRaPUNTHNcedzHPHocnUj8t8VMZqXkFM="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/sokol/default.nix b/pkgs/development/libraries/sokol/default.nix index daf1509e5852..b84f42490e33 100644 --- a/pkgs/development/libraries/sokol/default.nix +++ b/pkgs/development/libraries/sokol/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "sokol"; - version = "unstable-2022-06-13"; + version = "unstable-2023-08-04"; src = fetchFromGitHub { owner = "floooh"; repo = "sokol"; - rev = "3c7016105f3b7463f0cfc74df8a55642e5448c11"; - sha256 = "sha256-dKHb6GTp5aJPuWWXI4ZYnhgdXs23gGWyPymGPGwxcLY="; + rev = "47d92ff86298fc96b3b84d93d0ee8c8533d3a2d2"; + sha256 = "sha256-TsM5wK9a2ectrAY8VnrMPaxCNV3e1yW92SBBCHgs+0k="; }; dontBuild = true; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 40ab3f6ab0d7..55ebe329d88f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -72,7 +72,12 @@ mapAliases { thelounge = pkgs.thelounge; # Added 2023-05-22 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 + inherit (pkgs) ungit; # added 2023-08-20 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 vue-cli = self."@vue/cli"; # added 2023-08-18 + vue-language-server = self.vls; # added 2023-08-20 + inherit (pkgs) web-ext; # added 2023-08-20 + inherit (pkgs) write-good; # added 2023-08-20 + inherit (pkgs) yo; # added 2023-08-20 zx = pkgs.zx; # added 2023-08-01 } diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 07117e8ad49a..7bc78c62399c 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -75,7 +75,6 @@ vscode-css-languageserver-bin = "css-languageserver"; vscode-html-languageserver-bin = "html-languageserver"; vscode-json-languageserver-bin = "json-languageserver"; - vue-language-server = "vls"; webtorrent-cli = "webtorrent"; "@zwave-js/server" = "zwave-server"; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8458aef9904b..2d891a114df5 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -346,7 +346,6 @@ , "typescript-language-server" , "uglify-js" , "undollar" -, "ungit" , "unified-language-server" , "vega-cli" , "vega-lite" @@ -357,9 +356,7 @@ , "vscode-html-languageserver-bin" , "vscode-json-languageserver" , "vscode-json-languageserver-bin" -, "vue-language-server" , "wavedrom-cli" -, "web-ext" , "webpack" , "webpack-cli" , "webpack-dev-server" @@ -368,11 +365,9 @@ , "@withgraphite/graphite-cli" , "wrangler" , "wring" -, "write-good" , "@yaegassy/coc-nginx" , "yaml-language-server" , "yalc" , "yarn" -, "yo" , "@zwave-js/server" ] diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 942d5b193a6e..c68dddcf5b27 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -137186,495 +137186,6 @@ in bypassCache = true; reconstructLock = true; }; - ungit = nodeEnv.buildNodePackage { - name = "ungit"; - packageName = "ungit"; - version = "1.5.23"; - src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.23.tgz"; - sha512 = "3FJW6C12Cn71UiRPTUKmyUYy4qPrJjY7El8bEMqOvakn6knHMuPuM7ijOiNGm7nfKdsRY95gR7pDveqULd367w=="; - }; - dependencies = [ - sources."@colors/colors-1.5.0" - sources."@dabh/diagnostics-2.0.3" - sources."@pnpm/config.env-replace-1.1.0" - sources."@pnpm/network.ca-file-1.0.2" - sources."@pnpm/npm-conf-2.2.2" - sources."@primer/octicons-17.10.2" - sources."@sindresorhus/is-5.6.0" - sources."@socket.io/component-emitter-3.1.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.13" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/node-16.18.40" - sources."@types/triple-beam-1.3.2" - sources."JSONStream-1.3.5" - sources."abbrev-1.1.1" - sources."accepts-1.3.8" - sources."acorn-7.4.1" - sources."acorn-node-1.8.2" - sources."acorn-walk-7.2.0" - sources."ansi-regex-5.0.1" - (sources."ansi-styles-4.3.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."any-promise-1.3.0" - sources."array-flatten-1.1.1" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."async-3.2.4" - sources."available-typed-arrays-1.0.5" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."base64id-2.0.0" - sources."blueimp-md5-2.19.0" - sources."bn.js-5.2.1" - sources."body-parser-1.20.2" - sources."bootstrap-3.4.1" - sources."brace-expansion-1.1.11" - sources."brorand-1.1.0" - sources."browser-pack-6.1.0" - sources."browser-resolve-2.0.0" - sources."browserify-17.0.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."browserify-zlib-0.2.0" - sources."buffer-5.2.1" - sources."buffer-from-1.1.2" - sources."buffer-xor-1.0.3" - sources."bufferutil-4.0.7" - sources."builtin-status-codes-3.0.0" - sources."bytes-3.1.2" - sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" - sources."cached-path-relative-1.1.0" - sources."call-bind-1.0.2" - sources."cipher-base-1.0.4" - sources."cliui-8.0.1" - sources."clone-2.1.2" - sources."color-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-string-1.9.1" - sources."colorspace-1.1.4" - (sources."combine-source-map-0.8.0" // { - dependencies = [ - sources."convert-source-map-1.1.3" - ]; - }) - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."config-chain-1.1.13" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."convert-source-map-1.9.0" - sources."cookie-0.4.1" - sources."cookie-parser-1.4.6" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."cors-2.8.5" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."crossroads-0.12.2" - sources."crypto-browserify-3.12.0" - sources."dash-ast-1.0.0" - sources."debug-2.6.9" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defer-to-connect-2.0.1" - sources."define-lazy-prop-2.0.0" - sources."defined-1.0.1" - sources."depd-2.0.0" - sources."deps-sort-2.0.1" - sources."des.js-1.1.0" - sources."destroy-1.2.0" - sources."detective-5.2.1" - sources."diff-5.1.0" - sources."diff2html-3.4.40" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."dnd-page-scroll-0.0.4" - sources."domain-browser-1.2.0" - sources."duplexer2-0.1.4" - sources."ee-first-1.1.1" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."emoji-regex-8.0.0" - sources."enabled-2.0.0" - sources."encodeurl-1.0.2" - (sources."engine.io-6.2.1" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."engine.io-parser-5.0.7" - sources."error-ex-1.3.2" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."eve-0.5.4" - sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" - (sources."express-4.18.2" // { - dependencies = [ - sources."body-parser-1.20.1" - sources."cookie-0.5.0" - sources."raw-body-2.5.1" - ]; - }) - (sources."express-session-1.17.3" // { - dependencies = [ - sources."cookie-0.4.2" - ]; - }) - sources."fast-safe-stringify-2.1.1" - sources."fecha-4.2.3" - sources."finalhandler-1.2.0" - sources."fn.name-1.1.0" - sources."for-each-0.3.3" - sources."form-data-encoder-2.1.4" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-assigned-identifiers-1.2.0" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - sources."get-stream-6.0.1" - sources."getmac-5.20.0" - sources."glob-7.2.3" - sources."gopd-1.0.1" - sources."got-12.6.1" - sources."graceful-fs-4.2.10" - sources."has-1.0.3" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."hash.js-1.1.7" - sources."hasher-1.2.0" - sources."hmac-drbg-1.0.1" - (sources."hogan.js-3.0.2" // { - dependencies = [ - sources."mkdirp-0.3.0" - ]; - }) - sources."htmlescape-1.1.1" - sources."http-cache-semantics-4.1.1" - sources."http-errors-2.0.0" - sources."http2-wrapper-2.2.0" - sources."https-browserify-1.0.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.2.1" - sources."ipaddr.js-1.9.1" - sources."is-arguments-1.1.1" - sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-callable-1.2.7" - sources."is-core-module-2.13.0" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-stream-2.0.1" - sources."is-typed-array-1.1.12" - sources."is-utf8-0.2.1" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."jquery-3.6.4" - sources."jquery-ui-1.13.2" - sources."json-buffer-3.0.1" - sources."jsonparse-1.3.1" - sources."just-detect-adblock-1.1.0" - sources."keyv-4.5.3" - sources."knockout-3.5.1" - sources."kuler-2.0.0" - sources."labeled-stream-splicer-2.0.2" - sources."latest-version-7.0.0" - sources."lodash-4.17.21" - sources."lodash.memoize-3.0.4" - (sources."logform-2.5.1" // { - dependencies = [ - sources."ms-2.1.3" - ]; - }) - sources."lowercase-keys-3.0.0" - sources."lru-cache-4.1.5" - sources."md5.js-1.3.5" - sources."media-typer-0.3.0" - (sources."memorystore-1.6.7" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-4.0.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-2.1.6" - sources."mkdirp-classic-0.5.3" - sources."module-deps-6.2.3" - sources."moment-2.29.4" - sources."ms-2.0.0" - sources."negotiator-0.6.3" - sources."node-cache-5.1.2" - sources."node-gyp-build-4.6.0" - sources."node-watch-0.7.4" - sources."nopt-1.0.10" - sources."normalize-url-8.0.0" - sources."nprogress-0.2.0" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."one-time-1.0.0" - sources."open-8.4.2" - sources."os-browserify-0.3.0" - sources."p-cancelable-3.0.0" - sources."p-limit-4.0.0" - sources."package-json-8.1.1" - sources."pako-1.0.11" - sources."parents-1.0.1" - sources."parse-asn1-5.1.6" - sources."parse-json-2.2.0" - sources."parseurl-1.3.3" - sources."passport-0.6.0" - sources."passport-local-1.0.0" - sources."passport-strategy-1.0.0" - sources."path-browserify-1.0.1" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."path-platform-0.11.15" - sources."path-to-regexp-0.1.7" - sources."pause-0.0.1" - sources."pbkdf2-3.1.2" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."proto-list-1.2.4" - sources."proxy-addr-2.0.7" - sources."pseudomap-1.0.2" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."punycode-1.4.1" - sources."qs-6.11.0" - sources."querystring-es3-0.2.1" - sources."quick-lru-5.1.1" - sources."random-bytes-1.0.0" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" - sources."range-parser-1.2.1" - sources."raven-js-3.27.2" - sources."raw-body-2.5.2" - sources."rc-1.2.8" - sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."require-directory-2.1.1" - sources."resolve-1.22.4" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - sources."rimraf-4.1.4" - sources."ripemd160-2.0.2" - sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.3" - sources."safer-buffer-2.1.2" - (sources."semver-7.3.8" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.15.0" - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - sources."shasum-object-1.0.0" - sources."shell-quote-1.8.1" - sources."side-channel-1.0.4" - sources."signals-1.0.0" - sources."simple-concat-1.0.1" - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) - sources."snapsvg-0.5.1" - (sources."socket.io-4.5.4" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."socket.io-adapter-2.4.0" - (sources."socket.io-parser-4.2.4" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."source-map-0.5.7" - sources."stack-trace-0.0.10" - sources."statuses-2.0.1" - (sources."stream-browserify-3.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."stream-combiner2-1.1.1" - (sources."stream-http-3.2.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."stream-splicer-2.0.1" - sources."string-width-4.2.3" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-bom-2.0.0" - sources."strip-json-comments-2.0.1" - sources."subarg-1.0.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."syntax-error-1.4.0" - (sources."temp-0.9.4" // { - dependencies = [ - sources."mkdirp-0.5.6" - sources."rimraf-2.6.3" - ]; - }) - sources."text-hex-1.0.0" - sources."through-2.3.8" - sources."through2-2.0.5" - sources."timers-browserify-1.4.2" - sources."toidentifier-1.0.1" - sources."triple-beam-1.4.1" - sources."tsconfig-5.0.3" - (sources."tsify-5.0.4" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."tty-browserify-0.0.1" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."typescript-4.9.5" - sources."uid-safe-2.1.5" - sources."umd-3.0.3" - sources."undeclared-identifiers-1.1.3" - sources."unpipe-1.0.0" - sources."url-0.11.1" - sources."utf-8-validate-5.0.10" - sources."util-0.12.5" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."vm-browserify-1.1.2" - sources."which-typed-array-1.1.11" - (sources."winston-3.8.2" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - (sources."winston-transport-4.5.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."ws-8.2.3" - sources."xtend-4.0.2" - sources."y18n-5.0.8" - sources."yallist-2.1.2" - sources."yargs-17.6.2" - sources."yargs-parser-21.1.1" - sources."yocto-queue-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Git made easy"; - homepage = "https://github.com/FredrikNoren/ungit#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; unified-language-server = nodeEnv.buildNodePackage { name = "unified-language-server"; packageName = "unified-language-server"; @@ -138756,1014 +138267,6 @@ in bypassCache = true; reconstructLock = true; }; - vue-language-server = nodeEnv.buildNodePackage { - name = "vue-language-server"; - packageName = "vue-language-server"; - version = "0.0.67"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.67.tgz"; - sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; - }; - dependencies = [ - sources."@adobe/css-tools-4.3.0" - sources."@babel/code-frame-7.22.10" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/highlight-7.22.10" - sources."@emmetio/extract-abbreviation-0.1.6" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@one-ini/wasm-0.1.1" - sources."@sindresorhus/is-0.14.0" - sources."@starptech/expression-parser-0.10.0" - sources."@starptech/hast-util-from-webparser-0.10.0" - sources."@starptech/prettyhtml-0.10.0" - sources."@starptech/prettyhtml-formatter-0.10.0" - sources."@starptech/prettyhtml-hast-to-html-0.10.0" - sources."@starptech/prettyhtml-hastscript-0.10.0" - (sources."@starptech/prettyhtml-sort-attributes-0.10.0" // { - dependencies = [ - sources."unist-util-visit-1.4.1" - ]; - }) - sources."@starptech/rehype-minify-whitespace-0.10.0" - sources."@starptech/rehype-webparser-0.10.0" - sources."@starptech/webparser-0.10.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.4.9" - sources."@types/unist-2.0.7" - sources."@types/vfile-3.0.2" - sources."@types/vfile-message-2.0.0" - sources."abbrev-1.1.1" - sources."acorn-6.4.2" - sources."acorn-jsx-5.3.2" - sources."ajv-6.12.6" - (sources."ajv-keywords-2.1.1" // { - dependencies = [ - sources."ajv-5.5.2" - sources."fast-deep-equal-1.1.0" - sources."json-schema-traverse-0.3.1" - ]; - }) - (sources."ansi-align-3.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.1" - sources."ansi-styles-3.2.1" - sources."anymatch-3.1.3" - sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-find-index-1.0.2" - sources."array-iterate-1.1.4" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."arrify-1.0.1" - sources."assign-symbols-1.0.0" - sources."astral-regex-1.0.0" - sources."async-1.5.2" - sources."atob-2.1.2" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."js-tokens-3.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - sources."babel-runtime-6.26.0" - sources."bail-1.0.5" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."binary-extensions-2.2.0" - sources."bootstrap-vue-helper-json-1.1.1" - (sources."boxen-3.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - sources."camelcase-5.3.1" - sources."emoji-regex-7.0.3" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."buefy-helper-json-1.0.3" - sources."buffer-from-1.1.2" - sources."builtin-modules-1.1.1" - sources."cache-base-1.0.1" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."call-me-maybe-1.0.2" - (sources."caller-path-0.1.0" // { - dependencies = [ - sources."callsites-0.2.0" - ]; - }) - sources."callsites-3.1.0" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."ccount-1.1.0" - sources."chalk-2.4.2" - sources."character-entities-html4-1.1.4" - sources."character-entities-legacy-1.1.4" - sources."chardet-0.7.0" - (sources."chokidar-3.0.2" // { - dependencies = [ - sources."braces-3.0.2" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."is-number-7.0.0" - sources."to-regex-range-5.0.1" - ]; - }) - sources."ci-info-2.0.0" - sources."circular-json-0.3.3" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."cli-boxes-2.2.1" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - sources."cliui-4.1.0" - sources."clone-1.0.4" - sources."clone-response-1.0.3" - sources."co-4.6.0" - sources."code-point-at-1.1.0" - sources."collapse-white-space-1.0.6" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - (sources."columnify-1.5.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - sources."comma-separated-tokens-1.0.8" - sources."commander-10.0.1" - sources."common-tags-1.8.2" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."config-chain-1.1.13" - sources."configstore-4.0.0" - sources."copy-descriptor-0.1.1" - sources."core-js-2.6.12" - sources."core-util-is-1.0.3" - sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" - (sources."css-2.2.4" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."css-parse-2.0.0" - sources."currently-unhandled-0.4.1" - sources."debug-3.2.7" - sources."decamelize-1.2.0" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."map-obj-1.0.1" - ]; - }) - sources."decode-uri-component-0.2.2" - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" - sources."defaults-1.0.4" - sources."defer-to-connect-1.1.3" - sources."define-property-2.0.2" - sources."diff-4.0.2" - sources."dir-glob-2.0.0" - sources."dlv-1.1.3" - sources."doctrine-3.0.0" - sources."dot-prop-4.2.1" - sources."duplexer3-0.1.5" - (sources."editorconfig-1.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."lru-cache-6.0.0" - sources."minimatch-9.0.1" - sources."semver-7.5.4" - sources."yallist-4.0.0" - ]; - }) - sources."element-helper-json-2.0.6" - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - (sources."eslint-5.16.0" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."debug-4.3.4" - sources."ignore-4.0.6" - sources."ms-2.1.2" - ]; - }) - (sources."eslint-plugin-vue-6.2.2" // { - dependencies = [ - sources."acorn-7.4.1" - sources."debug-4.3.4" - sources."eslint-scope-5.1.1" - sources."espree-6.2.1" - sources."ms-2.1.2" - (sources."vue-eslint-parser-7.11.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - ]; - }) - sources."eslint-scope-4.0.3" - sources."eslint-utils-1.4.3" - sources."eslint-visitor-keys-1.3.0" - sources."espree-5.0.1" - sources."esprima-4.0.1" - (sources."esquery-1.5.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."execa-0.7.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."external-editor-3.1.0" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."fast-deep-equal-3.1.3" - sources."fast-glob-2.2.7" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fault-1.0.4" - sources."figures-2.0.0" - sources."file-entry-cache-5.0.1" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-up-2.1.0" - sources."flat-cache-2.0.1" - sources."flatted-2.0.2" - sources."fn-name-2.0.1" - sources."for-in-1.0.2" - sources."format-0.2.2" - sources."fragment-cache-0.2.1" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."functional-red-black-tree-1.0.1" - sources."get-caller-file-1.0.3" - sources."get-stream-3.0.0" - sources."get-value-2.0.6" - sources."glob-7.2.3" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."glob-to-regexp-0.3.0" - sources."global-dirs-0.1.1" - sources."globals-11.12.0" - sources."globby-8.0.2" - (sources."got-9.6.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) - sources."graceful-fs-4.2.11" - sources."gridsome-helper-json-1.0.3" - sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."has-flag-3.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - sources."kind-of-4.0.0" - ]; - }) - sources."has-yarn-2.1.0" - sources."hast-util-embedded-1.0.6" - sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.1.0" - sources."hast-util-parse-selector-2.2.5" - sources."hast-util-to-string-1.0.4" - sources."hast-util-whitespace-1.0.4" - sources."hosted-git-info-2.8.9" - sources."html-void-elements-1.0.5" - sources."html-whitespace-sensitive-tag-names-1.0.3" - sources."http-cache-semantics-4.1.1" - sources."iconv-lite-0.4.24" - sources."ignore-3.3.10" - (sources."import-fresh-3.3.0" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."indent-string-3.2.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - (sources."inquirer-6.5.2" // { - dependencies = [ - sources."ansi-regex-4.1.1" - sources."strip-ansi-5.2.0" - ]; - }) - sources."invert-kv-2.0.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-alphabetical-1.0.4" - sources."is-alphanumerical-1.0.4" - sources."is-arrayish-0.2.1" - sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.5" - sources."is-ci-2.0.0" - sources."is-core-module-2.13.0" - sources."is-data-descriptor-1.0.0" - sources."is-decimal-1.0.4" - sources."is-descriptor-1.0.2" - sources."is-empty-1.2.0" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.3" - sources."is-hexadecimal-1.0.4" - sources."is-hidden-1.1.3" - sources."is-installed-globally-0.1.0" - sources."is-npm-3.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - ]; - }) - sources."is-obj-1.0.1" - sources."is-object-1.0.2" - sources."is-path-inside-1.0.1" - sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-resolvable-1.1.0" - sources."is-stream-1.1.0" - sources."is-utf8-0.2.1" - sources."is-windows-1.0.2" - sources."is-yarn-global-0.3.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - (sources."js-beautify-1.14.9" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-8.1.0" - sources."minimatch-5.1.6" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.3" - sources."jsonc-parser-1.0.3" - sources."keyv-3.1.0" - sources."kind-of-6.0.3" - sources."latest-version-5.1.0" - sources."lcid-2.0.0" - sources."levn-0.3.0" - sources."load-json-file-4.0.0" - sources."load-plugin-2.3.1" - sources."locate-path-2.0.0" - sources."lodash-4.17.21" - sources."lodash.assign-4.2.0" - sources."lodash.defaults-4.2.0" - sources."lodash.iteratee-4.7.0" - sources."lodash.merge-4.6.2" - sources."lodash.unescape-4.0.1" - sources."loglevel-1.8.1" - (sources."loglevel-colored-level-prefix-1.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."make-dir-1.3.0" - sources."map-age-cleaner-0.1.3" - sources."map-cache-0.2.2" - sources."map-obj-2.0.0" - sources."map-visit-1.0.0" - (sources."mem-4.3.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) - (sources."meow-5.0.0" // { - dependencies = [ - sources."read-pkg-up-3.0.0" - ]; - }) - sources."merge2-1.4.1" - sources."micromatch-3.1.10" - sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minimist-options-3.0.2" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.6" - sources."mout-0.5.0" - sources."ms-2.1.3" - sources."mute-stream-0.0.7" - sources."nanomatch-1.2.13" - sources."natural-compare-1.4.0" - sources."nice-try-1.0.5" - sources."nopt-6.0.0" - sources."normalize-package-data-2.5.0" - sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" - sources."npm-prefix-1.2.0" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" - sources."nuxt-helper-json-1.0.0" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."optionator-0.8.3" - sources."os-homedir-1.0.2" - (sources."os-locale-3.1.0" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."execa-1.0.0" - sources."get-stream-4.1.0" - ]; - }) - sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."parent-module-1.0.1" - sources."parse-gitignore-1.0.1" - sources."parse-json-4.0.0" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" - 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" - sources."path-parse-1.0.7" - sources."path-type-3.0.0" - sources."picomatch-2.3.1" - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - (sources."pkg-conf-1.1.3" // { - dependencies = [ - sources."find-up-1.1.2" - sources."load-json-file-1.1.0" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" - sources."pify-2.3.0" - sources."strip-bom-2.0.0" - ]; - }) - sources."pluralize-7.0.0" - sources."posix-character-classes-0.1.1" - sources."prelude-ls-1.1.2" - sources."prepend-http-2.0.0" - sources."prettier-1.19.1" - (sources."prettier-eslint-8.8.2" // { - dependencies = [ - sources."acorn-5.7.4" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - sources."ajv-5.5.2" - sources."chardet-0.4.2" - sources."doctrine-2.1.0" - sources."eslint-4.19.1" - sources."eslint-scope-3.7.3" - sources."espree-3.5.4" - sources."external-editor-2.2.0" - sources."fast-deep-equal-1.1.0" - sources."file-entry-cache-2.0.0" - sources."flat-cache-1.3.4" - sources."inquirer-3.3.0" - sources."json-schema-traverse-0.3.1" - sources."regexpp-1.1.0" - sources."slice-ansi-1.0.0" - sources."table-4.0.2" - sources."typescript-2.9.2" - sources."vue-eslint-parser-2.0.3" - sources."write-0.2.1" - ]; - }) - sources."prettier-tslint-0.4.2" - sources."pretty-format-23.6.0" - sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" - sources."property-information-5.6.0" - sources."proto-list-1.2.4" - sources."pseudomap-1.0.2" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."quick-lru-1.1.0" - sources."rc-1.2.8" - sources."read-pkg-3.0.0" - (sources."read-pkg-up-4.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."p-try-2.2.0" - ]; - }) - sources."readable-stream-2.3.8" - sources."readdirp-3.6.0" - sources."redent-2.0.0" - sources."regenerator-runtime-0.11.1" - sources."regex-not-1.0.2" - sources."regexpp-2.0.1" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - (sources."rehype-sort-attribute-values-2.0.1" // { - dependencies = [ - sources."unist-util-visit-1.4.1" - ]; - }) - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."require-relative-0.8.7" - (sources."require-uncached-1.0.3" // { - dependencies = [ - sources."resolve-from-1.0.1" - ]; - }) - sources."resolve-1.22.4" - sources."resolve-from-5.0.0" - sources."resolve-url-0.2.1" - sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" - sources."ret-0.1.15" - sources."rimraf-2.6.3" - sources."run-async-2.4.1" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" - sources."rxjs-6.6.7" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."semver-5.7.2" - sources."semver-diff-2.1.0" - sources."set-blocking-2.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shellsubstitute-1.2.0" - sources."signal-exit-3.0.7" - sources."slash-1.0.0" - sources."slice-ansi-2.1.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - ]; - }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" - sources."space-separated-tokens-1.1.5" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" - sources."stampit-1.2.0" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."string-width-2.1.1" - sources."string_decoder-1.1.1" - sources."stringify-entities-2.0.0" - sources."strip-ansi-4.0.0" - sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" - sources."strip-indent-2.0.0" - sources."strip-json-comments-2.0.1" - (sources."stylint-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."camelcase-3.0.0" - sources."chalk-1.1.3" - sources."cliui-3.2.0" - sources."find-up-1.1.2" - sources."glob-7.0.4" - sources."invert-kv-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."lcid-1.0.0" - sources."load-json-file-1.1.0" - sources."os-locale-1.4.0" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" - sources."path-type-1.1.0" - sources."pify-2.3.0" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."set-blocking-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" - sources."supports-color-2.0.0" - sources."yargs-4.7.1" - sources."yargs-parser-2.4.1" - ]; - }) - (sources."stylus-0.54.8" // { - dependencies = [ - sources."debug-3.1.0" - sources."mkdirp-1.0.4" - sources."ms-2.0.0" - sources."semver-6.3.1" - sources."source-map-0.7.4" - ]; - }) - (sources."stylus-supremacy-2.17.5" // { - dependencies = [ - sources."argparse-2.0.1" - sources."brace-expansion-2.0.1" - sources."debug-4.3.4" - sources."glob-8.1.0" - sources."js-yaml-4.1.0" - sources."minimatch-5.1.6" - sources."ms-2.1.2" - sources."source-map-0.7.4" - (sources."stylus-0.59.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - ]; - }) - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."symbol-0.2.3" - (sources."table-5.4.6" // { - dependencies = [ - sources."ansi-regex-4.1.1" - sources."emoji-regex-7.0.3" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."term-size-1.2.0" - sources."text-table-0.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - ]; - }) - sources."to-readable-stream-1.0.0" - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."to-vfile-6.1.0" - sources."trim-newlines-2.0.0" - sources."trough-1.0.5" - sources."tslib-1.14.1" - (sources."tslint-5.20.1" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - sources."tsutils-2.29.0" - sources."type-check-0.3.2" - sources."type-fest-0.3.1" - sources."typedarray-0.0.6" - sources."typescript-3.9.10" - (sources."typescript-eslint-parser-16.0.1" // { - dependencies = [ - sources."semver-5.5.0" - ]; - }) - (sources."unified-7.1.0" // { - dependencies = [ - sources."unist-util-stringify-position-1.1.2" - sources."vfile-3.0.1" - sources."vfile-message-1.1.1" - ]; - }) - (sources."unified-engine-6.0.1" // { - dependencies = [ - sources."to-vfile-4.0.0" - sources."unist-util-stringify-position-1.1.2" - sources."vfile-3.0.1" - sources."vfile-message-1.1.1" - (sources."vfile-reporter-5.1.2" // { - dependencies = [ - sources."unist-util-stringify-position-2.0.3" - ]; - }) - ]; - }) - sources."union-value-1.0.1" - sources."unique-string-1.0.0" - sources."unist-util-find-1.0.4" - sources."unist-util-inspect-4.1.4" - sources."unist-util-is-2.1.3" - sources."unist-util-modify-children-1.1.6" - (sources."unist-util-stringify-position-4.0.0" // { - dependencies = [ - sources."@types/unist-3.0.0" - ]; - }) - (sources."unist-util-visit-2.0.3" // { - dependencies = [ - sources."unist-util-is-4.1.0" - sources."unist-util-visit-parents-3.1.1" - ]; - }) - (sources."unist-util-visit-parents-2.1.2" // { - dependencies = [ - sources."unist-util-is-3.0.0" - ]; - }) - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."untildify-2.1.0" - sources."update-notifier-3.0.1" - sources."uri-js-4.4.1" - sources."urix-0.1.0" - sources."url-parse-lax-3.0.0" - sources."use-3.1.1" - sources."user-home-2.0.0" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - (sources."vfile-4.2.1" // { - dependencies = [ - sources."unist-util-stringify-position-2.0.3" - sources."vfile-message-2.0.4" - ]; - }) - (sources."vfile-message-4.0.2" // { - dependencies = [ - sources."@types/unist-3.0.0" - ]; - }) - (sources."vfile-reporter-6.0.2" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-6.1.0" - sources."unist-util-stringify-position-2.0.3" - ]; - }) - sources."vfile-sort-2.2.2" - sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.4.0" // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0-next.2" - sources."vscode-uri-2.1.2" - ]; - }) - sources."vscode-emmet-helper-1.2.17" - sources."vscode-jsonrpc-8.1.0" - sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.17.3" - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.3" - sources."vscode-nls-5.2.0" - sources."vscode-textbuffer-1.0.0" - sources."vscode-uri-1.0.8" - (sources."vue-eslint-parser-6.0.5" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."vue-onsenui-helper-json-1.0.2" - sources."wcwidth-1.0.1" - sources."which-1.3.1" - sources."which-module-2.0.1" - sources."widest-line-2.0.1" - sources."window-size-0.2.0" - sources."word-wrap-1.2.5" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) - sources."wrappy-1.0.2" - sources."write-1.0.3" - sources."write-file-atomic-2.4.3" - sources."x-is-array-0.1.0" - sources."x-is-string-0.1.0" - sources."xdg-basedir-3.0.0" - sources."xtend-4.0.2" - sources."y18n-3.2.2" - sources."yallist-2.1.2" - (sources."yargs-11.1.1" // { - dependencies = [ - sources."yargs-parser-9.0.2" - ]; - }) - sources."yargs-parser-10.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "vue-language-server"; - homepage = "https://github.com/vuejs/vetur/tree/master/server"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; wavedrom-cli = nodeEnv.buildNodePackage { name = "wavedrom-cli"; packageName = "wavedrom-cli"; @@ -139918,716 +138421,6 @@ in bypassCache = true; reconstructLock = true; }; - web-ext = nodeEnv.buildNodePackage { - name = "web-ext"; - packageName = "web-ext"; - version = "7.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-7.6.2.tgz"; - sha512 = "xlxbzgFBIS/UWWlvWxyR1PIqRRzDj1cutoHh+VZu4ZTcJTfv35KVdKkLRZv4PQwHu4dg8VfTg7WEcNP4QLaaFQ=="; - }; - dependencies = [ - sources."@aashutoshrathi/word-wrap-1.2.6" - (sources."@babel/code-frame-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.5" - (sources."@babel/highlight-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/runtime-7.21.0" - sources."@devicefarmer/adbkit-3.2.3" - sources."@devicefarmer/adbkit-logcat-2.1.3" - sources."@devicefarmer/adbkit-monkey-1.2.1" - sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.6.2" - (sources."@eslint/eslintrc-2.1.1" // { - dependencies = [ - sources."ajv-6.12.6" - sources."eslint-visitor-keys-3.4.2" - sources."espree-9.6.1" - sources."json-schema-traverse-0.4.1" - sources."strip-json-comments-3.1.1" - ]; - }) - sources."@eslint/js-8.36.0" - sources."@fluent/syntax-0.19.0" - sources."@humanwhocodes/config-array-0.11.10" - sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@mdn/browser-compat-data-5.2.42" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/minimatch-3.0.5" - sources."@types/node-20.4.9" - sources."@types/yauzl-2.10.0" - sources."abort-controller-3.0.0" - sources."accepts-1.3.8" - sources."acorn-8.10.0" - sources."acorn-jsx-5.3.2" - sources."addons-linter-5.32.0" - sources."addons-moz-compare-1.3.0" - (sources."addons-scanner-utils-8.5.0" // { - dependencies = [ - sources."node-fetch-2.6.7" - ]; - }) - sources."adm-zip-0.5.10" - sources."ajv-8.12.0" - (sources."ansi-align-3.0.1" // { - dependencies = [ - sources."string-width-4.2.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."any-promise-1.3.0" - sources."argparse-2.0.1" - sources."array-differ-4.0.0" - sources."array-flatten-1.1.1" - sources."array-union-3.0.1" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-3.2.4" - sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" - sources."atomic-sleep-1.0.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.7.2" - (sources."body-parser-1.20.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."boolbase-1.0.0" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."chalk-5.3.0" - sources."type-fest-2.19.0" - ]; - }) - sources."brace-expansion-1.1.11" - sources."buffer-6.0.3" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-equal-constant-time-1.0.1" - sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - sources."bunyan-1.8.15" - sources."bytes-3.1.2" - sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.13" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - sources."camelcase-7.0.1" - sources."caseless-0.12.0" - sources."chalk-4.1.2" - sources."cheerio-1.0.0-rc.12" - sources."cheerio-select-2.1.0" - sources."chrome-launcher-0.15.1" - sources."ci-info-3.8.0" - sources."cli-boxes-3.0.0" - (sources."cliui-8.0.1" // { - dependencies = [ - sources."string-width-4.2.3" - sources."wrap-ansi-7.0.0" - ]; - }) - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."columnify-1.6.0" - sources."combined-stream-1.0.8" - sources."commander-9.5.0" - sources."common-tags-1.8.2" - sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."configstore-6.0.0" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."core-js-3.29.0" - sources."core-util-is-1.0.3" - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."css-select-5.1.0" - sources."css-what-6.1.0" - sources."dashdash-1.14.1" - sources."data-uri-to-buffer-4.0.1" - sources."debounce-1.2.1" - sources."debug-4.3.4" - sources."decamelize-6.0.0" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" - sources."deepcopy-2.1.0" - sources."deepmerge-4.3.1" - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."define-lazy-prop-2.0.0" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."doctrine-3.0.0" - sources."dom-serializer-2.0.0" - sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" - sources."domutils-3.1.0" - sources."dot-prop-6.0.1" - sources."dtrace-provider-0.8.8" - sources."eastasianwidth-0.2.0" - sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.11" - sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."end-of-stream-1.4.4" - sources."entities-4.5.0" - sources."error-ex-1.3.2" - sources."es6-error-4.1.1" - sources."es6-promisify-7.0.0" - sources."escalade-3.1.1" - sources."escape-goat-4.0.0" - sources."escape-html-1.0.3" - sources."escape-string-regexp-4.0.0" - (sources."eslint-8.36.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."strip-json-comments-3.1.1" - ]; - }) - sources."eslint-plugin-no-unsanitized-4.0.2" - sources."eslint-scope-7.2.2" - sources."eslint-visitor-keys-3.3.0" - sources."espree-9.5.0" - sources."esprima-4.0.1" - sources."esquery-1.5.0" - sources."esrecurse-4.3.0" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."event-target-shim-5.0.1" - sources."events-3.3.0" - sources."execa-4.1.0" - (sources."express-4.18.2" // { - dependencies = [ - sources."body-parser-1.20.1" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."raw-body-2.5.1" - ]; - }) - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-patch-3.1.1" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fast-redact-3.3.0" - sources."fastq-1.15.0" - sources."fd-slicer-1.1.0" - sources."fetch-blob-3.2.0" - sources."file-entry-cache-6.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."find-up-5.0.0" - (sources."firefox-profile-4.3.2" // { - dependencies = [ - sources."fs-extra-9.0.1" - ]; - }) - sources."first-chunk-stream-3.0.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.7" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."form-data-encoder-2.1.4" - sources."formdata-polyfill-4.0.10" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - (sources."fs-extra-11.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - (sources."fx-runner-1.3.0" // { - dependencies = [ - sources."commander-2.9.0" - sources."isexe-1.1.2" - sources."which-1.2.4" - ]; - }) - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - sources."get-stream-5.2.0" - sources."getpass-0.1.7" - (sources."glob-9.3.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-7.4.6" - ]; - }) - sources."glob-parent-6.0.2" - sources."glob-to-regexp-0.4.1" - sources."global-dirs-3.0.1" - sources."globals-13.20.0" - (sources."got-12.6.1" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."graceful-fs-4.2.11" - sources."graceful-readlink-1.0.1" - sources."grapheme-splitter-1.0.4" - sources."growly-1.3.0" - sources."har-schema-2.0.0" - (sources."har-validator-5.1.5" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - ]; - }) - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-yarn-3.0.0" - sources."htmlparser2-8.0.2" - sources."http-cache-semantics-4.1.1" - sources."http-errors-2.0.0" - sources."http-signature-1.2.0" - sources."http2-wrapper-2.2.0" - sources."human-signals-1.1.1" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - sources."image-size-1.0.2" - sources."immediate-3.0.6" - sources."import-fresh-3.3.0" - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - sources."invert-kv-3.0.1" - sources."ipaddr.js-1.9.1" - sources."is-absolute-0.1.7" - sources."is-arrayish-0.2.1" - sources."is-ci-3.0.1" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-mergeable-object-1.1.1" - sources."is-npm-6.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-relative-0.1.3" - sources."is-stream-2.0.1" - sources."is-typedarray-1.0.0" - sources."is-utf8-0.2.1" - sources."is-wsl-2.2.0" - sources."is-yarn-global-0.4.1" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jed-1.1.1" - sources."jose-4.13.1" - sources."js-sdsl-4.4.2" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."jsbn-0.1.1" - sources."json-buffer-3.0.1" - sources."json-merge-patch-1.0.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-1.0.0" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json-stringify-safe-5.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."jsonwebtoken-9.0.0" - sources."jsprim-1.4.2" - (sources."jszip-3.10.1" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."jwa-1.4.1" - sources."jws-3.2.2" - sources."keyv-4.5.3" - sources."latest-version-7.0.0" - sources."lcid-3.1.1" - sources."levn-0.4.1" - sources."lie-3.3.0" - (sources."lighthouse-logger-1.4.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."lines-and-columns-2.0.3" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" - sources."lodash.merge-4.6.2" - sources."lowercase-keys-3.0.0" - sources."lru-cache-10.0.0" - sources."make-error-1.3.6" - sources."map-age-cleaner-0.1.3" - sources."marky-1.2.5" - sources."media-typer-0.3.0" - sources."mem-5.1.1" - sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."mimic-response-4.0.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-4.2.8" - sources."mkdirp-1.0.4" - sources."moment-2.29.4" - sources."ms-2.1.2" - sources."multimatch-6.0.0" - (sources."mv-2.1.1" // { - dependencies = [ - sources."glob-6.0.4" - sources."mkdirp-0.5.6" - sources."rimraf-2.4.5" - ]; - }) - sources."mz-2.7.0" - sources."nan-2.17.0" - sources."nanoid-3.3.6" - sources."natural-compare-1.4.0" - sources."ncp-2.0.0" - sources."negotiator-0.6.3" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.1" - sources."node-forge-1.3.1" - sources."node-gyp-build-4.6.0" - sources."node-notifier-10.0.1" - sources."normalize-url-8.0.0" - sources."npm-run-path-4.0.1" - sources."nth-check-2.1.1" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."on-exit-leak-free-2.1.0" - sources."on-finished-2.4.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.2" - sources."optionator-0.9.3" - sources."os-locale-5.0.0" - sources."os-shim-0.1.3" - sources."p-cancelable-3.0.0" - sources."p-defer-1.0.0" - sources."p-is-promise-2.1.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."package-json-8.1.1" - sources."pako-1.0.11" - sources."parent-module-1.0.1" - sources."parse-json-6.0.2" - sources."parse5-7.1.2" - sources."parse5-htmlparser2-tree-adapter-7.0.0" - sources."parseurl-1.3.3" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."minipass-7.0.2" - ]; - }) - sources."path-to-regexp-0.1.7" - sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."picocolors-1.0.0" - sources."pino-8.11.0" - sources."pino-abstract-transport-1.0.0" - sources."pino-std-serializers-6.2.2" - sources."postcss-8.4.21" - sources."prelude-ls-1.2.1" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."process-warning-2.2.0" - sources."promise-toolbox-0.21.0" - sources."proto-list-1.2.4" - sources."proxy-addr-2.0.7" - sources."psl-1.9.0" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."pupa-3.1.0" - sources."qs-6.11.0" - sources."queue-6.0.2" - sources."queue-microtask-1.2.3" - sources."quick-format-unescaped-4.0.4" - sources."quick-lru-5.1.1" - sources."range-parser-1.2.1" - sources."raw-body-2.5.2" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."readable-stream-4.4.2" - sources."real-require-0.2.0" - sources."regenerator-runtime-0.13.11" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - (sources."relaxed-json-1.0.3" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-2.20.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.3" - sources."uuid-3.4.0" - ]; - }) - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.1" - sources."resolve-from-4.0.0" - sources."responselike-3.0.0" - sources."reusify-1.0.4" - (sources."rimraf-3.0.2" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) - sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" - sources."safe-compare-1.1.4" - sources."safe-json-stringify-1.2.0" - sources."safe-stable-stringify-2.4.3" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - (sources."semver-7.3.8" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."semver-diff-4.0.0" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.15.0" - sources."setimmediate-1.0.5" - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shell-quote-1.7.3" - sources."shellwords-0.1.1" - sources."side-channel-1.0.4" - sources."sign-addon-5.3.0" - sources."signal-exit-3.0.7" - sources."sonic-boom-3.3.0" - sources."source-map-0.6.1" - sources."source-map-js-1.0.2" - sources."source-map-support-0.5.21" - sources."spawn-sync-1.0.15" - sources."split-1.0.1" - sources."split2-4.2.0" - sources."sshpk-1.17.0" - sources."statuses-2.0.1" - sources."stream-to-array-2.3.0" - sources."stream-to-promise-3.0.0" - (sources."string-width-5.1.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-bom-5.0.0" - sources."strip-bom-buf-2.0.0" - sources."strip-bom-stream-4.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-json-comments-5.0.0" - sources."supports-color-7.2.0" - sources."text-table-0.2.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."thread-stream-2.3.0" - sources."through-2.3.8" - sources."tmp-0.2.1" - sources."toidentifier-1.0.1" - sources."tosource-1.0.0" - sources."tough-cookie-2.5.0" - sources."tr46-0.0.3" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.4.0" - sources."type-detect-4.0.8" - sources."type-fest-0.20.2" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."typedarray-to-buffer-3.1.5" - sources."unique-string-3.0.0" - sources."universalify-1.0.0" - sources."unpipe-1.0.0" - sources."upath-2.0.1" - (sources."update-notifier-6.0.2" // { - dependencies = [ - sources."chalk-5.3.0" - ]; - }) - sources."uri-js-4.4.1" - sources."utf-8-validate-6.0.3" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - sources."watchpack-2.4.0" - sources."wcwidth-1.0.1" - sources."web-streams-polyfill-3.2.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."when-3.7.7" - sources."which-2.0.2" - sources."widest-line-4.0.1" - sources."winreg-0.0.12" - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-8.13.0" - sources."xdg-basedir-5.1.0" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - (sources."yargs-17.7.1" // { - dependencies = [ - sources."string-width-4.2.3" - ]; - }) - sources."yargs-parser-21.1.1" - sources."yauzl-2.10.0" - sources."yocto-queue-0.1.0" - sources."zip-dir-2.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A command line tool to help build, run, and test web extensions"; - homepage = "https://github.com/mozilla/web-ext"; - license = "MPL-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; @@ -141981,248 +139774,6 @@ in bypassCache = true; reconstructLock = true; }; - write-good = nodeEnv.buildNodePackage { - name = "write-good"; - packageName = "write-good"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-1.0.8.tgz"; - sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; - }; - dependencies = [ - sources."@aashutoshrathi/word-wrap-1.2.6" - sources."@babel/runtime-7.22.10" - sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.6.2" - (sources."@eslint/eslintrc-2.1.1" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."@eslint/js-8.46.0" - (sources."@humanwhocodes/config-array-0.11.10" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@types/json5-0.0.29" - sources."acorn-8.10.0" - sources."acorn-jsx-5.3.2" - sources."adverb-where-0.2.5" - sources."ajv-6.12.6" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."aria-query-5.3.0" - sources."array-buffer-byte-length-1.0.0" - sources."array-includes-3.1.6" - sources."array.prototype.findlastindex-1.2.2" - sources."array.prototype.flat-1.3.1" - sources."array.prototype.flatmap-1.3.1" - sources."array.prototype.tosorted-1.1.1" - sources."arraybuffer.prototype.slice-1.0.1" - sources."ast-types-flow-0.0.7" - sources."available-typed-arrays-1.0.5" - sources."axe-core-4.7.2" - sources."axobject-query-3.2.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-2.20.3" - sources."concat-map-0.0.1" - sources."cross-spawn-7.0.3" - sources."damerau-levenshtein-1.0.8" - sources."debug-3.2.7" - sources."deep-is-0.1.4" - sources."define-properties-1.2.0" - sources."dequal-2.0.3" - sources."doctrine-2.1.0" - sources."e-prime-0.10.4" - sources."emoji-regex-9.2.2" - sources."es-abstract-1.22.1" - sources."es-set-tostringtag-2.0.1" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" - sources."escape-string-regexp-4.0.0" - (sources."eslint-8.46.0" // { - dependencies = [ - sources."debug-4.3.4" - sources."doctrine-3.0.0" - sources."ms-2.1.2" - ]; - }) - sources."eslint-import-resolver-node-0.3.9" - sources."eslint-module-utils-2.8.0" - sources."eslint-plugin-import-2.28.0" - sources."eslint-plugin-jsx-a11y-6.7.1" - (sources."eslint-plugin-react-7.33.1" // { - dependencies = [ - sources."resolve-2.0.0-next.4" - ]; - }) - sources."eslint-plugin-react-hooks-4.6.0" - sources."eslint-scope-7.2.2" - sources."eslint-visitor-keys-3.4.2" - sources."espree-9.6.1" - sources."esquery-1.5.0" - sources."esrecurse-4.3.0" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastq-1.15.0" - sources."file-entry-cache-6.0.1" - sources."find-up-5.0.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.7" - sources."for-each-0.3.3" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.1" - sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-6.0.2" - sources."globals-13.20.0" - sources."globalthis-1.0.3" - sources."gopd-1.0.1" - sources."graphemer-1.4.0" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."ignore-5.2.4" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.5" - sources."is-array-buffer-3.0.2" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.7" - sources."is-core-module-2.13.0" - sources."is-date-object-1.0.5" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-negative-zero-2.0.2" - sources."is-number-object-1.0.7" - sources."is-path-inside-3.0.3" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" - sources."is-weakref-1.0.2" - sources."isarray-2.0.5" - sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-1.0.2" - sources."jsx-ast-utils-3.3.5" - sources."language-subtag-registry-0.3.22" - sources."language-tags-1.0.5" - sources."levn-0.4.1" - sources."locate-path-6.0.0" - sources."lodash.merge-4.6.2" - sources."loose-envify-1.4.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."ms-2.1.3" - sources."natural-compare-1.4.0" - sources."no-cliches-0.3.4" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."object.entries-1.1.6" - sources."object.fromentries-2.0.6" - sources."object.groupby-1.0.0" - sources."object.hasown-1.1.2" - sources."object.values-1.1.6" - sources."once-1.4.0" - sources."optionator-0.9.3" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parent-module-1.0.1" - sources."passive-voice-0.1.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."prelude-ls-1.2.1" - sources."prop-types-15.8.1" - sources."punycode-2.3.0" - sources."queue-microtask-1.2.3" - sources."react-is-16.13.1" - sources."regenerator-runtime-0.14.0" - sources."regexp.prototype.flags-1.5.0" - sources."resolve-1.22.4" - sources."resolve-from-4.0.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."safe-array-concat-1.0.0" - sources."safe-regex-test-1.0.0" - sources."semver-6.3.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" - sources."string.prototype.matchall-4.0.8" - sources."string.prototype.trim-1.2.7" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" - sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."text-table-0.2.0" - sources."too-wordy-0.3.4" - sources."tsconfig-paths-3.14.2" - sources."type-check-0.4.0" - sources."type-fest-0.20.2" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" - sources."unbox-primitive-1.0.2" - sources."uri-js-4.4.1" - sources."weasel-words-0.1.1" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.11" - sources."wrappy-1.0.2" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Naive linter for English prose"; - homepage = "https://github.com/btford/write-good#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@yaegassy/coc-nginx" = nodeEnv.buildNodePackage { name = "_at_yaegassy_slash_coc-nginx"; packageName = "@yaegassy/coc-nginx"; @@ -142360,1042 +139911,6 @@ in bypassCache = true; reconstructLock = true; }; - yo = nodeEnv.buildNodePackage { - name = "yo"; - packageName = "yo"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-4.3.1.tgz"; - sha512 = "KKp5WNPq0KdqfJY4W6HSiDG4DcgvmL4InWfkg5SVG9oYp+DTUUuc5ZmDw9VAvK0Z2J6XeEumDHcWh8NDhzrtOw=="; - }; - dependencies = [ - (sources."@babel/code-frame-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.5" - (sources."@babel/highlight-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/runtime-7.22.10" - sources."@gar/promisify-1.1.3" - sources."@isaacs/string-locale-compare-1.1.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-4.3.1" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."semver-7.5.4" - ]; - }) - (sources."@npmcli/fs-1.1.1" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - (sources."@npmcli/git-2.1.0" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."semver-7.5.4" - ]; - }) - sources."@npmcli/installed-package-contents-1.0.7" - (sources."@npmcli/map-workspaces-2.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - (sources."@npmcli/metavuln-calculator-2.0.0" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - (sources."@npmcli/move-file-1.1.2" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) - sources."@npmcli/name-from-folder-1.0.1" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/package-json-1.0.1" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@sindresorhus/is-0.7.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-1.1.2" - sources."@types/cacheable-request-6.0.3" - sources."@types/expect-1.20.4" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.4" - sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.9" - sources."@types/normalize-package-data-2.4.1" - sources."@types/responselike-1.0.0" - sources."@types/vinyl-2.0.7" - sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - (sources."agent-base-6.0.2" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - sources."ansi-0.3.1" - sources."ansi-align-3.0.1" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - sources."are-we-there-yet-1.1.7" - (sources."argparse-1.0.10" // { - dependencies = [ - sources."sprintf-js-1.0.3" - ]; - }) - sources."array-differ-3.0.0" - sources."array-find-index-1.0.2" - sources."array-union-2.1.0" - sources."arrify-2.0.1" - sources."asap-2.0.6" - sources."async-3.2.4" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - (sources."bin-links-3.0.3" // { - dependencies = [ - sources."npm-normalize-package-bin-2.0.0" - sources."write-file-atomic-4.0.2" - ]; - }) - sources."bin-version-3.1.0" - (sources."bin-version-check-4.0.0" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."binaryextensions-4.18.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."boolean-3.2.0" - (sources."boxen-5.1.2" // { - dependencies = [ - sources."camelcase-6.3.0" - sources."type-fest-0.20.2" - sources."wrap-ansi-7.0.0" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."builtins-1.0.3" - (sources."cacache-15.3.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - sources."mkdirp-1.0.4" - ]; - }) - sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-2.1.4" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."lowercase-keys-1.0.0" - ]; - }) - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."capture-stack-trace-1.0.2" - sources."chalk-4.1.2" - sources."char-regex-1.0.2" - sources."chardet-0.7.0" - sources."chownr-2.0.0" - sources."ci-info-2.0.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.1" - sources."cli-cursor-3.1.0" - sources."cli-list-0.2.0" - sources."cli-spinners-2.9.0" - sources."cli-table-0.3.11" - sources."cli-width-3.0.0" - sources."clone-1.0.4" - sources."clone-buffer-1.0.0" - sources."clone-regexp-1.0.1" - sources."clone-response-1.0.2" - sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.3" - sources."cmd-shim-5.0.0" - sources."code-point-at-1.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."colors-1.0.3" - sources."commander-7.1.0" - sources."common-ancestor-path-1.0.1" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."config-chain-1.1.13" - sources."configstore-5.0.1" - sources."console-control-strings-1.1.0" - sources."core-js-3.32.0" - sources."core-util-is-1.0.3" - sources."create-error-class-3.0.2" - sources."cross-spawn-7.0.3" - sources."crypto-random-string-2.0.0" - sources."currently-unhandled-0.4.1" - sources."dateformat-4.6.3" - sources."debug-2.6.9" - sources."debuglog-1.0.1" - sources."decamelize-2.0.0" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."decamelize-1.2.0" - sources."map-obj-1.0.1" - ]; - }) - sources."decode-uri-component-0.2.2" - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" - sources."default-uid-1.0.0" - sources."defaults-1.0.4" - sources."defer-to-connect-1.1.3" - sources."define-lazy-prop-2.0.0" - sources."define-properties-1.2.0" - sources."delegates-1.0.0" - sources."detect-node-2.1.0" - sources."dezalgo-1.0.4" - sources."diff-5.1.0" - sources."dir-glob-3.0.1" - sources."dot-prop-5.3.0" - sources."downgrade-root-1.2.2" - sources."duplexer3-0.1.5" - sources."ejs-3.1.9" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."end-of-stream-1.4.4" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."error-10.4.0" - sources."error-ex-1.3.2" - sources."es6-error-4.1.1" - sources."escape-goat-2.1.1" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."event-target-shim-5.0.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - (sources."execa-1.0.0" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) - sources."execall-1.0.0" - sources."exit-hook-1.1.1" - sources."extend-3.0.2" - sources."external-editor-3.1.0" - sources."fast-glob-3.3.1" - sources."fastq-1.15.0" - sources."figures-3.2.0" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."fill-range-7.0.1" - sources."filter-obj-2.0.2" - sources."find-up-2.1.0" - sources."find-versions-3.2.0" - sources."find-yarn-workspace-root2-1.2.16" - sources."first-chunk-stream-2.0.0" - sources."foreachasync-3.0.0" - sources."from2-2.3.0" - sources."fs-minipass-2.1.0" - sources."fs.realpath-1.0.0" - sources."fullname-4.0.1" - sources."function-bind-1.1.1" - sources."gauge-1.2.7" - sources."get-intrinsic-1.2.1" - sources."get-stdin-4.0.1" - sources."get-stream-4.1.0" - (sources."glob-8.1.0" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."glob-parent-5.1.2" - (sources."global-agent-3.0.0" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - (sources."global-dirs-3.0.1" // { - dependencies = [ - sources."ini-2.0.0" - ]; - }) - sources."global-tunnel-ng-2.7.1" - sources."globalthis-1.0.3" - sources."globby-11.1.0" - (sources."got-8.3.2" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."p-cancelable-0.4.1" - ]; - }) - sources."graceful-fs-4.2.11" - sources."grouped-queue-2.0.0" - sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.3" - sources."has-to-string-tag-x-1.4.1" - sources."has-unicode-2.0.1" - sources."has-yarn-2.1.0" - sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-3.8.1" - (sources."http-proxy-agent-4.0.1" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - (sources."http2-wrapper-1.0.3" // { - dependencies = [ - sources."quick-lru-5.1.1" - ]; - }) - (sources."https-proxy-agent-5.0.1" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."human-signals-2.1.0" - sources."humanize-ms-1.2.1" - sources."humanize-string-2.1.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - (sources."ignore-walk-4.0.1" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."inquirer-8.2.6" - (sources."into-stream-3.1.0" // { - dependencies = [ - sources."p-is-promise-1.1.0" - ]; - }) - sources."ip-2.0.0" - sources."is-arrayish-0.2.1" - sources."is-ci-2.0.0" - sources."is-core-module-2.13.0" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-interactive-1.0.0" - sources."is-lambda-1.0.1" - sources."is-npm-5.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-object-1.0.2" - sources."is-path-inside-3.0.3" - sources."is-plain-obj-1.1.0" - sources."is-redirect-1.0.0" - sources."is-regexp-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-root-1.0.0" - sources."is-scoped-2.1.0" - sources."is-stream-1.1.0" - sources."is-supported-regexp-flag-1.0.1" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."is-utf8-0.2.1" - sources."is-wsl-2.2.0" - sources."is-yarn-global-0.3.0" - sources."isarray-1.0.0" - sources."isbinaryfile-5.0.0" - sources."isexe-2.0.0" - sources."isurl-1.0.0" - (sources."jake-10.8.7" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-stringify-nice-1.1.4" - sources."json-stringify-safe-5.0.1" - sources."jsonparse-1.3.1" - sources."just-diff-5.2.0" - sources."just-diff-apply-5.5.0" - sources."keyv-3.0.0" - (sources."latest-version-5.1.0" // { - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."cacheable-request-6.1.0" - sources."get-stream-5.2.0" - sources."got-9.6.0" - sources."http-cache-semantics-4.1.1" - sources."lowercase-keys-2.0.0" - sources."normalize-url-4.5.1" - sources."p-cancelable-1.1.0" - sources."package-json-6.5.0" - ]; - }) - sources."lines-and-columns-1.2.4" - (sources."load-json-file-4.0.0" // { - dependencies = [ - sources."strip-bom-3.0.0" - ]; - }) - (sources."load-yaml-file-0.2.0" // { - dependencies = [ - sources."pify-4.0.1" - sources."strip-bom-3.0.0" - ]; - }) - sources."locate-path-2.0.0" - sources."locutus-2.0.16" - sources."lodash-4.17.21" - sources."lodash.pad-4.5.1" - sources."lodash.padend-4.6.1" - sources."lodash.padstart-4.6.1" - sources."log-symbols-4.1.0" - sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - sources."make-dir-3.1.0" - (sources."make-fetch-happen-9.1.0" // { - dependencies = [ - sources."http-cache-semantics-4.1.1" - ]; - }) - sources."map-age-cleaner-0.1.3" - sources."map-obj-2.0.0" - (sources."matcher-3.0.0" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) - sources."mem-5.1.1" - sources."mem-fs-2.3.0" - sources."mem-fs-editor-9.7.0" - (sources."meow-5.0.0" // { - dependencies = [ - sources."read-pkg-up-3.0.0" - ]; - }) - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" - sources."minimatch-7.4.6" - sources."minimist-1.2.8" - (sources."minimist-options-3.0.2" // { - dependencies = [ - sources."arrify-1.0.1" - ]; - }) - sources."minipass-3.3.6" - sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" - sources."minipass-flush-1.0.5" - sources."minipass-json-stream-1.0.1" - sources."minipass-pipeline-1.2.4" - sources."minipass-sized-1.0.3" - sources."minizlib-2.1.2" - sources."mkdirp-0.5.6" - (sources."mkdirp-infer-owner-2.0.0" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) - sources."ms-2.0.0" - (sources."multimatch-5.0.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."mute-stream-0.0.8" - sources."negotiator-0.6.3" - sources."nice-try-1.0.5" - (sources."node-gyp-8.4.1" // { - dependencies = [ - sources."are-we-there-yet-3.0.1" - sources."brace-expansion-1.1.11" - sources."gauge-4.0.4" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - sources."npmlog-6.0.2" - sources."readable-stream-3.6.2" - sources."semver-7.5.4" - ]; - }) - sources."nopt-5.0.0" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."normalize-path-3.0.0" - sources."normalize-url-2.0.1" - sources."npm-bundled-1.1.2" - sources."npm-conf-1.1.3" - (sources."npm-install-checks-4.0.0" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - (sources."npm-keyword-6.1.0" // { - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."cacheable-request-6.1.0" - sources."get-stream-5.2.0" - sources."got-9.6.0" - sources."http-cache-semantics-4.1.1" - sources."lowercase-keys-2.0.0" - sources."normalize-url-4.5.1" - sources."p-cancelable-1.1.0" - ]; - }) - sources."npm-normalize-package-bin-1.0.1" - (sources."npm-package-arg-8.1.5" // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."semver-7.5.4" - ]; - }) - (sources."npm-packlist-3.0.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - (sources."npm-pick-manifest-6.1.1" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@npmcli/move-file-2.0.1" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."debug-4.3.4" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.2" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - (sources."npm-run-path-2.0.2" // { - dependencies = [ - sources."path-key-2.0.1" - ]; - }) - sources."npmlog-2.0.4" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."object-keys-1.1.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.2" - sources."ora-5.4.1" - sources."os-homedir-1.0.2" - sources."os-shim-0.1.3" - sources."os-tmpdir-1.0.2" - sources."p-any-2.1.0" - sources."p-cancelable-2.1.1" - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-map-4.0.0" - (sources."p-queue-6.6.2" // { - dependencies = [ - sources."p-timeout-3.2.0" - ]; - }) - sources."p-some-4.1.0" - sources."p-timeout-2.0.1" - (sources."p-transform-1.3.0" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."p-try-1.0.0" - (sources."package-json-7.0.0" // { - dependencies = [ - sources."@sindresorhus/is-4.6.0" - sources."@szmarczak/http-timer-4.0.6" - sources."cacheable-request-7.0.4" - sources."decompress-response-6.0.0" - sources."defer-to-connect-2.0.1" - sources."get-stream-5.2.0" - sources."got-11.8.6" - sources."http-cache-semantics-4.1.1" - sources."json-buffer-3.0.1" - sources."keyv-4.5.3" - sources."lowercase-keys-2.0.0" - sources."mimic-response-3.1.0" - sources."normalize-url-6.1.0" - sources."responselike-2.0.1" - sources."semver-7.5.4" - ]; - }) - (sources."pacote-12.0.3" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) - sources."pad-component-0.0.1" - sources."parse-conflict-json-2.0.2" - sources."parse-help-1.0.0" - sources."parse-json-4.0.0" - sources."passwd-user-3.0.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - (sources."pkg-dir-4.2.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - ]; - }) - (sources."preferred-pm-3.0.3" // { - dependencies = [ - sources."find-up-5.0.0" - 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."prepend-http-2.0.0" - sources."pretty-bytes-5.6.0" - sources."proc-log-1.0.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."promise-all-reject-late-1.0.1" - sources."promise-call-limit-1.0.2" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."proto-list-1.2.4" - sources."pump-3.0.0" - sources."pupa-2.1.1" - sources."query-string-5.1.1" - sources."queue-microtask-1.2.3" - sources."quick-lru-1.1.0" - sources."rc-1.2.8" - sources."read-cmd-shim-3.0.1" - sources."read-package-json-fast-2.0.3" - (sources."read-pkg-3.0.0" // { - dependencies = [ - sources."path-type-3.0.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."type-fest-0.6.0" - ]; - }) - sources."type-fest-0.8.1" - ]; - }) - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."readdir-scoped-modules-1.1.0" - (sources."redent-2.0.0" // { - dependencies = [ - sources."indent-string-3.2.0" - ]; - }) - sources."regenerator-runtime-0.14.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.1" - sources."resolve-1.22.4" - sources."resolve-alpn-1.2.1" - sources."responselike-1.0.2" - sources."restore-cursor-3.1.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - (sources."rimraf-3.0.2" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - sources."roarr-2.15.4" - sources."root-check-1.0.0" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rx-4.1.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."scoped-regex-2.1.0" - sources."semver-6.3.1" - sources."semver-compare-1.0.0" - sources."semver-diff-3.1.1" - sources."semver-regex-2.0.0" - (sources."semver-truncate-1.1.2" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - (sources."serialize-error-7.0.1" // { - dependencies = [ - sources."type-fest-0.13.1" - ]; - }) - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - (sources."socks-proxy-agent-6.2.1" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."sort-keys-2.0.0" - sources."sort-on-4.1.1" - sources."spawn-sync-1.0.15" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - sources."sprintf-js-1.1.2" - sources."ssri-8.0.1" - sources."strict-uri-encode-1.1.0" - sources."string-length-4.0.2" - sources."string-width-4.2.3" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-bom-2.0.0" - sources."strip-bom-buf-1.0.0" - sources."strip-bom-stream-2.0.0" - sources."strip-eof-1.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-indent-2.0.0" - sources."strip-json-comments-2.0.1" - (sources."sudo-block-1.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."is-docker-1.1.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tabtab-1.3.2" // { - dependencies = [ - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."cli-cursor-1.0.2" - sources."cli-width-2.2.1" - sources."external-editor-1.1.1" - sources."figures-1.7.0" - sources."inquirer-1.2.3" - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.6" - sources."onetime-1.1.0" - sources."restore-cursor-1.0.1" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."tmp-0.0.29" - ]; - }) - sources."taketalk-1.0.0" - (sources."tar-6.1.15" // { - dependencies = [ - sources."minipass-5.0.0" - sources."mkdirp-1.0.4" - ]; - }) - sources."text-table-0.2.0" - sources."textextensions-5.16.0" - sources."through-2.3.8" - sources."timed-out-4.0.1" - sources."titleize-2.1.0" - sources."tmp-0.0.33" - sources."to-readable-stream-1.0.0" - sources."to-regex-range-5.0.1" - sources."treeverse-1.0.4" - sources."trim-newlines-2.0.0" - sources."tslib-2.6.1" - sources."tunnel-0.0.6" - (sources."twig-1.16.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.0.8" - ]; - }) - sources."type-fest-0.3.1" - sources."typedarray-0.0.6" - sources."typedarray-to-buffer-3.1.5" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."unique-string-2.0.0" - sources."untildify-4.0.0" - sources."unzip-response-2.0.1" - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" - sources."user-home-2.0.0" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-3.0.0" - (sources."vinyl-2.2.1" // { - dependencies = [ - sources."clone-2.1.2" - ]; - }) - (sources."vinyl-file-3.0.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."walk-2.3.15" - sources."walk-up-path-1.0.0" - sources."wcwidth-1.0.1" - sources."which-2.0.2" - (sources."which-pm-2.0.0" // { - dependencies = [ - sources."path-exists-4.0.0" - ]; - }) - sources."wide-align-1.1.5" - sources."widest-line-3.1.0" - sources."wrap-ansi-6.2.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" - sources."xregexp-4.0.0" - sources."yallist-4.0.0" - sources."yargs-parser-10.1.0" - (sources."yeoman-character-1.1.0" // { - dependencies = [ - sources."has-flag-1.0.0" - sources."supports-color-3.2.3" - ]; - }) - (sources."yeoman-doctor-5.0.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."get-stream-3.0.0" - (sources."global-agent-2.2.0" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."got-6.7.1" - sources."has-flag-3.0.0" - sources."latest-version-3.1.0" - sources."log-symbols-2.2.0" - sources."package-json-4.0.1" - sources."prepend-http-1.0.4" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" - sources."semver-5.7.2" - sources."supports-color-5.5.0" - sources."url-parse-lax-1.0.0" - ]; - }) - (sources."yeoman-environment-3.19.3" // { - dependencies = [ - (sources."are-we-there-yet-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."brace-expansion-1.1.11" - sources."buffer-6.0.3" - sources."debug-4.3.4" - sources."escape-string-regexp-4.0.0" - sources."execa-5.1.1" - sources."find-up-5.0.0" - sources."gauge-3.0.2" - sources."get-stream-6.0.1" - sources."is-stream-2.0.1" - sources."isbinaryfile-4.0.10" - sources."locate-path-6.0.0" - sources."minimatch-3.1.2" - sources."ms-2.1.2" - sources."npm-run-path-4.0.1" - sources."npmlog-5.0.1" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - sources."readable-stream-4.4.2" - sources."semver-7.5.4" - sources."string_decoder-1.3.0" - ]; - }) - sources."yocto-queue-0.1.0" - (sources."yosay-2.0.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - ]; - }) - sources."cli-boxes-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CLI tool for running Yeoman generators"; - homepage = "http://yeoman.io"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@zwave-js/server" = nodeEnv.buildNodePackage { name = "_at_zwave-js_slash_server"; packageName = "@zwave-js/server"; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 578fd84db77c..9c5ea550abb1 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; rev = "refs/tags/v${version}"; - hash = "sha256-oWKCUARTMCiXDp4SCOOrOUQLUDU4DIzwsmUXCXoDvx0="; + hash = "sha256-QH/pC1WIa0XQaDbAhYwKbCeCyxUprJbNyRfguiLjlHI="; }; sourceRoot = "${src.name}/packages/basemap"; diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index aa8c9b2f0440..a60e80353599 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -1,22 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools +, poetry-core , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { - pname = "Cerberus"; - version = "1.3.4"; + pname = "cerberus"; + version = "1.3.5"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pyeve"; repo = "cerberus"; - rev = version; - sha256 = "03kj15cf1pbd11mxsik96m5w1m6p0fbdc4ia5ihzmq8rz28razpq"; + rev = "refs/tags/${version}"; + hash = "sha256-4sVNM4zHc9nsrntmJVdE9nm47CSF0UOJPPI9z3Z2YDc="; }; propagatedBuildInputs = [ + poetry-core setuptools ]; @@ -24,23 +30,20 @@ buildPythonPackage rec { pytestCheckHook ]; - preCheck = '' - export TESTDIR=$(mktemp -d) - cp -R ./cerberus/tests $TESTDIR - pushd $TESTDIR - ''; - - postCheck = '' - popd - ''; - pythonImportsCheck = [ "cerberus" ]; + disabledTestPaths = [ + # We don't care about benchmarks + "cerberus/benchmarks/" + ]; + meta = with lib; { + description = "Schema and data validation tool for Python dictionaries"; homepage = "http://python-cerberus.org/"; - description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; + changelog = "https://github.com/pyeve/cerberus/blob/${version}/CHANGES.rst"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/cert-chain-resolver/default.nix b/pkgs/development/python-modules/cert-chain-resolver/default.nix index cdd26163d2fd..b1cbde96ab38 100644 --- a/pkgs/development/python-modules/cert-chain-resolver/default.nix +++ b/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cert-chain-resolver"; - version = "1.0.1"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rkoopmans"; repo = "python-certificate-chain-resolver"; - rev = version; - hash = "sha256-NLTRx6J6pjs7lyschHN5KtgrnpQpEyvZ2zz0pSd5sc4="; + rev = "refs/tags/${version}"; + hash = "sha256-2itpu/Ap5GNnqAiw3Cp+8rndreWlwfPd+WwM99G7U2E="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolve / obtain the certificate intermediates of a x509 certificate"; homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver"; + changelog = "https://github.com/rkoopmans/python-certificate-chain-resolver/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ veehaitch ]; }; diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index 324bb21f4d51..641941e7f38d 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -1,69 +1,94 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder , asn1crypto +, buildPythonPackage , click -, oscrypto -, pyyaml -, python-dateutil -, tzlocal -, pytest-aiohttp -, pytz +, cryptography +, fetchFromGitHub , freezegun , jinja2 +, oscrypto , pyhanko-certvalidator +, pytest-aiohttp +, pytestCheckHook +, python-dateutil +, python-pkcs11 +, pythonOlder +, pytz +, pyyaml , requests , requests-mock +, setuptools +, tzlocal , werkzeug -, pytestCheckHook +, wheel }: buildPythonPackage rec { pname = "certomancer"; - version = "0.9.1"; - format = "setuptools"; + version = "0.11.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; - # Tests are only available on GitHub src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "certomancer"; - rev = version; - sha256 = "4v2e46ZrzhKXpMULj0vmDRoLOypi030eaADAYjLMg5M="; + rev = "refs/tags/v${version}"; + hash = "sha256-UQV0Tk4C5b5iBZ34Je59gK2dLTaJusnpxdyNicIh2Q8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ' "pytest-runner",' "" \ + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ asn1crypto click oscrypto - pyyaml python-dateutil + pyyaml tzlocal ]; - postPatch = '' - substituteInPlace setup.py --replace ", 'pytest-runner'" "" - ''; + passthru.optional-dependencies = { + requests-mocker = [ + requests-mock + ]; + web-api = [ + jinja2 + werkzeug + ]; + pkcs12 = [ + cryptography + ]; + pkcs11 = [ + python-pkcs11 + ]; + }; nativeCheckInputs = [ freezegun - jinja2 pyhanko-certvalidator pytest-aiohttp + pytestCheckHook pytz requests - requests-mock - werkzeug - pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = [ # pyhanko_certvalidator.errors.DisallowedAlgorithmError "test_validate" ]; - pythonImportsCheck = [ "certomancer" ]; + pythonImportsCheck = [ + "certomancer" + ]; meta = with lib; { description = "Quickly construct, mock & deploy PKI test configurations using simple declarative configuration"; diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 63304bc82114..02998caec37c 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -17,7 +17,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.3.0"; + version = "0.4.1"; in buildPythonPackage { @@ -30,7 +30,7 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-/bXpwSBFr1IM04GNEczzsnsjdFV4miUAzJkvrQjfIq4="; + hash = "sha256-JDkTSJi7QltKAdgkM+aJ33DP2emOAviyCqI/jeapUB8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 7b7c5f59ad95..c65d1b032f44 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.92.0"; + version = "1.93.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JlR2eoNOsZ/YE313fWAtoxJhlpMnUaDJcFpwA2b6p4c="; + hash = "sha256-+L9V9Uk5VRucp3r9zrywXzJOfY/9aeWMep6MTiwngVI="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index ad8de4b2d138..56d36ebdda56 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.142"; + version = "2.1.143"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+2WJEOL+rtdl9dZmXqkaRRuj7TzDZn93tyZXxPWRaBM="; + hash = "sha256-xyYD9oGrlK1kswQ7uiO3/gAJUnelvWv7ZHyzn/g5iCg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix index fc0ef714ce99..4a49c8160a25 100644 --- a/pkgs/development/python-modules/pyflume/default.nix +++ b/pkgs/development/python-modules/pyflume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyflume"; - version = "0.7.2"; + version = "0.8.3"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ChrisMandich"; repo = "PyFlume"; rev = "refs/tags/v${version}"; - hash = "sha256-wmaOOM8y7LthEgf3Uyv1N4ODviPGSlIQejC01IlhaJw="; + hash = "sha256-RtzbAXjMtvKc8vnZIxIJnc6CS+BrYcQgdy5bVaJumg0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 9509f82494ca..5018f8f924a5 100644 --- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -1,34 +1,38 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder , aiohttp , asn1crypto +, buildPythonPackage , cryptography +, fetchFromGitHub , freezegun -, oscrypto -, requests -, uritools , openssl +, oscrypto , pytest-asyncio , pytestCheckHook +, pythonOlder +, requests +, setuptools +, uritools }: buildPythonPackage rec { pname = "pyhanko-certvalidator"; - version = "0.20.1"; - format = "setuptools"; + version = "0.23.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - # Tests are only available on GitHub src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "certvalidator"; - rev = version; - hash = "sha256-0RSveoSZb7R6d4cMlF1mIrDfnTx2DYNwfTMMtmg+RpM="; + rev = "refs/tags/v${version}"; + hash = "sha256-q2YxncyMHmbRmcoLb68huK02CYiKqF2CFRl8vkUfxg4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ asn1crypto cryptography @@ -71,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for validating X.509 certificates and paths"; homepage = "https://github.com/MatthiasValvekens/certvalidator"; + changelog = "https://github.com/MatthiasValvekens/certvalidator/blob/v${version}/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; }; diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index a7f6d4aaf7e9..8db7aef6d192 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -1,49 +1,58 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder +, aiohttp , asn1crypto +, buildPythonPackage +, certomancer , click , cryptography +, defusedxml +, fetchFromGitHub +, fonttools +, freezegun +, oscrypto +, pillow , pyhanko-certvalidator +, pytest-aiohttp +, pytestCheckHook +, python-barcode +, python-pae +, python-pkcs11 +, pythonOlder , pytz , pyyaml , qrcode , requests -, tzlocal -, certomancer -, freezegun -, python-pae -, pytest-aiohttp , requests-mock -, pytestCheckHook - -# optionals -, defusedxml -, oscrypto -, fonttools +, setuptools +, tzlocal , uharfbuzz -, pillow -, python-barcode -, python-pkcs11 -, aiohttp +, wheel }: buildPythonPackage rec { pname = "pyhanko"; - version = "0.17.0"; - format = "setuptools"; + version = "0.20.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - # Tests are only available on GitHub src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "pyHanko"; - rev = "refs/tags/${version}"; - hash = "sha256-tvb2zdmIN6MkezmLNkyCcP8EfqxrbPg/FEqgW16Ka6Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-mWhkTVhq3bDkOlhUZIBBqwXUuQCXcFHW1haGOGMywzg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ' "pytest-runner",' "" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ asn1crypto click @@ -57,7 +66,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - extra_pubkey_algs = [ + extra-pubkey-algs = [ oscrypto ]; xmp = [ @@ -74,16 +83,11 @@ buildPythonPackage rec { pkcs11 = [ python-pkcs11 ]; - async_http = [ + async-http = [ aiohttp ]; }; - postPatch = '' - substituteInPlace setup.py \ - --replace ", 'pytest-runner'" "" \ - ''; - nativeCheckInputs = [ aiohttp certomancer @@ -132,6 +136,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sign and stamp PDF files"; homepage = "https://github.com/MatthiasValvekens/pyHanko"; + changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/v${version}/docs/changelog.rst"; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; }; diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 583a17c0704a..709271d0905f 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.4"; + version = "2.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d9t/zO1ROCndS+5kiFVyDbs+96z7GMHaH6T82b8hl40="; + hash = "sha256-2w1D0380ljgRa5NSPAUlUPFTmGzjl79hyLwirmuHmGo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 1186cac19213..4610e71876e6 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.19.3"; + version = "1.19.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xaLpSHRtpv5QToQEKE9FfY6Y2m31BHxrs/cbGIgunSo="; + hash = "sha256-KTXVS0gtGby1Rla9oBy77J7kH/1C0jWlJwX9lcq3D9c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index fb5fd4c88451..98e7cf7e9a85 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Lh+3ZpOAhOQjSLoJTaLY5706I3tKy7pqQE6M1cRCYrw="; + hash = "sha256-ZxZIv69HooX6SUIdrtAuhOEVPN7E+E/AZ138XmzIYIE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index ca5010accdeb..20abdd01828a 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.2"; + version = "2.4.5"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PbgNTYrA1fWot+sLgoT9yUa0IImHwyQPSo267w16YmU="; + hash = "sha256-hx2aDFIYf+9GplioNs446P654KOvsWO/wOiBmjEbeS4="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 119ceb0ee978..a7092f3c1f9a 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.18.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-fN86wdKe3KWRkVxRK/4L4Gcf8auelAi2e+erANLCCmA="; + sha256 = "sha256-YiKULnLSP5wgrYob1t4HssGS9ubSR5dHECIwnAicg8M="; }; - vendorHash = "sha256-3Gjo5i3tLXZNUNdp+CKX5hPxVupH5juUIKzndN2AaBU="; + vendorHash = "sha256-3GPe76zcyKItYWedmnAnmN4c1AorQePxxWXkRk0vNpk="; tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index eff472c69aa1..e50ade55d9b8 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.2.1"; + version = "16.3.0"; in buildGoModule rec { inherit version; @@ -17,19 +17,18 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-Rzy4R4QR+rPqzhjZlqcuiP3DDLOu9Z2fb42WPaSPR/4="; + vendorHash = "sha256-tMhzq9ygUmNi9+mlI9Gvr2nDyG9HQbs8PVusSgadZIE="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-GMvBZ3H29F4XyisAt3J4VWRwaEIF7ZQ/tI0gKbDTS/E="; + sha256 = "sha256-YAnHOIpUN1OuNefjCIccZOLwPNMxVBuCRQgX0Tb5bos="; }; patches = [ ./fix-shell-path.patch ./remove-bash-test.patch - ./fix-invalid-host-header.patch # see https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4249 ]; prePatch = '' diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-invalid-host-header.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-invalid-host-header.patch deleted file mode 100644 index 291e94378a9a..000000000000 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-invalid-host-header.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0087ed1e060cab8341f20a4342c0f750d5bb328b Mon Sep 17 00:00:00 2001 -From: Michael Adler -Date: Fri, 18 Aug 2023 14:42:49 +0200 -Subject: [PATCH] Backport fix for invalid Host header - ---- - go.mod | 4 ++-- - go.sum | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/go.mod b/go.mod -index d93029df7..23e8fd707 100644 ---- a/go.mod -+++ b/go.mod -@@ -15,12 +15,12 @@ require ( - github.com/bmatcuk/doublestar/v4 v4.4.0 - github.com/creack/pty v1.1.17 - github.com/denisbrodbeck/machineid v1.0.1 -- github.com/docker/cli v23.0.1+incompatible -+ github.com/docker/cli v24.0.5+incompatible - github.com/docker/distribution v2.8.2+incompatible - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0 - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 - github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.11.0 -- github.com/docker/docker v23.0.6+incompatible -+ github.com/docker/docker v24.0.5+incompatible - github.com/docker/go-connections v0.4.0 - github.com/docker/go-units v0.5.0 - github.com/docker/machine v0.7.1-0.20170120224952-7b7a141da844 -diff --git a/go.sum b/go.sum -index fba5228da..0a9d36bef 100644 ---- a/go.sum -+++ b/go.sum -@@ -497,8 +497,8 @@ github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/ - github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= - github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= - github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= --github.com/docker/cli v23.0.1+incompatible h1:LRyWITpGzl2C9e9uGxzisptnxAn1zfZKXy13Ul2Q5oM= --github.com/docker/cli v23.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -+github.com/docker/cli v24.0.5+incompatible h1:WeBimjvS0eKdH4Ygx+ihVq1Q++xg36M/rMi4aXAvodc= -+github.com/docker/cli v24.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= - github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= - github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= - github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -@@ -507,8 +507,8 @@ github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc - github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= - github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= - github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= --github.com/docker/docker v23.0.6+incompatible h1:aBD4np894vatVX99UTx/GyOUOK4uEcROwA3+bQhEcoU= --github.com/docker/docker v23.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -+github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= -+github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= - github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= - github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= - github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= --- -2.41.0 - diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix new file mode 100644 index 000000000000..3f8f8b26167a --- /dev/null +++ b/pkgs/development/tools/misc/pest-ide-tools/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, nix-update-script +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "pest-ide-tools"; + version = "0.3.3"; + cargoSha256 = "sha256-TXsRGkhswxxLCPOk1qMTvDjs4de1sClRJMr/0o6u4Pg="; + + src = fetchFromGitHub { + owner = "pest-parser"; + repo = "pest-ide-tools"; + rev = "v${version}"; + sha256 = "sha256-XAdQQFU8ZF0zarqCB6WlhpZVNqNyX6e4np4Wjalhobo="; + }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "IDE support for Pest, via the LSP."; + homepage = "https://pest.rs"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ nickhu ]; + mainProgram = "pest-language-server"; + }; +} diff --git a/pkgs/development/tools/tokio-console/cargo-lock.patch b/pkgs/development/tools/tokio-console/cargo-lock.patch new file mode 100644 index 000000000000..224a4acc082b --- /dev/null +++ b/pkgs/development/tools/tokio-console/cargo-lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index fcbe50c..27d4c30 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1390,7 +1390,7 @@ dependencies = [ + + [[package]] + name = "tokio-console" +-version = "0.1.8" ++version = "0.1.9" + dependencies = [ + "atty", + "clap", diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix index 8c9b2803a0ae..558934fd15ff 100644 --- a/pkgs/development/tools/tokio-console/default.nix +++ b/pkgs/development/tools/tokio-console/default.nix @@ -6,19 +6,21 @@ rustPlatform.buildRustPackage rec { pname = "tokio-console"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "tokio-rs"; repo = "console"; rev = "tokio-console-v${version}"; - sha256 = "sha256-yTNLKpBkzzN0X73CjN/UXRGjAGOnCCgJa6A6loA6baM="; + hash = "sha256-zISgEhUmAfHErq4AelbnSwtKjtxYH//pbLUAlPKxQYk="; }; - cargoSha256 = "sha256-K/auhqlL/K6RYE0lHyvSUqK1cOwJBBZD3QTUevZzLXQ="; + cargoHash = "sha256-qK8U6BZN7sdBP8CbzsDeewsGulNA/KFVS9vscBxysRg="; nativeBuildInputs = [ protobuf ]; + cargoPatches = [ ./cargo-lock.patch ]; + # uses currently unstable tokio features RUSTFLAGS = "--cfg tokio_unstable"; @@ -32,6 +34,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A debugger for asynchronous Rust code"; homepage = "https://github.com/tokio-rs/console"; + mainProgram = "tokio-console"; license = with licenses; [ mit ]; maintainers = with maintainers; [ max-niederman ]; }; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index d931775dc582..877b0c824728 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.6"; + version = "1.16.8"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-ZpOIKruxv22e/kMUfU8hY7jJjCadLSo7UEGn+Akx13c="; + hash = "sha256-JEXc/yR7QbqaKGHrmc/1ZwFVL0NqAAb5JDhidS0p1Ik="; }; - cargoHash = "sha256-OlblTYN1gG/Lt+ZKB7kEQsxX1WnfC1zuT/nfOVG6eqU="; + cargoHash = "sha256-f6BvUc5YVSRZUWEtwUMBnvXwKNFiYbcGzvlplma7Mj4="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix new file mode 100644 index 000000000000..acadcd94b57f --- /dev/null +++ b/pkgs/development/tools/web-ext/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "web-ext"; + version = "7.6.2"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "web-ext"; + rev = version; + hash = "sha256-tFMngcoHFA3QmR0AK68elUVpli37PsVlcL978o7DQCs="; + }; + + npmDepsHash = "sha256-KPBKUjCxva11w/E+Qhlx+1vikpCL7Hr9MiKenYHEVSU="; + + meta = { + description = "A command line tool to help build, run, and test web extensions"; + homepage = "https://github.com/mozilla/web-ext"; + license = lib.licenses.mpl20; + mainProgram = "web-ext"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/tools/yo/default.nix b/pkgs/development/tools/yo/default.nix new file mode 100644 index 000000000000..325939a7609b --- /dev/null +++ b/pkgs/development/tools/yo/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "yo"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "yeoman"; + repo = "yo"; + rev = "v${version}"; + hash = "sha256-vnvcg3hvAYcqS11enBEHtpTwTOy4puY5i/6zPOHCywo="; + }; + + npmDepsHash = "sha256-QkEPaepvI6NfEEmqnVA4Xx/tByn6goyGWVpoJNMigd8="; + + dontNpmBuild = true; + + meta = { + description = "CLI tool for running Yeoman generators"; + homepage = "https://github.com/yeoman/yo"; + license = lib.licenses.bsd2; + mainProgram = "yo"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index f68ec501185c..e5f99033b5d4 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -17,20 +17,23 @@ in }) ]; - tests.netbox = nixosTests.netbox_3_3; + tests = { + netbox = nixosTests.netbox_3_3; + inherit (nixosTests) netbox-upgrade; + }; maintainers = with lib.maintainers; [ n0emis raitobezarius ]; eol = true; }; netbox = callPackage generic { - version = "3.5.6"; - hash = "sha256-n5EJQcC5uVoL5KjGzF7bLF8c4Wke/YBJpx2V9KZz5Qo="; + version = "3.5.7"; + hash = "sha256-R5P4FOhn7rE6e9H9U3JlE3ms4Svv6ps4c3+ZjE1KwNM="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch ]; tests = { - inherit (nixosTests) netbox; + inherit (nixosTests) netbox netbox-upgrade; }; maintainers = with lib.maintainers; [ minijackson n0emis raitobezarius ]; diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 01167b4d007a..9ce0eda43cce 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -43,23 +43,15 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.23"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-zS25XeNtBN7QIi+Re/p1uLoH/Q4xKAsFrEmgk2LYRu8="; + hash = "sha256-tnYyHhldPmMZcygpcOcbaYFQbRQjPr/FlvyYfRylTmQ="; }; - patches = [ - # Fix compatiblity with fmt 10.0. Remove with the next release - (fetchpatch { - url = "https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch"; - hash = "sha256-Z4Sqdyp/doJPTB+hEUrG9vncUP29L/b0yJ/u5ldpnds="; - }) - ]; - prePatch = '' ln -s ${enDict} src/modules/spell/$(stripHash ${enDict}) ''; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index eefedd6a8455..1fca5fdc77f9 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-anthy"; - version = "5.0.14"; + version = "5.1.0"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.xz"; - sha256 = "sha256-CodNcN9O8i8euGjCfq9m4zVOFgnbje05JUT49rxUp7c="; + sha256 = "sha256-tyWxNhCreJaAc+IUH85iayo8OALcY0ytFc7Aa8Ye80M="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index b4109e846783..4facccf49fbb 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.0.14"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-zfaq5pkHcB12iFvXWvvzmX9mpcXAZSri9lVlzfePLAQ="; + sha256 = "sha256-Zjwt7JHwCfXlY46qRTXSmXI69fANZNI7DY1ixpMEqPM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 780fb60aa3c4..8077a48dcfd8 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.17"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Licj/sZ2rZablsk/ytCZlkdjSHszr31JURrQkXs1BXE="; + sha256 = "sha256-Z5X/yKxj8jX/einrebkP6rSCSrKvaQ7vOlbmT1IKXfY="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index bd98019cf203..b2b6716a3b66 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.17"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-nYHrJBcbaYxZ61OEFfnwTTsZFEBtDJkR0kuYPyTcjio="; + sha256 = "sha256-kjoAcoqLJ8XHMI6NUr5DZfltWfX3GPco3VGseze6qbw="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 299dd0e1385d..0dfa9f822a29 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.23"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-RMi2D9uqGmvyDIB7eRbr52aahCJ5u21jCyZ9hbCDdKY="; + sha256 = "sha256-xVBmFFUnlWqviht/KGFTHCd3xCln/6hyBG72tIHqopc="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 18facb5fb31a..84d9c398cdda 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.0.11"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-VA9LDGMJRJDDCxIsx7wpDgdc2V9cuWlydAq5yiIvpxA="; + sha256 = "sha256-3cJLF80oAqGSJvPPyKcHxaWysA9RtWYGgptailYd4dk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index 3c4bd06cb96f..19336e58d1dd 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.0.11"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-MCSJGZGpnOcZ9ZHlUDOPrbfo61HRM4s2xuj8zblyW/8="; + sha256 = "sha256-qo3tS0tjQCD7+CoNvjyvhQPAfa38o7/f/MjqRkIL2R0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 24019041eb19..7d627772d970 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.17"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Pi5Xb7H/h89OcTzYX7X3Xw8FQIczkWd6rMrbwnHr/L4="; + sha256 = "sha256-LWOELt1uo5TtM85ppxt6MK7fvUuocHkWXYjUE1yyOV4="; }; preConfigure = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 4249567635cf..665c76561454 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -1,5 +1,6 @@ -{ lib, stdenv -, fetchFromGitHub +{ lib +, stdenv +, fetchurl , pkg-config , cmake , extra-cmake-modules @@ -13,13 +14,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.16"; + version = "5.1.1"; - src = fetchFromGitHub { - owner = "fcitx"; - repo = pname; - rev = version; - sha256 = "sha256-YAunuxdMlv1KOj2/xXstb/Uhm97G9D9rxb35AbNgMaE="; + src = fetchurl { + url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-qo0m/asTranm70PHPLwWCn/jX+FWNEGRKBRNNW+B28A="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 42ffa524a420..6a424c0ef86d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-skk"; - version = "5.0.15"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-y5GciWJMEFQM8SsqYANXe/SdVq6GEqsfF1yrKKhw0KA="; + sha256 = "sha256-N69OyGzJGO27tsR1g06d0EILsX2mpbW/tIgeSLc06OU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 1c3a15d85b7f..38026c0de9f7 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.13"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-/YIZMSCKJlnPL+pmUWfVf8tINKjXKkGAK7rWQ98RRjQ="; + sha256 = "sha256-os2C/6r9hz/3MEAny8Klc01cRGIiKD39rdu56kQDCnQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index 061c14065594..b0129a923438 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.11"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Km0c6so+Ed/lbK9t54stWjlkK70aEcf7EbQm7msPDKM="; + sha256 = "sha256-ymHAKaPmQckxM/XHoDOVSzEWpyQGb7zVG21CDwNfyjg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 1f14fb2eeb47..61f12faf5e64 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.0.13"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "sha256-UpCXcgVUGe5/yunLqRNx2H2aLOnD1wJNA8y3q8R4+sY="; + sha256 = "sha256-X00/jGtbApWtS9+S6lTXJ0+BK7SUsLA1sKxq0vW1VNE="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/tools/inputmethods/fcitx5/update.py index 6c745ef7dbec..8fa59d2926e2 100755 --- a/pkgs/tools/inputmethods/fcitx5/update.py +++ b/pkgs/tools/inputmethods/fcitx5/update.py @@ -1,7 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i python3 -p nix-update python3Packages.requests -from nix_prefetch_github import * import requests import subprocess diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 722f81cb751c..eb914227c47a 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -1,11 +1,11 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , chafa , cmake , dbus , dconf +, ddcutil , glib , imagemagick_light , libglvnd @@ -42,23 +42,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-mXbkzPlX1OsK+ahUSJWktV5D7Mo2zkhXgXP54QjbIR4="; + hash = "sha256-7Sk2Fd9u5c1XLTd9vl32TpD10M1JeB9V05yF/dF+Sfk="; }; - patches = [ - # Don't fetch yyjson. - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch"; - hash = "sha256-mOykwXSuad8BrUBmjX39EmQb0/hnKezgmWe8cpAybsw="; - }) - ]; - nativeBuildInputs = [ cmake makeBinaryWrapper @@ -74,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.isLinux [ dbus dconf + ddcutil glib libglvnd libpulseaudio @@ -105,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" + "-DENABLE_SYSTEM_YYJSON=YES" ]; postInstall = '' @@ -127,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Like neofetch, but much faster because written in C"; homepage = "https://github.com/fastfetch-cli/fastfetch"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gerg-l khaneliman ]; + maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ]; platforms = lib.platforms.all; mainProgram = "fastfetch"; }; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 4ec5052503ea..81610e41cef8 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "5.1.1"; + version = "5.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubikey-manager"; rev = version; - hash = "sha256-rF1oOhlZP1EKiqErJ4L/otkoEvW0iA2P4g5MWCKrCO4="; + hash = "sha256-33Y2adUuGIDi5gdenkwZJKKKk2NtcHwLzxy1NXhBa9M="; }; postPatch = '' diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index b3493c3a3098..61249d354df1 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -1,24 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "govulncheck"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; - rev = "v${version}"; - sha256 = "sha256-cewQ03dK/k3mXevE09M01Yox/3ZWP6IrG0H4QsZMzy8="; + rev = "refs/tags/v${version}"; + hash = "sha256-cewQ03dK/k3mXevE09M01Yox/3ZWP6IrG0H4QsZMzy8="; }; - vendorSha256 = "sha256-r9XshbgVA5rppJF46SFYPad344ZHMLWTHTnL6vbIFH8="; + vendorHash = "sha256-r9XshbgVA5rppJF46SFYPad344ZHMLWTHTnL6vbIFH8="; - subPackages = [ "cmd/govulncheck" ]; + subPackages = [ + "cmd/govulncheck" + ]; # Vendoring breaks tests doCheck = false; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { homepage = "https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck"; diff --git a/pkgs/tools/text/write-good/default.nix b/pkgs/tools/text/write-good/default.nix new file mode 100644 index 000000000000..db3e16c23deb --- /dev/null +++ b/pkgs/tools/text/write-good/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "write-good"; + version = "1.0.8"; + + src = fetchFromGitHub { + owner = "btford"; + repo = "write-good"; + rev = "v${version}"; + hash = "sha256-cq3cj2BwoQMKqo3iU2l+PR/2bJIFMSTRsDGQJ06GWXk="; + }; + + npmDepsHash = "sha256-0M9RzyeINmUPYcLy654iI+/ehElKrhIAibpiSqlXD2A="; + + dontNpmBuild = true; + + meta = { + description = "Naive linter for English prose"; + homepage = "https://github.com/btford/write-good"; + license = lib.licenses.mit; + mainProgram = "write-good"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d3ea778c3afb..2fa19974f1ee 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1823,6 +1823,7 @@ mapAliases ({ ### W ### wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21 + waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 wayfireApplications-unwrapped = throw '' 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 733e6a5bac46..75d0dcf0d4a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2458,6 +2458,8 @@ with pkgs; transcrypt = callPackage ../applications/version-management/transcrypt { }; + ungit = callPackage ../applications/version-management/ungit { }; + inherit (haskellPackages) git-annex; inherit (haskellPackages) git-brunch; @@ -4773,6 +4775,8 @@ with pkgs; cambalache = callPackage ../development/tools/cambalache { }; + cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { }; + changedetection-io = callPackage ../servers/web-apps/changedetection-io { }; clini = callPackage ../tools/misc/clini { }; @@ -14452,6 +14456,8 @@ with pkgs; wpscan = callPackage ../tools/security/wpscan { }; + write-good = callPackage ../tools/text/write-good { }; + wsmancli = callPackage ../tools/system/wsmancli { }; wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel; @@ -17255,6 +17261,8 @@ with pkgs; opensycl = darwin.apple_sdk_11_0.callPackage ../development/compilers/opensycl { }; opensyclWithRocm = opensycl.override { rocmSupport = true; }; + pest-ide-tools = callPackage ../development/tools/misc/pest-ide-tools { }; + ravedude = callPackage ../development/tools/rust/ravedude { }; ra-multiplex = callPackage ../development/tools/rust/ra-multiplex {}; @@ -20377,6 +20385,8 @@ with pkgs; watson-ruby = callPackage ../development/tools/misc/watson-ruby { }; + web-ext = callPackage ../development/tools/web-ext { }; + webdis = callPackage ../development/tools/database/webdis { }; xmake = callPackage ../development/tools/build-managers/xmake { @@ -20432,6 +20442,8 @@ with pkgs; python = python3; }; + yo = callPackage ../development/tools/yo { }; + yodl = callPackage ../development/tools/misc/yodl { }; yq = python3.pkgs.toPythonApplication python3.pkgs.yq; @@ -32667,10 +32679,6 @@ with pkgs; waybar = callPackage ../applications/misc/waybar { }; - waybar-hyprland = callPackage ../applications/misc/waybar { - hyprlandSupport = true; - }; - waycorner = callPackage ../applications/misc/waycorner { }; waylock = callPackage ../applications/misc/waylock { };