diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 3018ebf687..7dc14a61cb 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -97,9 +97,9 @@ /pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 # Perl -/pkgs/development/interpreters/perl @volth @stigtsp -/pkgs/top-level/perl-packages.nix @volth @stigtsp -/pkgs/development/perl-modules @volth @stigtsp +/pkgs/development/interpreters/perl @volth @stigtsp @zakame +/pkgs/top-level/perl-packages.nix @volth @stigtsp @zakame +/pkgs/development/perl-modules @volth @stigtsp @zakame # R /pkgs/applications/science/math/R @jbedo @bcdarwin diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 8174b36839..0f7e448b54 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -2096,6 +2096,16 @@ githubId = 25088352; name = "Christian Kögler"; }; + ckie = { + email = "nixpkgs-0efe364@ckie.dev"; + github = "ckiee"; + githubId = 2526321; + keys = [{ + longkeyid = "rsa4096/0x13E79449C0525215"; + fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; + }]; + name = "ckie"; + }; clkamp = { email = "c@lkamp.de"; github = "clkamp"; @@ -8326,6 +8336,17 @@ githubId = 127548; name = "Judson Lester"; }; + nzbr = { + email = "nixos@nzbr.de"; + github = "nzbr"; + githubId = 7851175; + name = "nzbr"; + matrix = "@nzbr:nzbr.de"; + keys = [{ + longkeyid = "rsa2048/0x6C78B50B97A42F8A"; + fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A"; + }]; + }; nzhang-zh = { email = "n.zhang.hp.au@gmail.com"; github = "nzhang-zh"; @@ -8688,6 +8709,12 @@ githubId = 13225611; name = "Nicolas Martin"; }; + pennae = { + name = "pennae"; + email = "github@quasiparticle.net"; + github = "pennae"; + githubId = 82953136; + }; p3psi = { name = "Elliot Boo"; email = "p3psi.boo@gmail.com"; @@ -9684,16 +9711,6 @@ githubId = 1312525; name = "Rongcui Dong"; }; - ronthecookie = { - name = "Ron B"; - email = "me@ronthecookie.me"; - github = "ronthecookie"; - githubId = 2526321; - keys = [{ - longkeyid = "rsa2048/0x6F5B32DE5E5FA80C"; - fingerprint = "4B2C DDA5 FA35 642D 956D 7294 6F5B 32DE 5E5F A80C"; - }]; - }; roosemberth = { email = "roosembert.palacios+nixpkgs@posteo.ch"; github = "roosemberth"; @@ -10389,6 +10406,12 @@ fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; }]; }; + sirseruju = { + email = "sir.seruju@yandex.ru"; + github = "sirseruju"; + githubId = 74881555; + name = "Fofanov Sergey"; + }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 700ad741c0..023f0f57a9 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -55,6 +55,11 @@ actions. + + + KDE Plasma now finally works on Wayland. + + bash now defaults to major version 5. @@ -1106,6 +1111,23 @@ Superuser created successfully. functionality. + + + services.xserver.displayManager.defaultSession = "plasma5" + does not work anymore, instead use either + "plasma" for the Plasma X11 + session or "plasmawayland" for + the Plasma Wayland sesison. + + + + + boot.kernelParams now only accepts one + command line parameter per string. This change is aimed to + reduce common mistakes like param = 12, which + would be parsed as 3 parameters. + +
@@ -1513,6 +1535,25 @@ Superuser created successfully. release notes for changes and upgrade instructions. + + + The systemd.network module has gained + support for the FooOverUDP link type. + + + + + The networking module has a new + networking.fooOverUDP option to configure + Foo-over-UDP encapsulations. + + + + + networking.sits now supports Foo-over-UDP + encapsulation. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index ab1e94d59f..658f3b59da 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -20,6 +20,8 @@ In addition to numerous new and upgraded packages, this release has the followin This allows activation scripts to output what they would change if the activation was really run. The users/modules activation script supports this and outputs some of is actions. +- KDE Plasma now finally works on Wayland. + - bash now defaults to major version 5. - Systemd was updated to version 249 (from 247). @@ -342,6 +344,9 @@ In addition to numerous new and upgraded packages, this release has the followin configuration file. For details, see the [upstream changelog](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst). - `opencv2` no longer includes the non-free libraries by default, and consequently `pfstools` no longer includes OpenCV support by default. Both packages now support an `enableUnfree` option to re-enable this functionality. +- `services.xserver.displayManager.defaultSession = "plasma5"` does not work anymore, instead use either `"plasma"` for the Plasma X11 session or `"plasmawayland"` for the Plasma Wayland sesison. + +- `boot.kernelParams` now only accepts one command line parameter per string. This change is aimed to reduce common mistakes like "param = 12", which would be parsed as 3 parameters. ## Other Notable Changes {#sec-release-21.11-notable-changes} @@ -438,3 +443,9 @@ In addition to numerous new and upgraded packages, this release has the followin - Three new options, [xdg.mime.addedAssociations](#opt-xdg.mime.addedAssociations), [xdg.mime.defaultApplications](#opt-xdg.mime.defaultApplications), and [xdg.mime.removedAssociations](#opt-xdg.mime.removedAssociations) have been added to the [xdg.mime](#opt-xdg.mime.enable) module to allow the configuration of `/etc/xdg/mimeapps.list`. - Kopia was upgraded from 0.8.x to 0.9.x. Please read the [upstream release notes](https://github.com/kopia/kopia/releases/tag/v0.9.0) for changes and upgrade instructions. + +- The `systemd.network` module has gained support for the FooOverUDP link type. + +- The `networking` module has a new `networking.fooOverUDP` option to configure Foo-over-UDP encapsulations. + +- `networking.sits` now supports Foo-over-UDP encapsulation. diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py index 56c510c4e6..e659b0c04f 100755 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -1126,9 +1126,9 @@ class Driver: try: yield return True - except: - rootlog.error(f'Test "{name}" failed with error:') - raise + except Exception as e: + rootlog.error(f'Test "{name}" failed with error: "{e}"') + raise e def test_symbols(self) -> Dict[str, Any]: @contextmanager diff --git a/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix index c7c9871cfe..f7383b2023 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix @@ -96,9 +96,8 @@ let }; } cfg.extraConfig; - configFile = pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; + configFile = pkgs.runCommandLocal "config.toml" { + nativeBuildInputs = [ pkgs.remarshal ]; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \ diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index d5d2a7d8b8..d049370047 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -555,6 +555,22 @@ in + "\n" ) cfg.buildMachines; }; + assertions = + let badMachine = m: m.system == null && m.systems == []; + in [ + { + assertion = !(builtins.any badMachine cfg.buildMachines); + message = '' + At least one system type (via system or + systems) must be set for every build machine. + Invalid machine specifications: + '' + " " + + (builtins.concatStringsSep "\n " + (builtins.map (m: m.hostName) + (builtins.filter (badMachine) cfg.buildMachines))); + } + ]; + systemd.packages = [ nix ]; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix b/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix index f560f838e4..8e871309c9 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix @@ -86,7 +86,7 @@ in serviceConfig = { User = cfg.user; Group = cfg.group; - ExecStart = "${sickbeard}/SickBeard.py --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port}"; + ExecStart = "${sickbeard}/bin/${sickbeard.pname} --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port}"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index b40d6b3ca0..62e90232e1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -192,7 +192,7 @@ let serviceConfig.MemoryDenyWriteExecute = true; serviceConfig.NoNewPrivileges = true; serviceConfig.PrivateDevices = true; - serviceConfig.ProtectClock = true; + serviceConfig.ProtectClock = mkDefault true; serviceConfig.ProtectControlGroups = true; serviceConfig.ProtectHome = true; serviceConfig.ProtectHostname = true; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix index ed594460d9..baac21b050 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -35,6 +35,10 @@ in ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags} ''; + # The systemd collector needs AF_UNIX + RestrictAddressFamilies = lib.optional (lib.any (x: x == "systemd") cfg.enabledCollectors) "AF_UNIX"; + # The timex collector needs to access clock APIs + ProtectClock = lib.any (x: x == "timex") cfg.disabledCollectors; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix index 01e420db38..ef829a1b7d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix @@ -61,6 +61,11 @@ in serviceConfig = { # rtl-sdr udev rules make supported USB devices +rw by plugdev. SupplementaryGroups = "plugdev"; + # rtl_433 needs rw access to the USB radio. + PrivateDevices = lib.mkForce false; + DeviceAllow = lib.mkForce "char-usb_device rw"; + RestrictAddressFamilies = [ "AF_NETLINK" ]; + ExecStart = let matchers = (map (m: "--channel_matcher '${m.name},${toString m.channel},${m.location}'" diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix index 708ea28a94..caf89c8439 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix @@ -172,9 +172,15 @@ in ExecStart = "${(removeSuffix "\n" cmd)} start"; ExecStop = "${(removeSuffix "\n" cmd)} stop"; Restart = "on-failure"; + TimeoutSec = "5min"; User = "unifi"; UMask = "0077"; WorkingDirectory = "${stateDir}"; + # the stop command exits while the main process is still running, and unifi + # wants to manage its own child processes. this means we have to set KillSignal + # to something the main process ignores, otherwise every stop will have unifi.service + # fail with SIGTERM status. + KillSignal = "SIGCONT"; # Hardening AmbientCapabilities = ""; @@ -215,5 +221,5 @@ in }; - meta.maintainers = with lib.maintainers; [ erictapen ]; + meta.maintainers = with lib.maintainers; [ erictapen pennae ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index e418195e1a..11cb4d3b8a 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -13,7 +13,6 @@ let pulseaudio = config.hardware.pulseaudio; pactl = "${getBin pulseaudio.package}/bin/pactl"; - startplasma-x11 = "${getBin plasma5.plasma-workspace}/bin/startplasma-x11"; sed = "${getBin pkgs.gnused}/bin/sed"; gtkrc2 = writeText "gtkrc-2.0" '' @@ -136,9 +135,6 @@ let fi fi - '' - + '' - exec "${startplasma-x11}" ''; in @@ -172,6 +168,12 @@ in disabled by default. ''; }; + + useQtScaling = mkOption { + type = types.bool; + default = false; + description = "Enable HiDPI scaling in Qt."; + }; }; }; @@ -183,6 +185,7 @@ in config = mkMerge [ (mkIf cfg.enable { + # Seed our configuration into nixos-generate-config system.nixos-generate-config.desktopConfiguration = ['' # Enable the Plasma 5 Desktop Environment. @@ -190,11 +193,7 @@ in services.xserver.desktopManager.plasma5.enable = true; '']; - services.xserver.desktopManager.session = singleton { - name = "plasma5"; - bgSupport = true; - start = startplasma; - }; + services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-workspace ]; security.wrappers = { kcheckpass = @@ -347,6 +346,8 @@ in environment.etc."X11/xkb".source = xcfg.xkbDir; + environment.sessionVariables.PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1"; + # Enable GTK applications to load SVG icons services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; @@ -389,6 +390,7 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; + services.xserver.displayManager.setupCommands = startplasma; nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; }) diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 4f57f9abd0..e036c684c8 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -26,7 +26,6 @@ let load-module module-udev-detect load-module module-native-protocol-unix load-module module-default-device-restore - load-module module-rescue-streams load-module module-always-sink load-module module-intended-roles load-module module-suspend-on-idle diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix index 46f2e3fec0..4a9da93945 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -83,7 +83,10 @@ in }; boot.kernelParams = mkOption { - type = types.listOf types.str; + type = types.listOf (types.strMatching ''([^"[:space:]]|"[^"]*")+'' // { + name = "kernelParam"; + description = "string, with spaces inside double quotes"; + }); default = [ ]; description = "Parameters added to the kernel command line."; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index 51e105bf62..662dfe2db9 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -250,6 +250,16 @@ let (assertRange "ERSPANIndex" 1 1048575) ]; + sectionFooOverUDP = checkUnitConfig "FooOverUDP" [ + (assertOnlyFields [ + "Port" + "Encapsulation" + "Protocol" + ]) + (assertPort "Port") + (assertValueOneOf "Encapsulation" ["FooOverUDP" "GenericUDPEncapsulation"]) + ]; + sectionPeer = checkUnitConfig "Peer" [ (assertOnlyFields [ "Name" @@ -919,6 +929,18 @@ let ''; }; + fooOverUDPConfig = mkOption { + default = { }; + example = { Port = 9001; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionFooOverUDP; + description = '' + Each attribute in this set specifies an option in the + [FooOverUDP] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + peerConfig = mkOption { default = {}; example = { Name = "veth2"; }; @@ -1449,6 +1471,10 @@ let [Tunnel] ${attrsToSection def.tunnelConfig} '' + + optionalString (def.fooOverUDPConfig != { }) '' + [FooOverUDP] + ${attrsToSection def.fooOverUDPConfig} + '' + optionalString (def.peerConfig != { }) '' [Peer] ${attrsToSection def.peerConfig} diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix index 79624ec707..e8e2de090b 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix @@ -466,6 +466,39 @@ let ''; }); + createFouEncapsulation = n: v: nameValuePair "${n}-fou-encap" + (let + # if we have a device to bind to we can wait for its addresses to be + # configured, otherwise external sequencing is required. + deps = optionals (v.local != null && v.local.dev != null) + (deviceDependency v.local.dev ++ [ "network-addresses-${v.local.dev}.service" ]); + fouSpec = "port ${toString v.port} ${ + if v.protocol != null then "ipproto ${toString v.protocol}" else "gue" + } ${ + optionalString (v.local != null) "local ${escapeShellArg v.local.address} ${ + optionalString (v.local.dev != null) "dev ${escapeShellArg v.local.dev}" + }" + }"; + in + { description = "FOU endpoint ${n}"; + wantedBy = [ "network-setup.service" (subsystemDevice n) ]; + bindsTo = deps; + partOf = [ "network-setup.service" ]; + after = [ "network-pre.target" ] ++ deps; + before = [ "network-setup.service" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + path = [ pkgs.iproute2 ]; + script = '' + # always remove previous incarnation since show can't filter + ip fou del ${fouSpec} >/dev/null 2>&1 || true + ip fou add ${fouSpec} + ''; + postStop = '' + ip fou del ${fouSpec} || true + ''; + }); + createSitDevice = n: v: nameValuePair "${n}-netdev" (let deps = deviceDependency v.dev; @@ -486,7 +519,12 @@ let ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ ${optionalString (v.ttl != null) "ttl ${toString v.ttl}"} \ - ${optionalString (v.dev != null) "dev \"${v.dev}\""} + ${optionalString (v.dev != null) "dev \"${v.dev}\""} \ + ${optionalString (v.encapsulation != null) + "encap ${v.encapsulation.type} encap-dport ${toString v.encapsulation.port} ${ + optionalString (v.encapsulation.sourcePort != null) + "encap-sport ${toString v.encapsulation.sourcePort}" + }"} ip link set "${n}" up ''; postStop = '' @@ -530,6 +568,7 @@ let // mapAttrs' createVswitchDevice cfg.vswitches // mapAttrs' createBondDevice cfg.bonds // mapAttrs' createMacvlanDevice cfg.macvlans + // mapAttrs' createFouEncapsulation cfg.fooOverUDP // mapAttrs' createSitDevice cfg.sits // mapAttrs' createVlanDevice cfg.vlans // { diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix index 225f9dc67f..ccfd7fd413 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix @@ -47,6 +47,9 @@ in } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; + }) ++ flip mapAttrsToList cfg.fooOverUDP (n: { local, ... }: { + assertion = local == null; + message = "networking.fooOverUDP.${n}.local is not supported by networkd."; }); networking.dhcpcd.enable = mkDefault false; @@ -194,6 +197,23 @@ in macvlan = [ name ]; } ]); }))) + (mkMerge (flip mapAttrsToList cfg.fooOverUDP (name: fou: { + netdevs."40-${name}" = { + netdevConfig = { + Name = name; + Kind = "fou"; + }; + # unfortunately networkd cannot encode dependencies of netdevs on addresses/routes, + # so we cannot specify Local=, Peer=, PeerPort=. this looks like a missing feature + # in networkd. + fooOverUDPConfig = { + Port = fou.port; + Encapsulation = if fou.protocol != null then "FooOverUDP" else "GenericUDPEncapsulation"; + } // (optionalAttrs (fou.protocol != null) { + Protocol = fou.protocol; + }); + }; + }))) (mkMerge (flip mapAttrsToList cfg.sits (name: sit: { netdevs."40-${name}" = { netdevConfig = { @@ -207,7 +227,17 @@ in Local = sit.local; }) // (optionalAttrs (sit.ttl != null) { TTL = sit.ttl; - }); + }) // (optionalAttrs (sit.encapsulation != null) ( + { + FooOverUDP = true; + Encapsulation = + if sit.encapsulation.type == "fou" + then "FooOverUDP" + else "GenericUDPEncapsulation"; + FOUDestinationPort = sit.encapsulation.port; + } // (optionalAttrs (sit.encapsulation.sourcePort != null) { + FOUSourcePort = sit.encapsulation.sourcePort; + }))); }; networks = mkIf (sit.dev != null) { "40-${sit.dev}" = (mkMerge [ (genericNetwork (mkOverride 999)) { diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index 313b0fac7d..4e20ec1184 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -10,6 +10,8 @@ let hasVirtuals = any (i: i.virtual) interfaces; hasSits = cfg.sits != { }; hasBonds = cfg.bonds != { }; + hasFous = cfg.fooOverUDP != { } + || filterAttrs (_: s: s.encapsulation != null) cfg.sits != { }; slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) @@ -823,6 +825,71 @@ in }); }; + networking.fooOverUDP = mkOption { + default = { }; + example = + { + primary = { port = 9001; local = { address = "192.0.2.1"; dev = "eth0"; }; }; + backup = { port = 9002; }; + }; + description = '' + This option allows you to configure Foo Over UDP and Generic UDP Encapsulation + endpoints. See ip-fou + 8 for details. + ''; + type = with types; attrsOf (submodule { + options = { + port = mkOption { + type = port; + description = '' + Local port of the encapsulation UDP socket. + ''; + }; + + protocol = mkOption { + type = nullOr (ints.between 1 255); + default = null; + description = '' + Protocol number of the encapsulated packets. Specifying null + (the default) creates a GUE endpoint, specifying a protocol number will create + a FOU endpoint. + ''; + }; + + local = mkOption { + type = nullOr (submodule { + options = { + address = mkOption { + type = types.str; + description = '' + Local address to bind to. The address must be available when the FOU + endpoint is created, using the scripted network setup this can be achieved + either by setting dev or adding dependency information to + systemd.services.<name>-fou-encap; it isn't supported + when using networkd. + ''; + }; + + dev = mkOption { + type = nullOr str; + default = null; + example = "eth0"; + description = '' + Network device to bind to. + ''; + }; + }; + }); + default = null; + example = { address = "203.0.113.22"; }; + description = '' + Local address (and optionally device) to bind to using the given port. + ''; + }; + }; + }); + }; + networking.sits = mkOption { default = { }; example = literalExpression '' @@ -882,6 +949,44 @@ in ''; }; + encapsulation = with types; mkOption { + type = nullOr (submodule { + options = { + type = mkOption { + type = enum [ "fou" "gue" ]; + description = '' + Selects encapsulation type. See + ip-link + 8 for details. + ''; + }; + + port = mkOption { + type = port; + example = 9001; + description = '' + Destination port for encapsulated packets. + ''; + }; + + sourcePort = mkOption { + type = nullOr types.port; + default = null; + example = 9002; + description = '' + Source port for encapsulated packets. Will be chosen automatically by + the kernel if unset. + ''; + }; + }; + }); + default = null; + example = { type = "fou"; port = 9001; }; + description = '' + Configures encapsulation in UDP packets. + ''; + }; + }; }); @@ -1116,7 +1221,8 @@ in boot.kernelModules = [ ] ++ optional hasVirtuals "tun" ++ optional hasSits "sit" - ++ optional hasBonds "bonding"; + ++ optional hasBonds "bonding" + ++ optional hasFous "fou"; boot.extraModprobeConfig = # This setting is intentional as it prevents default bond devices diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix index 8b947ddf0c..647c8942b3 100644 --- a/third_party/nixpkgs/nixos/tests/networking.nix +++ b/third_party/nixpkgs/nixos/tests/networking.nix @@ -380,12 +380,57 @@ let router.wait_until_succeeds("ping -c 1 192.168.1.3") ''; }; + fou = { + name = "foo-over-udp"; + nodes.machine = { ... }: { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = networkd; + useDHCP = false; + interfaces.eth1.ipv4.addresses = mkOverride 0 + [ { address = "192.168.1.1"; prefixLength = 24; } ]; + fooOverUDP = { + fou1 = { port = 9001; }; + fou2 = { port = 9002; protocol = 41; }; + fou3 = mkIf (!networkd) + { port = 9003; local.address = "192.168.1.1"; }; + fou4 = mkIf (!networkd) + { port = 9004; local = { address = "192.168.1.1"; dev = "eth1"; }; }; + }; + }; + systemd.services = { + fou3-fou-encap.after = optional (!networkd) "network-addresses-eth1.service"; + }; + }; + testScript = { ... }: + '' + import json + + machine.wait_for_unit("network.target") + fous = json.loads(machine.succeed("ip -json fou show")) + assert {"port": 9001, "gue": None, "family": "inet"} in fous, "fou1 exists" + assert {"port": 9002, "ipproto": 41, "family": "inet"} in fous, "fou2 exists" + '' + optionalString (!networkd) '' + assert { + "port": 9003, + "gue": None, + "family": "inet", + "local": "192.168.1.1", + } in fous, "fou3 exists" + assert { + "port": 9004, + "gue": None, + "family": "inet", + "local": "192.168.1.1", + "dev": "eth1", + } in fous, "fou4 exists" + ''; + }; sit = let node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; - firewall.enable = false; useDHCP = false; sits.sit = { inherit remote; @@ -400,8 +445,30 @@ let }; in { name = "Sit"; - nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; }; - nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; }; + # note on firewalling: the two nodes are explicitly asymmetric. + # client1 sends SIT packets in UDP, but accepts only proto-41 incoming. + # client2 does the reverse, sending in proto-41 and accepting only UDP incoming. + # that way we'll notice when either SIT itself or FOU breaks. + nodes.client1 = args@{ pkgs, ... }: + mkMerge [ + (node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; } args) + { + networking = { + firewall.extraCommands = "iptables -A INPUT -p 41 -j ACCEPT"; + sits.sit.encapsulation = { type = "fou"; port = 9001; }; + }; + } + ]; + nodes.client2 = args@{ pkgs, ... }: + mkMerge [ + (node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; } args) + { + networking = { + firewall.allowedUDPPorts = [ 9001 ]; + fooOverUDP.fou1 = { port = 9001; protocol = 41; }; + }; + } + ]; testScript = { ... }: '' start_all() diff --git a/third_party/nixpkgs/nixos/tests/plasma5.nix b/third_party/nixpkgs/nixos/tests/plasma5.nix index f09859a055..7a5b7db946 100644 --- a/third_party/nixpkgs/nixos/tests/plasma5.nix +++ b/third_party/nixpkgs/nixos/tests/plasma5.nix @@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ...} : imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.defaultSession = "plasma5"; + services.xserver.displayManager.defaultSession = "plasma"; services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.autoLogin = { enable = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix index 029710206f..ab3267eae7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix @@ -14,9 +14,6 @@ stdenv.mkDerivation rec { pname = "csound"; - # When updating, please check if https://github.com/csound/csound/issues/1078 - # has been fixed in the new version so we can use the normal fluidsynth - # version and remove fluidsynth 1.x from nixpkgs again. version = "6.16.2"; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix index 1e85d57c3f..e1366d38ba 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix @@ -16,6 +16,7 @@ , lilv , lsp-plugins , lv2 +, mda_lv2 , meson , ninja , nlohmann_json @@ -25,20 +26,20 @@ , rnnoise , rubberband , speexdsp -, wrapGAppsHook +, wrapGAppsHook4 , zam-plugins , zita-convolver }: stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.0.3"; + version = "6.1.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-GzqPC/m/HMthLMamhJ4EXX6fxZYscdX1QmXgqHOPEcg="; + sha256 = "sha256-1UfeqPJxY4YT98UdqTZtG+QUBOZlKfK+7WbszhO22A0="; }; nativeBuildInputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -74,17 +75,20 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py + # https://github.com/wwmm/easyeffects/pull/1205 + substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; preFixup = let lv2Plugins = [ - calf # limiter, compressor exciter, bass enhancer and others - lsp-plugins # delay + calf # compressor exciter, bass enhancer and others + lsp-plugins # delay, limiter, multiband compressor + mda_lv2 # loudness + zam-plugins # maximizer ]; ladspaPlugins = [ rubberband # pitch shifting - zam-plugins # maximizer ]; in '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix b/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix new file mode 100644 index 0000000000..7cf0fb8c14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix @@ -0,0 +1,45 @@ +{ stdenv, cmake, lib, fetchFromGitHub, qt5, fftw, libtorch-bin, portaudio, eigen +, xorg, pkg-config, autoPatchelfHook, soxr +}: + +stdenv.mkDerivation rec { + pname = "in-formant"; + version = "2021-06-30"; + + # no Qt6 yet, so we're stuck in the last Qt5-supporting commit: https://github.com/NixOS/nixpkgs/issues/108008 + src = fetchFromGitHub { + owner = "in-formant"; + repo = "in-formant"; + rev = "e28e628cf5ff0949a7b046d220cc884f6035f31a"; + sha256 = "sha256-YvtV0wGUNmI/+GGxrIfTk/l8tqUsWgc/LAI17X+AWGI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config qt5.wrapQtAppsHook autoPatchelfHook ]; + + buildInputs = [ + qt5.qtbase + qt5.qtquickcontrols + qt5.qtquickcontrols2 + qt5.qtcharts + fftw + libtorch-bin + portaudio + eigen + xorg.libxcb + soxr + ]; + + installPhase = '' + mkdir -p $out/bin + cp in-formant $out/bin + ''; + + meta = with lib; { + description = "A real-time pitch and formant tracking software"; + homepage = "https://github.com/in-formant/in-formant"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/librespot/cargo-lock.patch b/third_party/nixpkgs/pkgs/applications/audio/librespot/cargo-lock.patch deleted file mode 100644 index 0c2af8f80c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/librespot/cargo-lock.patch +++ /dev/null @@ -1,3817 +0,0 @@ ---- source/Cargo.lock 1970-01-01 01:00:01.000000000 +0100 -+++ ../nix-build-librespot-0.1.6.drv-0/source/Cargo.lock 2021-04-27 19:07:38.535244188 +0200 -@@ -4,2784 +4,2782 @@ - name = "aes" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9" - dependencies = [ -- "aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes-soft", -+ "aesni", -+ "block-cipher-trait", - ] - - [[package]] - name = "aes-ctr" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" - dependencies = [ -- "aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes-soft", -+ "aesni", -+ "ctr", -+ "stream-cipher", - ] - - [[package]] - name = "aes-soft" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" - dependencies = [ -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-cipher-trait", -+ "byteorder", -+ "opaque-debug", - ] - - [[package]] - name = "aesni" - version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" - dependencies = [ -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-cipher-trait", -+ "opaque-debug", -+ "stream-cipher", - ] - - [[package]] - name = "alga" - version = "0.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" - dependencies = [ -- "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "approx", -+ "num-complex", -+ "num-traits", - ] - - [[package]] - name = "alsa" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4a0d4ebc8b23041c5de9bc9aee13b4bad844a589479701f31a5934cfe4aeb32" - dependencies = [ -- "alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "alsa-sys", -+ "bitflags 0.9.1", -+ "libc", -+ "nix", - ] - - [[package]] - name = "alsa-sys" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "approx" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" - dependencies = [ -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits", - ] - - [[package]] - name = "arc-swap" - version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" - - [[package]] - name = "atty" - version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" - dependencies = [ -- "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hermit-abi", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "autocfg" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - - [[package]] - name = "autocfg" - version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - - [[package]] - name = "base64" - version = "0.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "safemem", - ] - - [[package]] - name = "base64" - version = "0.10.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", - ] - - [[package]] - name = "bindgen" - version = "0.53.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "cexpr 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "clang-sys 0.29.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "cexpr", -+ "cfg-if", -+ "clang-sys", -+ "lazy_static", -+ "lazycell", -+ "peeking_take_while", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "regex", -+ "rustc-hash", -+ "shlex", - ] - - [[package]] - name = "bit-set" - version = "0.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" - dependencies = [ -- "bit-vec 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bit-vec", - ] - - [[package]] - name = "bit-vec" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" - - [[package]] - name = "bitflags" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" - - [[package]] - name = "bitflags" - version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" - - [[package]] - name = "bitflags" - version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - - [[package]] - name = "block-buffer" - version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" - dependencies = [ -- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-padding", -+ "byte-tools", -+ "byteorder", -+ "generic-array", - ] - - [[package]] - name = "block-cipher-trait" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" - dependencies = [ -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "generic-array", - ] - - [[package]] - name = "block-modes" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529" - dependencies = [ -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-cipher-trait", -+ "block-padding", - ] - - [[package]] - name = "block-padding" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" - dependencies = [ -- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byte-tools", - ] - - [[package]] - name = "byte-tools" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - - [[package]] - name = "byteorder" - version = "1.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - - [[package]] - name = "bytes" - version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "iovec", - ] - - [[package]] - name = "cc" - version = "1.0.58" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" - - [[package]] - name = "cexpr" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" - dependencies = [ -- "nom 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nom", - ] - - [[package]] - name = "cfg-if" - version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - - [[package]] - name = "chrono" - version = "0.4.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" - dependencies = [ -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer", -+ "num-traits", -+ "time", - ] - - [[package]] - name = "clang-sys" - version = "0.29.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" - dependencies = [ -- "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glob", -+ "libc", -+ "libloading 0.5.2", - ] - - [[package]] - name = "cloudabi" - version = "0.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", - ] - - [[package]] - name = "core-foundation-sys" - version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "coreaudio-rs" - version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "coreaudio-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "coreaudio-sys", - ] - - [[package]] - name = "coreaudio-sys" - version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d6570ee6e089131e928d5ec9236db9e818aa3cf850f48b0eec6ef700571271d4" - dependencies = [ -- "bindgen 0.53.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bindgen", - ] - - [[package]] - name = "cpal" - version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d58ae1ed6536b1b233f5e3aeb6997a046ddb4d05e3f61701b58a92eb254a829e" - dependencies = [ -- "alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "alsa-sys", -+ "core-foundation-sys", -+ "coreaudio-rs", -+ "lazy_static", -+ "libc", -+ "stdweb", -+ "winapi 0.3.9", - ] - - [[package]] - name = "crossbeam-deque" - version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" - dependencies = [ -- "crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-epoch", -+ "crossbeam-utils 0.7.2", -+ "maybe-uninit", - ] - - [[package]] - name = "crossbeam-epoch" - version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "cfg-if", -+ "crossbeam-utils 0.7.2", -+ "lazy_static", -+ "maybe-uninit", -+ "memoffset", -+ "scopeguard", - ] - - [[package]] - name = "crossbeam-queue" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" - dependencies = [ -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6", - ] - - [[package]] - name = "crossbeam-queue" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "crossbeam-utils 0.7.2", -+ "maybe-uninit", - ] - - [[package]] - name = "crossbeam-utils" - version = "0.6.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "lazy_static", - ] - - [[package]] - name = "crossbeam-utils" - version = "0.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "cfg-if", -+ "lazy_static", - ] - - [[package]] - name = "crypto-mac" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" - dependencies = [ -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "generic-array", -+ "subtle", - ] - - [[package]] - name = "ctr" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" - dependencies = [ -- "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-cipher-trait", -+ "stream-cipher", - ] - - [[package]] - name = "digest" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" - dependencies = [ -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "generic-array", - ] - - [[package]] - name = "dns-sd" - version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d748509dea20228f63ba519bf142ce2593396386125b01f5b0d6412dab972087" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "env_logger" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" - dependencies = [ -- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty", -+ "humantime", -+ "log 0.4.11", -+ "termcolor", - ] - - [[package]] - name = "error-chain" - version = "0.12.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" - dependencies = [ -- "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check", - ] - - [[package]] - name = "fake-simd" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - - [[package]] - name = "fnv" - version = "1.0.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - - [[package]] - name = "fuchsia-cprng" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - - [[package]] - name = "fuchsia-zircon" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "fuchsia-zircon-sys", - ] - - [[package]] - name = "fuchsia-zircon-sys" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - - [[package]] - name = "futures" - version = "0.1.29" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" - - [[package]] - name = "futures-channel" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" - dependencies = [ -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-core", - ] - - [[package]] - name = "futures-core" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" - - [[package]] - name = "futures-cpupool" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "num_cpus", - ] - - [[package]] - name = "futures-executor" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" - dependencies = [ -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-core", -+ "futures-task", -+ "futures-util", - ] - - [[package]] - name = "futures-macro" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" - dependencies = [ -- "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro-hack", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "syn 1.0.35", - ] - - [[package]] - name = "futures-sink" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" - - [[package]] - name = "futures-task" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" - dependencies = [ -- "once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "once_cell", - ] - - [[package]] - name = "futures-util" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" - dependencies = [ -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "pin-project 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro-nested 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-core", -+ "futures-macro", -+ "futures-task", -+ "pin-project", -+ "pin-utils", -+ "proc-macro-hack", -+ "proc-macro-nested", -+ "slab 0.4.2", - ] - - [[package]] - name = "gcc" - version = "0.3.55" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - - [[package]] - name = "generic-array" - version = "0.12.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" - dependencies = [ -- "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "typenum", - ] - - [[package]] - name = "getopts" - version = "0.2.21" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" - dependencies = [ -- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width", - ] - - [[package]] - name = "getrandom" - version = "0.1.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", -+ "wasi", - ] - - [[package]] - name = "glib" - version = "0.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-task", -+ "futures-util", -+ "glib-sys", -+ "gobject-sys", -+ "lazy_static", -+ "libc", - ] - - [[package]] - name = "glib-sys" - version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "glob" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - - [[package]] - name = "gobject-sys" - version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" - dependencies = [ -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "gstreamer" - version = "0.15.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "muldiv 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "paste 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "cfg-if", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gstreamer-sys", -+ "lazy_static", -+ "libc", -+ "muldiv", -+ "num-rational", -+ "paste", - ] - - [[package]] - name = "gstreamer-app" - version = "0.15.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "789784e8d42f5add1e1e965cf9f7e2d09e21dd0756bae6148f971db9a761d6a9" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-app-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-base 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "futures-core", -+ "futures-sink", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gstreamer", -+ "gstreamer-app-sys", -+ "gstreamer-base", -+ "gstreamer-sys", -+ "lazy_static", -+ "libc", - ] - - [[package]] - name = "gstreamer-app-sys" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf869ce152c23bca5d761ab62146b47f750d0b28d4d499731857532897d48167" - dependencies = [ -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-base-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "gstreamer-base-sys", -+ "gstreamer-sys", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "gstreamer-base" - version = "0.15.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42552f75cc6c260b0be180d5c955f4cd74bd170289c622404c25f1210b521c12" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-base-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "glib", -+ "glib-sys", -+ "gobject-sys", -+ "gstreamer", -+ "gstreamer-base-sys", -+ "gstreamer-sys", -+ "libc", - ] - - [[package]] - name = "gstreamer-base-sys" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba384f52174b3c586593fca32642680a9e67961fea9f4cd8419f678965023bed" - dependencies = [ -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "gobject-sys", -+ "gstreamer-sys", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "gstreamer-sys" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d18da01b97d0ab5896acd5151e4c155acefd0e6c03c3dd24dd133ba054053db" - dependencies = [ -- "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glib-sys", -+ "gobject-sys", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "hermit-abi" - version = "0.1.15" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "hex" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" - - [[package]] - name = "hmac" - version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" - dependencies = [ -- "crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crypto-mac", -+ "digest", - ] - - [[package]] - name = "hostname" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "match_cfg", -+ "winapi 0.3.9", - ] - - [[package]] - name = "httparse" - version = "1.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" - - [[package]] - name = "humantime" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" - dependencies = [ -- "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quick-error", - ] - - [[package]] - name = "hyper" - version = "0.11.27" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34a590ca09d341e94cddf8e5af0bbccde205d5fbc2fa3c09dd67c7f85cea59d7" - dependencies = [ -- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "base64 0.9.3", -+ "bytes", -+ "futures", -+ "futures-cpupool", -+ "httparse", -+ "iovec", -+ "language-tags", -+ "log 0.4.11", -+ "mime", -+ "net2", -+ "percent-encoding", -+ "relay", -+ "time", -+ "tokio-core", -+ "tokio-io", -+ "tokio-proto", -+ "tokio-service", -+ "unicase", -+ "want", - ] - - [[package]] - name = "hyper-proxy" - version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "44f0925de2747e481e6e477dd212c25e8f745567f02f6182e04d27b97c3fbece" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "hyper", -+ "tokio-core", -+ "tokio-io", - ] - - [[package]] - name = "idna" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" - dependencies = [ -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-normalization 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", - ] - - [[package]] - name = "if-addrs" - version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48" - dependencies = [ -- "if-addrs-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "if-addrs-sys", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "if-addrs-sys" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" - dependencies = [ -- "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", -+ "libc", - ] - - [[package]] - name = "iovec" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "itoa" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - - [[package]] - name = "jack" - version = "0.5.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e15fc592e2e5a74a105ff507083c04db1aa20ba1b90d425362ba000e57422df" - dependencies = [ -- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "jack-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 0.7.0", -+ "jack-sys", -+ "lazy_static", -+ "libc", - ] - - [[package]] - name = "jack-sys" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0d4ca501477fd3cd93a36df581046e5d6338ed826cf7e9b8d302603521e6cc3" - dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static", -+ "libc", -+ "libloading 0.4.3", - ] - - [[package]] - name = "kernel32-sys" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" - dependencies = [ -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.2.8", -+ "winapi-build", - ] - - [[package]] - name = "language-tags" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - - [[package]] - name = "lazy_static" - version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "lazycell" - version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" - - [[package]] - name = "lewton" - version = "0.9.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "ogg", -+ "smallvec 0.6.13", - ] - - [[package]] - name = "libc" - version = "0.2.73" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9" - - [[package]] - name = "libloading" - version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9" - dependencies = [ -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys", -+ "lazy_static", -+ "winapi 0.2.8", - ] - - [[package]] - name = "libloading" - version = "0.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" - dependencies = [ -- "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "libm" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - - [[package]] - name = "libmdns" - version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d8582c174736c53633bc482ac709b24527c018356c3dc6d8e25a788b06b394e" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "hostname 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "if-addrs 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "multimap 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "futures", -+ "hostname", -+ "if-addrs", -+ "log 0.4.11", -+ "multimap", -+ "net2", -+ "quick-error", -+ "rand 0.7.3", -+ "tokio-core", - ] - - [[package]] - name = "libpulse-sys" - version = "0.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9bb11b06faf883500c1b625cf4453e6c7737e9df9c7ba01df3f84b22b083e4ac" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "librespot" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-audio 0.1.5", -- "librespot-connect 0.1.5", -- "librespot-core 0.1.5", -- "librespot-metadata 0.1.5", -- "librespot-playback 0.1.5", -- "librespot-protocol 0.1.5", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-process 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-signal 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "base64 0.10.1", -+ "env_logger", -+ "futures", -+ "getopts", -+ "hex", -+ "hyper", -+ "librespot-audio", -+ "librespot-connect", -+ "librespot-core", -+ "librespot-metadata", -+ "librespot-playback", -+ "librespot-protocol", -+ "log 0.4.11", -+ "num-bigint", -+ "protobuf", -+ "rand 0.7.3", -+ "rpassword", -+ "sha-1", -+ "tokio-core", -+ "tokio-io", -+ "tokio-process", -+ "tokio-signal", -+ "url", - ] - - [[package]] - name = "librespot-audio" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "bit-set 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-core 0.1.5", -- "librespot-tremor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "vorbis 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes-ctr", -+ "bit-set", -+ "byteorder", -+ "bytes", -+ "futures", -+ "lewton", -+ "librespot-core", -+ "librespot-tremor", -+ "log 0.4.11", -+ "num-bigint", -+ "num-traits", -+ "tempfile", -+ "vorbis", - ] - - [[package]] - name = "librespot-connect" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "block-modes 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "dns-sd 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "libmdns 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-core 0.1.5", -- "librespot-playback 0.1.5", -- "librespot-protocol 0.1.5", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes-ctr", -+ "base64 0.10.1", -+ "block-modes", -+ "dns-sd", -+ "futures", -+ "hmac", -+ "hyper", -+ "libmdns", -+ "librespot-core", -+ "librespot-playback", -+ "librespot-protocol", -+ "log 0.4.11", -+ "num-bigint", -+ "protobuf", -+ "rand 0.7.3", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "sha-1", -+ "tokio-core", -+ "url", - ] - - [[package]] - name = "librespot-core" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-protocol 0.1.5", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "shannon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "vergen 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aes", -+ "base64 0.10.1", -+ "byteorder", -+ "bytes", -+ "error-chain", -+ "futures", -+ "hmac", -+ "httparse", -+ "hyper", -+ "hyper-proxy", -+ "lazy_static", -+ "librespot-protocol", -+ "log 0.4.11", -+ "num-bigint", -+ "num-integer", -+ "num-traits", -+ "pbkdf2", -+ "protobuf", -+ "rand 0.7.3", -+ "serde", -+ "serde_derive", -+ "serde_json", -+ "sha-1", -+ "shannon", -+ "tokio-codec", -+ "tokio-core", -+ "tokio-io", -+ "url", -+ "uuid", -+ "vergen", - ] - - [[package]] - name = "librespot-metadata" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-core 0.1.5", -- "librespot-protocol 0.1.5", -- "linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "futures", -+ "librespot-core", -+ "librespot-protocol", -+ "linear-map", -+ "log 0.4.11", -+ "protobuf", - ] - - [[package]] - name = "librespot-playback" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cpal 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "gstreamer-app 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "jack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "librespot-audio 0.1.5", -- "librespot-core 0.1.5", -- "librespot-metadata 0.1.5", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "portaudio-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "zerocopy 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "alsa", -+ "byteorder", -+ "cpal", -+ "futures", -+ "glib", -+ "gstreamer", -+ "gstreamer-app", -+ "jack", -+ "libc", -+ "libpulse-sys", -+ "librespot-audio", -+ "librespot-core", -+ "librespot-metadata", -+ "log 0.4.11", -+ "portaudio-rs", -+ "rodio", -+ "sdl2", -+ "shell-words", -+ "zerocopy", - ] - - [[package]] - name = "librespot-protocol" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ -- "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf-codegen-pure 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glob", -+ "protobuf", -+ "protobuf-codegen", -+ "protobuf-codegen-pure", - ] - - [[package]] - name = "librespot-tremor" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97f525bff915d478a76940a7b988e5ea34911ba7280c97bd3a7673f54d68b4fe" - dependencies = [ -- "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", -+ "libc", -+ "ogg-sys", -+ "pkg-config", - ] - - [[package]] - name = "linear-map" - version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" - - [[package]] - name = "lock_api" - version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" - dependencies = [ -- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard", - ] - - [[package]] - name = "log" - version = "0.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" - dependencies = [ -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.11", - ] - - [[package]] - name = "log" - version = "0.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", - ] - - [[package]] - name = "match_cfg" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - - [[package]] - name = "matches" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - - [[package]] - name = "matrixmultiply" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4f7ec66360130972f34830bfad9ef05c6610a43938a467bcc9ab9369ab3478f" - dependencies = [ -- "rawpointer 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rawpointer", - ] - - [[package]] - name = "maybe-uninit" - version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - - [[package]] - name = "memchr" - version = "2.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - - [[package]] - name = "memoffset" - version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", - ] - - [[package]] - name = "mime" - version = "0.3.16" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - - [[package]] - name = "mio" - version = "0.6.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "fuchsia-zircon", -+ "fuchsia-zircon-sys", -+ "iovec", -+ "kernel32-sys", -+ "libc", -+ "log 0.4.11", -+ "miow 0.2.1", -+ "net2", -+ "slab 0.4.2", -+ "winapi 0.2.8", - ] - - [[package]] - name = "mio-named-pipes" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" - dependencies = [ -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "miow 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.11", -+ "mio", -+ "miow 0.3.5", -+ "winapi 0.3.9", - ] - - [[package]] - name = "mio-uds" - version = "0.6.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" - dependencies = [ -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -+ "iovec", -+ "libc", -+ "mio", - ] - - [[package]] - name = "miow" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" - dependencies = [ -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys", -+ "net2", -+ "winapi 0.2.8", -+ "ws2_32-sys", - ] - - [[package]] - name = "miow" - version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" - dependencies = [ -- "socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "socket2", -+ "winapi 0.3.9", - ] - - [[package]] - name = "muldiv" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" - - [[package]] - name = "multimap" - version = "0.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" - dependencies = [ -- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde", - ] - - [[package]] - name = "nalgebra" - version = "0.18.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2" - dependencies = [ -- "alga 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "matrixmultiply 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "alga", -+ "approx", -+ "generic-array", -+ "matrixmultiply", -+ "num-complex", -+ "num-rational", -+ "num-traits", -+ "rand 0.6.5", -+ "typenum", - ] - - [[package]] - name = "net2" - version = "0.2.34" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "nix" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" - dependencies = [ -- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 0.9.1", -+ "cfg-if", -+ "libc", -+ "void", - ] - - [[package]] - name = "nom" - version = "5.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" - dependencies = [ -- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr", -+ "version_check", - ] - - [[package]] - name = "num" - version = "0.1.42" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" - dependencies = [ -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-iter 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer", -+ "num-iter", -+ "num-traits", - ] - - [[package]] - name = "num-bigint" - version = "0.2.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-integer", -+ "num-traits", - ] - - [[package]] - name = "num-complex" - version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-traits", - ] - - [[package]] - name = "num-integer" - version = "0.1.43" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-traits", - ] - - [[package]] - name = "num-iter" - version = "0.1.41" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-integer", -+ "num-traits", - ] - - [[package]] - name = "num-rational" - version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "num-integer", -+ "num-traits", - ] - - [[package]] - name = "num-traits" - version = "0.2.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libm 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.0", -+ "libm", - ] - - [[package]] - name = "num_cpus" - version = "1.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" - dependencies = [ -- "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hermit-abi", -+ "libc", - ] - - [[package]] - name = "ogg" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", - ] - - [[package]] - name = "ogg-sys" - version = "0.0.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a95b8c172e17df1a41bf8d666301d3b2c4efeb90d9d0415e2a4dc0668b35fdb2" - dependencies = [ -- "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gcc", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "once_cell" - version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" - - [[package]] - name = "opaque-debug" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - - [[package]] - name = "parking_lot" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" - dependencies = [ -- "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lock_api", -+ "parking_lot_core", -+ "rustc_version", - ] - - [[package]] - name = "parking_lot_core" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "cloudabi", -+ "libc", -+ "redox_syscall", -+ "rustc_version", -+ "smallvec 0.6.13", -+ "winapi 0.3.9", - ] - - [[package]] - name = "paste" - version = "0.1.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" - dependencies = [ -- "paste-impl 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "paste-impl", -+ "proc-macro-hack", - ] - - [[package]] - name = "paste-impl" - version = "0.1.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" - dependencies = [ -- "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro-hack", - ] - - [[package]] - name = "pbkdf2" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" - dependencies = [ -- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "base64 0.9.3", -+ "byteorder", -+ "crypto-mac", -+ "hmac", -+ "rand 0.5.6", -+ "sha2", -+ "subtle", - ] - - [[package]] - name = "peeking_take_while" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - - [[package]] - name = "percent-encoding" - version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - - [[package]] - name = "pin-project" - version = "0.4.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" - dependencies = [ -- "pin-project-internal 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pin-project-internal", - ] - - [[package]] - name = "pin-project-internal" - version = "0.4.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" - dependencies = [ -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "syn 1.0.35", - ] - - [[package]] - name = "pin-utils" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - - [[package]] - name = "pkg-config" - version = "0.3.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" - - [[package]] - name = "portaudio-rs" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb6b5eff96ccc9bf44d34c379ab03ae944426d83d1694345bdf8159d561d562" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "portaudio-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "libc", -+ "portaudio-sys", - ] - - [[package]] - name = "portaudio-sys" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5194a4fa953b4ffd851c320ef6f0484cd7278cb7169ea9d6c433e49b23f7b7f5" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "ppv-lite86" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" - - [[package]] - name = "proc-macro-hack" - version = "0.5.16" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" - - [[package]] - name = "proc-macro-nested" - version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" - - [[package]] - name = "proc-macro2" - version = "0.4.30" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" - dependencies = [ -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.1.0", - ] - - [[package]] - name = "proc-macro2" - version = "1.0.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" - dependencies = [ -- "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.1", - ] - - [[package]] - name = "protobuf" - version = "2.14.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485" - - [[package]] - name = "protobuf-codegen" - version = "2.14.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c" - dependencies = [ -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "protobuf", - ] - - [[package]] - name = "protobuf-codegen-pure" - version = "2.14.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440" - dependencies = [ -- "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "protobuf", -+ "protobuf-codegen", - ] - - [[package]] - name = "quick-error" - version = "1.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - - [[package]] - name = "quote" - version = "0.6.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.30", - ] - - [[package]] - name = "quote" - version = "1.0.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" - dependencies = [ -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.19", - ] - - [[package]] - name = "rand" - version = "0.3.23" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "rand 0.4.6", - ] - - [[package]] - name = "rand" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" - dependencies = [ -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.3.1", -+ "rdrand", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand" - version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" - dependencies = [ -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cloudabi", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.3.1", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand" - version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "libc", -+ "rand_chacha 0.1.1", -+ "rand_core 0.4.2", -+ "rand_hc 0.1.0", -+ "rand_isaac", -+ "rand_jitter", -+ "rand_os", -+ "rand_pcg", -+ "rand_xorshift", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand" - version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" - dependencies = [ -- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "getrandom", -+ "libc", -+ "rand_chacha 0.2.2", -+ "rand_core 0.5.1", -+ "rand_hc 0.2.0", - ] - - [[package]] - name = "rand_chacha" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_chacha" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" - dependencies = [ -- "ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ppv-lite86", -+ "rand_core 0.5.1", - ] - - [[package]] - name = "rand_core" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" - dependencies = [ -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2", - ] - - [[package]] - name = "rand_core" - version = "0.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - - [[package]] - name = "rand_core" - version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" - dependencies = [ -- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "getrandom", - ] - - [[package]] - name = "rand_hc" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_hc" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" - dependencies = [ -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1", - ] - - [[package]] - name = "rand_isaac" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_jitter" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "rand_core 0.4.2", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand_os" - version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" - dependencies = [ -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cloudabi", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.4.2", -+ "rdrand", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand_pcg" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "rand_core 0.4.2", - ] - - [[package]] - name = "rand_xorshift" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rawpointer" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - - [[package]] - name = "rdrand" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "redox_syscall" - version = "0.1.57" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - - [[package]] - name = "regex" - version = "1.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" - dependencies = [ -- "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax", - ] - - [[package]] - name = "regex-syntax" - version = "0.6.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - - [[package]] - name = "relay" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", - ] - - [[package]] - name = "remove_dir_all" - version = "0.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" - dependencies = [ -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rodio" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d0f961b254e66d147a7b550c78b01308934c97d807a34b417fd0f5a0a0f3a2d" - dependencies = [ -- "cpal 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "nalgebra 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cpal", -+ "lazy_static", -+ "nalgebra", - ] - - [[package]] - name = "rpassword" - version = "3.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c34fa7bcae7fca3c8471e8417088bbc3ad9af8066b0ecf4f3c0d98a0d772716e" - dependencies = [ -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys", -+ "libc", -+ "winapi 0.2.8", - ] - - [[package]] - name = "rustc-hash" - version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - - [[package]] - name = "rustc_version" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" - dependencies = [ -- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver", - ] - - [[package]] - name = "ryu" - version = "1.0.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - - [[package]] - name = "safemem" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - - [[package]] - name = "scoped-tls" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" - - [[package]] - name = "scopeguard" - version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - - [[package]] - name = "sdl2" - version = "0.32.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "lazy_static", -+ "libc", -+ "num", -+ "rand 0.6.5", -+ "sdl2-sys", - ] - - [[package]] - name = "sdl2-sys" - version = "0.32.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", - ] - - [[package]] - name = "semver" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" - dependencies = [ -- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver-parser", - ] - - [[package]] - name = "semver-parser" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - - [[package]] - name = "serde" - version = "1.0.114" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" - - [[package]] - name = "serde_derive" - version = "1.0.114" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" - dependencies = [ -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "syn 1.0.35", - ] - - [[package]] - name = "serde_json" - version = "1.0.56" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" - dependencies = [ -- "itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa", -+ "ryu", -+ "serde", - ] - - [[package]] - name = "sha-1" - version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" - dependencies = [ -- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-buffer", -+ "digest", -+ "fake-simd", -+ "opaque-debug", - ] - - [[package]] - name = "sha2" - version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" - dependencies = [ -- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "block-buffer", -+ "digest", -+ "fake-simd", -+ "opaque-debug", - ] - - [[package]] - name = "shannon" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ea5b41c9427b56caa7b808cb548a04fb50bb5b9e98590b53f28064ff4174561" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", - ] - - [[package]] - name = "shell-words" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a" - - [[package]] - name = "shlex" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - - [[package]] - name = "signal-hook-registry" - version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" - dependencies = [ -- "arc-swap 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arc-swap", -+ "libc", - ] - - [[package]] - name = "slab" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" - - [[package]] - name = "slab" - version = "0.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - - [[package]] - name = "smallvec" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013" - - [[package]] - name = "smallvec" - version = "0.6.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" - dependencies = [ -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "maybe-uninit", - ] - - [[package]] - name = "socket2" - version = "0.3.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "winapi 0.3.9", - ] - - [[package]] - name = "stdweb" - version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" - - [[package]] - name = "stream-cipher" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" - dependencies = [ -- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "generic-array", - ] - - [[package]] - name = "subtle" - version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - - [[package]] - name = "syn" - version = "0.15.44" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "unicode-xid 0.1.0", - ] - - [[package]] - name = "syn" - version = "1.0.35" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" - dependencies = [ -- "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.19", -+ "quote 1.0.7", -+ "unicode-xid 0.2.1", - ] - - [[package]] - name = "synstructure" - version = "0.10.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "syn 0.15.44", -+ "unicode-xid 0.1.0", - ] - - [[package]] - name = "take" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" - - [[package]] - name = "tempfile" - version = "3.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)", -- "remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if", -+ "libc", -+ "rand 0.7.3", -+ "redox_syscall", -+ "remove_dir_all", -+ "winapi 0.3.9", - ] - - [[package]] - name = "termcolor" - version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" - dependencies = [ -- "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util", - ] - - [[package]] - name = "time" - version = "0.1.43" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "tinyvec" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" - - [[package]] - name = "tokio" - version = "0.1.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-fs 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-udp 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-uds 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "mio", -+ "num_cpus", -+ "tokio-codec", -+ "tokio-current-thread", -+ "tokio-executor", -+ "tokio-fs", -+ "tokio-io", -+ "tokio-reactor", -+ "tokio-sync", -+ "tokio-tcp", -+ "tokio-threadpool", -+ "tokio-timer", -+ "tokio-udp", -+ "tokio-uds", - ] - - [[package]] - name = "tokio-codec" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "tokio-io", - ] - - [[package]] - name = "tokio-core" - version = "0.1.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "iovec", -+ "log 0.4.11", -+ "mio", -+ "scoped-tls", -+ "tokio", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-reactor", -+ "tokio-timer", - ] - - [[package]] - name = "tokio-current-thread" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "tokio-executor", - ] - - [[package]] - name = "tokio-executor" - version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" - dependencies = [ -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.2", -+ "futures", - ] - - [[package]] - name = "tokio-fs" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "tokio-io", -+ "tokio-threadpool", - ] - - [[package]] - name = "tokio-io" - version = "0.1.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "log 0.4.11", - ] - - [[package]] - name = "tokio-process" - version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "382d90f43fa31caebe5d3bc6cfd854963394fff3b8cb59d5146607aaae7e7e43" - dependencies = [ -- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio-named-pipes 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-signal 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-queue 0.1.2", -+ "futures", -+ "lazy_static", -+ "libc", -+ "log 0.4.11", -+ "mio", -+ "mio-named-pipes", -+ "tokio-io", -+ "tokio-reactor", -+ "tokio-signal", -+ "winapi 0.3.9", - ] - - [[package]] - name = "tokio-proto" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "log 0.3.9", -+ "net2", -+ "rand 0.3.23", -+ "slab 0.3.0", -+ "smallvec 0.2.1", -+ "take", -+ "tokio-core", -+ "tokio-io", -+ "tokio-service", - ] - - [[package]] - name = "tokio-reactor" - version = "0.1.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" - dependencies = [ -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.2", -+ "futures", -+ "lazy_static", -+ "log 0.4.11", -+ "mio", -+ "num_cpus", -+ "parking_lot", -+ "slab 0.4.2", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-sync", - ] - - [[package]] - name = "tokio-service" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", - ] - - [[package]] - name = "tokio-signal" - version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "libc", -+ "mio", -+ "mio-uds", -+ "signal-hook-registry", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-reactor", -+ "winapi 0.3.9", - ] - - [[package]] - name = "tokio-sync" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" - dependencies = [ -- "fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fnv", -+ "futures", - ] - - [[package]] - name = "tokio-tcp" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "iovec", -+ "mio", -+ "tokio-io", -+ "tokio-reactor", - ] - - [[package]] - name = "tokio-threadpool" - version = "0.1.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" - dependencies = [ -- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-queue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-deque", -+ "crossbeam-queue 0.2.3", -+ "crossbeam-utils 0.7.2", -+ "futures", -+ "lazy_static", -+ "log 0.4.11", -+ "num_cpus", -+ "slab 0.4.2", -+ "tokio-executor", - ] - - [[package]] - name = "tokio-timer" - version = "0.2.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" - dependencies = [ -- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.2", -+ "futures", -+ "slab 0.4.2", -+ "tokio-executor", - ] - - [[package]] - name = "tokio-udp" - version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "log 0.4.11", -+ "mio", -+ "tokio-codec", -+ "tokio-io", -+ "tokio-reactor", - ] - - [[package]] - name = "tokio-uds" - version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "iovec", -+ "libc", -+ "log 0.4.11", -+ "mio", -+ "mio-uds", -+ "tokio-codec", -+ "tokio-io", -+ "tokio-reactor", - ] - - [[package]] - name = "try-lock" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2" - - [[package]] - name = "typenum" - version = "1.12.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" - - [[package]] - name = "unicase" - version = "2.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" - dependencies = [ -- "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check", - ] - - [[package]] - name = "unicode-bidi" - version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" - dependencies = [ -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches", - ] - - [[package]] - name = "unicode-normalization" - version = "0.1.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" - dependencies = [ -- "tinyvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tinyvec", - ] - - [[package]] - name = "unicode-width" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - - [[package]] - name = "unicode-xid" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - - [[package]] - name = "unicode-xid" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - - [[package]] - name = "url" - version = "1.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" - dependencies = [ -- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "idna", -+ "matches", -+ "percent-encoding", - ] - - [[package]] - name = "uuid" - version = "0.7.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" - dependencies = [ -- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.6.5", - ] - - [[package]] - name = "vergen" - version = "3.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1", -+ "chrono", - ] - - [[package]] - name = "version_check" - version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" - - [[package]] - name = "void" - version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - - [[package]] - name = "vorbis" - version = "0.0.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e8a194457075360557b82dac78f7ca2d65bbb6679bccfabae5f7c8c706cc776" - dependencies = [ -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "vorbisfile-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "ogg-sys", -+ "vorbis-sys", -+ "vorbisfile-sys", - ] - - [[package]] - name = "vorbis-sys" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3a0a8d7034313748da1d84b0adfa501f83f9ec83250f37fbacfa92a3580327c4" - dependencies = [ -- "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gcc", -+ "libc", -+ "ogg-sys", -+ "pkg-config", - ] - - [[package]] - name = "vorbisfile-sys" - version = "0.0.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f4306d7e1ac4699b55e20de9483750b90c250913188efd7484db6bfbe9042d1" - dependencies = [ -- "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", -- "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -- "vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gcc", -+ "libc", -+ "ogg-sys", -+ "pkg-config", -+ "vorbis-sys", - ] - - [[package]] - name = "want" - version = "0.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "log 0.4.11", -+ "try-lock", - ] - - [[package]] - name = "wasi" - version = "0.9.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - - [[package]] - name = "winapi" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - - [[package]] - name = "winapi" - version = "0.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" - dependencies = [ -- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", - ] - - [[package]] - name = "winapi-build" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - - [[package]] - name = "winapi-i686-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - - [[package]] - name = "winapi-util" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" - dependencies = [ -- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9", - ] - - [[package]] - name = "winapi-x86_64-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "ws2_32-sys" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" - dependencies = [ -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.2.8", -+ "winapi-build", - ] - - [[package]] - name = "zerocopy" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "992b9b31f80fd4a167f903f879b8ca43d6716cc368ea01df90538baa2dd34056" - dependencies = [ -- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "zerocopy-derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "zerocopy-derive", - ] - - [[package]] - name = "zerocopy-derive" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b090467ecd0624026e8a6405d343ac7382592530d54881330b3fc8e400280fa5" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -- "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[metadata] --"checksum aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9" --"checksum aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" --"checksum aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" --"checksum aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" --"checksum alga 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" --"checksum alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a0d4ebc8b23041c5de9bc9aee13b4bad844a589479701f31a5934cfe4aeb32" --"checksum alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58" --"checksum approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" --"checksum arc-swap 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" --"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" --"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" --"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" --"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" --"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" --"checksum bindgen 0.53.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" --"checksum bit-set 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" --"checksum bit-vec 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" --"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" --"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" --"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" --"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" --"checksum block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" --"checksum block-modes 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529" --"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" --"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" --"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" --"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" --"checksum cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" --"checksum cexpr 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" --"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" --"checksum chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" --"checksum clang-sys 0.29.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" --"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" --"checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" --"checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491" --"checksum coreaudio-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d6570ee6e089131e928d5ec9236db9e818aa3cf850f48b0eec6ef700571271d4" --"checksum cpal 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58ae1ed6536b1b233f5e3aeb6997a046ddb4d05e3f61701b58a92eb254a829e" --"checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" --"checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" --"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" --"checksum crossbeam-queue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" --"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" --"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" --"checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" --"checksum ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" --"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" --"checksum dns-sd 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d748509dea20228f63ba519bf142ce2593396386125b01f5b0d6412dab972087" --"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" --"checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" --"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" --"checksum fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" --"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" --"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" --"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" --"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" --"checksum futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" --"checksum futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" --"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" --"checksum futures-executor 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" --"checksum futures-macro 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" --"checksum futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" --"checksum futures-task 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" --"checksum futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" --"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" --"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" --"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" --"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" --"checksum glib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" --"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" --"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" --"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" --"checksum gstreamer 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163" --"checksum gstreamer-app 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)" = "789784e8d42f5add1e1e965cf9f7e2d09e21dd0756bae6148f971db9a761d6a9" --"checksum gstreamer-app-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf869ce152c23bca5d761ab62146b47f750d0b28d4d499731857532897d48167" --"checksum gstreamer-base 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "42552f75cc6c260b0be180d5c955f4cd74bd170289c622404c25f1210b521c12" --"checksum gstreamer-base-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ba384f52174b3c586593fca32642680a9e67961fea9f4cd8419f678965023bed" --"checksum gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d18da01b97d0ab5896acd5151e4c155acefd0e6c03c3dd24dd133ba054053db" --"checksum hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" --"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" --"checksum hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" --"checksum hostname 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" --"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" --"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" --"checksum hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)" = "34a590ca09d341e94cddf8e5af0bbccde205d5fbc2fa3c09dd67c7f85cea59d7" --"checksum hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44f0925de2747e481e6e477dd212c25e8f745567f02f6182e04d27b97c3fbece" --"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" --"checksum if-addrs 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48" --"checksum if-addrs-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" --"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" --"checksum itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" --"checksum jack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1e15fc592e2e5a74a105ff507083c04db1aa20ba1b90d425362ba000e57422df" --"checksum jack-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4ca501477fd3cd93a36df581046e5d6338ed826cf7e9b8d302603521e6cc3" --"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" --"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" --"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" --"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" --"checksum lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0" --"checksum libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)" = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9" --"checksum libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9" --"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" --"checksum libm 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" --"checksum libmdns 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5d8582c174736c53633bc482ac709b24527c018356c3dc6d8e25a788b06b394e" --"checksum libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9bb11b06faf883500c1b625cf4453e6c7737e9df9c7ba01df3f84b22b083e4ac" --"checksum librespot-tremor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97f525bff915d478a76940a7b988e5ea34911ba7280c97bd3a7673f54d68b4fe" --"checksum linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" --"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" --"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" --"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" --"checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" --"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" --"checksum matrixmultiply 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f7ec66360130972f34830bfad9ef05c6610a43938a467bcc9ab9369ab3478f" --"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" --"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" --"checksum memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" --"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" --"checksum mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)" = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" --"checksum mio-named-pipes 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" --"checksum mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" --"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" --"checksum miow 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" --"checksum muldiv 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" --"checksum multimap 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" --"checksum nalgebra 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2" --"checksum net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" --"checksum nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" --"checksum nom 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" --"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" --"checksum num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" --"checksum num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" --"checksum num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" --"checksum num-iter 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" --"checksum num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" --"checksum num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" --"checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" --"checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15" --"checksum ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "a95b8c172e17df1a41bf8d666301d3b2c4efeb90d9d0415e2a4dc0668b35fdb2" --"checksum once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" --"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" --"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" --"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" --"checksum paste 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" --"checksum paste-impl 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" --"checksum pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" --"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" --"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" --"checksum pin-project 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)" = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" --"checksum pin-project-internal 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" --"checksum pin-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" --"checksum pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" --"checksum portaudio-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cdb6b5eff96ccc9bf44d34c379ab03ae944426d83d1694345bdf8159d561d562" --"checksum portaudio-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5194a4fa953b4ffd851c320ef6f0484cd7278cb7169ea9d6c433e49b23f7b7f5" --"checksum ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" --"checksum proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)" = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" --"checksum proc-macro-nested 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" --"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" --"checksum proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" --"checksum protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485" --"checksum protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c" --"checksum protobuf-codegen-pure 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440" --"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" --"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" --"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" --"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" --"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" --"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" --"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" --"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" --"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" --"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" --"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" --"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" --"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" --"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" --"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" --"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" --"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" --"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" --"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" --"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" --"checksum rawpointer 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" --"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" --"checksum redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)" = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" --"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" --"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" --"checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" --"checksum remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" --"checksum rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d0f961b254e66d147a7b550c78b01308934c97d807a34b417fd0f5a0a0f3a2d" --"checksum rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c34fa7bcae7fca3c8471e8417088bbc3ad9af8066b0ecf4f3c0d98a0d772716e" --"checksum rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" --"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" --"checksum ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" --"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" --"checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" --"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" --"checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b" --"checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86" --"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" --"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" --"checksum serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" --"checksum serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" --"checksum serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)" = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" --"checksum sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" --"checksum sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" --"checksum shannon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ea5b41c9427b56caa7b808cb548a04fb50bb5b9e98590b53f28064ff4174561" --"checksum shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a" --"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" --"checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" --"checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" --"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" --"checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013" --"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" --"checksum socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" --"checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" --"checksum stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" --"checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" --"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" --"checksum syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" --"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" --"checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" --"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" --"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" --"checksum time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" --"checksum tinyvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" --"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" --"checksum tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" --"checksum tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71" --"checksum tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" --"checksum tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" --"checksum tokio-fs 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" --"checksum tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" --"checksum tokio-process 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "382d90f43fa31caebe5d3bc6cfd854963394fff3b8cb59d5146607aaae7e7e43" --"checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389" --"checksum tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" --"checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" --"checksum tokio-signal 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12" --"checksum tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" --"checksum tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" --"checksum tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" --"checksum tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" --"checksum tokio-udp 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" --"checksum tokio-uds 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" --"checksum try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2" --"checksum typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" --"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" --"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" --"checksum unicode-normalization 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" --"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" --"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" --"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" --"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" --"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" --"checksum vergen 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb" --"checksum version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" --"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" --"checksum vorbis 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "5e8a194457075360557b82dac78f7ca2d65bbb6679bccfabae5f7c8c706cc776" --"checksum vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0a8d7034313748da1d84b0adfa501f83f9ec83250f37fbacfa92a3580327c4" --"checksum vorbisfile-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f4306d7e1ac4699b55e20de9483750b90c250913188efd7484db6bfbe9042d1" --"checksum want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" --"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" --"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" --"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" --"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" --"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" --"checksum winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" --"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" --"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" --"checksum zerocopy 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "992b9b31f80fd4a167f903f879b8ca43d6716cc368ea01df90538baa2dd34056" --"checksum zerocopy-derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b090467ecd0624026e8a6405d343ac7382592530d54881330b3fc8e400280fa5" -+ "proc-macro2 0.4.30", -+ "syn 0.15.44", -+ "synstructure", -+] diff --git a/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix index 61f709b33e..de1952b991 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix @@ -4,17 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "librespot"; - version = "0.1.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "librespot-org"; repo = "librespot"; rev = "v${version}"; - sha256 = "153i9n3qwmmwc29f62cz8nbqrlry16iygvibm1sdnvpf0s6wk5f3"; + sha256 = "0n7h690gplpp47gdj038g6ncgwr7wvwfkg00cbrbvxhv7kzqqa1f"; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "11d64rpq4b5rdxk5wx0hhzgc6mvs6h2br0w3kfncfklp67vn3v4v"; + cargoSha256 = "0qakvpxvn84ppgs3qlsfan4flqkmjcgs698w25jasx9ymiv8wc3s"; cargoBuildFlags = with lib; [ "--no-default-features" diff --git a/third_party/nixpkgs/pkgs/applications/audio/lmms/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lmms/default.nix index f791ad51bf..4830476af2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lmms/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lmms/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cmake, pkg-config, alsa-lib ? null, fftwFloat, fltk13 -, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null +, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: @@ -21,7 +21,7 @@ mkDerivation rec { alsa-lib fftwFloat fltk13 - fluidsynth_1 + fluidsynth lame libgig libjack2 diff --git a/third_party/nixpkgs/pkgs/applications/audio/mousai/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mousai/default.nix index 9044d201c4..f61b7c5b7b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mousai/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mousai/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, substituteAll , appstream-glib , desktop-file-utils , gettext @@ -13,12 +14,13 @@ , meson , ninja , pkg-config +, pulseaudio , wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "mousai"; - version = "0.4.2"; + version = "0.6.6"; format = "other"; @@ -26,9 +28,16 @@ python3.pkgs.buildPythonApplication rec { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - sha256 = "sha256-zH++GGFIz3oxkKOYB4zhY6yL3vENEXxtrv8mZZ+41kU="; + sha256 = "sha256-nCbFVFg+nVF8BOBfdzQVgdTRXR5UF18PJFC266yTFwg="; }; + patches = [ + (substituteAll { + src = ./paths.patch; + pactl = "${lib.getBin pulseaudio}/bin/pactl"; + }) + ]; + postPatch = '' patchShebangs build-aux/meson ''; @@ -53,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { gtk4 libadwaita librsvg + pulseaudio ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mousai/paths.patch b/third_party/nixpkgs/pkgs/applications/audio/mousai/paths.patch new file mode 100644 index 0000000000..35b328ad0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mousai/paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/backend/utils.py b/src/backend/utils.py +index cebc009..0087c09 100644 +--- a/src/backend/utils.py ++++ b/src/backend/utils.py +@@ -79,7 +79,7 @@ class Utils: + @staticmethod + def get_default_audio_sources(): + pactl_output = subprocess.run( +- ['/usr/bin/pactl', 'info'], ++ ['@pactl@', 'info'], + stdout=subprocess.PIPE, + text=True + ).stdout.splitlines() diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix index a0adc22af7..10418c418f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.9.2"; + version = "21.10.2"; name = "${pname}-${version}"; suffix = { @@ -18,9 +18,9 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | rg ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-mgip818sGkrKwF4v2mj/JeTNxBoj7DgdNPoxZ8sp8OvojHB2sa0hm4YXfrzAdPf8CP6d5ChUmwccQyYilGUiOQ=="; - x86_64-linux = "sha512-f02m8Q6ITYhIXH1FS2BA/QYYsdtxklDDNYBXBarj8b1kA+yhDFZ3VL9vy+nZNdPQHQ2yMQreDzpcToXBQ67XyQ=="; + sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' + aarch64-linux = "sha512-+qXN9cQk1u18ZzeMecPNfhkTTsw61iM/IJYksPJl9+zx2AKldv9tAFUnnmKZ65LabiaIXI+emN185SRRcaOndw=="; + x86_64-linux = "sha512-WpiG8VOEODqsQ1/jERiEEGwVqR0zbMqERGjOysEVYorA0p3xZyl7OSpWOSWaUjPBZpQtJIBdqhSXeoSRcvfJgg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 5a3cd7b13f..9cee648550 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -13,12 +13,12 @@ let sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l"; }; betaVersion = { - version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" - sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; + version = "2021.1.1.14"; # "Android Studio Bumblebee (2021.1.1) Beta 1" + sha256Hash = "1j1fxl4vzq3bln2z9ycxn9imjgy55yd1nbl7ycmsi90bdp96pzj0"; }; latestVersion = { # canary & dev - version = "2021.1.1.13"; # "Android Studio Bumblebee (2021.1.1) Canary 13" - sha256Hash = "04w5jw79fkxk4gy1n9iy8kjxg6k3zcl59z76f04rh556n12f01gm"; + version = "2021.2.1.1"; # "Android Studio Chipmunk (2021.2.1) Canary 1" + sha256Hash = "1fn0jv6ybgdhgpwhamw16fjqbg2961ir9jhbjzanysi7y3935nbv"; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix index c0fb568046..0d9028e59f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix @@ -7,13 +7,13 @@ trivialBuild rec { pname = "apheleia"; - version = "0.pre+unstable=2021-08-08"; + version = "1.1.2+unstable=2021-10-03"; src = fetchFromGitHub { owner = "raxod502"; repo = pname; - rev = "8e022c67fea4248f831c678b31c19646cbcbbf6f"; - hash = "sha256-Put/BBQ7V423C18UIVfaM17T+TDWtAxRZi7WI8doPJw="; + rev = "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd"; + hash = "sha256-QwGlCdHBll16mbfQxGw1EORZFUxYCZSt8ThYTTGjRpo="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 8d6ba3540b..7eb9f12a5a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -369,10 +369,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.0.2.tar"; - sha256 = "07m832kn4d6njfz21qfmh12gzd35d17v29pqlxfq9v03cazww4lr"; + url = "https://elpa.gnu.org/packages/boxy-1.0.4.tar"; + sha256 = "0cwzjyj8yjg13b63va6pnj01m6kc5g3zx69c9w2ysl2wk24zn6dz"; }; packageRequires = [ emacs ]; meta = { @@ -380,18 +380,18 @@ license = lib.licenses.free; }; }) {}; - boxy-headlines = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }: + boxy-headings = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { - pname = "boxy-headlines"; - ename = "boxy-headlines"; - version = "1.0.2"; + pname = "boxy-headings"; + ename = "boxy-headings"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headlines-1.0.2.tar"; - sha256 = "1j8j2vc318mb4i116qs9zj6cvkiy1fips09mkzj6lqr25qk5fi31"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.0.tar"; + sha256 = "021w4ic028jsq7vxz1jgnfny9dymcz6v112b3b3nwyw3g3dnc62f"; }; - packageRequires = [ boxy emacs ]; + packageRequires = [ boxy emacs org ]; meta = { - homepage = "https://elpa.gnu.org/packages/boxy-headlines.html"; + homepage = "https://elpa.gnu.org/packages/boxy-headings.html"; license = lib.licenses.free; }; }) {}; @@ -666,10 +666,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.11.tar"; - sha256 = "14zjhsfhq5g9257maivyzpj5qxi1kprcsdk1qalwybyylyb4q4kk"; + url = "https://elpa.gnu.org/packages/consult-0.12.tar"; + sha256 = "0xcr7jki9m30hppy24z74nrw7xv5nahm1yrjilcck32mxfkrc69x"; }; packageRequires = [ emacs ]; meta = { @@ -696,10 +696,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.11"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.11.tar"; - sha256 = "1sf7ll25ry7vwff4bvqgdh84zviqj6wifmqdb2z8hf12awz63icz"; + url = "https://elpa.gnu.org/packages/corfu-0.13.tar"; + sha256 = "0psvkxr7fjqq7gkqdzl0ma367zjlxgixk563vpv9hmwfwymddyyb"; }; packageRequires = [ emacs ]; meta = { @@ -1086,10 +1086,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.5.tar"; - sha256 = "1p2chzj5hnaiqhammvdp82ck5pi6h1rl9r782zaqxrhrqsp3vg09"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.6.tar"; + sha256 = "0amr1s1q5w4513qw31qsr8gpsfgj5b2j7qn017rmwbaf1mj0k6z0"; }; packageRequires = [ emacs seq ]; meta = { @@ -1146,10 +1146,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20211006"; + version = "20211011"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20211006.tar"; - sha256 = "08z9q5y46fqm7r1gwiv0ir2hcybwfrvh0b7pxsrppjs1gvclyazn"; + url = "https://elpa.gnu.org/packages/eev-20211011.tar"; + sha256 = "1a71qam6z5s3zl7fvxpsnabbqxh8a7llm1524nxs2353pb6ksfra"; }; packageRequires = [ emacs ]; meta = { @@ -1325,6 +1325,21 @@ license = lib.licenses.free; }; }) {}; + erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "erc"; + ename = "erc"; + version = "5.4.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/erc-5.4.1.tar"; + sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/erc.html"; + license = lib.licenses.free; + }; + }) {}; ergoemacs-mode = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -2084,16 +2099,16 @@ license = lib.licenses.free; }; }) {}; - kiwix = callPackage ({ elpaBuild, elquery, emacs, fetchurl, lib, request }: + kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: elpaBuild { pname = "kiwix"; ename = "kiwix"; - version = "1.1.0"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kiwix-1.1.0.tar"; - sha256 = "1clp0q34bs395d0hrqdyvm9ds665hgf5qrdiqa14k31h4lbv2wsn"; + url = "https://elpa.gnu.org/packages/kiwix-1.1.4.tar"; + sha256 = "1ls11a7fc6d4gj85g8m09r95fvc4ppc0k0fs28d1hzybmgl89rgl"; }; - packageRequires = [ elquery emacs request ]; + packageRequires = [ emacs request ]; meta = { homepage = "https://elpa.gnu.org/packages/kiwix.html"; license = lib.licenses.free; @@ -2268,10 +2283,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.8.tar"; - sha256 = "0afry11i7kgfa0q83p63hmahl7jzsqhn4sl1rnkjy98pnikwv9kd"; + url = "https://elpa.gnu.org/packages/marginalia-0.9.tar"; + sha256 = "0jnw9ys7p2rhi7sx2wxi3xs95ryg9vr34xb2jdfiz0p1xv04a300"; }; packageRequires = [ emacs ]; meta = { @@ -2577,14 +2592,29 @@ license = lib.licenses.free; }; }) {}; + nano-agenda = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "nano-agenda"; + ename = "nano-agenda"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nano-agenda-0.1.tar"; + sha256 = "1bylgd4ly6dybpg66ndgsmgs5w0y5ymfq3s2pbwjnl46fnrmggz0"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nano-agenda.html"; + license = lib.licenses.free; + }; + }) {}; nano-modeline = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-modeline-0.1.tar"; - sha256 = "10hnxgjp56dqydf39mbn9zmwwvnwzi89lwnam5k3x6d6p2cnfgcx"; + url = "https://elpa.gnu.org/packages/nano-modeline-0.2.tar"; + sha256 = "13m8j8jnd33wwv1siv6frzdbs7bhspg859sflq58vimv444zjzac"; }; packageRequires = [ emacs ]; meta = { @@ -2596,10 +2626,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.2"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.2.tar"; - sha256 = "0kcirnl1fg9kvavw8aq9l16jv4rrxv5w62i7wrsjn7np697sm0s6"; + url = "https://elpa.gnu.org/packages/nano-theme-0.2.1.tar"; + sha256 = "0m98kq40dhbrn55x4bp2x5d5j1gps4y7z4086mgnj8wr1y3w8kdl"; }; packageRequires = [ emacs ]; meta = { @@ -2791,16 +2821,16 @@ license = lib.licenses.free; }; }) {}; - org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }: + org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.1.tar"; - sha256 = "0rklzp32v30ndyqli3fjcsqvvpiz3klsz26b7zn2bai2ldx6016s"; + url = "https://elpa.gnu.org/packages/org-real-1.0.4.tar"; + sha256 = "0bn9vyx74lki2nggzir02mcrww94dnqpbkryjr7a4i6am0ylf705"; }; - packageRequires = [ boxy emacs ]; + packageRequires = [ boxy emacs org ]; meta = { homepage = "https://elpa.gnu.org/packages/org-real.html"; license = lib.licenses.free; @@ -3020,10 +3050,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.8.0.tar"; - sha256 = "05q2zr661bn2h6pdvyv3apdajfxnsx0rb0n5np8cg98a7gw4zyxd"; + url = "https://elpa.gnu.org/packages/project-0.8.1.tar"; + sha256 = "1x3zkbjsi04v5ny3yxqrb75vcacrj9kxmpm9mvkp0n07j5g34f68"; }; packageRequires = [ emacs xref ]; meta = { @@ -3095,10 +3125,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.27.1"; + version = "0.28"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.27.1.el"; - sha256 = "0jygl2w8x73v22w0rzq75i2hnm3f46dzgg5x1ckz720nznvwwkka"; + url = "https://elpa.gnu.org/packages/python-0.28.tar"; + sha256 = "1pvhsdjla1rvw223h7irmbzzsrixnpy1rsskiq9xmkpkc688b6pm"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3546,10 +3576,10 @@ elpaBuild { pname = "shelisp"; ename = "shelisp"; - version = "0.9.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shelisp-0.9.1.el"; - sha256 = "15z8rpx8nhx53q77z5fqcpww255di80lb5mm28mnn2myalrr8b59"; + url = "https://elpa.gnu.org/packages/shelisp-1.0.0.tar"; + sha256 = "05r26gy1ajl47ir0yz5gn62xw2f31vdq04n3r8ywlzxbqyvzlc0d"; }; packageRequires = []; meta = { @@ -3561,10 +3591,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.1.tar"; - sha256 = "1dmi7fn4g55va5ljpyswr3dpgj471747kkdixfyp8zpsbhvr5yf6"; + url = "https://elpa.gnu.org/packages/shell-command+-2.3.1.tar"; + sha256 = "0g8pcrkkh3bxcxxbasnz834gi3pvhlkpf011fvmlhwzswypcyqmy"; }; packageRequires = [ emacs ]; meta = { @@ -4574,10 +4604,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.2.2.tar"; - sha256 = "14kdy8blhs6lwg349l9lmv0bbpybgi9nsg2iic3v87j4jyi41ljm"; + url = "https://elpa.gnu.org/packages/xref-1.3.0.tar"; + sha256 = "0bw2cbxmjavzhmpd9gyl41d4c201p535jrfz3b7jb5zw12jdnppl"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 2ee92e251b..3f5dd795cc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -198,8 +198,6 @@ railgun = callPackage ./railgun { }; - rec-mode = callPackage ./rec-mode { }; - structured-haskell-mode = self.shm; sv-kalender = callPackage ./sv-kalender { }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index be3c69e114..ac2fdc4b37 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -155,14 +155,29 @@ license = lib.licenses.free; }; }) {}; + flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "flymake-kondor"; + ename = "flymake-kondor"; + version = "0.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.0.tar"; + sha256 = "0fn9vnrqy5nmv07jv2ry0xs90rkb92qhrh7j5pdikw7zykcwlbdd"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-kondor.html"; + license = lib.licenses.free; + }; + }) {}; geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.16"; + version = "0.18"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.16.tar"; - sha256 = "1mhngb1ik3qsc3w466cs61rbz3nn08ag29m5vfbd6adk60xmhnfk"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.18.tar"; + sha256 = "131j4f82hl4pqj07qsl1f2dz4105v5fyll3bc97ggayzvrdiy58i"; }; packageRequires = [ emacs ]; meta = { @@ -330,10 +345,10 @@ elpaBuild { pname = "git-commit"; ename = "git-commit"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/git-commit-3.2.1.tar"; - sha256 = "1jndc8ppj4r2s62idabygj4q0qbpk4gwifn8jrd6pa61d7dlvp28"; + url = "https://elpa.nongnu.org/nongnu/git-commit-3.3.0.tar"; + sha256 = "0lp6r4w1k0idvfc2h0chlplap2i4x2slva9cw3iw1rhhxbcvlmdx"; }; packageRequires = [ dash emacs transient with-editor ]; meta = { @@ -416,6 +431,21 @@ license = lib.licenses.free; }; }) {}; + haskell-tng-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, popup }: + elpaBuild { + pname = "haskell-tng-mode"; + ename = "haskell-tng-mode"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar"; + sha256 = "1dndnxb9bdjnixyl09025065wdrk0h8q721rbwvransq308fijwy"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html"; + license = lib.licenses.free; + }; + }) {}; highlight-parentheses = callPackage ({ elpaBuild , emacs , fetchurl @@ -560,10 +590,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-3.2.1.tar"; - sha256 = "0yyf16605bp5q8jl2vbljxx04ja0ljvs775dnnawlc3mvn13zd9n"; + url = "https://elpa.nongnu.org/nongnu/magit-3.3.0.tar"; + sha256 = "0ihrds45z12z155c1y7haz1mxc95w6v4rynh0izm159xhz44121z"; }; packageRequires = [ dash @@ -582,10 +612,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-3.2.1.tar"; - sha256 = "1ppinys8rfa38ac8grcx16hlaw33p03pif4ya6bbw280kq8c73rv"; + url = "https://elpa.nongnu.org/nongnu/magit-section-3.3.0.tar"; + sha256 = "08ac10vips6f2gy4x4w2wkz2ki3q0d6dhynkmlpdinsdmgagziny"; }; packageRequires = [ dash emacs ]; meta = { @@ -657,10 +687,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.1"; + version = "0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-contrib-0.1.tar"; - sha256 = "07hzywvgj11wd21dw4lbkvqv32da03407f9qynlzgg1qa7wknm2k"; + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.3.tar"; + sha256 = "0fqhyby7624drskfsasgvzyxbgjb42rd6vw8l6xgb3h22kaprl0q"; }; packageRequires = [ emacs org ]; meta = { @@ -683,6 +713,21 @@ license = lib.licenses.free; }; }) {}; + popup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "popup"; + ename = "popup"; + version = "0.5.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/popup-0.5.8.tar"; + sha256 = "1amwxsymzvzmj8696fa6i0cqx4ac581rvr4dwkri7akkr7amh3yh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/popup.html"; + license = lib.licenses.free; + }; + }) {}; projectile = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "projectile"; @@ -841,10 +886,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.0.tar"; - sha256 = "1pfp1nvq2gny6kbiq3q0dcms0ysw43zq0aayfwqdj0llkf025dfp"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.1.tar"; + sha256 = "0f87bjgva0iv818bh2dqvc1svrwh5zm134jpxcmvmzr1yqazx4qp"; }; packageRequires = [ emacs seq ]; meta = { @@ -882,6 +927,21 @@ license = lib.licenses.free; }; }) {}; + vc-fossil = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "vc-fossil"; + ename = "vc-fossil"; + version = "20210928"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/vc-fossil-20210928.tar"; + sha256 = "0n4h1cj1336mv5cswq0139bkry5gnv4hrrwzd4bqhrxp5kbhqa5y"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-fossil.html"; + license = lib.licenses.free; + }; + }) {}; web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "web-mode"; @@ -916,10 +976,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.4.tar"; - sha256 = "032i954rzn8sg1qp6vjhz6j8j1fl6mpvhfnmd3va8k9q9m27k4an"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.5.tar"; + sha256 = "0bri6jr99133k9w0d754rw2f6hgjzndczngfw2lf2rvxks448krm"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix deleted file mode 100644 index 8cb560fde5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, trivialBuild -, recutils -}: - -trivialBuild { - pname = "rec-mode"; - - inherit (recutils) version src; - - postUnpack = '' - sourceRoot="$sourceRoot/etc" - ''; - - meta = recutils.meta // { - description = "A major mode for editing rec files"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 663510d92e..5b2372f634 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1878,25 +1878,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20211006, - 1629 + 20211011, + 725 ], "deps": [ "consult" ], - "commit": "ccf486a902cd573d79b43ca61a4ba855fd056567", - "sha256": "07zhp5a4bfi7nyjsr84a7yp9rasn9yk08m445iwjcrjxxy230qlg" + "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", + "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "consult" ], - "commit": "be08c4ec49681474cbebaf0957568f27e42c4b3c", - "sha256": "0lpqpy33bmsh84ib1i278sr8ldn8y9ydqdikch1xi56via4ic2x2" + "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", + "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" } }, { @@ -1962,8 +1962,8 @@ "annotation", "eri" ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "070d0c841788d3a09e4557d92fd954bb1b6a7e9e", + "sha256": "055cyxcanmj29yphvw7g6k022bj8gs19xrhamxm4xii7bwbd5imv" }, "stable": { "version": [ @@ -2344,20 +2344,20 @@ "deps": [ "flycheck" ], - "commit": "0508d5a0e6e18cd6e489506d98730a9aaa6541a2", - "sha256": "1fn12zdsdn0ssj88ziyqw97ibkzvvql90dxf0x1a02mjqzkqviif" + "commit": "bddc1dc5757bd6ef308f21ed70811281a2ad5298", + "sha256": "1vpsddfjxpvylq70r7ip6c0iaqn10jdkxmwd93r1zzkxg30hzsf3" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], "deps": [ "flycheck" ], - "commit": "ef9b4d4653c95388b9e0b242bc24fea9922cfcbb", - "sha256": "0w6p5qy3cdlngrn1nv79gbgv97idkpxmw47xfcw8fn615wa5j9q4" + "commit": "bddc1dc5757bd6ef308f21ed70811281a2ad5298", + "sha256": "1vpsddfjxpvylq70r7ip6c0iaqn10jdkxmwd93r1zzkxg30hzsf3" } }, { @@ -2476,14 +2476,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20210728, - 2119 + 20211009, + 2207 ], "deps": [ "all-the-icons" ], - "commit": "96500418541b7376cd0b3e4583b9509c0dd92b27", - "sha256": "0sn5jxmhdpnnjn8x99vc9m9d31kw9alkkdr0xc345aa0ssjlkf6f" + "commit": "a0f34d68cc12330ab3992a7521f9caa1de3b8470", + "sha256": "18dd37p1vh8ixc2q07jqwzpc82qq31m89nzps192pdgkfffhdp8r" } }, { @@ -2495,13 +2495,13 @@ "unstable": { "version": [ 20211007, - 1405 + 1729 ], "deps": [ "all-the-icons" ], - "commit": "46ca70416391c1bf3a2b148c4a636dee249aa1b3", - "sha256": "1b2w6bkdc5f02xhgvl37gh7x0d2vjl6kdwnxh87qwscd68mc11qy" + "commit": "5e9b097f9950cc9f86de922b07903a4e5fefc733", + "sha256": "0p09rdq97hshg9gaivsqz9zvi2ba2p1a2ja1i8z6f896xv5jqs98" }, "stable": { "version": [ @@ -3246,8 +3246,8 @@ 20200914, 644 ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "070d0c841788d3a09e4557d92fd954bb1b6a7e9e", + "sha256": "055cyxcanmj29yphvw7g6k022bj8gs19xrhamxm4xii7bwbd5imv" }, "stable": { "version": [ @@ -3567,11 +3567,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20211004, - 527 + 20211014, + 612 ], - "commit": "48c66a669523d45de7e066d42933c1c7ca965bf4", - "sha256": "07hf143fzwnxj6a0l9yhy5s48zdsmlbmfjwy73pqbqfpi16739s2" + "commit": "30616b0924d85a99ca381f21d4717cb6eccc9f95", + "sha256": "09jb6xagdiyr0qvigsr4ij9kqgmm3qrq37z1djrh1r95qlq9b6wf" }, "stable": { "version": [ @@ -3598,6 +3598,30 @@ "sha256": "1b4ljzq4qyslwxxl6n2izghbl20wwzxxvcq5wk111blnwap4kddw" } }, + { + "ename": "apheleia", + "commit": "74ef92045e0f64b34cdb1ca686c9159b0623e61f", + "sha256": "0dmjvj7gw8qd8vh9m8ibs5pqgs63f5pv02686k97sawbkav7mg1r", + "fetcher": "github", + "repo": "raxod502/apheleia", + "unstable": { + "version": [ + 20211003, + 1818 + ], + "commit": "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd", + "sha256": "16j6lcqlsn1qy6nr82aq9hamkr0h6mnc9l5pk5x5v5n1s44sa0a3" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "53ac964e53e75b9a35a7bd173f23290d0f42d95c", + "sha256": "0f2dqid4h0psdyx3p18c7xn7nf8zr6y4qq98yvyjfbwq5lcjk4rn" + } + }, { "ename": "apib-mode", "commit": "dc2ebb04f975d8226a76260895399c937d6a1940", @@ -3658,11 +3682,11 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20201213, - 1118 + 20211014, + 2319 ], - "commit": "8c0c20b6896bba65c7f6cfe0a21e22b21a12c5f9", - "sha256": "1pr2qpvwfmqd0qysbdvaz0r0y7zznifridy0jyd8lwkddyi8jypf" + "commit": "9d1937af52cd8ecfeec27185644ea8cbf0dc1c08", + "sha256": "1kzvqxz0m2lgcm0whb121g1580vi7bvk4fj780d5xqqqlv0091a0" } }, { @@ -5579,8 +5603,8 @@ "avy", "embark" ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -7053,15 +7077,15 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20211002, - 1322 + 20211014, + 2143 ], "deps": [ "bibtex-completion", "parsebib" ], - "commit": "e84804e6f88747d39b36d9d18765ac0de99e95f5", - "sha256": "0ll6p81ijfrmivy0x4z07zyfgnw43x1l6y2rhlj9g3jrp2jrcwlx" + "commit": "b96728a7ccaa578360f7275bb01080c28bebd216", + "sha256": "17mif19zax6xhx0qbiwimfq1q3m18rka28nv6c9x5g3l6f0hby4i" }, "stable": { "version": [ @@ -8329,11 +8353,11 @@ "repo": "topikettunen/brutal-emacs", "unstable": { "version": [ - 20211007, - 926 + 20211014, + 2212 ], - "commit": "0d7d3133b80a2f37abcc67daf608c418e6372543", - "sha256": "19775jb6dknplafmy0gishi25x5i3rzfi096v6i069kwnn8g0wch" + "commit": "ce00e434baec93bdf846195516f083190edf3662", + "sha256": "0ax0qy597xknrqg8bp4sf7ag4nl7pdlgg1zicfis25xbdanyg9ar" } }, { @@ -8587,30 +8611,30 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210927, - 1513 + 20211008, + 1508 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", - "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" + "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", + "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" }, "stable": { "version": [ 0, 3, - 2 + 3 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", - "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" + "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", + "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" } }, { @@ -9775,8 +9799,8 @@ 20210707, 2310 ], - "commit": "d47d5871e2bce25aaab117cea3cdb7a41d9b0822", - "sha256": "1l3c8wpzif1cw94rdrj7ds6dp6av3yk44gxpv2nknq3gvx49n3av" + "commit": "cd6587efb64f58dc0e542f08734c875b93e63968", + "sha256": "094flwbwvvdr8asx5wgr07gbxz4n3fxb8ywbg13f69c9wagk6rkp" }, "stable": { "version": [ @@ -9886,11 +9910,11 @@ "repo": "fritzgrabo/cascading-dir-locals", "unstable": { "version": [ - 20210221, - 1516 + 20211013, + 1955 ], - "commit": "53967a3f4b2ac742ab8fd6b639c87cbb0229d5f8", - "sha256": "0pvvwxi7qbbg9h9hax6ispz69h0wk4c0adc26dyj1a2dpdxz2r5p" + "commit": "345d4b70e837d45ee84014684127e7399932d5e6", + "sha256": "160ay9rf1s4hm9xmmsd7z0mkhqrj9wpm8dpd49hhibcng8hv6z6a" } }, { @@ -10464,8 +10488,8 @@ 20171115, 2108 ], - "commit": "c2ab9b7ca6e0f23cfa359d69aba11f146bffa64d", - "sha256": "1ipyjli65sm09rns4yjmj92mrzs8gwgqspviz05df3rfw731b42c" + "commit": "ffa981bace8ab7dc1166c335b4b906b3bc0c6d32", + "sha256": "0ly2mnxpr27axvr4rxrk9a45jl0frfp190i86azd3sb9fj2klvq7" }, "stable": { "version": [ @@ -10583,16 +10607,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20211006, - 1711 + 20211013, + 1802 ], "deps": [ "dash", "posframe", "s" ], - "commit": "894d889a68a482d369010fe25da16c75f13f7cdb", - "sha256": "1698nnchw0i8xmar0v2lccn418w7snd3l0jarklk0xh33dq2klzr" + "commit": "c1f639d7bfd3e728cf85dbe224b06a4be76158f4", + "sha256": "1bic67769xvjdhinq88jqxnb4dql8gssmnx1wvrl69338zjqqjzg" }, "stable": { "version": [ @@ -11255,8 +11279,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20211003, - 947 + 20211013, + 2024 ], "deps": [ "clojure-mode", @@ -11267,8 +11291,8 @@ "sesman", "spinner" ], - "commit": "2b8bde358063e782771f2f12bdf32374d68a7174", - "sha256": "13x1wdxra3qqrsmxw1dqvc5d54za08yz4q4faprajs82h94vkifd" + "commit": "0a9d0ef429e76ee36c34e116c4633c69cea96c67", + "sha256": "06hzm7dpb7gsdrbxn3v3zjdci6qdm6mcnm7f03bgij3qcjg0isky" }, "stable": { "version": [ @@ -11537,8 +11561,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20211005, - 1943 + 20211014, + 1115 ], "deps": [ "dash", @@ -11549,8 +11573,8 @@ "s", "string-inflection" ], - "commit": "34e66583d95a8d80fb5b9f2960f3382ca0e6d3ab", - "sha256": "0y5apy2r657pzszgsc6vbxfy0l9qgxrwz2r4kj76fah4mf9g251b" + "commit": "c8ff95862823cdff067e8cc9bb7f5ef537e8f1d9", + "sha256": "1dqs5slpd9i8dj6fgryg46zabd6c134qrdq8dkj1i5n0k17ni0h1" }, "stable": { "version": [ @@ -11616,11 +11640,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210929, - 1422 + 20211010, + 1654 ], - "commit": "442a840a96e7103ef1873ffa253f8a83c79b2eec", - "sha256": "1xwb7vp5a576n8cfjixqpgyiiaqq1lv4d21pxda4yn4mvk4cjfa4" + "commit": "047aece5a6d8e1ed267e542c53f5f013293fce21", + "sha256": "09szz5m8gw3j86c3pd449wghrff1zbs1nxypbxxagry59kvsdxkf" }, "stable": { "version": [ @@ -12564,17 +12588,19 @@ 20210104, 1831 ], - "commit": "24fb43e3e757ad963082d9e92362242efb6ad265", - "sha256": "0amg5677g9ik40nsr2p2icny8vh7hw98gmp97ysz7if4yw928zd6" + "commit": "c5ae200d94333600117fc93e50c66bdd50994bbc", + "sha256": "0pay9ly2vzjb69a1aah1h6jkmixhrkps31i3mgk8frxyanlgjkgd" }, "stable": { "version": [ 3, - 21, - 3 + 22, + 0, + -1, + 1 ], - "commit": "7612abd52f192a13848a4d74191633a008892449", - "sha256": "1sg0vishbwhyxvw9p8vaqbfyaqaybv4bdkb32448irgsi382jp7w" + "commit": "167060303b6d9ffb56b2785cec0f7e363f0876c6", + "sha256": "0zaw4zjxsrjfm4rajqlh4wff158crbxyjpajbmh4yckd3gnz1swr" } }, { @@ -12726,11 +12752,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210925, - 1531 + 20211014, + 738 ], - "commit": "031f726941994d4a98649631eceeebb44b515b1b", - "sha256": "1rdrzrflnvskv41jg92zl5l99m3rzh1a7gwm325bmmi5fvsgsndd" + "commit": "68148cfc1f0723e554a09cbae4c732cfc348ecfd", + "sha256": "07y8ry0rwlxqdw39fi2maw114yyga8yzlbrxypw6irhnpm8mscjw" } }, { @@ -14070,30 +14096,30 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20210924, - 1159 + 20211015, + 1239 ], "deps": [ "company", "ht", "s" ], - "commit": "371d32ae7b488f76905fe98f3063ae30a72010fd", - "sha256": "1r3l2z6lagfj5piibph3n9lsb8fl3w5l8q6qg9z4fqfqrl9xclxi" + "commit": "493fe05fa81ba680fd44c5d05256a2ae788dabbe", + "sha256": "0fysg6fc20z8ymay27g6s1b3jcq0ndfcv5wynwjdfgvv2f5aay6z" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "company", "ht", "s" ], - "commit": "4d6d56a8b92af72aa3b1e0af1a7e7add965bf468", - "sha256": "1yr050zgygjvhwjmm2yd5p889y24vars90cr4pyqc4zhmgzrdkw5" + "commit": "ea577f13d0a47b6efbe2974a5a347a87d27c0c42", + "sha256": "1g6p5868qb2001ippdcnsscsm15d1fwl0iyilq7jk3ys68j30pr3" } }, { @@ -15004,16 +15030,16 @@ "repo": "Alexander-Miller/company-shell", "unstable": { "version": [ - 20170518, - 541 + 20211013, + 1725 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "52f3bf26b74adc30a275f5f4290a1fc72a6876ff", - "sha256": "0nv8vwmqgdb33cl1wfdbmncbrpfdciid48f6w8vmw39ks53i2z32" + "commit": "a77f4de75912aa87314cde92c603b831d5050246", + "sha256": "1mh93l6xn9frfvw86vbvs1fz544c7ylja118iaccfl42gr2ypsw9" }, "stable": { "version": [ @@ -15745,19 +15771,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20211007, - 848 + 20211014, + 1752 ], - "commit": "1af9ad3483f2ad2e52d03db3c1ee9bf6074a9669", - "sha256": "0wyz72579la8j5qd1xlwnpnpwr9z03yb8ckl081f4n9s6g4rb4qf" + "commit": "3715f7378bf1ea54af3878d118da1222bbf4bfa0", + "sha256": "1a3zg2nv2i2lgyvzn7l2y6d65s2jcrsmkz7j92gdv9zgmg4dbw7w" }, "stable": { "version": [ 0, - 11 + 12 ], - "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", - "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" + "commit": "ebb62563127a4b9442148372f897efb7baef61d2", + "sha256": "1bzlqn7k5akhyl763q29853yh5s8rmk6y1ncmy3am940wfypxjic" } }, { @@ -15775,8 +15801,8 @@ "company", "consult" ], - "commit": "9cd7987ebbcc7411404799639a88f24b690d8e16", - "sha256": "1djfb3dwg9yjx4kz37n1dd7i5pr9ks27c951yfijjhqcfr9m97aw" + "commit": "914c51c7d983e36869dd27bf21c80a8cac96a41f", + "sha256": "1wpq468mqzjq1c9ixks4hqik9yhli2p31x7mfmfqx3lw5rnc74cy" } }, { @@ -15787,15 +15813,15 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20210917, - 435 + 20211007, + 2352 ], "deps": [ "consult", "project" ], - "commit": "d3bb96abb5ccca29f4b04c6f623818386167a2b2", - "sha256": "1pqzc45g5db69nx5vq3qm48i47f3gjrdkq81pnh705vh4q7qgpky" + "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", + "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" } }, { @@ -15813,8 +15839,8 @@ "consult", "eglot" ], - "commit": "28a09cc839a9010df1a00a55528697ab34e1b259", - "sha256": "0vfr9cj2xzkpias7p25bl1yjbykg1lpphmn4a3p3sdmyh32zjy2s" + "commit": "f93c571dc392a8b11d35541bffde30bd9f411d30", + "sha256": "1jqg6sg6iaqxpfn7symiy221mg9sn4y1rn0l1rw9rj9xmcnng7s0" }, "stable": { "version": [ @@ -16009,8 +16035,8 @@ "consult", "yasnippet" ], - "commit": "9700eacab1ae7cabfacf1504db1b695b28a780b8", - "sha256": "1jzac2k9wx5wirz1m89a7fyhk4bi4vjfhlvkp618999dbfcqdx2q" + "commit": "bf6b496e00cecfd6475ebaa374a0c7c407963a8a", + "sha256": "0wgighq6r2vn9nxnisx7ci6xrxcpzhn19vaqs5xp2ig2gsm1andp" } }, { @@ -16102,6 +16128,36 @@ "sha256": "0pqdh9bx2j9kla57sn349m90azk02wajapmazdm26cjdc2npw7jh" } }, + { + "ename": "conventional-changelog", + "commit": "edbcd5c7d573bb4cb83260cd312144e707bfe897", + "sha256": "0bwyla7v8jvdm1xysg25fv0srpsn5wpi4dzqv6gz22z6rz4l3mp5", + "fetcher": "github", + "repo": "liuyinz/emacs-conventional-changelog", + "unstable": { + "version": [ + 20211012, + 1322 + ], + "deps": [ + "transient" + ], + "commit": "ba6285674d12d1eab6624ebf7a3bae7e72d56f99", + "sha256": "13l3h3akismyfgsw1l47df56lx3myr1zjqimhfzcl1jk4qg2579q" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "deps": [ + "transient" + ], + "commit": "ba6285674d12d1eab6624ebf7a3bae7e72d56f99", + "sha256": "13l3h3akismyfgsw1l47df56lx3myr1zjqimhfzcl1jk4qg2579q" + } + }, { "ename": "copy-as-format", "commit": "42fe8a2113d1c15701abe7a7e0a68e939c3d789b", @@ -16528,14 +16584,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210930, - 1140 + 20211010, + 1332 ], "deps": [ "counsel" ], - "commit": "dc7b9f9b381dffd19c79cb7ee53b79034590d309", - "sha256": "1zmx7vfi02c8k9wnbsmka5yx3ci8fv9wl8r0cc28jn40vgrivn8c" + "commit": "98860e5981b07952b5c15361cdb996741e5842c5", + "sha256": "056zqa9rq32vrmqq7i1yi37l5ypjdk2dgcd0yl9wlcl339cdzwsq" }, "stable": { "version": [ @@ -17195,11 +17251,11 @@ "repo": "kijimaD/create-link", "unstable": { "version": [ - 20210601, - 1327 + 20211014, + 1617 ], - "commit": "b2c24f42f2fae63433787150f77b397d69ce0e5b", - "sha256": "1c0smqhc87fzg7db20k92k938p8dkqiig59krwylkqgagsi7hbg4" + "commit": "e765b1067ced891a90ba0478af7fe675cff9b713", + "sha256": "1nr5dsbmhn9bs0v0h6v7d8a0pkgg859cm677nz7br2xaibdz0z47" }, "stable": { "version": [ @@ -18199,8 +18255,8 @@ 20190111, 2150 ], - "commit": "72c18e73679fc3b74d2acd037b4de2cbfff25257", - "sha256": "1ks9sr3r0kx7yi6dbwas6ncd9pn0ncgd9mqhriw5zxyd9c0b92ch" + "commit": "c129b15e8ee249a33ca9a5dc82a3defe509ad5c0", + "sha256": "0lg75np90niwj2ajqvla8s4dsgg8jr8k5bhgqsry6v6kx549rzvs" }, "stable": { "version": [ @@ -18407,8 +18463,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20211005, - 2006 + 20211013, + 1936 ], "deps": [ "bui", @@ -18420,8 +18476,8 @@ "posframe", "s" ], - "commit": "a225e73026f28b67f1837e80497fe3ec641373f4", - "sha256": "1bv19jpgk4h6rk8kzfnf29m4xpa8s2wgljqy4im184jhl4x2qg3c" + "commit": "1cddcedf9ab57a2c14a5ec50b6907b866920f42e", + "sha256": "0g67m40y4giill6sild7d9iaz5dis666wlxpcdl89vyvj2ys8hqd" }, "stable": { "version": [ @@ -21265,26 +21321,26 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20210419, - 1851 + 20211011, + 1804 ], "deps": [ "dash" ], - "commit": "4b94393a9adf677c7c037215e233eef5fbca553d", - "sha256": "14whrhi6hgzadrw9z9k2sh2800483xs1h611avz4x68c8d2jfj5k" + "commit": "bd161f38621d1a9e4d70c9bafab9b7e3520f00b2", + "sha256": "0cf5npgksl9a03mnfdhfdhlf46gr9qz9adjxz3dbckq9b1vl0dfc" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "dash" ], - "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576", - "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d" + "commit": "bd161f38621d1a9e4d70c9bafab9b7e3520f00b2", + "sha256": "0cf5npgksl9a03mnfdhfdhlf46gr9qz9adjxz3dbckq9b1vl0dfc" } }, { @@ -22040,8 +22096,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210930, - 556 + 20211011, + 824 ], "deps": [ "dash", @@ -22051,8 +22107,8 @@ "tablist", "transient" ], - "commit": "e1c0c99047a9835b8751b1d9f544ef0bc16c77a9", - "sha256": "0y54fg1i84k8avb9wnbn77wfl935z6d84xrqd7af13pdwndl2jjm" + "commit": "9d845e1eaed663ccc811c0a9ede3b3c61859e9e4", + "sha256": "01rnsyqrxvyc3kbfa4nmvxqxw261sc9b6jhqsnx14s3qfhy9w51l" }, "stable": { "version": [ @@ -22276,11 +22332,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20210923, - 1515 + 20211014, + 244 ], - "commit": "fe7ec7cf99608412073d2d68885577b9135a94ac", - "sha256": "1kjv2sh9pcmvciay1y6kp5k9lqm3mqm90qqlwh5g844bc5p7dgbh" + "commit": "6e20848a2786e8e9a5fecf27b6f29a7954635ff7", + "sha256": "1wdk4m117x9vidin1n5kr8a33znf08r4j096pnqhwm5axq5s3ciz" } }, { @@ -22413,16 +22469,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20211001, - 1049 + 20211013, + 644 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "257b9cd6deae367d0a167f0b634d39deb846aef6", - "sha256": "07i3rnrqwl99zpmrbhq0mq5p6l4jzkchg515hn6m8n04slfai59d" + "commit": "56876e64d92fa1aa2d569831a126e1a26ce06849", + "sha256": "1vpqa95ibw5srisrypfnmf3rkkspiq7crk72yf3sghpcancl7b50" }, "stable": { "version": [ @@ -22466,14 +22522,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210916, - 2120 + 20211011, + 1314 ], "deps": [ "cl-lib" ], - "commit": "e716ddbb882a3a06744faa74decb2fea1569c921", - "sha256": "02gp36hbmxcadp4567mnsj29b2ql9favhdcr9sm4pyp9bszm75ns" + "commit": "3e6f5d9ce129ac6fc0f466eb6f5518593625578f", + "sha256": "1ar9nb67hppqhbdl6l6mv1y6zl48mcdl91bmsc49bjpzp9a38y5b" }, "stable": { "version": [ @@ -23129,8 +23185,8 @@ 20210909, 1010 ], - "commit": "64f3f710e7238bab9164e75b3fe2e7d17918e6e3", - "sha256": "1jwrcxjld82xs97vx9s5laamg8l4s5hpz314x3rvcb5q6mrd7h07" + "commit": "87a2d25e56caf65600e9d3f647bcb4999556ecb4", + "sha256": "0g7vwfcbv88kbsxz7qzwj7wdxf88ir22wwlglxryaf5249fzzln5" }, "stable": { "version": [ @@ -23895,14 +23951,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210930, - 1217 + 20211014, + 1059 ], "deps": [ "parsebib" ], - "commit": "63b0700eefc982276002ae8d618e8a7fa1f68732", - "sha256": "14qiy68q60na9llh81kj3n4bqxn0car1431sdmfv3jjv2h176qv0" + "commit": "b829aac34b90471cb53960ac0c0186603d032946", + "sha256": "0fp2nbr3zrq62mj83qwfh7x358mpkicphh9ha0yq64pd6a4l0ivd" }, "stable": { "version": [ @@ -24604,11 +24660,19 @@ "repo": "suntsov/efar", "unstable": { "version": [ - 20210604, - 503 + 20211014, + 728 ], - "commit": "afc19e212a6f1227b5747b42407226b8222f92c5", - "sha256": "04ld4sk52hm6w4bqlsfd5b1633nb7waf0cmm6rpkgidnzlwv4fxm" + "commit": "1823b9301f552a6944a42f49a0a136a2861ffb88", + "sha256": "0fvdybwda6p09frlij7imqljmnlpa16p03wv45f6w1gsi4akqzy8" + }, + "stable": { + "version": [ + 1, + 23 + ], + "commit": "a9ff16e8994f525086e72d1e6a827e5fe90d1326", + "sha256": "0wv351ajzdy1srsbfmg33az2fdns96zc1jxygxfyzja0y2r9q065" } }, { @@ -24759,8 +24823,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210905, - 1905 + 20211009, + 1931 ], "deps": [ "eldoc", @@ -24769,8 +24833,8 @@ "project", "xref" ], - "commit": "c17bdf6c98d6bf0f1a85f1175556e1038654402f", - "sha256": "10liic4skqd5qr1zw18k0kx50i2m5pa90vc4yypli5c6bpadsyq4" + "commit": "9665359bb6bfb6a96b0c3b307d4abea9fcbff7a5", + "sha256": "154wf1ps7s00vpmdxgj2pw36gcda1w82f5yw0zhl9c7gi05g3xn3" }, "stable": { "version": [ @@ -24920,8 +24984,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210809, - 2101 + 20211012, + 347 ], "deps": [ "anaphora", @@ -24932,8 +24996,8 @@ "websocket", "with-editor" ], - "commit": "0600c286bd7b0812f4908d7df1be279b6b65923f", - "sha256": "0cwqngw05fg8rs6vz65wzji6h4fv2smp7xlh1xjbw03nrrz41bc2" + "commit": "e354ea77c29e8c20b6b1a9ee00d86e6a9512bc0d", + "sha256": "1ny4gjawwsq7gx1ih7f37p24pyyjv9jbp702v1sl6wfnk6r7ll9c" }, "stable": { "version": [ @@ -25382,11 +25446,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210524, - 1611 + 20211011, + 158 ], - "commit": "64545671174f9ae307c0bd0aa9f1304d04236421", - "sha256": "10hjqva6xpilnsfsi8z7w3mjmii4hzf53cmccv1w3076ccvcpq62" + "commit": "f4a45e47e58414da0984f9ac1328be207a897ba9", + "sha256": "1s1i665a3bknjchg47jsaxydmmq4fqyb59i18np7w0zhhzzpjxxs" } }, { @@ -25886,26 +25950,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210925, - 2 + 20211008, + 2330 ], "deps": [ "elfeed" ], - "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", - "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" + "commit": "973b337d7104a7adb519b7b74a91fc21f8757731", + "sha256": "16a0whgx47irgp3p17xwdwfiaylrv85f26dynh5ba2sy7l0d0irq" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "elfeed" ], - "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", - "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" + "commit": "d97c813d472b68c977569b14761c242cb33345e1", + "sha256": "1drgv16555cyn7w6g44z23yhi1i0cy1b9h1ri3lz6h814px0wj0z" } }, { @@ -26160,15 +26224,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20210615, - 1624 + 20211009, + 1531 ], "deps": [ "dash", "s" ], - "commit": "fdde21e34b1272783d566d8230b5ed2dc4749048", - "sha256": "15g3xp3w8lrshjf812c8v50y396zx7107fcyc59kljhsc257j62y" + "commit": "c06aec4486c034d0d4efae98cb7054749f9cc0ec", + "sha256": "0dhflhgc1px9kj2bhv9m646ab08a6qjcqdd1a6wd5psj047bkj9p" }, "stable": { "version": [ @@ -26236,11 +26300,11 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20211005, - 1542 + 20211013, + 1408 ], - "commit": "e44d5bfd68d735c4d93df9d2ae8e78ed9cb52d31", - "sha256": "0f0q6mn7zxwpsnln3k15911kskfp0gf1vyn2mdlzx13ql616a3r1" + "commit": "907ef434a0ce0f94dbd0c77f09bdfcdc779bca73", + "sha256": "0sri7m0n0wafc9dyffi5myvv2vawkfwx6lgmfrj7kikbds0l5s4c" }, "stable": { "version": [ @@ -26629,11 +26693,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20211007, - 915 + 20211008, + 1217 ], - "commit": "02fade7fc9a6b642359552694cc7bed95132cf18", - "sha256": "0428hhz57gb0sfxzfa34zm7c4m1njglc27sq9mbdmma8hk9by91p" + "commit": "81e107a26924747c10c671882032d341ca6d77c4", + "sha256": "1psvfqk71bi9p5mq99r2ihpk4h80sb7p8398fg2zb33a3j3g52b7" }, "stable": { "version": [ @@ -27216,8 +27280,8 @@ "deps": [ "emacsql" ], - "commit": "50aa9bdd76b0d18bf80526cff13a69fe306ee29c", - "sha256": "1jzvvsvi8jm2ws3y49nmpmwd3zlvf8j83rl2vwizd1aplwwdnmd6" + "commit": "209fd0c2649db0c7532e543ec12e7ba881a3325c", + "sha256": "0zr56gwn8rcgvaa9halhfxpxnn0x6yqc66z6r7vqzx5jbj7d6q46" }, "stable": { "version": [ @@ -27336,11 +27400,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211004, - 1250 + 20211013, + 119 ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -27359,15 +27423,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210829, - 1334 + 20211012, + 1921 ], "deps": [ "consult", "embark" ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -27534,16 +27598,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210911, - 2031 + 20211013, + 1353 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "c42fab572846b1dd76d82c5293ccfb6ee2c45991", - "sha256": "1jb4di2v1fxjd7qw8mjwzqpr3j8jcbli4jx7236b7kmcid9zfds7" + "commit": "f0da8453ae94aec630ad5b3395d6bc882ef0ae57", + "sha256": "098lx63narp2drx0bq6bni20z0mi6nwr80cb4gc358ry7zy4m9rn" }, "stable": { "version": [ @@ -28885,15 +28949,14 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20210402, - 1642 + 20211012, + 142 ], "deps": [ - "cl-lib", - "undo-tree" + "cl-lib" ], - "commit": "f9d6e3f7d99b877a63fa6f5ab61e6ba05a7075c8", - "sha256": "0xw99i47mmry205aps4mha1ninnnzir652s7jh81fdsys8y5j7w1" + "commit": "3f961db491f572b7f0637e09fd113c43a1061617", + "sha256": "1519y2q6mqvjncd8axdimajb12z7xmzmgxr8c021iq8s2ikf65bs" }, "stable": { "version": [ @@ -28940,8 +29003,8 @@ 20200914, 644 ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "d281edeac893db140ab2a0ec9f42a4c1dd2efecb", + "sha256": "089z3mgpgsb7gx6v7ysmvi8nc2fzbhd72av1yh2m4lc1alxw711a" }, "stable": { "version": [ @@ -28964,8 +29027,8 @@ 20210315, 1640 ], - "commit": "818bfab3463cf5f289a4d7be5a77667d673207d8", - "sha256": "0ab8g4p4ak49pzbigcn69657v19wx34v66hl8rqiwd9gmwji0d74" + "commit": "e782c0305e2fcdff0b9ea9c2b365878e602df04a", + "sha256": "1vfy86wsv8mx1w7lawxp7h7lc7iyqn9jsddi8006f8ccqsndbbzc" }, "stable": { "version": [ @@ -29826,11 +29889,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20211006, - 2210 + 20211011, + 2049 ], - "commit": "5691859d4edc4387165e561a2a06527c85e795ec", - "sha256": "1ja7ppw65n20kjfnij71fxf5nnvbdly4hk74wmdhvsr220vkc90n" + "commit": "569dca1f4ff939a93c7be97c34577666d9af8b3a", + "sha256": "086nl0486l28n1zmw9jxqh63d7bqanzlqwh9nm4a4aw1fyjy7pda" }, "stable": { "version": [ @@ -29994,15 +30057,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20211001, - 1717 + 20211009, + 55 ], "deps": [ "csv-mode", "ess" ], - "commit": "9be3d4566426264acea459f24428e1d0c868c6fe", - "sha256": "1bs2awcmmxzcdhqlyizgrhxgrgh80jl8a6jbkk5zspl838cq4n39" + "commit": "6fd97a89c73815672de7df21d1ecd362a66126b5", + "sha256": "1vbq9xnspbmykbz4axrxskfsb30bzcnfkymiyfy82shb65r53fn4" }, "stable": { "version": [ @@ -30421,15 +30484,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20211006, - 1559 + 20211011, + 2205 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "ebae35360c9be4828b7a9069396bd6a5ef3e9fdf", - "sha256": "0nq7sw7j6nwv44ynhgr6jjkxvlg0cy4ps77y12q9f4g0nx6sj5ga" + "commit": "44f75e93c6db89de882a0eb1d8bcc7c4ebb8e94e", + "sha256": "12r45djpmdhf4ygc9wdxj1jmxwcag300a8skfhkpiqimapnm8k5k" }, "stable": { "version": [ @@ -30573,28 +30636,28 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20210818, - 1228 + 20211011, + 1752 ], "deps": [ "evil", "evil-snipe" ], - "commit": "db01118a76112c61b7617aa44aa8c438d8f1871f", - "sha256": "15ihz0wwc7gzqsmzbrr48zzh3rw3bmbf2ghnhcy13pdq42wridcv" + "commit": "05c023740f3d95805533081894bfd87f06401af5", + "sha256": "1fnzrwr53h18wp4wkb834j39xg8bv7yqcmilb41bc81npfmi2mn1" }, "stable": { "version": [ 2, - 1, - 0 + 2, + 1 ], "deps": [ "evil", "evil-snipe" ], - "commit": "7844079b47f47bb1dc24c885b0ac2e67524fa960", - "sha256": "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2" + "commit": "05c023740f3d95805533081894bfd87f06401af5", + "sha256": "1fnzrwr53h18wp4wkb834j39xg8bv7yqcmilb41bc81npfmi2mn1" } }, { @@ -30623,15 +30686,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20211003, - 1458 + 20211007, + 1722 ], "deps": [ "annalist", "evil" ], - "commit": "bc5a02ed8572e7d40d04a78f17abc08061dfc37e", - "sha256": "1y5sw51k86sravaspmyg4j0986yldfsyl21cwcr9cvapsp46ba52" + "commit": "6709c1ec4118c8721df43ea6708ae45ebbc01fd3", + "sha256": "1wcjrqvirymwfn0f5sv8axw7ycfjff3h0x5f1cadakbpa96jrc9g" }, "stable": { "version": [ @@ -31324,11 +31387,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210719, - 1305 + 20211014, + 455 ], - "commit": "6bc41317ba4b8710d713a62e1b78047c3cc2d2d5", - "sha256": "14s2zrl2rpnqpfp647naa80qzb2x4c6jflvs1nhxsvn43s0gdfj9" + "commit": "63baf2d1c796edd11bbec5fe1dee711173d4155d", + "sha256": "0kk9l9wvvb40hric4wdzvccp98mbipln7ah9h8grl5ayb9kw6xxg" }, "stable": { "version": [ @@ -31363,14 +31426,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20210808, - 1424 + 20211011, + 103 ], "deps": [ "evil" ], - "commit": "8ce0066fa4889c9a43db5917d116baa9497837b7", - "sha256": "04dls5fmr4a8b8j3802nm0cf4rngr01bgpsa25rgdq1cdv9x9zb6" + "commit": "08f0c1ee93b8a563770eaefaf21ab9087fca7bdb", + "sha256": "0pcacrfvvk6ra9dgq84fdcsh5ziwk78k8dmr2c442fvr2lzch4yn" }, "stable": { "version": [ @@ -31949,8 +32012,8 @@ "deps": [ "evil" ], - "commit": "ebae35360c9be4828b7a9069396bd6a5ef3e9fdf", - "sha256": "0nq7sw7j6nwv44ynhgr6jjkxvlg0cy4ps77y12q9f4g0nx6sj5ga" + "commit": "44f75e93c6db89de882a0eb1d8bcc7c4ebb8e94e", + "sha256": "12r45djpmdhf4ygc9wdxj1jmxwcag300a8skfhkpiqimapnm8k5k" }, "stable": { "version": [ @@ -32141,15 +32204,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20211001, - 1457 + 20211008, + 1630 ], "deps": [ "evil", "tree-sitter" ], - "commit": "5b8dd1d1803e69dc7e7812841df6bfe772396f43", - "sha256": "0r4q1cn0wv7g8krmp8a3pflq1bfz9hp69wz0pzgvlnag55zmavps" + "commit": "ebde473af5a484959cda97483453d855c7bab89b", + "sha256": "1x30il32l57pmqiqj872z83w1v7g87scsaaspn05i4wd8x7y30qp" } }, { @@ -33260,19 +33323,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210602, - 1952 + 20211013, + 1554 ], - "commit": "cb8803355e20812d84195b1b7c9b0578c3262e68", - "sha256": "0wx2k9262p712aasn3ha8si250yzhcqz513apna8lp5gri2rxsg8" + "commit": "3c13ae4d694025207ba7eb43f174f90bb49395d4", + "sha256": "1iv9i1j39wj29y86z49yyw1a22wgyafdybjizmji60hi7x4r66az" }, "stable": { "version": [ 2, - 20 + 21 ], - "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", - "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" + "commit": "3c13ae4d694025207ba7eb43f174f90bb49395d4", + "sha256": "1iv9i1j39wj29y86z49yyw1a22wgyafdybjizmji60hi7x4r66az" } }, { @@ -33391,14 +33454,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20211006, - 842 + 20211015, + 1502 ], "deps": [ "s" ], - "commit": "4deddb48b5c9798bdb68a341a9cd23056b4fb2c4", - "sha256": "0vsfjk912n24j46ivlkfw8vlqi913qnvy8hixfcf13f68ak8cbav" + "commit": "d6913c8a8dff0711d3e3dc42ba1b63fb0a39ece5", + "sha256": "1pk7mfmfzxi1saaq2g76bgps9w4gcdbj1ck74hkhiv5a166w3fi8" } }, { @@ -33888,15 +33951,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20211006, - 2239 + 20211008, + 2353 ], "deps": [ "dash", "helm" ], - "commit": "65ec7d5c10115f3670b7488825922494e749d34a", - "sha256": "0hwimg57lwny3n2jz0m224blbhrjdd3qjfa5xmcvwsnw5lp54i48" + "commit": "1f0bcf009bf124c213d64dd2726061db6af981b5", + "sha256": "1wsqddl48shi2815zmx609g39bpc9kn28hv26vpjljap8qxpxpzw" } }, { @@ -34201,8 +34264,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20210919, - 929 + 20211015, + 937 ], "deps": [ "async", @@ -34213,8 +34276,8 @@ "s", "transient" ], - "commit": "77421f62e6e616ada9d6ee1bb2b7a920aeb51726", - "sha256": "12089lm3h70igfxasvjw8ccm1iag0p3159w2pn661awnv9nplwl0" + "commit": "21a492d3e67e5e3ab59b75107d345142a4c3ac02", + "sha256": "02n3h2zvdf24jxmcpp0cjcfba54cs0isymcd4k4j68zywszwzp36" }, "stable": { "version": [ @@ -36468,8 +36531,8 @@ "flycheck", "keg" ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -39407,8 +39470,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20211006, - 2025 + 20211014, + 1707 ], "deps": [ "closql", @@ -39421,14 +39484,14 @@ "transient", "yaml" ], - "commit": "8264234db61b8a7f427b972aaef6235f9f6a13fa", - "sha256": "0fw2v05bxjkya78jms7n3jdzf04plr1piwh9z92an7421m7mjkdj" + "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", + "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], "deps": [ "closql", @@ -39438,10 +39501,11 @@ "let-alist", "magit", "markdown-mode", - "transient" + "transient", + "yaml" ], - "commit": "e7d0d759440492549db331f3c39c3cc62880118f", - "sha256": "0j28vc0q1h36pk0y2nidnlsc2y7n0vpfrd8civiv1zp8z0jwfyc9" + "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", + "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" } }, { @@ -39476,15 +39540,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210929, - 2019 + 20211011, + 1029 ], "deps": [ "inheritenv", "language-id" ], - "commit": "772beb9acc3152cce10767ebba545c7af52b76e4", - "sha256": "1k70lrkbrj7g071nknqili0lga971fdyn52fzgjb8qwgr90j9fmp" + "commit": "88e095ab6f8eee9537ffad23f068ebbdee3cea31", + "sha256": "1z1sar005454b8lnfwmnnncpsdli13g4b1f2hvwl8c5w4z30n4g9" }, "stable": { "version": [ @@ -39621,26 +39685,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211007, - 846 + 20211015, + 607 ], "deps": [ "seq" ], - "commit": "f672b9af16184597747424543b87cbc6910e8ab8", - "sha256": "0xx67c8vbnqzdcyfsqv725xxj493hd9b3p3bqzl6an7v75v6bpi1" + "commit": "f370f8f2e57805b94ab61ea6997ad31e13f81f5c", + "sha256": "0ghxg54n09syxfnngiiil3hf1m566ajxkwi051i0m3pwfqcg6nwa" }, "stable": { "version": [ 3, 5, - 1 + 3 ], "deps": [ "seq" ], - "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", - "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" + "commit": "16bc2a6a817b53ed3306a3ff3cebd271e7bf8746", + "sha256": "13k84dzjar67fa1ixicl6h8gxzblszd0ik8vi11bvipysgp3j3ws" } }, { @@ -39702,15 +39766,14 @@ "repo": "alphapapa/frame-purpose.el", "unstable": { "version": [ - 20201219, - 1340 + 20211011, + 1518 ], "deps": [ - "dash", - "dash-functional" + "dash" ], - "commit": "b4a259fa077671e2dcf33d11b42955c91e395b8b", - "sha256": "033vbvv4rrjbsfw0bbhhzx2754r96vy9h4n1y8jmxrqzs9wi5mmq" + "commit": "7d498147445cc0afb87b922a8225d2e163e5ed5a", + "sha256": "03qalcx8hbf6r0jmh7hf1r4san13fbgaaabcs4c50cam7kdv525r" }, "stable": { "version": [ @@ -41171,6 +41234,25 @@ "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" } }, + { + "ename": "gemini-write", + "commit": "e97c45cafc44a4b2f08e577325e375c6312f6557", + "sha256": "039rdjsyx9lw7lh21ps84agm1rpinbylzlks6iv1h5pn341s67nd", + "fetcher": "git", + "url": "https://alexschroeder.ch/cgit/gemini-write", + "unstable": { + "version": [ + 20211009, + 2110 + ], + "deps": [ + "elpher", + "gemini-mode" + ], + "commit": "7e1fe7d4f2c65c0854eb571edc78e5a45d7078de", + "sha256": "0p1ch44w7sn73p87a7k47drgdj4sam961arfr4k0ii4fny54cyip" + } + }, { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", @@ -41179,14 +41261,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20210918, - 1525 + 20211008, + 1651 ], "deps": [ "cl-lib" ], - "commit": "a78da8f74fddb84412b98b9a8c881af4dce7ab24", - "sha256": "11rx5i0fmigjydpm2w4gwgrsf74a4xa856i17i6056mw1sjsjwaq" + "commit": "26f1d4c4e258c40e6b70ce831a04800c914f29b3", + "sha256": "16rjsmmhjjx4mch1aygrxqj3pr5c4xxqzf21qvr6s4c9yk6ayx1f" } }, { @@ -41412,11 +41494,11 @@ "repo": "leoliu/ggtags", "unstable": { "version": [ - 20190320, - 2208 + 20211008, + 528 ], - "commit": "1c43705753e639b34b58c9bf961a80b6610a7109", - "sha256": "15hv3d4wc32nidi0pl73i2v673s2lipzsy8llqy6asls2y268qgz" + "commit": "1442ab8c7f02d246f14150207534fba4a42201ba", + "sha256": "0bibr36b9cxxx5qgi27srfj21mv272npy5w1krrgmn0521qd07w1" }, "stable": { "version": [ @@ -41947,22 +42029,22 @@ }, { "ename": "git-commit", - "commit": "2571aed58ce9c4df998588cbcffdde704f4dce54", - "sha256": "171spbjdgnphv1d108y2ivf09yaqfpg61sjc7gs62cwld4krk4l6", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "0j4z9pmkbn366gqc9521dix5g5capqw4r6prjfxc6g0vlnzan30g", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211006, - 1626 + 20211010, + 1635 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -42059,8 +42141,8 @@ 20211002, 2345 ], - "commit": "c7fd6010ae223a1acde42260302b0be1ec11bdc3", - "sha256": "1r3pssix4g23adxxq5jf2v51dnk65xj4xr0zs31jnm5xj9z0qx1v" + "commit": "c1e51865eb26739052035177846f53476c8605da", + "sha256": "00rldkgmrjzr8nc3mngfh4vjscsdswqfqzrdwxmwmc0m3kx2yppz" }, "stable": { "version": [ @@ -42696,8 +42778,8 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20211003, - 1704 + 20211011, + 1933 ], "deps": [ "a", @@ -42706,8 +42788,8 @@ "ghub", "s" ], - "commit": "4d91dd6c56be1ae2b93b6b9e50c73f657cc461b6", - "sha256": "1j3qd7i1pjirzjfar29m6iyngj75jn13b08ba56mapp37jkzgavk" + "commit": "2a24e75dfc2d9f37789ff60b4c10deb7c96f3f88", + "sha256": "1mahd3kg5rr6jf1x3ixjvhgkv9c8fq8mxvikrmpjciari05sd58y" } }, { @@ -43370,11 +43452,11 @@ "repo": "lokedhs/gnu-apl-mode", "unstable": { "version": [ - 20210907, - 223 + 20211012, + 1139 ], - "commit": "f66273ba34a6f1d2bbb39bec9a6b4e38dc8d48f1", - "sha256": "1540z31hkz4mg9kkxkl7ii1pz1hy446j23r42la1qbchif6q0zpz" + "commit": "5d998206a963f2205dc6c4eddb41fb34187cb527", + "sha256": "1yzyq8k770j78f2gkkr1n1d5jpdfmj9l3w40pjd7fmn94xg3qw9a" } }, { @@ -43742,26 +43824,26 @@ "repo": "benma/go-dlv.el", "unstable": { "version": [ - 20200713, - 1202 + 20211015, + 816 ], "deps": [ "go-mode" ], - "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", - "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" + "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", + "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "go-mode" ], - "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", - "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" + "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", + "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" } }, { @@ -44239,19 +44321,19 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20211007, - 1403 + 20211014, + 1322 ], - "commit": "ae83654b4cdd752047674232290e7ca5c566748f", - "sha256": "07bjzs0w8b0spcksa2v5h20cnb8dvya1840xnagrpvcb1qfa49sk" + "commit": "ce730f126a63eae77bc9585f75fe1dce968d9a2f", + "sha256": "1r4x1v5j67k7idsy6vidc367kn2iznwdmlhx6h6lpnqv0l36n6py" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "27d9218aa10dc361aa89f666f91aea7fdfb43d1f", - "sha256": "0jgicsv8102pk340fn122w0hbhvac2nqcpr16lj7ccjg44qmnrdw" + "commit": "b3174e09a03954b1423c4ea2f2936f9fcd94f381", + "sha256": "054l7m9slhznpfkixrnk6n5h8rc9x7gjsahizxvkd73q0jvgqxgn" } }, { @@ -44864,14 +44946,14 @@ "magit-popup", "s" ], - "commit": "d6bd701aca21e3481213fc3769c5b220a2215826", - "sha256": "0irmk67zh0w890vy0cljqb6mcykimkjdjw410nlhl8hmvzykx5yn" + "commit": "086bb561d0544da01690d1028e6fd23c7c943573", + "sha256": "1ad9q4rv7c13ls1c9z5vdshcj8y6723phlkpzgq0aicw9fxvi36m" }, "stable": { "version": [ 0, - 26, - 1 + 27, + 0 ], "deps": [ "dash", @@ -44879,8 +44961,8 @@ "magit-popup", "s" ], - "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", - "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" + "commit": "086bb561d0544da01690d1028e6fd23c7c943573", + "sha256": "1ad9q4rv7c13ls1c9z5vdshcj8y6723phlkpzgq0aicw9fxvi36m" } }, { @@ -45646,11 +45728,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210617, - 1028 + 20211008, + 1720 ], - "commit": "7efb041b826f15b10aa9cfb67b971fdc41064980", - "sha256": "175gfhi1621pclwvhbz2a8rramfb47v353x5hxjys1b0p848yk1l" + "commit": "856d66a65a75fd9906c47a930a8ee584bdef4077", + "sha256": "1w4qcvmkwqz0kmzrqidrlr6mga8fi6khwdq2w5nzr31g915n2cv0" }, "stable": { "version": [ @@ -46011,11 +46093,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20210923, - 2359 + 20211015, + 1752 ], - "commit": "b5c7121a4a6e67c7e90bb6d8363936e50876093f", - "sha256": "0iccr1sjkbaw4lb3dja9bgyix6gwknvbmkk7xdn3misphl0fvnk1" + "commit": "e530afd2e42bc560b3236cebeabdeaef0e33faca", + "sha256": "10x8k19sf4jgbwxl0akzm3s47z8h78r83yb7512l62s2an3wi2g7" } }, { @@ -46962,16 +47044,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211007, - 1355 + 20211013, + 727 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "d8e433cac4ec2c594740f6d040e5fbfdec7a0bb5", - "sha256": "1hs3psdb69vc16jg49mnfy89gvhhc21ci9q3v8kjk0f26gvh5k6j" + "commit": "a86bcc99dcd45cd898a497715b4333d118a3c6f2", + "sha256": "0bf3cx7w11h7dwjys3gb62p8mfl586qnf86jlsrzhvsg0dm56b5f" }, "stable": { "version": [ @@ -47870,14 +47952,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211004, - 1655 + 20211013, + 445 ], "deps": [ "async" ], - "commit": "d8e433cac4ec2c594740f6d040e5fbfdec7a0bb5", - "sha256": "1hs3psdb69vc16jg49mnfy89gvhhc21ci9q3v8kjk0f26gvh5k6j" + "commit": "a86bcc99dcd45cd898a497715b4333d118a3c6f2", + "sha256": "0bf3cx7w11h7dwjys3gb62p8mfl586qnf86jlsrzhvsg0dm56b5f" }, "stable": { "version": [ @@ -49500,26 +49582,26 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20211004, - 857 + 20211013, + 430 ], "deps": [ "helm" ], - "commit": "11d9f8ca48f2ae638250b61ad8d7ef3741b07fbb", - "sha256": "1y0wqr8ic78n5a3fl205r9ss34lqm5mggncwxl240fckyzf2ibgq" + "commit": "ae2202fbbbe11873ad4b393a6959da50ac250c1e", + "sha256": "01j41pidn8aipz1c0x17p88rzr15bg7ij5fr1q2kf8qhky07xfvx" }, "stable": { "version": [ 1, 9, - 2 + 3 ], "deps": [ "helm" ], - "commit": "563f664df4076ec214035c8c1f8cee47841565de", - "sha256": "07jgkc8csnc2hcg4csy07zy3wjbm4fbk4lqiy82rdlxp1vad25vi" + "commit": "312392b786a7ea322914b60760e2693b53772ad6", + "sha256": "1bqk0z6zd3aza7ibb8h0ghya5kid4m6z01gs7jf4sr6p49rzp7hd" } }, { @@ -50004,8 +50086,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201213, - 837 + 20211011, + 1519 ], "deps": [ "dash", @@ -50014,8 +50096,8 @@ "org-recent-headings", "s" ], - "commit": "5da516a1586675992c0122ed32978c18dda06318", - "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" + "commit": "97418d581ea030f0718794e50b005e9bae44582e", + "sha256": "1y11rlnhi36lzhc1cagninv6hlcwbvj88xfr0g0xzpbzy7hys021" } }, { @@ -51555,14 +51637,25 @@ "repo": "brotzeit/helm-xref", "unstable": { "version": [ - 20201004, - 1817 + 20211013, + 1538 ], "deps": [ "helm" ], - "commit": "23f1174cfca7667d95828dcd388c655a4a9c877d", - "sha256": "0v0lkabpi1n4hgnp28jk19f7b78yk93ssm0gr0fr25yqx5zskdnk" + "commit": "9764eabd50c40b009073c7ef64e3a71d0d066d0b", + "sha256": "0v0wm1x11r1h9p139c5rl0r4s5q6092bmwrsnr2140ddbq34mnvy" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "helm" + ], + "commit": "9764eabd50c40b009073c7ef64e3a71d0d066d0b", + "sha256": "0v0wm1x11r1h9p139c5rl0r4s5q6092bmwrsnr2140ddbq34mnvy" } }, { @@ -54240,11 +54333,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20211007, - 308 + 20211011, + 557 ], - "commit": "ca48999554e720d20be46f194f69919fb2894a82", - "sha256": "10n6fnxnsg6xmgj07h172g9sqwqwldp6cw31zrylgirz5nk3vn4r" + "commit": "0916be7075e792773440c3bdb5cf9c153691846b", + "sha256": "0817y99zm1x01nya6lnhby96da2w9kivw4p59bbaxm7hi0ycrsfz" }, "stable": { "version": [ @@ -57628,14 +57721,14 @@ "repo": "alexmurray/ivy-xref", "unstable": { "version": [ - 20211006, - 1043 + 20211008, + 1103 ], "deps": [ "ivy" ], - "commit": "45df80767104dd8f4fe957156c82f1d8b77d64d5", - "sha256": "1c0k1in2hpfwfd7m5r8623d58kxsrfl6pwpgdrkk3077vdgbwiip" + "commit": "a82e8e117d2dd62c28b6a3e3d6e4cfb11c0bda38", + "sha256": "0h4cnhfqgrzm63kfrlz2mhgsk20jkcq18gjx9pvbbhhg59xvvnaj" } }, { @@ -59094,28 +59187,26 @@ "repo": "joshwnj/json-mode", "unstable": { "version": [ - 20190123, - 422 + 20211011, + 630 ], "deps": [ - "json-reformat", "json-snatcher" ], - "commit": "0e819e519ae17a2686e0881c4ca51fa873fa9b83", - "sha256": "0m4i6b5qmakdc0h8npsyajdp06jq03cb1c5rkj6x0khnjw9fv2fl" + "commit": "eedb4560034f795a7950fa07016bd4347c368873", + "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" }, "stable": { "version": [ 1, - 7, + 8, 0 ], "deps": [ - "json-reformat", "json-snatcher" ], - "commit": "9ba01b868a6b138feeff82b9eb0abd331d29325f", - "sha256": "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy" + "commit": "eedb4560034f795a7950fa07016bd4347c368873", + "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" } }, { @@ -60060,15 +60151,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20211007, - 1037 + 20211014, + 318 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "7fc3bb521cdb691067838acf756ce4579b727d9b", - "sha256": "0vgahjgdvggg2scif18msw8ddsbkdxw988j2ki5ipclil9qfz8h4" + "commit": "fd6f154ac96309ff56220c595f80e9126ec566c6", + "sha256": "1a8fy48xg4bbz3qf9dxvxh8xhvig5w8wkdvy9prn5fd456bn58hj" }, "stable": { "version": [ @@ -60210,14 +60301,14 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20210226, - 2246 + 20211008, + 1702 ], "deps": [ "cl-lib" ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -60231,8 +60322,8 @@ 20200601, 333 ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -60360,8 +60451,8 @@ 20200226, 2129 ], - "commit": "1ee67f3f8977d95785e021f7896685de1979137e", - "sha256": "0cv0naq2g8z52vgf1p4mb55ww30bp2kpj1jp5cjnql1hxsvbx0mm" + "commit": "6d31fcf78a1ab1841f735dfb5cbd2bf6b2ed25db", + "sha256": "19cszpr5m6j5xj18wl4myn7ifw27rrwbmhd0wcsds28b4czw2mhm" } }, { @@ -60893,8 +60984,8 @@ 20210318, 2106 ], - "commit": "9a1794e8c3e020252f7e41bc2d6ed78c461a69b0", - "sha256": "0yqgq71kfi68iy1f90yxlg0iar3z88ngs166s5rwp3m2yal9fdan" + "commit": "6430e1356248313f5cdd3a96c8861b17b12c0be7", + "sha256": "01rzf8v9psihzpg0s5ar2svkxccmb32ypwsms3863c67ag9d9818" }, "stable": { "version": [ @@ -60914,26 +61005,26 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210909, - 30 + 20211013, + 1558 + ], + "deps": [ + "request" + ], + "commit": "cb843349c10b1a492ceb59da20bfcef3ef02f4b5", + "sha256": "08dkxjrpdy3i6j0zgfa7bqdk8cykjfzybrfwrrf9848fxy96n4pb" + }, + "stable": { + "version": [ + 1, + 1, + 4 ], "deps": [ "request" ], "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" - }, - "stable": { - "version": [ - 1, - 1, - 3 - ], - "deps": [ - "request" - ], - "commit": "7d6039fa5d5d7561f42c4c2a93c698468ed34e70", - "sha256": "0g99qkch22ws3d8qwp91v0mysjh295bag1ak3bdl8q7rl015p9ik" } }, { @@ -61269,8 +61360,8 @@ "transient", "with-editor" ], - "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", - "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" + "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", + "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" }, "stable": { "version": [ @@ -61304,8 +61395,8 @@ "evil", "kubernetes" ], - "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", - "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" + "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", + "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" }, "stable": { "version": [ @@ -61530,8 +61621,8 @@ 20211005, 1517 ], - "commit": "6609581a58ae9c0124de785b056f4f5bbcec3b61", - "sha256": "12bav2dd0q6b47sxnqfv6ibrhzd6i74wwqz7zvm7lp9s4mpqscsa" + "commit": "3ef4c22982119674861ed61e3302ac3e0f05be2b", + "sha256": "0m05qyy0w5k9ycb2ywv222cy99brw2d1gmcan6b4311r04fv9k70" }, "stable": { "version": [ @@ -61580,16 +61671,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210520, - 1737 + 20211008, + 1231 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "2aeeb4cf1dcdc47ada963634731dde0b7a9e4948", - "sha256": "189mmxxdwyc8w94rqpg7f4hd0fhk973mrszvlw92xpca1i9825cq" + "commit": "933a1b37b86685bb1f2df2a2185741b0d21aaa78", + "sha256": "0mxsqf78y4chm4yyxbfz69p56m3n35c5sv4agdwg6griaf0s5f59" } }, { @@ -62314,8 +62405,8 @@ 20211003, 1412 ], - "commit": "a3cf051632d48d95eb0d3bafb6f79d61170c0755", - "sha256": "14j9c3i1vv5wq240j2q7b818cg1xm425nnhncrawizajj4wk2ri3" + "commit": "ac6ef9cbd39f7d9ac0019e28da09aad5bc2cfae5", + "sha256": "1gsv9yir8l53qfz280ji7307vawrifxx80g7bb5kyq7s0k5zfsan" } }, { @@ -62947,20 +63038,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20210303, - 1751 + 20211011, + 954 ], - "commit": "2eeb1dabf6b3105561233250063abf1d066a0df3", - "sha256": "13rb8wf8lihqwnpzbzxx5wzxv0qayix0qgjg2540mfsgzgsy7rd3" + "commit": "972179180b6a09791737b1af75a6f653a7146047", + "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" }, "stable": { "version": [ 0, - 26, + 27, 0 ], - "commit": "d48098c6724bc0a62170c2f9ff73c792c71c8452", - "sha256": "15vvpa4jqqxv8vffq86dh44qn0lij7hv6mbgizwz9bssbq1cdgsb" + "commit": "d5d3a30e724a4ba2d5a96b51180e1fd907e57d32", + "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" } }, { @@ -62971,15 +63062,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20210715, - 839 + 20211015, + 511 ], "deps": [ "fringe-helper", + "ht", "indicators" ], - "commit": "97494f705c0208ccc8dd51d8c0366cb2bd5f228e", - "sha256": "023kx8v7phaw3why3zkh1q7n6igqb0zgf37zkli6gi8y4spzlbns" + "commit": "c78bbb33c1f120da517ccd11f0681321bca17647", + "sha256": "114afr2b41yk60s4r1068nambkhj19k6pn6dn2v94i4gbq8p37bb" }, "stable": { "version": [ @@ -63111,14 +63203,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20210926, - 1333 + 20211008, + 1652 ], "deps": [ "avy" ], - "commit": "4326da5617e5d04715538536b93c44a085f5dad1", - "sha256": "024cyywz38bpb9szqjnnc0pjrl7cxi7k59bbgpa740r7713qybs4" + "commit": "83cd0489b16f013647d0507ef20905a0a91db433", + "sha256": "0kwaia6i0asr7yqcw1anzq6lf93357cc1fphkvp0llbmxizmkzb3" } }, { @@ -63212,6 +63304,30 @@ "sha256": "06rnma2xj2vnbvy1bnls59cagk6qsf862bj1zp6xbmpr1a5l9m4z" } }, + { + "ename": "liquidmetal", + "commit": "9aa2004e04ef2f1fbfdd722b271c7cdcbdc8ad10", + "sha256": "0f7xp490nd4ff43pi5g911hsbcvlxzj5wx26b6lflhhnljkh5fsv", + "fetcher": "github", + "repo": "jcs-elpa/liquidmetal", + "unstable": { + "version": [ + 20211004, + 1429 + ], + "commit": "e42baf790629cc3a7310194c4f00d9dafa34f933", + "sha256": "1p3bgfcp1pqilmc4jxs3y182mcddrqd7m0l9b2k2wbdcar1fphpf" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "commit": "32ddd9b52875a6fa403104ed271e15d86d215463", + "sha256": "1czyiy26wxkxc2lbrrblz8hzpf8p71fyp4hh63vsdf2fyimyl1cw" + } + }, { "ename": "liso-theme", "commit": "27b849f3a41a5ae3d497cef02a95c92fd479b93b", @@ -63315,8 +63431,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210914, - 1209 + 20211014, + 1136 ], "deps": [ "ace-window", @@ -63325,8 +63441,8 @@ "iedit", "zoutline" ], - "commit": "9568ee1aa5ac12e0ed03b9904b77c7a5bc4bb2e2", - "sha256": "1ysprqpha2nxf3zak0lssls66asfl95qn58q90k57p1hpf0qbs06" + "commit": "8ddcf0c8f69e2a669f197c50a701dc6aea74d7c5", + "sha256": "1z9z8225bb5ih9bf2d0nzwl6258wk327dky91z247jddv5mzj4m5" }, "stable": { "version": [ @@ -63763,8 +63879,8 @@ 20210701, 1955 ], - "commit": "aa92fa4aa2e41acb45bc697187036407f953ab03", - "sha256": "0x2s1xvdgmw7w6dr1kfvybqfwq6i1mvn2ijwbzi2sil8l5hb73a6" + "commit": "a1a02199a73e0d4edf50f977203eb40a1797e366", + "sha256": "0k2ya743k6ghkxnx0pyb3brsrbx8a31il62bj01ax4p17gq1w902" }, "stable": { "version": [ @@ -64514,8 +64630,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210929, - 1620 + 20211009, + 2036 ], "deps": [ "dap-mode", @@ -64525,14 +64641,14 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "38906bb3e69c16b3e8d328fd6ae764f1d4369b9f", - "sha256": "03ppi015i1fkq30vx401x4fny3jz6msqzy5lg5jyqrym3s6gfml7" + "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", + "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" }, "stable": { "version": [ 1, 20, - 0 + 1 ], "deps": [ "dap-mode", @@ -64542,8 +64658,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "1a839dcdedac47c90b4f82f456fea0a7cacf2940", - "sha256": "0m1bccpamxvasimdg6pq28lnbwy2v2xnzjradbl93x7c2drsvnik" + "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", + "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" } }, { @@ -64946,8 +65062,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20211006, - 1954 + 20211013, + 1655 ], "deps": [ "dash", @@ -64957,8 +65073,8 @@ "markdown-mode", "spinner" ], - "commit": "237363939b2630a807261f31614ac98fad29b785", - "sha256": "1x436jki9wqxjzp2j1p0kx8waw71glxbfh8zlcw31nyiwk7znb4i" + "commit": "b5d9b3b2c8638e223ba1524c76c16d0f616d73ce", + "sha256": "07ngkr86zgpi7xp1h9nx68gwpfvk5ffdk69m0mb4xn2zkjpd2d58" }, "stable": { "version": [ @@ -65292,16 +65408,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20211003, - 402 + 20211009, + 1545 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "69880741041d5c61abcef941d06234f7cbd545b0", - "sha256": "05awyfzwgzv8d3qjpmaxrkgxhh7njfqj72lkxlij6l5snng24bgz" + "commit": "d08c5528ba0a63433a466c2fa1265ec3250fcef1", + "sha256": "0p12arjl03y2ax8b6g36ppnb1qqkkc2pvv415wsgxydqias775mq" }, "stable": { "version": [ @@ -65806,14 +65922,14 @@ }, { "ename": "magit", - "commit": "4158066a2c75cf0bff128bd2dc1073472c32b1f4", - "sha256": "1hrh90qd47s6q6grr6rp2y7kfqq8bzhdfpyq2saihrric91s1rqz", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "0n327xp6zdyp5bbqr84qp0f779qqv6jrlr2kaf00whkgp59g5kf4", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211005, - 1646 + 20211011, + 1635 ], "deps": [ "dash", @@ -65822,8 +65938,8 @@ "transient", "with-editor" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -66157,21 +66273,21 @@ }, { "ename": "magit-libgit", - "commit": "0580362be495894c61b99b7efb4cfa435cc0dd72", - "sha256": "0fi3w2f79qn3hf5rw5jp8128xbk5r0xwwwb56zcjn2na02dynfb1", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "1hh7d1ii3aw9ghmidc6pifaa0ci230vm17sadl3xlq7snpghlrhi", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ 20211004, - 1955 + 1956 ], "deps": [ "libgit", "magit" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -66326,20 +66442,20 @@ }, { "ename": "magit-section", - "commit": "92cab05cc5ba4153be97648d6fcd95417871e9c7", - "sha256": "1v9g8y9r0lmp54hgaxgjqr3x86l7cz4wvrrjbpij7aai40ddqdp3", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "13dxx1rjpj465h1ns2nki7wfsmnfh9m1gzlm49jkka38iwnqr81j", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211004, - 1955 + 20211012, + 1845 ], "deps": [ "dash" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -67134,19 +67250,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20211006, - 724 + 20211012, + 1606 ], - "commit": "c9444d790d75c7cfaab1046570a05125f62576f0", - "sha256": "0si3wiacczqychsfc0dppnmwrcgjsb1n7rh555nn5jk1hsl0a0j5" + "commit": "9cd762b6c3f2714375f47993e9a6384d3bc16ebf", + "sha256": "05w8c4rlbdbiwpwirkpnkixifjki6rfgcz8myh0i4kyb1ayfrq2c" }, "stable": { "version": [ 0, - 8 + 9 ], - "commit": "b65d66e9301f9a0e3012568ca6721ae4ec276ebc", - "sha256": "1d6xbidxcxd5gxs5cjxbx1i1wdcmgdnn3hh7fxz0sgf1gaxyp5kv" + "commit": "37e24b798afca98da0d0364dde3fa63a42c5853e", + "sha256": "19l3fwh6phd17rssxk30v2380bs04x7w6cb3hjy4mx7vkc7w6ymv" } }, { @@ -67769,20 +67885,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20210917, - 1715 + 20211013, + 611 ], - "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", - "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" + "commit": "f6b608db585231eee231d5473edcf4183bb678fe", + "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" }, "stable": { "version": [ 0, - 6, - 1 + 7, + 0 ], - "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", - "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" + "commit": "f6b608db585231eee231d5473edcf4183bb678fe", + "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" } }, { @@ -68677,8 +68793,8 @@ 20210131, 2152 ], - "commit": "88516546fa25f3a629dc6729403328b6edc29109", - "sha256": "080m42ck7gdaa545vra02gkvx0prav43xspp5hwhx30mzkb77n5m" + "commit": "e9791ff92c27bc7df18f238a29f05fc164da2f51", + "sha256": "1j7ni3qjcy0fikzhhm4xwwwskdm6qnb1c1kshh8xrd9c06kmfrv7" }, "stable": { "version": [ @@ -69683,15 +69799,15 @@ "repo": "damon-kwok/modern-sh", "unstable": { "version": [ - 20210917, - 748 + 20211015, + 335 ], "deps": [ "eval-in-repl", "hydra" ], - "commit": "1905cc0c5fe7a306abb4e862c36f00471ce9d0cf", - "sha256": "1xmv6wkbrra3prdm2s3c6hjw5fzp082w15mha60638i3rfmj6sm8" + "commit": "e88d83958ab43e17b9763b3220e0dde862b49a83", + "sha256": "0x2j9i3kns5w9b6bklvmf077dbc5mdim3f4l68nbl0l6kcmlb68k" } }, { @@ -69741,11 +69857,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20211007, - 1358 + 20211015, + 456 ], - "commit": "86ce981066010f4f17de567546ed7151ce5aa4cc", - "sha256": "1934i9is9fdsgv20cp8v8g5jmi9gh51mq3mvg5qzizixslwp8pcv" + "commit": "5ea090b223e8a83f7f3800a96bd4ed3ac9d62230", + "sha256": "1dw6v1sz3b8xf28ly17vsf9j5r9ylwd1p1hz26c05zf9dygiwp45" }, "stable": { "version": [ @@ -70376,8 +70492,8 @@ 20210306, 1053 ], - "commit": "7a2decc75a4b9b1e08ed994c0e675b21e2b0f81a", - "sha256": "06zgjibyd8j0mnyf6cymrb5qhl26kg64z5jizrh2p841wija426v" + "commit": "aa48b23dcf92ea1d85d8e8dbca8c0a0c37e159f8", + "sha256": "181l8l2bihvsg3y652qhfjza5vp0irwdc6q6h1bl8zj0by66p859" }, "stable": { "version": [ @@ -71298,14 +71414,14 @@ "repo": "zevlg/multitran.el", "unstable": { "version": [ - 20210701, - 2153 + 20211008, + 826 ], "deps": [ "cl-lib" ], - "commit": "c34536186088f29d4e85631825e7c6d557a8d0fa", - "sha256": "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx" + "commit": "3a3f3561dba816f580cc21526d4f7a231a30bb51", + "sha256": "1s3iavcbbbb4rf70qay4maf7fvfm8i69smyxl2771vb7dj5fjk48" }, "stable": { "version": [ @@ -72522,11 +72638,11 @@ "repo": "danielsz/newspeak-mode", "unstable": { "version": [ - 20210913, - 1029 + 20211011, + 1425 ], - "commit": "4bfef8f834b021d65cf6f920b02c082a719a302f", - "sha256": "1ng024c5qw38p9qlmldh9r08wcvivs17vw2kl8y17z6d233xrgnw" + "commit": "7ae89edd0f72c2dc005933fada5ddaf48ec97dd6", + "sha256": "0fnl27phpmdgg3ja2jpm846x1pq47fqi3yjngxr32fag86hjamvw" } }, { @@ -72751,11 +72867,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20210929, - 2219 + 20211014, + 1848 ], - "commit": "e5d12e26bc98f99b3b1e4b5af452f3079a98e0ff", - "sha256": "0i02r2kvji7dkmkr5waix7bjzlqrjxmvbx53k3ywb9268pi9yv2j" + "commit": "b9e383b4fcc7a3232f9943aed29586a760602a1d", + "sha256": "1kmcpndqh4072nkkji2vxd2br0wyp4ih3b7r4rx90mrimpdvcbrm" } }, { @@ -73487,17 +73603,18 @@ 20210920, 2339 ], - "commit": "3e2e724d53a1dce3ba00a20c71b2e6f735678136", - "sha256": "0hx8l131qwy5cmxii22lhr48lnwni2i7sd025h12gjala6z78jfz" + "commit": "0f196b5659c8a66af4357fee3d4b3a169044472d", + "sha256": "0h068mfry2gllr8gy836a7i8zpkd6bqljnwfcm7yssfv3flrw3z3" }, "stable": { "version": [ 0, - 33, - 2 + 34, + -1, + 0 ], - "commit": "3c60a25c6dcc4d594b66c0f8acd3e84b82a6f42d", - "sha256": "0cqwvs8035rcnwjl92wx0gi4idnfq93n1k04gf19s0609409kbxw" + "commit": "0f196b5659c8a66af4357fee3d4b3a169044472d", + "sha256": "0h068mfry2gllr8gy836a7i8zpkd6bqljnwfcm7yssfv3flrw3z3" } }, { @@ -75364,8 +75481,8 @@ 20210923, 1348 ], - "commit": "3e4d68c726ff8f1baf04ee8076be57d712d2373e", - "sha256": "17r5k0kyvmmnj8g0zqhar0y0zm06q7rqjq4bd1n1cvr5f1zp9gg1" + "commit": "aa673e27f6d7cbc882ab6109cfbcca2ba0864507", + "sha256": "0xv9hmj7girdb4c1xqlk5nj4snhvl34yaz7k28jny50frkszvfca" }, "stable": { "version": [ @@ -75558,26 +75675,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210915, - 1404 + 20211015, + 1032 ], "deps": [ "org-re-reveal" ], - "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", - "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" + "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", + "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" }, "stable": { "version": [ 3, - 24, + 25, 0 ], "deps": [ "org-re-reveal" ], - "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", - "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" + "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", + "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" } }, { @@ -76565,14 +76682,14 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20210214, - 917 + 20211010, + 958 ], "deps": [ "async" ], - "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a", - "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja" + "commit": "50292af50d275846baa28e52d94eb8ef69c8d00b", + "sha256": "0n0divfnk4635aanjm0b3swdjkcj4qxr0x95q05pdlb67s6lfp5d" }, "stable": { "version": [ @@ -77490,8 +77607,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210805, - 2225 + 20211007, + 1843 ], "deps": [ "alert", @@ -77499,8 +77616,8 @@ "request", "request-deferred" ], - "commit": "db3072adc3f1a57c7a459a3ee911a40db0fc6a8e", - "sha256": "02jfcgl8schra7ir89ajzvnyc9ql208vfasa3qm27vr3yyxvykaj" + "commit": "8b6df4b727339e3933c68045e104b6b1d99816f7", + "sha256": "0gkdh32cfmqbmvvqd67i2x9i1fm5yfmhw6i5yvrb9swsl24kv194" }, "stable": { "version": [ @@ -78909,28 +79026,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20211005, - 1608 + 20211008, + 1310 ], "deps": [ "htmlize", "org" ], - "commit": "36d0973c6c3110a71bc27f8464f4d4b6a798e467", - "sha256": "146hnd1jd9j2bgpn951k7m8kh6ncvcfqvvs4rdhmsk1w426ah5vb" + "commit": "33d226ff707a31804ff3e6ba22416c3f0b463ad7", + "sha256": "0hi8lq9rj6i2m14dh75dzq7lq41i4f6qj4xbp2b8krqw6mk9xg7z" }, "stable": { "version": [ 3, 12, - 0 + 1 ], "deps": [ "htmlize", "org" ], - "commit": "36d0973c6c3110a71bc27f8464f4d4b6a798e467", - "sha256": "146hnd1jd9j2bgpn951k7m8kh6ncvcfqvvs4rdhmsk1w426ah5vb" + "commit": "33d226ff707a31804ff3e6ba22416c3f0b463ad7", + "sha256": "0hi8lq9rj6i2m14dh75dzq7lq41i4f6qj4xbp2b8krqw6mk9xg7z" } }, { @@ -78973,18 +79090,17 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201213, - 747 + 20211011, + 1519 ], "deps": [ "dash", - "dash-functional", "frecency", "org", "s" ], - "commit": "5da516a1586675992c0122ed32978c18dda06318", - "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" + "commit": "97418d581ea030f0718794e50b005e9bae44582e", + "sha256": "1y11rlnhi36lzhc1cagninv6hlcwbvj88xfr0g0xzpbzy7hys021" }, "stable": { "version": [ @@ -79014,8 +79130,8 @@ "deps": [ "org" ], - "commit": "093c1726ffe4358d60fbb97c1bcf01b785827098", - "sha256": "004g7av1dx3i25lr0r33dd2ch4i9r5mcgjh7gjm6rj6nbyh1gqhb" + "commit": "5662cc897ab1533b39e3e93b2150dacbe699d591", + "sha256": "0fq8ns5f0k9mg9dz1w778jp0icpjkx62fa3a51yrsqisycl3cl6y" }, "stable": { "version": [ @@ -79052,8 +79168,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210913, - 1445 + 20211008, + 1334 ], "deps": [ "bibtex-completion", @@ -79068,8 +79184,8 @@ "pdf-tools", "s" ], - "commit": "8c503e61681a39cfb104793b35f2f7b801c6830f", - "sha256": "1pz4gwi8gwlbnxa003hk2k0arzic8700xsj0bhpnh2d0zarghcj0" + "commit": "9556a6c9639f6b32124ec2b8059975b0538625c2", + "sha256": "0g7ldyxy1p5r2xrw51h0h4r3kcxncvfb5c0dfaw174r0g2vw4j5d" }, "stable": { "version": [ @@ -79216,8 +79332,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20211003, - 557 + 20211013, + 1624 ], "deps": [ "dash", @@ -79227,8 +79343,8 @@ "magit-section", "org" ], - "commit": "54d17cc50f03f22ca44f4d88f7e589a00c59d05c", - "sha256": "1j2nv3c424x88riqy3m0kb9qinpa15ixrpzqa0zizcnx2dj4iqmn" + "commit": "e9299297f9cc1aafda62deb8af7957dc8d56dc04", + "sha256": "0cg8kywg8qwr3079k2863gmlpjns6s61r38pc0p4iys1ry02bgxm" }, "stable": { "version": [ @@ -80071,11 +80187,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20210915, - 335 + 20211009, + 1707 ], - "commit": "571ff333084dad83a535becfc1fdd601ead2da02", - "sha256": "0k1lg3rc6x6alxhjwggh3fdlmpbx8qni8d6qakp6i1ba7459d0mj" + "commit": "27f8bb6a9676e1c0b500e75799e3b5c37a9156af", + "sha256": "0751qlg8xxwx7mldgdry1gfrarvhzg2smjzxd3382i6j63mpala9" }, "stable": { "version": [ @@ -80731,15 +80847,15 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20211006, - 1626 + 20211010, + 2105 ], "deps": [ "org", "seq" ], - "commit": "657d655caf408283cc1c6fcf437f33b25166244b", - "sha256": "1y2lav5dk67k4yy67kc0hxyd46x9mdg0kkzmc4sw5vvr9jgjk1in" + "commit": "05df4989c987dece40a450bd5cfbbd6cda0f2e7a", + "sha256": "184hag1kjbzfc7k7c1nd1y9w3gimgxjgkkyqawjzv00sph3mnvd4" }, "stable": { "version": [ @@ -81952,8 +82068,8 @@ "ox-gfm", "s" ], - "commit": "e79c4c4429f64fe61cfa673dcd33273bba30f9db", - "sha256": "153sr1pnnlglzmsz9kx8d8h604j01anf85n57pdz2dnbh6wr2wak" + "commit": "4adf97dd195f0a777b952b97888b77cdd9479629", + "sha256": "0yxzhgjkipy632jhw83l8cz5s7727m87sj6ldpzdh57w1abklidq" } }, { @@ -82131,14 +82247,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210902, - 1452 + 20211010, + 357 ], "deps": [ "org" ], - "commit": "624dee4ee2300315eb1a32b17e8831ce6677fc72", - "sha256": "1n49iwrfzxx9ad399sm5q1phzlv5890i3vacxci6hpmi26bnqb89" + "commit": "d99311fc5be0a7f0acf2ce9ae2d012a651e1c31d", + "sha256": "1ayqi6s4ympskn7iklk2kplnciryfr32yq3r6zm6x091vlayck69" } }, { @@ -83470,20 +83586,20 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20210930, - 540 + 20211013, + 453 ], - "commit": "fcebf650759929256ec9c4bb83b677240622be8a", - "sha256": "15aar5fsci2y8hy045ypdrig4z4kqrd8318im3yzyyf40y1xrz1d" + "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", + "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" }, "stable": { "version": [ 1, 0, - 4 + 6 ], - "commit": "5809ae74cd7f5217ae29dc3bae2dba4c1c2c855a", - "sha256": "15aar5fsci2y8hy045ypdrig4z4kqrd8318im3yzyyf40y1xrz1d" + "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", + "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" } }, { @@ -83494,28 +83610,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20210930, - 1615 + 20211013, + 452 ], "deps": [ "map", "parseclj" ], - "commit": "b00eb42a1c10f19ba0f6ff5f8cb9e3ac05285dbf", - "sha256": "1drlhsnqvqyxdw8k9dlfjnzqxgx1m5kpda1cjkanz1s0jq1dxgcl" + "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", + "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" }, "stable": { "version": [ 1, 0, - 4 + 6 ], "deps": [ "map", "parseclj" ], - "commit": "3b1bea14257fe2acd067b6644e0d916cfaa806ba", - "sha256": "1cz2bgaddlrcqzra8q50yh90rdl0kpyf5js2vxccdsq6ngr8bnmv" + "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", + "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" } }, { @@ -86018,11 +86134,11 @@ "repo": "thomasluquet/playerctl.el", "unstable": { "version": [ - 20210411, - 1442 + 20211014, + 856 ], - "commit": "41564d453c9f936a4ce2699afacc6d1dff974f1c", - "sha256": "0fbnfxhfyam5zvf2ild5bxq489dnpyrzclnfwq0lhzgswjj70hw6" + "commit": "4c3a6132616fd28f902590bf6e63332e6055492b", + "sha256": "18b59kcni6xp46r8lkwb8baz2mic9n4zyndib10dvfs6gwjmas2p" } }, { @@ -86996,8 +87112,8 @@ "repo": "ponylang/ponylang-mode", "unstable": { "version": [ - 20210118, - 1325 + 20211015, + 331 ], "deps": [ "company-ctags", @@ -87009,8 +87125,8 @@ "yafolding", "yasnippet" ], - "commit": "d3b108338219ff275e4ed2c67a2c5f2ce334bb94", - "sha256": "0klpwchiaqrg9gclpbc4ya4kkf33bl6h7khp1b4pjx6zg28qk8ih" + "commit": "1abf04bc8f4f09a6add4b587c7cf5ca23735e7c0", + "sha256": "1iv04dj2nc9cyyslhir7aj5sligwan1yyclsiarn86lik7b9lmwn" }, "stable": { "version": [ @@ -87087,11 +87203,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20211003, - 1054 + 20211011, + 435 ], - "commit": "918306c2afbb09e92f7cc704ddbabe9701bef6f8", - "sha256": "1rk9lzcjhkqvaxjgwj0gsfwnzh9q1kmlwiy1jvp3wzi81j42zdf2" + "commit": "6a2ddcb35432afb56f32e11518c2b6ae7795e8c0", + "sha256": "0sv8bi34fbg0awi8maah5fs13s0wmzbvalq13z2zx9ybb8ivrsfi" }, "stable": { "version": [ @@ -88176,11 +88292,11 @@ "repo": "fritzgrabo/project-mode-line-tag", "unstable": { "version": [ - 20210615, - 1825 + 20211013, + 1954 ], - "commit": "ed6adf9287d2aa526d85451623f1aa281cfa7e0a", - "sha256": "0xryvjsb2r4rj22wgjpixa31kg4sp7xww63hldnf7c1cvcc9g305" + "commit": "e411432a33cd82f8a9ff95471c91e9fe1833841c", + "sha256": "03aiv70shxhcjcldahny7xxclnqdw5bf37f8496dxmzz0zx0v98j" } }, { @@ -88693,11 +88809,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210918, - 2238 + 20211013, + 1911 ], - "commit": "38ae8fdf23f37af71b8a4f9717ba48c52653db63", - "sha256": "1x5d0rki2lsyg85srldwg34jaiq14l1nw58bab74n7xhp426pvyw" + "commit": "fd04605af1b07684da522c32d83ac346050926bb", + "sha256": "017j3vcwlg6k2h76wbads6jxmnmxj19g4c42zs3mi2vwqhfvgdqx" }, "stable": { "version": [ @@ -88797,11 +88913,11 @@ "repo": "google/protobuf", "unstable": { "version": [ - 20200619, - 1742 + 20211013, + 1726 ], - "commit": "b7cc13068dc198e480271e98b53cbeed195e9d05", - "sha256": "1lfy5p2akjnmpssc92jfx5j88q53s35338zhsafc2k4s650dc4f2" + "commit": "c01cd6ec794fd91b316cb236663c81eefa1efa4e", + "sha256": "1rqsg37dxglxddipfpph5xv6mlsh73hgy66vlirrvcs0ijiyjj8g" }, "stable": { "version": [ @@ -89212,11 +89328,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20210928, - 703 + 20211011, + 1529 ], - "commit": "a076d32f281d2984c6072461d034688c41eae3c1", - "sha256": "106qvdspwahyahd4my5wby02ffykbwb04ahlqcrbdapw6aflnv19" + "commit": "825952d0a4a1d5eebf849280ffd4e1e44e1a847c", + "sha256": "1w3iz542v83n6vc4j0nhqmkp21h0m42rqgp6648jlx7q0n4qmdz6" } }, { @@ -89876,8 +89992,8 @@ 20210411, 1931 ], - "commit": "c4ed76d3948afdb0176835c1fa6eb48f54bfd54f", - "sha256": "0m9ksp59bl9lkhrzgkjivnwkl3lv5lgg1zhs47q2gc0sl66xrknz" + "commit": "ab775f6f4507a1f0cd9dab0fd027c2f08be06928", + "sha256": "0js9addqxk2dchgrjnz2wdxxp7sszq95zvga8j1igihx7w83xp7f" }, "stable": { "version": [ @@ -90157,11 +90273,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210930, - 836 + 20211013, + 1620 ], - "commit": "c0ca60e1a83c635d96a76d36e912904e6d0e3446", - "sha256": "1c7w6bl9lccx96i9vyrxg714lwmfhdd3lar5rvf4k6an0vifqzc8" + "commit": "e92d0e800b494c1dfcca109154a6b7eb6fad0e4e", + "sha256": "1lxi1iwckpfk6966sgcdj3sz9bcbylsm3nqv9wbbzkqbjlyd28y4" }, "stable": { "version": [ @@ -90312,11 +90428,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20210527, - 829 + 20211014, + 707 ], - "commit": "045ff9476dac26086a04538d9b7ba186aa8f0fd1", - "sha256": "1y5jqqqh0df75qydw3h7rx24pv5z628ci8ymdksn5khl1qp5041x" + "commit": "31ea715f2164dd611e7fc77b26390ef3ca93509b", + "sha256": "1708xh2sq7xvs4z5zkik9ircxvzimhzi6phc2j43fvvxgglcgrk5" }, "stable": { "version": [ @@ -90382,12 +90498,10 @@ "stable": { "version": [ 1, - 1, - -2, 1 ], - "commit": "eb2d5bad076b17a8c431200be7357460a7d3c088", - "sha256": "1y7xd2lr88z47s70xaxkd9zl3aqna2d87ad2ism3ywncb1sqmd24" + "commit": "76de0de6449031ef5dd3e73ea4ab820e0d58a0e2", + "sha256": "1b7z3nxwrgkw1p7dp6ibsvhvpyl2m881w9yr9qcmdrkf78cqlpvx" } }, { @@ -90803,11 +90917,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20211005, - 1559 + 20211015, + 1650 ], - "commit": "46df4d9ecbaa7da1f48e55e5769d05e4ffdbd8b1", - "sha256": "0c4h86vxv9gwq7cy4jd446zxnp7kbkfj9h58m29i1hhwz056pk6j" + "commit": "46bb0bf29f6b2fb571374e1aaf4252bf5f54281f", + "sha256": "0hkshj2kf23pqnmwc6d1glcg7my402qqngcn4iliy89rp56xdgqs" } }, { @@ -93387,8 +93501,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20210723, - 1236 + 20211014, + 548 ], "deps": [ "cl-lib", @@ -93396,8 +93510,8 @@ "popup", "posframe" ], - "commit": "1d9bcc6dad4182e9b6a5839f8261b260e57be2fc", - "sha256": "157hndsslfxyi4n927y67shnk2xwhwz0idxwkdhcd4zl9jjzwpqr" + "commit": "b296856c21d32e700005110328fb6a1d48dcbf8d", + "sha256": "1x3v18hwxj56zhn4437nklyni4d3chk84c82a8y1z1flcayjipvy" }, "stable": { "version": [ @@ -94430,8 +94544,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210830, - 1944 + 20211014, + 2241 ], "deps": [ "dash", @@ -94444,8 +94558,8 @@ "spinner", "xterm-color" ], - "commit": "804ebfe0295a6bf37870e06f84a8d35f55c9f1a6", - "sha256": "0ya7l8yfbax74lrwvcr3lxaffb238m3yk8y37msvsk1pvwcjfkr7" + "commit": "4f25042b12a782c0acd87fc436de2a1a9140322e", + "sha256": "1aq79dijx62y1h8g5kgdbi5xh4w6wdq47m6g5w64c0rr2igziixg" } }, { @@ -94934,8 +95048,8 @@ 20200830, 301 ], - "commit": "dc045a7670c3f6a6b7c59cf38fd58d980c70e0f4", - "sha256": "1yhfa2f5yrhq9wbq5mshd1cnwks9pwx27isbi1v6gp32lzfwi1jq" + "commit": "dd7f6c0256ccfbd1e6efa6c06b9a12ef3565c29c", + "sha256": "0b5rkj75yxhcdbl7zy008g1n7lwivpnaz78434wb1ljn3l0s56yi" } }, { @@ -96825,8 +96939,8 @@ 20210924, 445 ], - "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", - "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" + "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", + "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" } }, { @@ -99269,6 +99383,36 @@ "sha256": "1y1z4lyv1b56sfimfpxzix5zww97hbci8a9q4cphx65hwkgbfa0d" } }, + { + "ename": "soccer", + "commit": "5111fad0a1dfc8b1e2254ace7907e5ce1be038ca", + "sha256": "1gzfqfgzfwkj85mxzrz83i13v6jrqldcbzcwfcz6bg49agh244bk", + "fetcher": "github", + "repo": "md-arif-shaikh/soccer", + "unstable": { + "version": [ + 20211015, + 934 + ], + "deps": [ + "dash" + ], + "commit": "8547a36789be66ac32caf4c80a330e7bdf9bb5dd", + "sha256": "0kddpbha5mlih9rmygkxqm8gs9719ics749p18p2np02pvka3x06" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "dash" + ], + "commit": "c486cad32f07db9bd55af08c6b4a6bb0cd481d67", + "sha256": "0gsd4mi1nddxn4z9jayi0fhn3bvk9rpj6615ssb5426k0zfhwjsz" + } + }, { "ename": "socyl", "commit": "774b3006f5b6b781594257f1d9819068becbbcc1", @@ -100200,11 +100344,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20211007, - 305 + 20211008, + 106 ], - "commit": "4e7ad5c5efadee670e29fa009c9026222a5bd3e3", - "sha256": "1m9biqvahmdigdf2iz3c2vns0jhrjsr60q444q9aa7l7k509lf35" + "commit": "f38bebefea9d23c2bd4293ecf7100211c1410cd4", + "sha256": "0wvg4c1z5y62icagfwl2vb329jprf6si804726mqka92zj4nnn77" } }, { @@ -101216,8 +101360,8 @@ 20200606, 1308 ], - "commit": "689689adb35f984f9fd833a6b92d4bf50ac565b3", - "sha256": "1iighf4kx2azakrqjf4s08nnsafzp6bh66d15qd68k5z1lkgljsl" + "commit": "ef629fd74c5d963f5b68507179896169a34a078e", + "sha256": "1wnx8s8cabg8zja0w0cvk6jfsqbkgbszdx624v1bl6g5iiv2im1j" }, "stable": { "version": [ @@ -101727,14 +101871,14 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210909, - 1003 + 20211008, + 1439 ], "deps": [ "transient" ], - "commit": "a4eb0da98a3909d301a7c07ae2e64197f8db22a0", - "sha256": "1pwy3h7k8y8hwb2dhpcx22sc5qzyk22r6hvvs4yd2gyjd4lw77vi" + "commit": "de3d4539dd8dd33c9b9d1a982cfc47c452c612de", + "sha256": "0xhggrjq3f9wq5aq69ib2bny36295aw678avgdib2vp1bf9xd73n" }, "stable": { "version": [ @@ -102037,11 +102181,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20210222, - 1037 + 20211011, + 607 ], - "commit": "839f579fa881467149e77d0e096a4a4a6c5d9878", - "sha256": "18hhl6x3xg5lykfq01iw2p03lj248x7rqaygq8nj64hbw46nzn0v" + "commit": "282acf8c01c37899955afe3dc32d9cbfb18065e2", + "sha256": "1kjnc7nl5kshy8wjppvjzavv94h4ynwas610g1xqbzfbpirsnz2p" } }, { @@ -102290,26 +102434,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20210925, - 430 + 20211009, + 635 ], "deps": [ "seq" ], - "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", - "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" + "commit": "babe36ca93e72c34b2a3856d8fac7e3fc9884f21", + "sha256": "133r7isdnz7r7y7pbf239928kjmk9ps2i8zqnxnma9zcmncw88ld" }, "stable": { "version": [ 8, 4, - 0 + 1 ], "deps": [ "seq" ], - "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", - "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" + "commit": "babe36ca93e72c34b2a3856d8fac7e3fc9884f21", + "sha256": "133r7isdnz7r7y7pbf239928kjmk9ps2i8zqnxnma9zcmncw88ld" } }, { @@ -102621,16 +102765,16 @@ "repo": "bgwines/symbol-navigation-hydra", "unstable": { "version": [ - 20211003, - 1859 + 20211010, + 2353 ], "deps": [ "auto-highlight-symbol", "hydra", "multiple-cursors" ], - "commit": "2744210b04fb8f5ee8c7948f5f36c8b2df1ea76d", - "sha256": "1a3gv2jpax1y5k1p7kmns9gnd7paqbllnm0gbmzxkh8p7yc0lrak" + "commit": "b3b1257e676514d93cd2d71a10a485bf00b5375f", + "sha256": "0ic6i589y8g41mpi9vzsd76rzcskxaxicfwwpw8d9g44p8zfghfz" } }, { @@ -103104,11 +103248,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20210525, - 2204 + 20211013, + 1942 ], - "commit": "2196e76cb6f11e6ae0f35ac8259dfb755ea60336", - "sha256": "1xifgdwqpf0ccmdxhdr9zxzqsa769984xs4343v657171f53flz4" + "commit": "d0d51ecbc5929eb7752b387c5bdfe4d879e78224", + "sha256": "1p3ikc776mr18r5py0sw098ahsj9w45ikqns4wbgr2fsjmgcgksr" } }, { @@ -103119,14 +103263,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210615, - 1915 + 20211013, + 2012 ], "deps": [ "s" ], - "commit": "a2e456097322d0b1cfdb7aa37c32a628bcca3bf0", - "sha256": "19ni9bl34hzmqsb9wiznbghw67m7g9zz3z5m3wgndn9zsj37ccka" + "commit": "a0389d87d2e793055dd74ae85b4593aa1d2720fd", + "sha256": "040nl3yn0vfhk5nbll2jpxz7qcjf8kdlkzqa44lz0gvc6d9414yv" } }, { @@ -103137,11 +103281,11 @@ "repo": "fritzgrabo/tab-bar-lost-commands", "unstable": { "version": [ - 20210215, - 1412 + 20211013, + 1945 ], - "commit": "e587cdb5d6d2c8d509c43db4b5bb285415916c4e", - "sha256": "1bnpcfh0lzjz4f1lbj2jqz7ly6d3bv8jhi4lxr5pj3g21437xf4y" + "commit": "989e03dc3d1057264b21b9a5d241fcba86cd297a", + "sha256": "047261v8nvi67h9yils2f1jilmbxc55n31v98qlqxmf56jkzz158" } }, { @@ -103588,28 +103732,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20211007, - 616 + 20211014, + 927 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "dcf5f041d30f5dd407e54f014f281e368d755529", - "sha256": "02d34p14yjqvaypirmr63h1vldmsvzpgkm0c18q2gfxbki6bj9f5" + "commit": "744d3698dd27a58822b2edcd4fe9689a701d0c37", + "sha256": "1hciz2anrjjrm1nw1j657zgglg4ggf9pkzby96a41s7l6d1qi10a" }, "stable": { "version": [ 0, 7, - 30 + 31 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "26fee82fac70d55ade55381b475e865d99dde496", - "sha256": "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9" + "commit": "c07f310552643dfeb6bed98860bd63b965baf262", + "sha256": "05j82796s4k3yr0igl6hir3p8qj0cw66vvhbpbcy28d6q9v9vjjz" } }, { @@ -104694,18 +104838,18 @@ 20200212, 1903 ], - "commit": "dd17e81e813e8e6604b870be0e1ba547ac9fa1dc", - "sha256": "1961wkf50w6qyqdqdnplhjhzqs40m76kflg9vbybr0gqz23abspc" + "commit": "9e70d608bf5f80e8ec0132953b91b7fa3d30ca26", + "sha256": "0x7hsy9v2py8b5i7pn8v5xymgjg8rixkmsxaxvvsbmr771blpkqm" }, "stable": { "version": [ 2021, 10, - 4, + 11, 0 ], - "commit": "6563eeda0cbcc599e0b9fffb665759e5b159b8ec", - "sha256": "1kmcnffdpl44bx80m1ybrssfqbgalw8x00gs9zqnfbyaqcxf0mqr" + "commit": "77016aea52af2156be7c8ebde55b821fe46b7849", + "sha256": "1lmh733m0anfny0izi2lc5njqaqdvr2z96lqfkyzsf0ln73ipb9b" } }, { @@ -104761,8 +104905,8 @@ "deps": [ "haskell-mode" ], - "commit": "991d5c7d1b53bc1b51b44e0560b9074ffdfd941c", - "sha256": "1sy74xi8j8v1bxc1y65j9f4bjhdbc2ym6n70zll9czzqa34g600g" + "commit": "5bc0b35756ab14af950aafa5f3d76bae568d3095", + "sha256": "13pryqrqk1y9qb5h2pg45hi62w17xnzrlrg471b6ga9r4zwn8vfz" }, "stable": { "version": [ @@ -105010,11 +105154,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210925, - 1118 + 20210930, + 1521 ], - "commit": "ed7f90d74d87e629dded6bfe0de2d04a856c5d61", - "sha256": "0lfj2ncygp7fzxcw1kswh75zhx5cdkdyrpd7ms4dfk8j8h7ra09j" + "commit": "e7655e95ad48418a3784de4e8a7dc45ed69540ed", + "sha256": "05bdavm4a1d0p176b8cnipv6byxlchbbp1fcma67ly5px4wxn0ld" }, "stable": { "version": [ @@ -105779,11 +105923,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210920, - 1038 + 20211013, + 2148 ], - "commit": "57942fe961d261360e61a72e47c676172ba7963f", - "sha256": "0d8mnvjbwnghh2yz7ys8r9395cy69mx5wjsm2kg8msi4kgk6yfjj" + "commit": "45975c24e1ab08bb32e9bdc06f5c5efe7c256e16", + "sha256": "0prx06z35fdvwbn1k18khw74phvfsa64pfsh4kpyihldj2k5f69j" }, "stable": { "version": [ @@ -106163,8 +106307,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211006, - 1837 + 20211015, + 1613 ], "deps": [ "ace-window", @@ -106176,14 +106320,14 @@ "pfuture", "s" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "ace-window", @@ -106195,8 +106339,8 @@ "pfuture", "s" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106214,21 +106358,21 @@ "all-the-icons", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106239,28 +106383,28 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210927, - 1735 + 20211007, + 1608 ], "deps": [ "evil", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "evil", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106271,26 +106415,26 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210630, - 1953 + 20211011, + 1824 ], "deps": [ "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106301,30 +106445,30 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210906, - 1653 + 20211010, + 1005 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106343,22 +106487,22 @@ "persp-mode", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106377,22 +106521,22 @@ "perspective", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106410,21 +106554,21 @@ "projectile", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "projectile", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -108385,11 +108529,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20211006, - 1337 + 20211008, + 454 ], - "commit": "b55e265735cb89f384ae51d903a59cda3e52509a", - "sha256": "1xa0p3q5n96rp85knj686argg2yx6302i9g9rc50zrc43lznvgl9" + "commit": "e6e3dd50fb7e3b20e38db555950b2f417a12c993", + "sha256": "0iri2836zxadqdvivkmm0rz2ai4wxb1khnfxjmk8k8q274w1lslf" } }, { @@ -108468,15 +108612,15 @@ "repo": "damon-kwok/v-mode", "unstable": { "version": [ - 20210608, - 629 + 20211015, + 309 ], "deps": [ "dash", "hydra" ], - "commit": "3afbd72180417ada6aeeec861081495aca962124", - "sha256": "0is9hdh8w87l9x84ihhcd040z8m7cy2321q2rmbfmpffaaja90cl" + "commit": "a5f39031a3391d0044c716425eb28645af51c79c", + "sha256": "0k0100fxhhzfyl2pcsrwblj1h7j0x9fzfnpcxqd751yvwihgrsb6" } }, { @@ -109594,11 +109738,11 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20210419, - 857 + 20211014, + 2141 ], - "commit": "bd78372bd3d8f3e90508e1eb0c9d1a53948dcc2b", - "sha256": "18ynnvz7an3bg33pd4fhkk0y85j2v48bgxny163ya6nbk0xp074s" + "commit": "2df643827a4fd82b732ea93042916c61078d4206", + "sha256": "1j8x044s4xzmfmqrsabim9gv435scj2yhym3f3p9bf5vq5ds2smj" }, "stable": { "version": [ @@ -110160,11 +110304,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210923, - 2248 + 20211009, + 252 ], - "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", - "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" + "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", + "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" } }, { @@ -110385,16 +110529,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20210629, - 1252 + 20211008, + 1118 ], "deps": [ "apel", "flim", "semi" ], - "commit": "769699d60aa033049804083b459ee562b82db77e", - "sha256": "0mgl28xsvc0421pysy6hh0hymr0li8iayaa330r41cbqsk3gz4nw" + "commit": "92ded1534ce7143f379b92a4029db275f3e22ee8", + "sha256": "0ai48j19dpyny1mmf81wjwmr5i5i5rnaj4d5n0hfchs4dcng0xrq" } }, { @@ -111921,11 +112065,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20211001, - 2220 + 20211015, + 1917 ], - "commit": "0c37fea45603257435294e2e01a403627da23abe", - "sha256": "1pynm4ng4rki2b2ka5dz01p66ygghk69mldsfbxs81d52jqfnx8f" + "commit": "8d52f933e50624c7bca3880f57297ac17ba4ac2d", + "sha256": "0k0k7mbsizsbgyjb92qj9hp5f2jbwbkzmfbxjhbmniw87q1flmmp" }, "stable": { "version": [ @@ -112241,8 +112385,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210913, - 1123 + 20211014, + 1207 ], "deps": [ "ace-link", @@ -112250,8 +112394,8 @@ "swiper", "zoutline" ], - "commit": "238b7c89229e4b56b36e81f06a2a49488940212a", - "sha256": "06qlkxkdq316habdxvhyyrf6d25i9pdxwjc4dmk3l83sg61rlg79" + "commit": "d22146bae521d4eeefd0bc2d95c7b64796760faa", + "sha256": "1vakix6pdv4ssmwzw7p7iaprp5kyiqjiw8gpi41hn7l3dsgmi4iq" }, "stable": { "version": [ @@ -112670,11 +112814,15 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210925, - 1643 + 20211008, + 707 ], - "commit": "0e834f351733fcae07e1cbd1a47d6330f17a8d74", - "sha256": "1gs5iynyljvjcwxjgvm7xj4zjk5ca59bpxgm016lmxkmdnr68fy5" + "commit": "eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://github.com/xahlee/xah-css-mode/archive/eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba.tar.gz': Couldn't resolve host name (6); retrying in 269 ms\nerror: unable to download 'https://github.com/xahlee/xah-css-mode/archive/eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba.tar.gz': HTTP error 404\n" + ] } }, { @@ -112685,11 +112833,15 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20211001, - 1536 + 20211008, + 717 ], - "commit": "bfd1d20e39d80ff00d3aefdf18c711df0685b022", - "sha256": "1v2i56ny5isvkdgac663g8c67r632fvvz6hkcyyy0fv9l0rzdmsl" + "commit": "de43714d9d4993b744afc4829d2f29ad1e806342", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nerror: unable to download 'https://github.com/xahlee/xah-elisp-mode/archive/de43714d9d4993b744afc4829d2f29ad1e806342.tar.gz': HTTP error 404\n" + ] } }, { @@ -112715,11 +112867,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210919, - 1355 + 20211009, + 1810 ], - "commit": "de9df16b79ec7e2caa81d7d53c8312a54bd52100", - "sha256": "13n4h58nqlxyfjwz4lq32lig73imvq4jk87w72j8cin5hgvnsv30" + "commit": "de43f45e5adc5342937a9bb66f5d00b2c02c16a7", + "sha256": "01wj3ii4lacns3ly8f0812sc53spvkqkwf9g7nqyda1laxqsgnic" } }, { @@ -112745,11 +112897,15 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20210925, - 1653 + 20211008, + 659 ], - "commit": "d99cce539d82cb4f0e10b7c02b5500561b13ff09", - "sha256": "07mlhsxhb3l3xawlvzx76jy4z6q52znjapmpj47w8hllnaibmhmy" + "commit": "f9c3fda86930bebf718da6e39649500be5628cc5", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nerror: unable to download 'https://github.com/xahlee/lookup-word-on-internet/archive/f9c3fda86930bebf718da6e39649500be5628cc5.tar.gz': HTTP error 404\n" + ] } }, { @@ -114691,14 +114847,14 @@ "repo": "schmir/zimports.el", "unstable": { "version": [ - 20200809, - 2035 + 20211011, + 2059 ], "deps": [ "projectile" ], - "commit": "4067b20a2ea25327504b0a42f443903728aa7966", - "sha256": "01ljp3cpslkmp8kxm24ayp5jlg6r431vpk6dm1b9ylr4x4p1klgx" + "commit": "76cf76bdc871cb0454a6fc555aeb1aa94f1b6e57", + "sha256": "1vx4j9n5q4gmc63lk1l4gbz5j5qn2423cyfibqcbynkkbwgas11z" } }, { @@ -115010,30 +115166,30 @@ "repo": "fvdbeek/emacs-zotero", "unstable": { "version": [ - 20211006, - 2051 + 20211008, + 2207 ], "deps": [ "ht", "oauth", "s" ], - "commit": "e63eba9deed272e4d8f4426949b9a5743db3c511", - "sha256": "0266hxdsi74pp2l5higyrqg8hdrmda2x1l63c4yi2x1w351i4jlb" + "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", + "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "ht", "oauth", "s" ], - "commit": "15eb7a8d099c93440f0a8920499633103f00fc83", - "sha256": "13mrssrkcjrrpc470rjpb3mwjfdsyvr4i8niqza54rzk0zxj2m95" + "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", + "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" } }, { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix index ea871ccf41..73fee0dcf3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix @@ -2,14 +2,11 @@ trivialBuild { pname = "sv-kalender"; - version = "1.9"; + version = "1.11"; src = fetchurl { url = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; - sha256 = "0kilp0nyhj67qscy13s0g07kygz2qwmddklhan020sk7z7jv3lpi"; - postFetch = '' - echo "(provide 'sv-kalender)" >> $out - ''; + sha256 = "0mcx7g1pg6kfp0i4b9rh3q9csgdf3054ijswy368bxwdxsjgfz2m"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix index bcd55258a4..db043140e7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -198,7 +198,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { description = "The extensible, customizable GNU text editor"; homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti jwiegley adisbladis ]; + maintainers = with maintainers; [ lovek323 jwiegley adisbladis ]; platforms = platforms.all; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index 998341d6bb..38f38ae3a5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv +{ stdenv +, lib , ctags +, cmark , appstream-glib , desktop-file-utils -, docbook_xsl -, docbook_xml_dtd_43 , fetchurl , flatpak , gnome , libgit2-glib +, gi-docgen , gobject-introspection , glade , gspell -, gtk-doc , gtk3 , gtksourceview4 , json-glib @@ -39,20 +39,20 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.40.2"; + version = "41.1"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "XVXkqqKkdYpGJj0cf9AJyz20RV4O1/nkTDoWNIYfo4o="; }; nativeBuildInputs = [ appstream-glib desktop-file-utils - docbook_xsl - docbook_xml_dtd_43 + gi-docgen gobject-introspection - gtk-doc meson ninja pkg-config @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags + cmark flatpak gnome.devhelp glade @@ -92,8 +93,6 @@ stdenv.mkDerivation rec { xvfb-run ]; - outputs = [ "out" "devdoc" ]; - prePatch = '' patchShebangs build-aux/meson/post_install.py ''; @@ -134,9 +133,13 @@ stdenv.mkDerivation rec { done ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libide "$devdoc" + ''; + passthru.updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch b/third_party/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch index 700ed754d2..8e4a7e3d84 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/clang-location.patch @@ -1,25 +1,61 @@ -diff --git i/src/cpp/core/libclang/LibClang.cpp w/src/cpp/core/libclang/LibClang.cpp -index ec12a3a1ff..8c81b633ae 100644 ---- i/src/cpp/core/libclang/LibClang.cpp -+++ w/src/cpp/core/libclang/LibClang.cpp -@@ -54,7 +54,7 @@ std::vector defaultCompileArgs(LibraryVersion version) +diff --git a/src/cpp/core/libclang/LibClang.cpp b/src/cpp/core/libclang/LibClang.cpp +index 1186f3a..58e8cc7 100644 +--- a/src/cpp/core/libclang/LibClang.cpp ++++ b/src/cpp/core/libclang/LibClang.cpp +@@ -58,7 +58,7 @@ std::vector defaultCompileArgs(LibraryVersion version) // we need to add in the associated libclang headers as // they are not discovered / used by default during compilation -- FilePath llvmPath = s_libraryPath.parent().parent(); +- FilePath llvmPath = s_libraryPath.getParent().getParent(); + FilePath llvmPath("@libclang@"); boost::format fmt("%1%/lib/clang/%2%/include"); - fmt % llvmPath.absolutePath() % version.asString(); + fmt % llvmPath.getAbsolutePath() % version.asString(); std::string includePath = fmt.str(); -@@ -77,10 +77,7 @@ std::vector systemClangVersions() - #elif defined(__unix__) - // default set of versions - clangVersions = { +@@ -70,46 +70,7 @@ std::vector defaultCompileArgs(LibraryVersion version) + + std::vector systemClangVersions() + { +- std::vector clangVersions; +- +-#if defined(__APPLE__) +- // NOTE: the version of libclang.dylib bundled with Xcode +- // doesn't seem to work well when loaded as a library +- // (there seems to be extra orchestration required to get +- // include paths set up; easier to just depend on command +- // line tools since we request their installation in other +- // contexts as well) +- clangVersions = { +- "/Library/Developer/CommandLineTools/usr/lib/libclang.dylib" +- }; +-#elif defined(__unix__) +- // default set of versions +- clangVersions = { - "/usr/lib/libclang.so", - "/usr/lib/llvm/libclang.so", - "/usr/lib64/libclang.so", - "/usr/lib64/llvm/libclang.so", -+ "@libclang.so@" - }; - - // iterate through the set of available 'llvm' directories +- }; +- +- // iterate through the set of available 'llvm' directories +- for (const char* prefix : {"/usr/lib", "/usr/lib64"}) +- { +- FilePath prefixPath(prefix); +- if (!prefixPath.exists()) +- continue; +- +- std::vector directories; +- Error error = prefixPath.getChildren(directories); +- if (error) +- LOG_ERROR(error); +- +- // generate a path for each 'llvm' directory +- for (const FilePath& path : directories) +- if (path.getFilename().find("llvm") == 0) +- clangVersions.push_back(path.completePath("lib/libclang.so.1").getAbsolutePath()); +- } +-#endif +- ++ std::vector clangVersions = { "@libclang.so@" }; + return clangVersions; + } + diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix index 56c3362139..d338a5b961 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -1,141 +1,209 @@ -{ lib, mkDerivation, fetchurl, fetchpatch, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib -, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel -, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc +{ lib +, mkDerivation +, fetchurl +, fetchpatch +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, cmake +, boost +, zlib +, openssl +, R +, qtbase +, qtxmlpatterns +, qtsensors +, qtwebengine +, qtwebchannel +, libuuid +, hunspellDicts +, unzip +, ant +, jdk +, gnumake +, makeWrapper +, pandoc , llvmPackages +, libyamlcpp +, soci +, postgresql +, nodejs +, mkYarnModules +, qmake }: -with lib; let - verMajor = "1"; - verMinor = "2"; - verPatch = "5042"; - version = "${verMajor}.${verMinor}.${verPatch}"; - ginVer = "2.1.2"; - gwtVer = "2.8.1"; -in -mkDerivation rec { pname = "RStudio"; - inherit version; - - nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - - buildInputs = [ boost zlib openssl R qtbase qtxmlpatterns qtsensors - qtwebengine qtwebchannel libuuid ]; + version = "1.4.1717"; + RSTUDIO_VERSION_MAJOR = lib.versions.major version; + RSTUDIO_VERSION_MINOR = lib.versions.minor version; + RSTUDIO_VERSION_PATCH = lib.versions.patch version; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; - rev = "v${version}"; - sha256 = "1n67fa357v51j3z1ma8v2ydfsx3y8n10k2svmfcf4mdzsi8w0kc5"; + rev = version; + sha256 = "sha256-9c1bNsf8kJjpcZ2cMV/pPNtXQkFOntX29a1cdnXpllE="; }; - # Hack RStudio to only use the input R and provided libclang. - patches = [ ./r-location.patch ./clang-location.patch - (fetchpatch { - # Fetch a patch to ensure Rstudio compiles against R - # 4.0.0, should be removed next 1.2.X Rstudio update - # or possibly 1.3.X - url = "https://github.com/rstudio/rstudio/commit/3fb2397c2f208bb8ace0bbaf269481ccb96b5b20.patch"; - sha256 = "0qpgjy6aash0fc0xbns42cwpj3nsw49nkbzwyq8az01xwg81g0f3"; - }) - ]; - postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} - substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@libclang@' ${llvmPackages.libclang.lib} \ - --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so - ''; - - ginSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; - sha256 = "16jzmljravpz6p2rxa87k5f7ir8vs7ya75lnfybfajzmci0p13mr"; - }; - - gwtSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; - sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb"; - }; - - hunspellDictionaries = filter isDerivation (unique (attrValues hunspellDicts)); - # These dicts contain identically-named dict files, so we only keep the - # -large versions in case of clashes - largeDicts = filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; - otherDicts = filter (d: !(hasAttr "dictFileName" d && - elem d.dictFileName (map (d: d.dictFileName) largeDicts))) hunspellDictionaries; - dictionaries = largeDicts ++ otherDicts; - mathJaxSrc = fetchurl { - url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip"; - sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; + url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; + sha256 = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY="; }; rsconnectSrc = fetchFromGitHub { owner = "rstudio"; repo = "rsconnect"; - rev = "984745d8"; - sha256 = "037z0y32k1gdda192y5qn5hi7wp8wyap44mkjlklrgcqkmlcylb9"; + rev = "f5854bb71464f6e3017da9855f058fe3d5b32efd"; + sha256 = "sha256-ULyWdSgGPSAwMt0t4QPuzeUE6Bo6IJh+5BMgW1bFN+Y="; }; - preConfigure = - '' - export RSTUDIO_VERSION_MAJOR=${verMajor} - export RSTUDIO_VERSION_MINOR=${verMinor} - export RSTUDIO_VERSION_PATCH=${verPatch} - - GWT_LIB_DIR=src/gwt/lib - - mkdir -p $GWT_LIB_DIR/gin/${ginVer} - unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer} - - unzip ${gwtSrc} - mkdir -p $GWT_LIB_DIR/gwt - mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer} - - mkdir dependencies/common/dictionaries - for dict in ${builtins.concatStringsSep " " dictionaries}; do - for i in "$dict/share/hunspell/"*; do - ln -sv $i dependencies/common/dictionaries/ - done - done - - unzip ${mathJaxSrc} -d dependencies/common/mathjax-26 - - mkdir -p dependencies/common/pandoc - cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ - - cp -r ${rsconnectSrc} dependencies/common/rsconnect - pushd dependencies/common - ${R}/bin/R CMD build -d --no-build-vignettes rsconnect - popd - ''; - - cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; - - desktopItem = makeDesktopItem { - name = "${pname}-${version}"; - exec = "rstudio %F"; - icon = "rstudio"; - desktopName = "RStudio"; - genericName = "IDE"; - comment = meta.description; - categories = "Development;"; - mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + panmirrorModules = mkYarnModules { + inherit pname version; + packageJSON = ./package.json; + yarnLock = ./yarn.lock; + yarnNix = ./yarndeps.nix; }; - qtWrapperArgs = [ "--suffix PATH : ${gnumake}/bin" ]; +in +mkDerivation rec { + inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH; - postInstall = '' - mkdir $out/share - cp -r ${desktopItem}/share/applications $out/share - mkdir $out/share/icons - ln $out/rstudio.png $out/share/icons + nativeBuildInputs = [ + cmake + unzip + ant + jdk + makeWrapper + pandoc + nodejs + copyDesktopItems + ]; + + buildInputs = [ + boost + zlib + openssl + R + qtbase + qtxmlpatterns + qtsensors + qtwebengine + qtwebchannel + libuuid + libyamlcpp + soci + postgresql + ]; + + cmakeFlags = [ + "-DRSTUDIO_TARGET=Desktop" + "-DCMAKE_BUILD_TYPE=Release" + "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake" + "-DRSTUDIO_USE_SYSTEM_SOCI=ON" + "-DRSTUDIO_USE_SYSTEM_BOOST=ON" + "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" + "-DPANDOC_VERSION=${pandoc.version}" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio" + ]; + + # Hack RStudio to only use the input R and provided libclang. + patches = [ + ./r-location.patch + ./clang-location.patch + # postFetch doesn't work with this | error: unexpected end-of-file + # replacing /usr/bin/node is done in postPatch + # https://src.fedoraproject.org/rpms/rstudio/tree/rawhide + (fetchpatch { + name = "system-node.patch"; + url = "https://src.fedoraproject.org/rpms/rstudio/raw/5bda2e290c9e72305582f2011040938d3e356906/f/0004-use-system-node.patch"; + sha256 = "sha256-P1Y07RB/ceFNa749nyBUWSE41eiiZgt43zVcmahvfZM="; + }) + ]; + + postPatch = '' + substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} + + substituteInPlace src/cpp/CMakeLists.txt \ + --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' + + substituteInPlace src/gwt/build.xml \ + --replace '/usr/bin/node' '${nodejs}/bin/node' + + substituteInPlace src/cpp/core/libclang/LibClang.cpp \ + --replace '@libclang@' ${llvmPackages.libclang.lib} \ + --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + + substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ + --replace "bin/pandoc" "${pandoc}/bin/pandoc" ''; - meta = with lib; - { description = "Set of integrated tools for the R language"; - homepage = "https://www.rstudio.com/"; - license = licenses.agpl3; - maintainers = with maintainers; [ ciil ]; - platforms = platforms.linux; - }; + hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); + # These dicts contain identically-named dict files, so we only keep the + # -large versions in case of clashes + largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; + otherDicts = with lib; filter + (d: !(hasAttr "dictFileName" d && + elem d.dictFileName (map (d: d.dictFileName) largeDicts))) + hunspellDictionaries; + dictionaries = largeDicts ++ otherDicts; + + preConfigure = '' + mkdir dependencies/dictionaries + for dict in ${builtins.concatStringsSep " " dictionaries}; do + for i in "$dict/share/hunspell/"*; do + ln -s $i dependencies/dictionaries/ + done + done + + unzip -q ${mathJaxSrc} -d dependencies/mathjax-27 + + mkdir -p dependencies/pandoc/${pandoc.version} + cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc + + cp -r ${rsconnectSrc} dependencies/rsconnect + ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect ) + + cp -r "${panmirrorModules}" src/gwt/panmirror/src/editor/node_modules + ''; + + postInstall = '' + mkdir -p $out/share/icons $out/bin + ln $out/lib/rstudio/rstudio.png $out/share/icons + + for f in {diagnostics,rpostback,rstudio}; do + ln -s $out/lib/rstudio/bin/$f $out/bin + done + + for f in .gitignore .Rbuildignore LICENSE README; do + find . -name $f -delete + done + rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} + rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc} + ''; + + qtWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ gnumake ]}" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "${pname}"; + exec = "rstudio %F"; + icon = "rstudio"; + desktopName = "RStudio"; + genericName = "IDE"; + comment = meta.description; + categories = "Development;"; + mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + }) + ]; + + meta = with lib; { + description = "Set of integrated tools for the R language"; + homepage = "https://www.rstudio.com/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ciil ]; + platforms = platforms.linux; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/package.json b/third_party/nixpkgs/pkgs/applications/editors/rstudio/package.json new file mode 100644 index 0000000000..31943987a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/package.json @@ -0,0 +1,83 @@ +{ + "name": "panmirror", + "version": "0.1.0", + "private": true, + "license": "agpl-3.0", + "dependencies": { + "@types/ace": "^0.0.43", + "@types/clipboard": "^2.0.1", + "@types/diff-match-patch": "^1.0.32", + "@types/js-yaml": "^3.12.3", + "@types/lodash.debounce": "^4.0.6", + "@types/lodash.uniqby": "^4.7.6", + "@types/orderedmap": "^1.0.0", + "@types/prosemirror-commands": "^1.0.3", + "@types/prosemirror-dev-tools": "^2.1.0", + "@types/prosemirror-dropcursor": "^1.0.0", + "@types/prosemirror-gapcursor": "^1.0.1", + "@types/prosemirror-history": "^1.0.1", + "@types/prosemirror-inputrules": "^1.0.3", + "@types/prosemirror-keymap": "^1.0.3", + "@types/prosemirror-model": "^1.7.2", + "@types/prosemirror-schema-list": "^1.0.1", + "@types/prosemirror-state": "^1.2.5", + "@types/prosemirror-tables": "^0.9.1", + "@types/prosemirror-transform": "^1.1.1", + "@types/react": "^16.9.32", + "@types/react-dom": "^16.9.6", + "@types/react-window": "^1.8.2", + "@types/zenscroll": "^4.0.0", + "biblatex-csl-converter": "^1.9.1", + "clipboard": "^2.0.6", + "diff-match-patch": "^1.0.4", + "fuse.js": "^6.0.4", + "js-yaml": "^3.13.1", + "lodash.debounce": "^4.0.8", + "lodash.uniqby": "^4.7.0", + "orderedmap": "^1.0.0", + "prosemirror-changeset": "^2.1.2", + "prosemirror-commands": "^1.1.4", + "prosemirror-dev-tools": "^2.1.1", + "prosemirror-dropcursor": "^1.3.2", + "prosemirror-gapcursor": "^1.1.5", + "prosemirror-history": "^1.1.3", + "prosemirror-inputrules": "^1.1.2", + "prosemirror-keymap": "^1.1.4", + "prosemirror-model": "^1.11.0", + "prosemirror-schema-list": "^1.1.4", + "prosemirror-state": "^1.3.3", + "prosemirror-tables": "^1.1.1", + "prosemirror-transform": "^1.2.8", + "prosemirror-utils": "^0.9.6", + "prosemirror-view": "^1.15.6", + "react": "^16.13.1", + "react-dom": "^16.13.1", + "react-window": "^1.8.5", + "sentence-splitter": "^3.2.0", + "thenby": "^1.3.3", + "tlite": "^0.1.9", + "typescript": "3.8.3", + "zenscroll": "^4.0.2" + }, + "scripts": { + "format": "prettier --write \"src/**/*.ts\" \"src/**/*.tsx\"", + "lint": "tslint -c tslint.json 'src/**/*.{ts,tsx}'", + "watch": "tsc --watch --noEmit --project './tsconfig.json'", + "generate-symbols": "ts-node tools/generate-symbols.ts" + }, + "devDependencies": { + "@types/node": "^14.0.4", + "@types/unzip": "^0.1.1", + "fast-xml-parser": "^3.17.1", + "fuse-box": "^3.7.1", + "prettier": "^1.18.2", + "terser": "^4.6.2", + "ts-node": "^8.10.2", + "tslint": "^5.20.0", + "tslint-config-prettier": "^1.18.0", + "tslint-react": "^5.0.0", + "typescript-tslint-plugin": "^0.5.5", + "uglify-js": "^3.7.4", + "unzip": "^0.1.11" + } +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/r-location.patch b/third_party/nixpkgs/pkgs/applications/editors/rstudio/r-location.patch index 24cb6a2469..44e54b36e0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/r-location.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/r-location.patch @@ -1,19 +1,23 @@ -diff -ur rstudio-1.1.216-old/src/cpp/core/CMakeLists.txt rstudio-1.1.216-new/src/cpp/core/CMakeLists.txt ---- rstudio-1.1.216-old/src/cpp/core/r_util/REnvironmentPosix.cpp 2017-04-30 03:37:26.669418665 -0400 -+++ rstudio-1.1.216-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2017-04-30 03:36:33.590726185 -0400 -@@ -87,10 +87,7 @@ +diff --git a/src/cpp/core/r_util/REnvironmentPosix.cpp b/src/cpp/core/r_util/REnvironmentPosix.cpp +index dbc9a9a1..9a526a86 100644 +--- a/src/cpp/core/r_util/REnvironmentPosix.cpp ++++ b/src/cpp/core/r_util/REnvironmentPosix.cpp +@@ -107,12 +107,9 @@ FilePath systemDefaultRScript(std::string* pErrMsg) { - // define potential paths - std::vector rScriptPaths; -- rScriptPaths.push_back("/usr/bin/R"); -- rScriptPaths.push_back("/usr/local/bin/R"); -- rScriptPaths.push_back("/opt/local/bin/R"); -- rScriptPaths.push_back("/Library/Frameworks/R.framework/Resources/bin/R"); -+ rScriptPaths.push_back("@R@/bin/R"); - return scanForRScript(rScriptPaths, pErrMsg); - } + // check fallback paths + std::vector rScriptPaths = { +- "/usr/bin/R", +- "/usr/local/bin/R", +- "/opt/local/bin/R", ++ "@R@/bin/R" + #ifdef __APPLE__ +- "/opt/homebrew/bin/R", +- "/Library/Frameworks/R.framework/Resources/bin/R", ++ "@R@/bin/R", + #endif + }; -@@ -226,8 +223,7 @@ +@@ -225,8 +222,7 @@ FilePath systemDefaultRScript(std::string* pErrMsg) // scan in standard locations as a fallback std::string scanErrMsg; std::vector rScriptPaths; @@ -21,5 +25,6 @@ diff -ur rstudio-1.1.216-old/src/cpp/core/CMakeLists.txt rstudio-1.1.216-new/src - rScriptPaths.push_back("/usr/bin/R"); + rScriptPaths.push_back("@R@/bin/R"); FilePath scriptPath = scanForRScript(rScriptPaths, &scanErrMsg); - if (scriptPath.empty()) + if (scriptPath.isEmpty()) { + diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarn.lock b/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarn.lock new file mode 100644 index 0000000000..d1717012db --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarn.lock @@ -0,0 +1,3835 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.0.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" + integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== + dependencies: + "@babel/highlight" "^7.8.3" + +"@babel/helper-module-imports@^7.0.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498" + integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg== + dependencies: + "@babel/types" "^7.8.3" + +"@babel/highlight@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" + integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^4.0.0" + +"@babel/runtime@^7.0.0": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" + integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308" + integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ== + dependencies: + regenerator-runtime "^0.13.2" + +"@babel/types@^7.8.3": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01" + integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA== + dependencies: + esutils "^2.0.2" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + +"@emotion/babel-utils@^0.6.4": + version "0.6.10" + resolved "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz#83dbf3dfa933fae9fc566e54fbb45f14674c6ccc" + integrity sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow== + dependencies: + "@emotion/hash" "^0.6.6" + "@emotion/memoize" "^0.6.6" + "@emotion/serialize" "^0.9.1" + convert-source-map "^1.5.1" + find-root "^1.1.0" + source-map "^0.7.2" + +"@emotion/hash@^0.6.2", "@emotion/hash@^0.6.6": + version "0.6.6" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44" + integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ== + +"@emotion/is-prop-valid@^0.6.1": + version "0.6.8" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz#68ad02831da41213a2089d2cab4e8ac8b30cbd85" + integrity sha512-IMSL7ekYhmFlILXcouA6ket3vV7u9BqStlXzbKOF9HBtpUPMMlHU+bBxrLOa2NvleVwNIxeq/zL8LafLbeUXcA== + dependencies: + "@emotion/memoize" "^0.6.6" + +"@emotion/memoize@^0.6.1", "@emotion/memoize@^0.6.6": + version "0.6.6" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b" + integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ== + +"@emotion/serialize@^0.9.1": + version "0.9.1" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145" + integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ== + dependencies: + "@emotion/hash" "^0.6.6" + "@emotion/memoize" "^0.6.6" + "@emotion/unitless" "^0.6.7" + "@emotion/utils" "^0.8.2" + +"@emotion/stylis@^0.7.0": + version "0.7.1" + resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5" + integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ== + +"@emotion/unitless@^0.6.2", "@emotion/unitless@^0.6.7": + version "0.6.7" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397" + integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg== + +"@emotion/utils@^0.8.2": + version "0.8.2" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc" + integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw== + +"@textlint/ast-node-types@^4.2.5": + version "4.3.4" + resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.3.4.tgz#f6596c45c32c85dc06915c3077bb7686033efd32" + integrity sha512-Grq+vJuNH7HCa278eFeiqJvowrD+onMCoG2ctLyoN+fXYIQGIr1/8fo8AcIg+VM16Kga+N6Y1UWNOWPd8j1nFg== + +"@types/ace@^0.0.43": + version "0.0.43" + resolved "https://registry.yarnpkg.com/@types/ace/-/ace-0.0.43.tgz#9f0916174b6060dabbccd36ba4868ea769a1c633" + integrity sha512-eQdX8AQ7CfSHym07MZMBQ8FKUj9AZ2Wcc26W5Ct8J4KOMjFY6SFUaf2YA8YHBut0Fwl//2kZ+0GLZNp+NQNRIA== + +"@types/clipboard@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.1.tgz#75a74086c293d75b12bc93ff13bc7797fef05a40" + integrity sha512-gJJX9Jjdt3bIAePQRRjYWG20dIhAgEqonguyHxXuqALxsoDsDLimihqrSg8fXgVTJ4KZCzkfglKtwsh/8dLfbA== + +"@types/diff-match-patch@^1.0.32": + version "1.0.32" + resolved "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz#d9c3b8c914aa8229485351db4865328337a3d09f" + integrity sha512-bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A== + +"@types/js-yaml@^3.12.3": + version "3.12.3" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.3.tgz#abf383c5b639d0aa8b8c4a420d6a85f703357d6c" + integrity sha512-otRe77JNNWzoVGLKw8TCspKswRoQToys4tuL6XYVBFxjgeM0RUrx7m3jkaTdxILxeGry3zM8mGYkGXMeQ02guA== + +"@types/lodash.debounce@^4.0.6": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@types/lodash.debounce/-/lodash.debounce-4.0.6.tgz#c5a2326cd3efc46566c47e4c0aa248dc0ee57d60" + integrity sha512-4WTmnnhCfDvvuLMaF3KV4Qfki93KebocUF45msxhYyjMttZDQYzHkO639ohhk8+oco2cluAFL3t5+Jn4mleylQ== + dependencies: + "@types/lodash" "*" + +"@types/lodash.uniqby@^4.7.6": + version "4.7.6" + resolved "https://registry.yarnpkg.com/@types/lodash.uniqby/-/lodash.uniqby-4.7.6.tgz#672827a701403f07904fe37f0721ae92abfa80e8" + integrity sha512-9wBhrm1y6asW50Joj6tsySCNUgzK2tCqL7vtKIej0E9RyeBFdcte7fxUosmFuMoOU0eHqOMK76kCCrK99jxHgg== + dependencies: + "@types/lodash" "*" + +"@types/lodash@*": + version "4.14.154" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.154.tgz#069e3c703fdb264e67be9e03b20a640bc0198ecc" + integrity sha512-VoDZIJmg3P8vPEnTldLvgA+q7RkIbVkbYX4k0cAVFzGAOQwUehVgRHgIr2/wepwivDst/rVRqaiBSjCXRnoWwQ== + +"@types/node@*", "@types/node@^14.0.4": + version "14.0.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.4.tgz#43a63fc5edce226bed106b31b875165256271107" + integrity sha512-k3NqigXWRzQZVBDS5D1U70A5E8Qk4Kh+Ha/x4M8Bt9pF0X05eggfnC9+63Usc9Q928hRUIpIhTQaXsZwZBl4Ew== + +"@types/orderedmap@*", "@types/orderedmap@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/orderedmap/-/orderedmap-1.0.0.tgz#807455a192bba52cbbb4517044bc82bdbfa8c596" + integrity sha512-dxKo80TqYx3YtBipHwA/SdFmMMyLCnP+5mkEqN0eMjcTBzHkiiX0ES118DsjDBjvD+zeSsSU9jULTZ+frog+Gw== + +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/prop-types@*": + version "15.7.3" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" + integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== + +"@types/prosemirror-commands@*", "@types/prosemirror-commands@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.3.tgz#e9fa5653cffd1c75c260594cf3ec5244c9004dbf" + integrity sha512-AjFCJqBvAhQ4gOzXPgUcnEZwu4jd7se7ani3dYAv8p4L+cWEPD6Pshrpp5uJDI5/pzvNXLWQ/4c2Qk4h9IML1w== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-dev-tools@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.0.tgz#91e2ef4f36129f5155f924296e306de187e86bdb" + integrity sha512-OhnSaC4yrrEMLPRUkEWcHAIPVqgKlLkE4kISqL3cHeAYxASouSPvPMLqhBIbWkGwaozy43DjjVC1OXkxTo+y5Q== + dependencies: + "@types/prosemirror-state" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-dropcursor@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.0.tgz#2df872bc6431a9f06bc1a4a0eac7c2dc527e7f12" + integrity sha512-S2ndHt94M64avSqjBcgIblaF3YeC3RfcmpY9/WIdfqU7aoJxuOh4RJk5emdmQPHZT1wbczMHFmFSsRqgErK0EQ== + dependencies: + "@types/prosemirror-state" "*" + +"@types/prosemirror-gapcursor@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.1.tgz#56a6274ef39f62c339adcc64305294b800211a5e" + integrity sha512-ruA7FK9NJv+bn5s55SZYFf9SwaN3wk/MkBvqRmhIqIHvowTTa7nzIGWbUdWZMga1DDTk+GrwdcQaEHunAFjFsQ== + dependencies: + "@types/prosemirror-state" "*" + +"@types/prosemirror-history@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.1.tgz#b8d7595f73788b63fc9f2b57a763ba8375abfe87" + integrity sha512-BYyPJlWDo3VEnWS5X2DCHXrrAKEjdbCe1DUjGL6R/8hmwMFe3iMJGYdBkOXU1FfkTpw7Z+PlwY/pMyeelVydmg== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + +"@types/prosemirror-inputrules@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.3.tgz#3f8f07921f692b6c7e4781fa426aee3e76b9018c" + integrity sha512-cxMkCcu/di8//68jWc/NrRpvpCbizgq9vqv4rCRsAiuSiJ8L5hf4aFlCBUYCffuQnrY98uOfJ8YAUY3dbtaF9A== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + +"@types/prosemirror-keymap@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.3.tgz#09cc469a69222a4c8a3d415d02eeb459bb74269c" + integrity sha512-iCYUtt0u8y6qeDZVsidEWJGbw2Kas+jtHD1QY374W/N2jASYp+8auucFLXe0UvoOy9jiWcGcqcecec1R+vkzgw== + dependencies: + "@types/prosemirror-commands" "*" + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-model@*", "@types/prosemirror-model@^1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.2.tgz#9c7aff2fd62f0f56eb76e2e0eb27bf6996e6c28a" + integrity sha512-2l+yXvidg3AUHN07mO4Jd8Q84fo6ksFsy7LHUurLYrZ74uTahBp2fzcO49AKZMzww2EulXJ40Kl/OFaQ/7A1fw== + dependencies: + "@types/orderedmap" "*" + +"@types/prosemirror-schema-list@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz#7f53e3c0326b1359755f3971b8c448d98b722f21" + integrity sha512-+iUYq+pj2wVHSThj0MjNDzkkGwq8aDQ6j0UJK8a0cNCL8v44Ftcx1noGPtBIEUJgitH960VnfBNoTWfQoQZfRA== + dependencies: + "@types/orderedmap" "*" + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + +"@types/prosemirror-state@*": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.3.tgz#7f5f871acf7b8c22e1862ff0068f9bf7e9682c0e" + integrity sha512-6m433Hubix9bx+JgcLW7zzyiZuzwjq5mBdSMYY4Yi5c5ZpV2RiVmg7Cy6f9Thtts8vuztilw+PczJAgDm1Frfw== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-transform" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-state@^1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.5.tgz#a91304e9aab6e71f868e23b3a1ae514a75033f8f" + integrity sha512-a5DxAifiF6vmdSJ5jsDMkpykUgUJUy+T5Q5hCjFOKJ4cfd3m3q1lsFKr7Bc4r91Qb7rfqyiKCMDnASS8LIHrKw== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-transform" "*" + "@types/prosemirror-view" "*" + +"@types/prosemirror-tables@^0.9.1": + version "0.9.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-tables/-/prosemirror-tables-0.9.1.tgz#d2203330f0fa1161c04152bf02c39e152082d408" + integrity sha512-zoY1qcAC6kG4UjnaQQXuoyYQdDJMQmY9uzRKdyUppP8rWRR5/kXBHOd84CD9ZvrYUBo3uDmS20qQnc3knr2j9A== + dependencies: + prosemirror-tables "*" + +"@types/prosemirror-transform@*", "@types/prosemirror-transform@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.1.tgz#5a0de16e8e0123b4c3d9559235e19f39cee85e5c" + integrity sha512-yYCYSoiRH+Wcbl8GJc0PFCzeyMzNQ1vL2xrHHSXZuNcIlH75VoiKrZFeZ6BS9cl8mYXjZrlmdBe8YOxYvyKM6A== + dependencies: + "@types/prosemirror-model" "*" + +"@types/prosemirror-view@*": + version "1.11.2" + resolved "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.11.2.tgz#58af5dcb7de20b7de874de99147552d5627209a1" + integrity sha512-EKcQmR4KdkFZU13wS5pWrkSojRCPGqz/l/uzpZFfW5cgdr7fQsftf2/ttvIjpk1a94ISifEY4UZwflVJ+uL4Rg== + dependencies: + "@types/prosemirror-model" "*" + "@types/prosemirror-state" "*" + "@types/prosemirror-transform" "*" + +"@types/react-dom@^16.9.6": + version "16.9.6" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.6.tgz#9e7f83d90566521cc2083be2277c6712dcaf754c" + integrity sha512-S6ihtlPMDotrlCJE9ST1fRmYrQNNwfgL61UB4I1W7M6kPulUKx9fXAleW5zpdIjUQ4fTaaog8uERezjsGUj9HQ== + dependencies: + "@types/react" "*" + +"@types/react-window@^1.8.2": + version "1.8.2" + resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.2.tgz#a5a6b2762ce73ffaab7911ee1397cf645f2459fe" + integrity sha512-gP1xam68Wc4ZTAee++zx6pTdDAH08rAkQrWm4B4F/y6hhmlT9Mgx2q8lTCXnrPHXsr15XjRN9+K2DLKcz44qEQ== + dependencies: + "@types/react" "*" + +"@types/react@*", "@types/react@^16.9.32": + version "16.9.32" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383" + integrity sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ== + dependencies: + "@types/prop-types" "*" + csstype "^2.2.0" + +"@types/unzip@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@types/unzip/-/unzip-0.1.1.tgz#96e80dc5e2917a769c8be01aa49c4fe660e7bab3" + integrity sha512-skD6Um7Pk2l7y+tVOKSgOA9vXViyhk/qJYmr17Ek4Uw3Zgo/DWPScphTPztPbApTIngyYSJnkEW87xrHzRYaew== + dependencies: + "@types/node" "*" + +"@types/zenscroll@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.0.tgz#9acc7df6c87cc9e064f5a6230df499835dee1972" + integrity sha512-n9np/qsr3HBH3VBVfviHhQPmGP1+D01+VI/40QFq/7LyJqDoIlcaaABu/qPAVats/oNuUJ/dhrjrOjVaqos+4A== + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +acorn-jsx@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e" + integrity sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw== + dependencies: + acorn "^5.0.3" + +acorn@^5.0.3, acorn@^5.7.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" + integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + +ajax-request@^1.2.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/ajax-request/-/ajax-request-1.2.3.tgz#99fcbec1d6d2792f85fa949535332bd14f5f3790" + integrity sha1-mfy+wdbSeS+F+pSVNTMr0U9fN5A= + dependencies: + file-system "^2.1.1" + utils-extend "^1.0.7" + +ajv@^6.5.5: + version "6.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7" + integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-escapes@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" + integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= + +anymatch@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" + integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== + dependencies: + micromatch "^2.1.5" + normalize-path "^2.0.0" + +app-root-path@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-1.4.0.tgz#6335d865c9640d0fad99004e5a79232238e92dfa" + integrity sha1-YzXYZclkDQ+tmQBOWnkjIjjpLfo= + +app-root-path@^2.0.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a" + integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA== + +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" + integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= + dependencies: + arr-flatten "^1.0.1" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + +arr-flatten@^1.0.1, arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-unique@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + +async-each@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" + integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== + +babel-plugin-emotion@^9.2.11: + version "9.2.11" + resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz#319c005a9ee1d15bb447f59fe504c35fd5807728" + integrity sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@emotion/babel-utils" "^0.6.4" + "@emotion/hash" "^0.6.2" + "@emotion/memoize" "^0.6.1" + "@emotion/stylis" "^0.7.0" + babel-plugin-macros "^2.0.0" + babel-plugin-syntax-jsx "^6.18.0" + convert-source-map "^1.5.0" + find-root "^1.1.0" + mkdirp "^0.5.1" + source-map "^0.5.7" + touch "^2.0.1" + +babel-plugin-macros@^2.0.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" + integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== + dependencies: + "@babel/runtime" "^7.7.2" + cosmiconfig "^6.0.0" + resolve "^1.12.0" + +babel-plugin-syntax-jsx@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" + integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= + +babel-runtime@^6.6.1: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +base16@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70" + integrity sha1-4pf2DX7BAUp6lxo568ipjAtoHnA= + +base64-img@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/base64-img/-/base64-img-1.0.4.tgz#3e22d55d6c74a24553d840d2b1bc12a7db078d35" + integrity sha1-PiLVXWx0okVT2EDSsbwSp9sHjTU= + dependencies: + ajax-request "^1.2.0" + file-system "^2.1.0" + +base64-js@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" + integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +biblatex-csl-converter@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-1.9.1.tgz#50aacfef172997f1c98d72837ffdd3b19c62f8c4" + integrity sha512-M7HkWas8NbiFoNdS/lZOfup5A83Scw4iWFoPn9r84zh9DzaG/gHU86qH1QHMgUc2dSaquuIBQZRHC9wCs7k92g== + +binary-extensions@^1.0.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== + +"binary@>= 0.3.0 < 1": + version "0.3.0" + resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" + integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= + dependencies: + buffers "~0.1.1" + chainsaw "~0.1.0" + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +body-parser@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +boundary@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz#4d67dc2602c0cc16dd9bce7ebf87e948290f5812" + integrity sha1-TWfcJgLAzBbdm85+v4fpSCkPWBI= + +bowser@^2.0.0-beta.3: + version "2.9.0" + resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz#3bed854233b419b9a7422d9ee3e85504373821c9" + integrity sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^1.8.2: + version "1.8.5" + resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" + integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= + dependencies: + expand-range "^1.8.1" + preserve "^0.2.0" + repeat-element "^1.1.2" + +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +buffers@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" + integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= + +builtin-modules@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +chain-able@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/chain-able/-/chain-able-1.0.1.tgz#b48ac9bdc18f2192ec730abc66609f90aab5605f" + integrity sha1-tIrJvcGPIZLscwq8ZmCfkKq1YF8= + +chain-able@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chain-able/-/chain-able-3.0.0.tgz#dcffe8b04f3da210941a23843bc1332bb288ca9f" + integrity sha512-26MoELhta86n7gCsE2T1hGRyncZvPjFXTkB/DEp4+i/EJVSxXQNwXMDZZb2+SWcbPuow18wQtztaW7GXOel9DA== + +chainsaw@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" + integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= + dependencies: + traverse ">=0.3.0 <0.4" + +chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chardet@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" + integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I= + +chokidar@^1.6.1: + version "1.7.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" + integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= + dependencies: + anymatch "^1.3.0" + async-each "^1.0.0" + glob-parent "^2.0.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^2.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + optionalDependencies: + fsevents "^1.0.0" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +clean-css@^4.1.9: + version "4.2.3" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" + integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== + dependencies: + source-map "~0.6.0" + +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + dependencies: + restore-cursor "^2.0.0" + +cli-width@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" + integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= + +clipboard@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376" + integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg== + dependencies: + good-listener "^1.2.2" + select "^1.1.2" + tiny-emitter "^2.0.0" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@^2.12.1, commander@^2.20.0, commander@~2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.4.7: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +concat-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" + integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.0.2" + typedarray "^0.0.6" + +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +convert-source-map@^1.5.0, convert-source-map@^1.5.1: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + +core-js@^2.4.0: + version "2.6.11" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" + integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +cosmiconfig@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.7.2" + +create-emotion-styled@^9.2.8: + version "9.2.8" + resolved "https://registry.yarnpkg.com/create-emotion-styled/-/create-emotion-styled-9.2.8.tgz#c0050e768ba439609bec108600467adf2de67cc3" + integrity sha512-2LrNM5MREWzI5hZK+LyiBHglwE18WE3AEbBQgpHQ1+zmyLSm/dJsUZBeFAwuIMb+TjNZP0KsMZlV776ufOtFdg== + dependencies: + "@emotion/is-prop-valid" "^0.6.1" + +create-emotion@^9.2.12: + version "9.2.12" + resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz#0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f" + integrity sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA== + dependencies: + "@emotion/hash" "^0.6.2" + "@emotion/memoize" "^0.6.1" + "@emotion/stylis" "^0.7.0" + "@emotion/unitless" "^0.6.2" + csstype "^2.5.2" + stylis "^3.5.0" + stylis-rule-sheet "^0.0.10" + +create-react-context@^0.1.5: + version "0.1.6" + resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.1.6.tgz#0f425931d907741127acc6e31acb4f9015dd9fdc" + integrity sha512-eCnYYEUEc5i32LHwpE/W7NlddOB9oHwsPaWtWzYtflNkkwa3IfindIcoXdVWs12zCbwaMCavKNu84EXogVIWHw== + +csstype@^2.2.0: + version "2.6.10" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b" + integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w== + +csstype@^2.5.2: + version "2.6.9" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098" + integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q== + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + +deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + +define-properties@^1.1.2, define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +delegate@^3.1.2: + version "3.2.0" + resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" + integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +diff-match-patch@^1.0.0, diff-match-patch@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1" + integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg== + +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +emotion@^9.2.5: + version "9.2.12" + resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz#53925aaa005614e65c6e43db8243c843574d1ea9" + integrity sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ== + dependencies: + babel-plugin-emotion "^9.2.11" + create-emotion "^9.2.12" + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es-abstract@^1.17.0-next.1, es-abstract@^1.17.5: + version "1.17.6" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a" + integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.0" + is-regex "^1.1.0" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +es6-object-assign@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" + integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw= + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escodegen@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" + integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +exec-sh@^0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36" + integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw== + dependencies: + merge "^1.2.0" + +expand-brackets@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" + integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= + dependencies: + is-posix-bracket "^0.1.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expand-range@^1.8.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" + integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= + dependencies: + fill-range "^2.1.0" + +express@^4.14.0: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +external-editor@^2.0.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" + integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A== + dependencies: + chardet "^0.4.0" + iconv-lite "^0.4.17" + tmp "^0.0.33" + +extglob@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" + integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= + dependencies: + is-extglob "^1.0.0" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" + integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fast-xml-parser@^3.17.1: + version "3.17.1" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.17.1.tgz#579fa64346cc891ce240d378268c6216e74aab10" + integrity sha512-jZ0EVn1iBuZtx/sbQnfvhSaaUltz+0+yfR+6QRyzrlt5yMiU+8ZfGj9i3/hoXJxm+aFri7dycBWbncox7frCAQ== + +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + dependencies: + escape-string-regexp "^1.0.5" + +file-match@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/file-match/-/file-match-1.0.2.tgz#c9cad265d2c8adf3a81475b0df475859069faef7" + integrity sha1-ycrSZdLIrfOoFHWw30dYWQafrvc= + dependencies: + utils-extend "^1.0.6" + +file-system@^2.1.0, file-system@^2.1.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/file-system/-/file-system-2.2.2.tgz#7d65833e3a2347dcd956a813c677153ed3edd987" + integrity sha1-fWWDPjojR9zZVqgTxncVPtPt2Yc= + dependencies: + file-match "^1.0.1" + utils-extend "^1.0.4" + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +filename-regex@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" + integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= + +fill-range@^2.1.0: + version "2.2.4" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" + integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== + dependencies: + is-number "^2.1.0" + isobject "^2.0.0" + randomatic "^3.0.0" + repeat-element "^1.1.2" + repeat-string "^1.5.2" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-root@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" + integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== + +fliplog@^0.3.13: + version "0.3.13" + resolved "https://registry.yarnpkg.com/fliplog/-/fliplog-0.3.13.tgz#dd0d786e821822aae272e0ddc84012596a96154c" + integrity sha512-R504CdX+mdhMYpmyrdiQ9PW6ncAyZnxyeA85fS1/P/Y9qmbMiQsqt6QzsYhq5kbqMb84PibVOcS1oz98GJl6EQ== + dependencies: + chain-able "^1.0.1" + +for-in@^1.0.1, for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + +for-own@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" + integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= + dependencies: + for-in "^1.0.1" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +forwarded@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +fs-extra@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@^1.0.0: + version "1.2.11" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" + integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw== + dependencies: + bindings "^1.5.0" + nan "^2.12.1" + +"fstream@>= 0.1.30 < 1": + version "0.1.31" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz#7337f058fbbbbefa8c9f561a28cab0849202c988" + integrity sha1-czfwWPu7vvqMn1YaKMqwhJICyYg= + dependencies: + graceful-fs "~3.0.2" + inherits "~2.0.0" + mkdirp "0.5" + rimraf "2" + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +fuse-box@^3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-3.7.1.tgz#d32879ceee4c8bcec9bbd8fcfe5b29e7142371cd" + integrity sha512-aM7t9bUcRpNNQu9M+YjXXzx9JSJQVPWeY+8iTyv7OhvJNWHrqqEWPzbn9OfcyFa2AfPwAUyC/uzWexBbjtTvsA== + dependencies: + acorn "^5.7.3" + acorn-jsx "^4.0.1" + ansi "^0.3.1" + app-root-path "^2.0.1" + base64-img "^1.0.3" + base64-js "^1.2.0" + bowser "^2.0.0-beta.3" + chokidar "^1.6.1" + clean-css "^4.1.9" + escodegen "^1.8.1" + express "^4.14.0" + fliplog "^0.3.13" + fs-extra "^7.0.0" + fuse-concat-with-sourcemaps "^1.0.5" + getopts "^2.1.1" + glob "^7.1.1" + ieee754 "^1.1.8" + inquirer "^3.0.6" + lego-api "^1.0.7" + mustache "^2.3.0" + postcss "^6.0.1" + pretty-time "^0.2.0" + prettysize "0.0.3" + realm-utils "^1.0.9" + regexpu-core "^4.1.3" + request "^2.79.0" + shorthash "0.0.2" + source-map "^0.7.1" + sourcemap-blender "1.0.5" + stream-browserify "^2.0.1" + tslib "^1.8.0" + watch "^1.0.1" + ws "^1.1.1" + +fuse-concat-with-sourcemaps@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/fuse-concat-with-sourcemaps/-/fuse-concat-with-sourcemaps-1.0.5.tgz#9c6a521f675cff5cdbb48db1ca9c181ae49a7b97" + integrity sha512-tKsRJIxn9tU3IH8JHMwFhGbObqkDKXhNKOvcM+QyflAlYb2EgOvIQe8D6WB/cocA3puldHatsp9SN5SKryasrw== + dependencies: + source-map "^0.6.1" + +fuse.js@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.0.4.tgz#9f5af976f836247ad5d2c338090d6ce13cf9a4d2" + integrity sha512-XAeQaT+DV8dxqohN911+Qzkb4iMzTzae04mdb9/XSQbMjbsFasQxe0+UwM+3UWP+8vO7svz1Rj0KuQw6xJ45Ww== + +get-caller-file@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" + integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + +getopts@^2.1.1: + version "2.2.5" + resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b" + integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA== + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +glob-base@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" + integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= + dependencies: + glob-parent "^2.0.0" + is-glob "^2.0.0" + +glob-parent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" + integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= + dependencies: + is-glob "^2.0.0" + +glob@^7.1.1, glob@^7.1.3: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +good-listener@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" + integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA= + dependencies: + delegate "^3.1.2" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + +graceful-fs@~3.0.2: + version "3.0.12" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz#0034947ce9ed695ec8ab0b854bc919e82b1ffaef" + integrity sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg== + dependencies: + natives "^1.1.3" + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" + integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + dependencies: + ajv "^6.5.5" + har-schema "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-symbols@^1.0.0, has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +html@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz#a544fa9ea5492bfb3a2cca8210a10be7b5af1f61" + integrity sha1-pUT6nqVJK/s6LMqCEKEL57WvH2E= + dependencies: + concat-stream "^1.4.7" + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +iconv-lite@0.4.24, iconv-lite@^0.4.17: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ie-array-find-polyfill@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ie-array-find-polyfill/-/ie-array-find-polyfill-1.1.0.tgz#5078e533f026831da22bd7476513d9460d65a142" + integrity sha1-UHjlM/Amgx2iK9dHZRPZRg1loUI= + +ieee754@^1.1.8: + version "1.1.13" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" + integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== + +import-fresh@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +inquirer@^3.0.6: + version "3.3.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" + integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ== + dependencies: + ansi-escapes "^3.0.0" + chalk "^2.0.0" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^2.0.4" + figures "^2.0.0" + lodash "^4.3.0" + mute-stream "0.0.7" + run-async "^2.2.0" + rx-lite "^4.0.8" + rx-lite-aggregates "^4.0.8" + string-width "^2.1.0" + strip-ansi "^4.0.0" + through "^2.3.6" + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-callable@^1.1.4, is-callable@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" + integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-date-object@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-dotfile@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" + integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= + +is-equal-shallow@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" + integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= + dependencies: + is-primitive "^2.0.0" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" + integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-glob@^2.0.0, is-glob@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" + integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= + dependencies: + is-extglob "^1.0.0" + +is-number@^2.0.2, is-number@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= + dependencies: + kind-of "^3.0.2" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + dependencies: + kind-of "^3.0.2" + +is-number@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" + integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== + +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-posix-bracket@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" + integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= + +is-primitive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" + integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= + +is-promise@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" + integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + +is-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" + integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw== + dependencies: + has-symbols "^1.0.1" + +is-symbol@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + dependencies: + has-symbols "^1.0.1" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + +json-parse-better-errors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +jsondiffpatch@^0.3.11: + version "0.3.11" + resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.3.11.tgz#43f9443a0d081b5f79d413fe20f302079e493201" + integrity sha512-Xi3Iygdt/BGhml6bdUFhgDki1TgOsp3hG3iiH3KtzP+CahtGcdPfKRLlnZbSw+3b1umZkhmKrqXUgUcKenyhtA== + dependencies: + chalk "^2.3.0" + diff-match-patch "^1.0.0" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +lego-api@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/lego-api/-/lego-api-1.0.8.tgz#5e26be726c5e11d540f89e7c6b1abf8c5834bd01" + integrity sha512-pZD0mf32+RL1bUMJztRcXiNBB1gE8gd/h4MDLWdZp7vaMZyjPiYK/zNpNNGoJvmoa7D/wf9dll+5z7pDObdLFg== + dependencies: + chain-able "^3.0.0" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +lodash._getnative@^3.0.0: + version "3.9.1" + resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" + integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= + +lodash.curry@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170" + integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA= + +lodash.debounce@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5" + integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU= + dependencies: + lodash._getnative "^3.0.0" + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + +lodash.flow@^3.3.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a" + integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o= + +lodash.uniqby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" + integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= + +lodash@^4.17.13, lodash@^4.3.0: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + +loose-envify@^1.1.0, loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +make-error@^1.1.1: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + dependencies: + object-visit "^1.0.0" + +"match-stream@>= 0.0.2 < 1": + version "0.0.2" + resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf" + integrity sha1-mesFAJOzTf+t5CG5rAtBCpz6F88= + dependencies: + buffers "~0.1.1" + readable-stream "~1.0.0" + +math-random@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" + integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +"memoize-one@>=3.1.1 <6": + version "5.1.1" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0" + integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA== + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" + integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^2.1.5: + version "2.3.11" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" + integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= + dependencies: + arr-diff "^2.0.0" + array-unique "^0.2.1" + braces "^1.8.2" + expand-brackets "^0.1.4" + extglob "^0.3.1" + filename-regex "^2.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.1" + kind-of "^3.0.2" + normalize-path "^2.0.1" + object.omit "^2.0.0" + parse-glob "^3.0.4" + regex-cache "^0.4.2" + +micromatch@^3.1.10: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +mime-db@1.43.0: + version "1.43.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" + integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== + +mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: + version "2.1.26" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" + integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== + dependencies: + mime-db "1.43.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= + +minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp@0.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mkdirp@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + dependencies: + minimist "0.0.8" + +mock-require@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946" + integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg== + dependencies: + get-caller-file "^1.0.2" + normalize-path "^2.1.1" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +mustache@^2.3.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" + integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== + +mute-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + +nan@^2.12.1: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +nanoseconds@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/nanoseconds/-/nanoseconds-0.1.0.tgz#69ec39fcd00e77ab3a72de0a43342824cd79233a" + integrity sha1-aew5/NAOd6s6ct4KQzQoJM15Izo= + +natives@^1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb" + integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA== + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" + integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= + dependencies: + abbrev "1" + +normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + dependencies: + remove-trailing-separator "^1.0.1" + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-inspect@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" + integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== + +object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + dependencies: + isobject "^3.0.0" + +object.assign@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" + integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== + dependencies: + define-properties "^1.1.2" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" + +object.omit@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" + integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= + dependencies: + for-own "^0.1.4" + is-extendable "^0.1.1" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + dependencies: + isobject "^3.0.1" + +object.values@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + dependencies: + mimic-fn "^1.0.0" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +options@>=0.0.5: + version "0.0.6" + resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" + integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= + +orderedmap@^1.0.0, orderedmap@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz#c618e77611b3b21d0fe3edc92586265e0059c789" + integrity sha512-3Ux8um0zXbVacKUkcytc0u3HgC0b0bBLT+I60r2J/En72cI0nZffqrA7Xtf2Hqs27j1g82llR5Mhbd0Z1XW4AQ== + +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +"over@>= 0.0.5 < 1": + version "0.0.5" + resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708" + integrity sha1-8phS5w/X4l82DgE6jsRMgq7bVwg= + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-glob@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" + integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= + dependencies: + glob-base "^0.3.0" + is-dotfile "^1.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.0" + +parse-json@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" + integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + lines-and-columns "^1.1.6" + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + +postcss@^6.0.1: + version "6.0.23" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" + integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== + dependencies: + chalk "^2.4.1" + source-map "^0.6.1" + supports-color "^5.4.0" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +preserve@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" + integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= + +prettier@^1.18.2: + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== + +pretty-time@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-0.2.0.tgz#7a3bdec4049c620cd7c42b7f342b74d56e73d74e" + integrity sha1-ejvexAScYgzXxCt/NCt01W5z104= + dependencies: + is-number "^2.0.2" + nanoseconds "^0.1.0" + +prettysize@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/prettysize/-/prettysize-0.0.3.tgz#14afff6a645e591a4ddf1c72919c23b4146181a1" + integrity sha1-FK//amReWRpN3xxykZwjtBRhgaE= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +prop-types@^15.5.8, prop-types@^15.6.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.8.1" + +prosemirror-changeset@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.1.2.tgz#91dee900eb4618b21ed0c38c8d41dc7539303864" + integrity sha512-/eeAM2XeOFmtiPsFVfVkM3Iq4xfNlFuDB6MlC8Hqch/ibq3YlH3YxDi8fqg78fT8fkrfvN6zRu9EE0HkSmH8PA== + dependencies: + prosemirror-transform "^1.0.0" + +prosemirror-commands@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.4.tgz#991563e67623acab4f8c510fad1570f8b4693780" + integrity sha512-kj4Qi+8h3EpJtZuuEDwZ9h2/QNGWDsIX/CzjmClxi9GhxWyBUMVUvIFk0mgdqHyX20lLeGmOpc0TLA5aPzgpWg== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-dev-tools@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.1.tgz#0c4304b05b437608b3666b72fdb4b21e24fa29fc" + integrity sha512-d9MG4PF82meg5Ru64ox6WCKPkQNsiZEaG5xR5a+l88RJ0VRButMZq5JzPh28vUlTBq+TXnpdTJRlPQIgTOtpqg== + dependencies: + emotion "^9.2.5" + es6-object-assign "^1.1.0" + html "^1.0.0" + ie-array-find-polyfill "^1.1.0" + jsondiffpatch "^0.3.11" + prop-types "^15.6.2" + prosemirror-model ">=1.0.0" + prosemirror-state ">=1.0.0" + react-dock "^0.2.4" + react-emotion "^9.2.5" + react-json-tree "^0.11.0" + unstated "^2.1.1" + +prosemirror-dropcursor@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz#28738c4ed7102e814d7a8a26d70018523fc7cd6d" + integrity sha512-4c94OUGyobGnwcQI70OXyMhE/9T4aTgjU+CHxkd5c7D+jH/J0mKM/lk+jneFVKt7+E4/M0D9HzRPifu8U28Thw== + dependencies: + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + prosemirror-view "^1.1.0" + +prosemirror-gapcursor@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz#0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246" + integrity sha512-SjbUZq5pgsBDuV3hu8GqgIpZR5eZvGLM+gPQTqjVVYSMUCfKW3EGXTEYaLHEl1bGduwqNC95O3bZflgtAb4L6w== + dependencies: + prosemirror-keymap "^1.0.0" + prosemirror-model "^1.0.0" + prosemirror-state "^1.0.0" + prosemirror-view "^1.0.0" + +prosemirror-history@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz#4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489" + integrity sha512-zGDotijea+vnfnyyUGyiy1wfOQhf0B/b6zYcCouBV8yo6JmrE9X23M5q7Nf/nATywEZbgRLG70R4DmfSTC+gfg== + dependencies: + prosemirror-state "^1.2.2" + prosemirror-transform "^1.0.0" + rope-sequence "^1.3.0" + +prosemirror-inputrules@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz#487e46c763e1212a4577397aba7706139084f012" + integrity sha512-Ja5Z3BWestlHYGvtSGqyvxMeB8QEuBjlHM8YnKtLGUXMDp965qdDV4goV8lJb17kIWHk7e7JNj6Catuoa3302g== + dependencies: + prosemirror-state "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.3.tgz#be22d6108df2521608e9216a87b1a810f0ed361e" + integrity sha512-PRA4NzkUMzV/NFf5pyQ6tmlIHiW/qjQ1kGWUlV2rF/dvlOxtpGpTEjIMhWgLuMf+HiDEFnUEP7uhYXu+t+491g== + dependencies: + prosemirror-state "^1.0.0" + w3c-keyname "^2.2.0" + +prosemirror-keymap@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz#8b481bf8389a5ac40d38dbd67ec3da2c7eac6a6d" + integrity sha512-Al8cVUOnDFL4gcI5IDlG6xbZ0aOD/i3B17VT+1JbHWDguCgt/lBHVTHUBcKvvbSg6+q/W4Nj1Fu6bwZSca3xjg== + dependencies: + prosemirror-state "^1.0.0" + w3c-keyname "^2.2.0" + +prosemirror-model@>=1.0.0, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz#8c08cf556f593c5f015548d2c1a6825661df087f" + integrity sha512-Qblh8pm1c7Ll64sYLauwwzjimo/tFg1zW3Q3IWhKRhvfOEgRKqa6dC5pRrAa+XHOIjBFEYrqbi52J5bqA2dV8Q== + dependencies: + orderedmap "^1.1.0" + +prosemirror-model@^1.11.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.0.tgz#dc36cdb3ad6442b9f6325c7d89170c624f9dc520" + integrity sha512-GqoAz/mIYjdv8gVYJ8mWFKpHoTxn/lXq4tXJ6bTVxs+rem2LzMYXrNVXfucGtfsgqsJlRIgng/ByG9j7Q8XDrg== + dependencies: + orderedmap "^1.1.0" + +prosemirror-schema-list@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz#471f9caf2d2bed93641d2e490434c0d2d4330df1" + integrity sha512-pNTuZflacFOBlxrTcWSdWhjoB8BaucwfJVp/gJNxztOwaN3wQiC65axclXyplf6TKgXD/EkWfS/QAov3/Znadw== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-state@>=1.0.0, prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.2.tgz#1b910b0dc01c1f00926bb9ba1589f7b7ac0d658b" + integrity sha512-t/JqE3aR0SV9QrzFVkAXsQwsgrQBNs/BDbcFH20RssW0xauqNNdjTXxy/J/kM7F+0zYi6+BRmz7cMMQQFU3mwQ== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-state@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.3.tgz#b2862866b14dec2b3ae1ab18229f2bd337651a2c" + integrity sha512-PLXh2VJsIgvlgSTH6I2Yg6vk1CzPDp21DFreVpQtDMY2S6WaMmrQgDTLRcsrD8X38v8Yc873H7+ogdGzyIPn+w== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-transform "^1.0.0" + +prosemirror-tables@*: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.0.0.tgz#ec3d0b11e638c6a92dd14ae816d0a2efd1719b70" + integrity sha512-zFw5Us4G5Vdq0yIj8GiqZOGA6ud5UKpMKElux9O0HrfmhkuGa1jf1PCpz2R5pmIQJv+tIM24H1mox/ODBAX37Q== + dependencies: + prosemirror-keymap "^1.1.2" + prosemirror-model "^1.8.1" + prosemirror-state "^1.3.1" + prosemirror-transform "^1.2.1" + prosemirror-view "^1.13.3" + +prosemirror-tables@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz#ad66300cc49500455cf1243bb129c9e7d883321e" + integrity sha512-LmCz4jrlqQZRsYRDzCRYf/pQ5CUcSOyqZlAj5kv67ZWBH1SVLP2U9WJEvQfimWgeRlIz0y0PQVqO1arRm1+woA== + dependencies: + prosemirror-keymap "^1.1.2" + prosemirror-model "^1.8.1" + prosemirror-state "^1.3.1" + prosemirror-transform "^1.2.1" + prosemirror-view "^1.13.3" + +prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1: + version "1.2.3" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.3.tgz#239d17591af24d39ef3f1999daa09e1f1c76b06a" + integrity sha512-PUfayeskQfuUBXktvL6207ZWRwHBFNPNPiek4fR+LgCPnBofuEb2+L0FfbNtrAwffHVs6M3DaFvJB1W2VQdV0A== + dependencies: + prosemirror-model "^1.0.0" + +prosemirror-transform@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.8.tgz#4b86544fa43637fe381549fb7b019f4fb71fe65c" + integrity sha512-hKqceqv9ZmMQXNQkhFjr0KFGPvkhygaWND+uIM0GxRpALrKfxP97SsgHTBs3OpJhDmh5N+mB4D/CksB291Eavg== + dependencies: + prosemirror-model "^1.0.0" + +prosemirror-utils@^0.9.6: + version "0.9.6" + resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz#3d97bd85897e3b535555867dc95a51399116a973" + integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA== + +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3: + version "1.14.2" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.14.2.tgz#23eb89f6101e9671b5e0c19d82ee0ad9de5608de" + integrity sha512-9yPVH6OLyaEraHjWHbSk2DB0R/1TsEE6AA1LI+vmCypXXA+zTzNrktUFzBhSJHehXDoEJcQfnl1Wdp5GPSh2+g== + dependencies: + prosemirror-model "^1.1.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + +prosemirror-view@^1.15.6: + version "1.15.6" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.6.tgz#446bf7662235300c5f47362af2db805c6df3ad24" + integrity sha512-9FBFB+rK5pvvzHsHOacy0T/Jf+OxZSzY8tSlQiur3SZwAVaNVQm+fl23V/6gU2dHBnreGxjYx9jK+F3XPsPCGw== + dependencies: + prosemirror-model "^1.1.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + +proxy-addr@~2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" + integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== + dependencies: + forwarded "~0.1.2" + ipaddr.js "1.9.1" + +psl@^1.1.28: + version "1.7.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" + integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== + +"pullstream@>= 0.4.1 < 1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz#d6fb3bf5aed697e831150eb1002c25a3f8ae1314" + integrity sha1-1vs79a7Wl+gxFQ6xACwlo/iuExQ= + dependencies: + over ">= 0.0.5 < 1" + readable-stream "~1.0.31" + setimmediate ">= 1.0.2 < 2" + slice-stream ">= 1.0.0 < 2" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +pure-color@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e" + integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4= + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +randomatic@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" + integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== + dependencies: + is-number "^4.0.0" + kind-of "^6.0.0" + math-random "^1.0.1" + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +react-base16-styling@^0.5.1: + version "0.5.3" + resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.5.3.tgz#3858f24e9c4dd8cbd3f702f3f74d581ca2917269" + integrity sha1-OFjyTpxN2MvT9wLz901YHKKRcmk= + dependencies: + base16 "^1.0.0" + lodash.curry "^4.0.1" + lodash.flow "^3.3.0" + pure-color "^1.2.0" + +react-dock@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/react-dock/-/react-dock-0.2.4.tgz#e727dc7550b3b73116635dcb9c0e04d0b7afe17c" + integrity sha1-5yfcdVCztzEWY13LnA4E0Lev4Xw= + dependencies: + lodash.debounce "^3.1.1" + prop-types "^15.5.8" + +react-dom@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" + integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.19.1" + +react-emotion@^9.2.5: + version "9.2.12" + resolved "https://registry.yarnpkg.com/react-emotion/-/react-emotion-9.2.12.tgz#74d1494f89e22d0b9442e92a33ca052461955c83" + integrity sha512-qt7XbxnEKX5sZ73rERJ92JMbEOoyOwG3BuCRFRkXrsJhEe+rFBRTljRw7yOLHZUCQC4GBObZhjXIduQ8S0ZpYw== + dependencies: + babel-plugin-emotion "^9.2.11" + create-emotion-styled "^9.2.8" + +react-is@^16.8.1: + version "16.13.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" + integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA== + +react-json-tree@^0.11.0: + version "0.11.2" + resolved "https://registry.yarnpkg.com/react-json-tree/-/react-json-tree-0.11.2.tgz#af70199fcbc265699ade2aec492465c51608f95e" + integrity sha512-aYhUPj1y5jR3ZQ+G3N7aL8FbTyO03iLwnVvvEikLcNFqNTyabdljo9xDftZndUBFyyyL0aK3qGO9+8EilILHUw== + dependencies: + babel-runtime "^6.6.1" + prop-types "^15.5.8" + react-base16-styling "^0.5.1" + +react-window@^1.8.5: + version "1.8.5" + resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz#a56b39307e79979721021f5d06a67742ecca52d1" + integrity sha512-HeTwlNa37AFa8MDZFZOKcNEkuF2YflA0hpGPiTT9vR7OawEt+GZbfM6wqkBahD3D3pUjIabQYzsnY/BSJbgq6Q== + dependencies: + "@babel/runtime" "^7.0.0" + memoize-one ">=3.1.1 <6" + +react@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" + integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + +readable-stream@^2.0.2, readable-stream@^2.2.2: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.2: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@~1.0.0, readable-stream@~1.0.31: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readdirp@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +realm-utils@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/realm-utils/-/realm-utils-1.0.9.tgz#5c76a5ff39e4816af2c133a161f4221d6628eff4" + integrity sha1-XHal/znkgWrywTOhYfQiHWYo7/Q= + dependencies: + app-root-path "^1.3.0" + mkdirp "^0.5.1" + +regenerate-unicode-properties@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" + integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA== + dependencies: + regenerate "^1.4.0" + +regenerate@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" + integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + +regenerator-runtime@^0.13.2: + version "0.13.3" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" + integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== + +regenerator-runtime@^0.13.4: + version "0.13.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" + integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== + +regex-cache@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" + integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== + dependencies: + is-equal-shallow "^0.1.3" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +regexpu-core@^4.1.3: + version "4.6.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" + integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== + dependencies: + regenerate "^1.4.0" + regenerate-unicode-properties "^8.1.0" + regjsgen "^0.5.0" + regjsparser "^0.6.0" + unicode-match-property-ecmascript "^1.0.4" + unicode-match-property-value-ecmascript "^1.1.0" + +regjsgen@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" + integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== + +regjsparser@^0.6.0: + version "0.6.3" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460" + integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA== + dependencies: + jsesc "~0.5.0" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +repeat-element@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + +repeat-string@^1.5.2, repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + +request@^2.79.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + +resolve@^1.12.0, resolve@^1.3.2: + version "1.15.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" + integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== + dependencies: + path-parse "^1.0.6" + +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +rimraf@2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rope-sequence@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b" + integrity sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg== + +run-async@^2.2.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8" + integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg== + dependencies: + is-promise "^2.1.0" + +rx-lite-aggregates@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" + integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74= + dependencies: + rx-lite "*" + +rx-lite@*, rx-lite@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" + integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ= + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@^5.0.1, safe-buffer@^5.1.2: + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + +safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" + integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +select@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" + integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= + +semver@^5.3.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +sentence-splitter@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.0.tgz#fb2cd2f61f40006643ba83d9acf4609233c1c68c" + integrity sha512-lKX2tZ1rsA9Tu0gW8vRmMDmIEJoZ1d7cKpzcbFZdUrSpCR6gy/7OPPh7jjT/6Oc6Z79ToUmC2l8tyTEGanVmiA== + dependencies: + "@textlint/ast-node-types" "^4.2.5" + concat-stream "^2.0.0" + object.values "^1.1.0" + structured-source "^3.0.2" + +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +"setimmediate@>= 1.0.1 < 2", "setimmediate@>= 1.0.2 < 2": + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +shorthash@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/shorthash/-/shorthash-0.0.2.tgz#59b268eecbde59038b30da202bcfbddeb2c4a4eb" + integrity sha1-WbJo7sveWQOLMNogK8+93rLEpOs= + +signal-exit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + +"slice-stream@>= 1.0.0 < 2": + version "1.0.0" + resolved "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz#5b33bd66f013b1a7f86460b03d463dec39ad3ea0" + integrity sha1-WzO9ZvATsaf4ZGCwPUY97DmtPqA= + dependencies: + readable-stream "~1.0.31" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-support@^0.5.17: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@~0.5.12: + version "0.5.16" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" + integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + +source-map@^0.5.6, source-map@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@^0.7.1, source-map@^0.7.2, source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +sourcemap-blender@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sourcemap-blender/-/sourcemap-blender-1.0.5.tgz#d361f3d12381c4e477178113878fdf984a91bdbc" + integrity sha512-GPhjCmDtJ8YY6zt1L6kP6WtBg6WrdWt5hw2Wmgt9rwC3yiwLo9vEuabh/YYSZ5KmFV20hVkGdkTwpXtT2E65TA== + dependencies: + source-map "^0.7.3" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stream-browserify@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" + integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== + dependencies: + inherits "~2.0.1" + readable-stream "^2.0.2" + +string-width@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string.prototype.trimend@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" + integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +string.prototype.trimstart@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" + integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +structured-source@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz#dd802425e0f53dc4a6e7aca3752901a1ccda7af5" + integrity sha1-3YAkJeD1PcSm56yjdSkBoczaevU= + dependencies: + boundary "^1.0.1" + +stylis-rule-sheet@^0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" + integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw== + +stylis@^3.5.0: + version "3.5.4" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe" + integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q== + +supports-color@^5.3.0, supports-color@^5.4.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +terser@^4.6.2: + version "4.6.4" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz#40a0b37afbe5b57e494536815efa68326840fc00" + integrity sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + +thenby@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.3.3.tgz#016c3427772a284bbfef982d978f7574fd15ee9d" + integrity sha512-vCzp0TxrQ+2bfRJoWNhMwk6RNfboOUN2S+nbEfhJfj7RwJHD6PlgtXH/hXiSmv6UJs35IQDtVqiI45J+cAgLqg== + +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +tiny-emitter@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" + integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== + +tlite@^0.1.9: + version "0.1.9" + resolved "https://registry.yarnpkg.com/tlite/-/tlite-0.1.9.tgz#e886e4a305b7522242e2453b7ca4fb84f2d9de0f" + integrity sha512-5QOBAvDxZZwW1i+2YXMgF6/PuV/KhA0LyE9PyVi8Ywr3bfIPziZcQD+RpdJaQurCU8zIGtBo/XuPCEHdvyeFuQ== + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +touch@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz#ca0b2a3ae3211246a61b16ba9e6cbf1596287164" + integrity sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A== + dependencies: + nopt "~1.0.10" + +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +"traverse@>=0.3.0 <0.4": + version "0.3.9" + resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" + integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= + +ts-node@^8.10.2: + version "8.10.2" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" + integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA== + dependencies: + arg "^4.1.0" + diff "^4.0.1" + make-error "^1.1.1" + source-map-support "^0.5.17" + yn "3.1.1" + +tslib@^1.8.0, tslib@^1.8.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" + integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== + +tslint-config-prettier@^1.18.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" + integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg== + +tslint-react@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-5.0.0.tgz#d0ae644e8163bdd3e134012e9353094904e8dd44" + integrity sha512-/IbcSmoBPlFic8kQaRfQ4knTY4mivwo5LVzvozvX6Dyu2ynEnrh1dIcR2ujjyp/IodXqY/H5GbxFxSMo/Kf2Hg== + dependencies: + tsutils "^3.17.1" + +tslint@^5.20.0: + version "5.20.1" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d" + integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg== + dependencies: + "@babel/code-frame" "^7.0.0" + builtin-modules "^1.1.1" + chalk "^2.3.0" + commander "^2.12.1" + diff "^4.0.1" + glob "^7.1.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + mkdirp "^0.5.1" + resolve "^1.3.2" + semver "^5.3.0" + tslib "^1.8.0" + tsutils "^2.29.0" + +tsutils@^2.29.0: + version "2.29.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" + integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== + dependencies: + tslib "^1.8.1" + +tsutils@^3.17.1: + version "3.17.1" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" + integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== + dependencies: + tslib "^1.8.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +typescript-tslint-plugin@^0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c" + integrity sha512-tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA== + dependencies: + minimatch "^3.0.4" + mock-require "^3.0.3" + vscode-languageserver "^5.2.1" + +typescript@3.8.3: + version "3.8.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" + integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== + +uglify-js@^3.7.4: + version "3.8.0" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz#f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805" + integrity sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ== + dependencies: + commander "~2.20.3" + source-map "~0.6.1" + +ultron@1.0.x: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" + integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po= + +unicode-canonical-property-names-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" + integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== + +unicode-match-property-ecmascript@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" + integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== + dependencies: + unicode-canonical-property-names-ecmascript "^1.0.4" + unicode-property-aliases-ecmascript "^1.0.4" + +unicode-match-property-value-ecmascript@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277" + integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g== + +unicode-property-aliases-ecmascript@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" + integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +unstated@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/unstated/-/unstated-2.1.1.tgz#36b124dfb2e7a12d39d0bb9c46dfb6e51276e3a2" + integrity sha512-fORlTWMZxq7NuMJDxyIrrYIZKN7wEWYQ9SiaJfIRcSpsowr6Ph/JIfK2tgtXLW614JfPG/t5q9eEIhXRCf55xg== + dependencies: + create-react-context "^0.1.5" + +unzip@^0.1.11: + version "0.1.11" + resolved "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz#89749c63b058d7d90d619f86b98aa1535d3b97f0" + integrity sha1-iXScY7BY19kNYZ+GuYqhU107l/A= + dependencies: + binary ">= 0.3.0 < 1" + fstream ">= 0.1.30 < 1" + match-stream ">= 0.0.2 < 1" + pullstream ">= 0.4.1 < 1" + readable-stream "~1.0.31" + setimmediate ">= 1.0.1 < 2" + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +utils-extend@^1.0.4, utils-extend@^1.0.6, utils-extend@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/utils-extend/-/utils-extend-1.0.8.tgz#ccfd7b64540f8e90ee21eec57769d0651cab8a5f" + integrity sha1-zP17ZFQPjpDuIe7Fd2nQZRyril8= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +uuid@^3.3.2: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +vscode-jsonrpc@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" + integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg== + +vscode-languageserver-protocol@3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f" + integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g== + dependencies: + vscode-jsonrpc "^4.0.0" + vscode-languageserver-types "3.14.0" + +vscode-languageserver-types@3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" + integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== + +vscode-languageserver@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb" + integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A== + dependencies: + vscode-languageserver-protocol "3.14.1" + vscode-uri "^1.0.6" + +vscode-uri@^1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" + integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== + +w3c-keyname@^2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.2.tgz#7ea63170454bb19f1a3c6b628fc3dc8889276e91" + integrity sha512-8Vs/aVwcy0IJACaPm4tyzh1fzehZE70bGSjEl3dDms5UXtWnaBElrSHC8lDDeak0Gk5jxKOFstL64/65o7Ge2A== + +watch@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz#340a717bde765726fa0aa07d721e0147a551df0c" + integrity sha1-NApxe952Vyb6CqB9ch4BR6VR3ww= + dependencies: + exec-sh "^0.2.0" + minimist "^1.2.0" + +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@^1.1.1: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51" + integrity sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w== + dependencies: + options ">=0.0.5" + ultron "1.0.x" + +yaml@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" + integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw== + dependencies: + "@babel/runtime" "^7.6.3" + +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + +zenscroll@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/zenscroll/-/zenscroll-4.0.2.tgz#e8d5774d1c0738a47bcfa8729f3712e2deddeb25" + integrity sha1-6NV3TRwHOKR7z6hynzcS4t7d6yU= diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarndeps.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarndeps.nix new file mode 100644 index 0000000000..be4480a67c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarndeps.nix @@ -0,0 +1,4373 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; + sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; + }; + } + { + name = "_babel_highlight___highlight_7.8.3.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; + sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; + }; + } + { + name = "_babel_runtime___runtime_7.9.6.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; + sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + }; + } + { + name = "_babel_runtime___runtime_7.8.4.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz"; + sha1 = "d79f5a2040f7caa24d53e563aad49cbc05581308"; + }; + } + { + name = "_babel_types___types_7.8.6.tgz"; + path = fetchurl { + name = "_babel_types___types_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz"; + sha1 = "629ecc33c2557fcde7126e58053127afdb3e6d01"; + }; + } + { + name = "_emotion_babel_utils___babel_utils_0.6.10.tgz"; + path = fetchurl { + name = "_emotion_babel_utils___babel_utils_0.6.10.tgz"; + url = "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz"; + sha1 = "83dbf3dfa933fae9fc566e54fbb45f14674c6ccc"; + }; + } + { + name = "_emotion_hash___hash_0.6.6.tgz"; + path = fetchurl { + name = "_emotion_hash___hash_0.6.6.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz"; + sha1 = "62266c5f0eac6941fece302abad69f2ee7e25e44"; + }; + } + { + name = "_emotion_is_prop_valid___is_prop_valid_0.6.8.tgz"; + path = fetchurl { + name = "_emotion_is_prop_valid___is_prop_valid_0.6.8.tgz"; + url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz"; + sha1 = "68ad02831da41213a2089d2cab4e8ac8b30cbd85"; + }; + } + { + name = "_emotion_memoize___memoize_0.6.6.tgz"; + path = fetchurl { + name = "_emotion_memoize___memoize_0.6.6.tgz"; + url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz"; + sha1 = "004b98298d04c7ca3b4f50ca2035d4f60d2eed1b"; + }; + } + { + name = "_emotion_serialize___serialize_0.9.1.tgz"; + path = fetchurl { + name = "_emotion_serialize___serialize_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz"; + sha1 = "a494982a6920730dba6303eb018220a2b629c145"; + }; + } + { + name = "_emotion_stylis___stylis_0.7.1.tgz"; + path = fetchurl { + name = "_emotion_stylis___stylis_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz"; + sha1 = "50f63225e712d99e2b2b39c19c70fff023793ca5"; + }; + } + { + name = "_emotion_unitless___unitless_0.6.7.tgz"; + path = fetchurl { + name = "_emotion_unitless___unitless_0.6.7.tgz"; + url = "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz"; + sha1 = "53e9f1892f725b194d5e6a1684a7b394df592397"; + }; + } + { + name = "_emotion_utils___utils_0.8.2.tgz"; + path = fetchurl { + name = "_emotion_utils___utils_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz"; + sha1 = "576ff7fb1230185b619a75d258cbc98f0867a8dc"; + }; + } + { + name = "_textlint_ast_node_types___ast_node_types_4.3.4.tgz"; + path = fetchurl { + name = "_textlint_ast_node_types___ast_node_types_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.3.4.tgz"; + sha1 = "f6596c45c32c85dc06915c3077bb7686033efd32"; + }; + } + { + name = "_types_ace___ace_0.0.43.tgz"; + path = fetchurl { + name = "_types_ace___ace_0.0.43.tgz"; + url = "https://registry.yarnpkg.com/@types/ace/-/ace-0.0.43.tgz"; + sha1 = "9f0916174b6060dabbccd36ba4868ea769a1c633"; + }; + } + { + name = "_types_clipboard___clipboard_2.0.1.tgz"; + path = fetchurl { + name = "_types_clipboard___clipboard_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.1.tgz"; + sha1 = "75a74086c293d75b12bc93ff13bc7797fef05a40"; + }; + } + { + name = "_types_diff_match_patch___diff_match_patch_1.0.32.tgz"; + path = fetchurl { + name = "_types_diff_match_patch___diff_match_patch_1.0.32.tgz"; + url = "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz"; + sha1 = "d9c3b8c914aa8229485351db4865328337a3d09f"; + }; + } + { + name = "_types_js_yaml___js_yaml_3.12.3.tgz"; + path = fetchurl { + name = "_types_js_yaml___js_yaml_3.12.3.tgz"; + url = "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.3.tgz"; + sha1 = "abf383c5b639d0aa8b8c4a420d6a85f703357d6c"; + }; + } + { + name = "_types_lodash.debounce___lodash.debounce_4.0.6.tgz"; + path = fetchurl { + name = "_types_lodash.debounce___lodash.debounce_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/lodash.debounce/-/lodash.debounce-4.0.6.tgz"; + sha1 = "c5a2326cd3efc46566c47e4c0aa248dc0ee57d60"; + }; + } + { + name = "_types_lodash.uniqby___lodash.uniqby_4.7.6.tgz"; + path = fetchurl { + name = "_types_lodash.uniqby___lodash.uniqby_4.7.6.tgz"; + url = "https://registry.yarnpkg.com/@types/lodash.uniqby/-/lodash.uniqby-4.7.6.tgz"; + sha1 = "672827a701403f07904fe37f0721ae92abfa80e8"; + }; + } + { + name = "_types_lodash___lodash_4.14.154.tgz"; + path = fetchurl { + name = "_types_lodash___lodash_4.14.154.tgz"; + url = "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.154.tgz"; + sha1 = "069e3c703fdb264e67be9e03b20a640bc0198ecc"; + }; + } + { + name = "_types_node___node_14.0.4.tgz"; + path = fetchurl { + name = "_types_node___node_14.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.0.4.tgz"; + sha1 = "43a63fc5edce226bed106b31b875165256271107"; + }; + } + { + name = "_types_orderedmap___orderedmap_1.0.0.tgz"; + path = fetchurl { + name = "_types_orderedmap___orderedmap_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/orderedmap/-/orderedmap-1.0.0.tgz"; + sha1 = "807455a192bba52cbbb4517044bc82bdbfa8c596"; + }; + } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } + { + name = "_types_prop_types___prop_types_15.7.3.tgz"; + path = fetchurl { + name = "_types_prop_types___prop_types_15.7.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz"; + sha1 = "2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"; + }; + } + { + name = "_types_prosemirror_commands___prosemirror_commands_1.0.3.tgz"; + path = fetchurl { + name = "_types_prosemirror_commands___prosemirror_commands_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.3.tgz"; + sha1 = "e9fa5653cffd1c75c260594cf3ec5244c9004dbf"; + }; + } + { + name = "_types_prosemirror_dev_tools___prosemirror_dev_tools_2.1.0.tgz"; + path = fetchurl { + name = "_types_prosemirror_dev_tools___prosemirror_dev_tools_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.0.tgz"; + sha1 = "91e2ef4f36129f5155f924296e306de187e86bdb"; + }; + } + { + name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.0.tgz"; + path = fetchurl { + name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.0.tgz"; + sha1 = "2df872bc6431a9f06bc1a4a0eac7c2dc527e7f12"; + }; + } + { + name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.1.tgz"; + sha1 = "56a6274ef39f62c339adcc64305294b800211a5e"; + }; + } + { + name = "_types_prosemirror_history___prosemirror_history_1.0.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_history___prosemirror_history_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.1.tgz"; + sha1 = "b8d7595f73788b63fc9f2b57a763ba8375abfe87"; + }; + } + { + name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.3.tgz"; + path = fetchurl { + name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.3.tgz"; + sha1 = "3f8f07921f692b6c7e4781fa426aee3e76b9018c"; + }; + } + { + name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.3.tgz"; + path = fetchurl { + name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.3.tgz"; + sha1 = "09cc469a69222a4c8a3d415d02eeb459bb74269c"; + }; + } + { + name = "_types_prosemirror_model___prosemirror_model_1.7.2.tgz"; + path = fetchurl { + name = "_types_prosemirror_model___prosemirror_model_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.2.tgz"; + sha1 = "9c7aff2fd62f0f56eb76e2e0eb27bf6996e6c28a"; + }; + } + { + name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz"; + sha1 = "7f53e3c0326b1359755f3971b8c448d98b722f21"; + }; + } + { + name = "_types_prosemirror_state___prosemirror_state_1.2.3.tgz"; + path = fetchurl { + name = "_types_prosemirror_state___prosemirror_state_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.3.tgz"; + sha1 = "7f5f871acf7b8c22e1862ff0068f9bf7e9682c0e"; + }; + } + { + name = "_types_prosemirror_state___prosemirror_state_1.2.5.tgz"; + path = fetchurl { + name = "_types_prosemirror_state___prosemirror_state_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.5.tgz"; + sha1 = "a91304e9aab6e71f868e23b3a1ae514a75033f8f"; + }; + } + { + name = "_types_prosemirror_tables___prosemirror_tables_0.9.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_tables___prosemirror_tables_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-tables/-/prosemirror-tables-0.9.1.tgz"; + sha1 = "d2203330f0fa1161c04152bf02c39e152082d408"; + }; + } + { + name = "_types_prosemirror_transform___prosemirror_transform_1.1.1.tgz"; + path = fetchurl { + name = "_types_prosemirror_transform___prosemirror_transform_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.1.tgz"; + sha1 = "5a0de16e8e0123b4c3d9559235e19f39cee85e5c"; + }; + } + { + name = "_types_prosemirror_view___prosemirror_view_1.11.2.tgz"; + path = fetchurl { + name = "_types_prosemirror_view___prosemirror_view_1.11.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.11.2.tgz"; + sha1 = "58af5dcb7de20b7de874de99147552d5627209a1"; + }; + } + { + name = "_types_react_dom___react_dom_16.9.6.tgz"; + path = fetchurl { + name = "_types_react_dom___react_dom_16.9.6.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.6.tgz"; + sha1 = "9e7f83d90566521cc2083be2277c6712dcaf754c"; + }; + } + { + name = "_types_react_window___react_window_1.8.2.tgz"; + path = fetchurl { + name = "_types_react_window___react_window_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.2.tgz"; + sha1 = "a5a6b2762ce73ffaab7911ee1397cf645f2459fe"; + }; + } + { + name = "_types_react___react_16.9.32.tgz"; + path = fetchurl { + name = "_types_react___react_16.9.32.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz"; + sha1 = "f6368625b224604148d1ddf5920e4fefbd98d383"; + }; + } + { + name = "_types_unzip___unzip_0.1.1.tgz"; + path = fetchurl { + name = "_types_unzip___unzip_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/unzip/-/unzip-0.1.1.tgz"; + sha1 = "96e80dc5e2917a769c8be01aa49c4fe660e7bab3"; + }; + } + { + name = "_types_zenscroll___zenscroll_4.0.0.tgz"; + path = fetchurl { + name = "_types_zenscroll___zenscroll_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.0.tgz"; + sha1 = "9acc7df6c87cc9e064f5a6230df499835dee1972"; + }; + } + { + name = "abbrev___abbrev_1.1.1.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + }; + } + { + name = "acorn_jsx___acorn_jsx_4.1.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz"; + sha1 = "e8e41e48ea2fe0c896740610ab6a4ffd8add225e"; + }; + } + { + name = "acorn___acorn_5.7.3.tgz"; + path = fetchurl { + name = "acorn___acorn_5.7.3.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; + sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + }; + } + { + name = "ajax_request___ajax_request_1.2.3.tgz"; + path = fetchurl { + name = "ajax_request___ajax_request_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/ajax-request/-/ajax-request-1.2.3.tgz"; + sha1 = "99fcbec1d6d2792f85fa949535332bd14f5f3790"; + }; + } + { + name = "ajv___ajv_6.12.0.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz"; + sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7"; + }; + } + { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi___ansi_0.3.1.tgz"; + path = fetchurl { + name = "ansi___ansi_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz"; + sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; + }; + } + { + name = "anymatch___anymatch_1.3.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz"; + sha1 = "553dcb8f91e3c889845dfdba34c77721b90b9d7a"; + }; + } + { + name = "app_root_path___app_root_path_1.4.0.tgz"; + path = fetchurl { + name = "app_root_path___app_root_path_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/app-root-path/-/app-root-path-1.4.0.tgz"; + sha1 = "6335d865c9640d0fad99004e5a79232238e92dfa"; + }; + } + { + name = "app_root_path___app_root_path_2.2.1.tgz"; + path = fetchurl { + name = "app_root_path___app_root_path_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz"; + sha1 = "d0df4a682ee408273583d43f6f79e9892624bc9a"; + }; + } + { + name = "arg___arg_4.1.3.tgz"; + path = fetchurl { + name = "arg___arg_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz"; + sha1 = "269fc7ad5b8e42cb63c896d5666017261c144089"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "arr_diff___arr_diff_2.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + }; + } + { + name = "arr_diff___arr_diff_4.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + } + { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + path = fetchurl { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + }; + } + { + name = "arr_union___arr_union_3.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_unique___array_unique_0.2.1.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz"; + sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + }; + } + { + name = "array_unique___array_unique_0.3.2.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + } + { + name = "asn1___asn1_0.2.4.tgz"; + path = fetchurl { + name = "asn1___asn1_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + path = fetchurl { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + } + { + name = "async_each___async_each_1.0.3.tgz"; + path = fetchurl { + name = "async_each___async_each_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; + sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "atob___atob_2.1.2.tgz"; + path = fetchurl { + name = "atob___atob_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; + sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + }; + } + { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + path = fetchurl { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + { + name = "aws4___aws4_1.9.1.tgz"; + path = fetchurl { + name = "aws4___aws4_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; + sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; + }; + } + { + name = "babel_plugin_emotion___babel_plugin_emotion_9.2.11.tgz"; + path = fetchurl { + name = "babel_plugin_emotion___babel_plugin_emotion_9.2.11.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz"; + sha1 = "319c005a9ee1d15bb447f59fe504c35fd5807728"; + }; + } + { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + path = fetchurl { + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; + }; + } + { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + path = fetchurl { + name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; + }; + } + { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "base16___base16_1.0.0.tgz"; + path = fetchurl { + name = "base16___base16_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz"; + sha1 = "e297f60d7ec1014a7a971a39ebc8a98c0b681e70"; + }; + } + { + name = "base64_img___base64_img_1.0.4.tgz"; + path = fetchurl { + name = "base64_img___base64_img_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/base64-img/-/base64-img-1.0.4.tgz"; + sha1 = "3e22d55d6c74a24553d840d2b1bc12a7db078d35"; + }; + } + { + name = "base64_js___base64_js_1.3.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; + sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; + }; + } + { + name = "base___base_0.11.2.tgz"; + path = fetchurl { + name = "base___base_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; + sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + }; + } + { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + path = fetchurl { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + { + name = "biblatex_csl_converter___biblatex_csl_converter_1.9.1.tgz"; + path = fetchurl { + name = "biblatex_csl_converter___biblatex_csl_converter_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-1.9.1.tgz"; + sha1 = "50aacfef172997f1c98d72837ffdd3b19c62f8c4"; + }; + } + { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; + }; + } + { + name = "binary___binary_0.3.0.tgz"; + path = fetchurl { + name = "binary___binary_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + }; + } + { + name = "boundary___boundary_1.0.1.tgz"; + path = fetchurl { + name = "boundary___boundary_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz"; + sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; + }; + } + { + name = "bowser___bowser_2.9.0.tgz"; + path = fetchurl { + name = "bowser___bowser_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz"; + sha1 = "3bed854233b419b9a7422d9ee3e85504373821c9"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_1.8.5.tgz"; + path = fetchurl { + name = "braces___braces_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + }; + } + { + name = "braces___braces_2.3.2.tgz"; + path = fetchurl { + name = "braces___braces_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; + sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "buffers___buffers_0.1.1.tgz"; + path = fetchurl { + name = "buffers___buffers_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz"; + sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; + }; + } + { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + path = fetchurl { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + name = "cache_base___cache_base_1.0.1.tgz"; + path = fetchurl { + name = "cache_base___cache_base_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; + sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "chain_able___chain_able_1.0.1.tgz"; + path = fetchurl { + name = "chain_able___chain_able_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/chain-able/-/chain-able-1.0.1.tgz"; + sha1 = "b48ac9bdc18f2192ec730abc66609f90aab5605f"; + }; + } + { + name = "chain_able___chain_able_3.0.0.tgz"; + path = fetchurl { + name = "chain_able___chain_able_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chain-able/-/chain-able-3.0.0.tgz"; + sha1 = "dcffe8b04f3da210941a23843bc1332bb288ca9f"; + }; + } + { + name = "chainsaw___chainsaw_0.1.0.tgz"; + path = fetchurl { + name = "chainsaw___chainsaw_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chardet___chardet_0.4.2.tgz"; + path = fetchurl { + name = "chardet___chardet_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; + }; + } + { + name = "chokidar___chokidar_1.7.0.tgz"; + path = fetchurl { + name = "chokidar___chokidar_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz"; + sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; + }; + } + { + name = "class_utils___class_utils_0.3.6.tgz"; + path = fetchurl { + name = "class_utils___class_utils_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; + sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + }; + } + { + name = "clean_css___clean_css_4.2.3.tgz"; + path = fetchurl { + name = "clean_css___clean_css_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; + sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; + }; + } + { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + } + { + name = "cli_width___cli_width_2.2.0.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + } + { + name = "clipboard___clipboard_2.0.6.tgz"; + path = fetchurl { + name = "clipboard___clipboard_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz"; + sha1 = "52921296eec0fdf77ead1749421b21c968647376"; + }; + } + { + name = "collection_visit___collection_visit_1.0.0.tgz"; + path = fetchurl { + name = "collection_visit___collection_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "concat_stream___concat_stream_2.0.0.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz"; + sha1 = "414cf5af790a48c60ab9be4527d56d5e41133cb1"; + }; + } + { + name = "content_disposition___content_disposition_0.5.3.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + }; + } + { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } + { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + path = fetchurl { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + } + { + name = "core_js___core_js_2.6.11.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.11.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; + sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + }; + } + { + name = "create_emotion_styled___create_emotion_styled_9.2.8.tgz"; + path = fetchurl { + name = "create_emotion_styled___create_emotion_styled_9.2.8.tgz"; + url = "https://registry.yarnpkg.com/create-emotion-styled/-/create-emotion-styled-9.2.8.tgz"; + sha1 = "c0050e768ba439609bec108600467adf2de67cc3"; + }; + } + { + name = "create_emotion___create_emotion_9.2.12.tgz"; + path = fetchurl { + name = "create_emotion___create_emotion_9.2.12.tgz"; + url = "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz"; + sha1 = "0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f"; + }; + } + { + name = "create_react_context___create_react_context_0.1.6.tgz"; + path = fetchurl { + name = "create_react_context___create_react_context_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.1.6.tgz"; + sha1 = "0f425931d907741127acc6e31acb4f9015dd9fdc"; + }; + } + { + name = "csstype___csstype_2.6.10.tgz"; + path = fetchurl { + name = "csstype___csstype_2.6.10.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz"; + sha1 = "e63af50e66d7c266edb6b32909cfd0aabe03928b"; + }; + } + { + name = "csstype___csstype_2.6.9.tgz"; + path = fetchurl { + name = "csstype___csstype_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz"; + sha1 = "05141d0cd557a56b8891394c1911c40c8a98d098"; + }; + } + { + name = "dashdash___dashdash_1.14.1.tgz"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "define_property___define_property_0.2.5.tgz"; + path = fetchurl { + name = "define_property___define_property_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + } + { + name = "define_property___define_property_1.0.0.tgz"; + path = fetchurl { + name = "define_property___define_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + } + { + name = "define_property___define_property_2.0.2.tgz"; + path = fetchurl { + name = "define_property___define_property_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; + sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "delegate___delegate_3.2.0.tgz"; + path = fetchurl { + name = "delegate___delegate_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz"; + sha1 = "b66b71c3158522e8ab5744f720d8ca0c2af59166"; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "diff_match_patch___diff_match_patch_1.0.4.tgz"; + path = fetchurl { + name = "diff_match_patch___diff_match_patch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz"; + sha1 = "6ac4b55237463761c4daf0dc603eb869124744b1"; + }; + } + { + name = "diff___diff_4.0.2.tgz"; + path = fetchurl { + name = "diff___diff_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; + sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; + }; + } + { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + path = fetchurl { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + { + name = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "emotion___emotion_9.2.12.tgz"; + path = fetchurl { + name = "emotion___emotion_9.2.12.tgz"; + url = "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz"; + sha1 = "53925aaa005614e65c6e43db8243c843574d1ea9"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es_abstract___es_abstract_1.17.6.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.17.6.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; + sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + }; + } + { + name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; + path = fetchurl { + name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz"; + sha1 = "c2c3582656247c39ea107cb1e6652b6f9f24523c"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escodegen___escodegen_1.14.1.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; + sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "exec_sh___exec_sh_0.2.2.tgz"; + path = fetchurl { + name = "exec_sh___exec_sh_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz"; + sha1 = "2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"; + }; + } + { + name = "expand_brackets___expand_brackets_0.1.5.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + }; + } + { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + } + { + name = "expand_range___expand_range_1.8.2.tgz"; + path = fetchurl { + name = "expand_range___expand_range_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + }; + } + { + name = "express___express_4.17.1.tgz"; + path = fetchurl { + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + }; + } + { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + } + { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "external_editor___external_editor_2.2.0.tgz"; + path = fetchurl { + name = "external_editor___external_editor_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz"; + sha1 = "045511cfd8d133f3846673d1047c154e214ad3d5"; + }; + } + { + name = "extglob___extglob_0.3.2.tgz"; + path = fetchurl { + name = "extglob___extglob_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + }; + } + { + name = "extglob___extglob_2.0.4.tgz"; + path = fetchurl { + name = "extglob___extglob_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; + sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + }; + } + { + name = "extsprintf___extsprintf_1.3.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + { + name = "extsprintf___extsprintf_1.4.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; + sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "fast_xml_parser___fast_xml_parser_3.17.1.tgz"; + path = fetchurl { + name = "fast_xml_parser___fast_xml_parser_3.17.1.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.17.1.tgz"; + sha1 = "579fa64346cc891ce240d378268c6216e74aab10"; + }; + } + { + name = "figures___figures_2.0.0.tgz"; + path = fetchurl { + name = "figures___figures_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + } + { + name = "file_match___file_match_1.0.2.tgz"; + path = fetchurl { + name = "file_match___file_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/file-match/-/file-match-1.0.2.tgz"; + sha1 = "c9cad265d2c8adf3a81475b0df475859069faef7"; + }; + } + { + name = "file_system___file_system_2.2.2.tgz"; + path = fetchurl { + name = "file_system___file_system_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/file-system/-/file-system-2.2.2.tgz"; + sha1 = "7d65833e3a2347dcd956a813c677153ed3edd987"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } + { + name = "filename_regex___filename_regex_2.0.1.tgz"; + path = fetchurl { + name = "filename_regex___filename_regex_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz"; + sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + }; + } + { + name = "fill_range___fill_range_2.2.4.tgz"; + path = fetchurl { + name = "fill_range___fill_range_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz"; + sha1 = "eb1e773abb056dcd8df2bfdf6af59b8b3a936565"; + }; + } + { + name = "fill_range___fill_range_4.0.0.tgz"; + path = fetchurl { + name = "fill_range___fill_range_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + }; + } + { + name = "find_root___find_root_1.1.0.tgz"; + path = fetchurl { + name = "find_root___find_root_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; + sha1 = "abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"; + }; + } + { + name = "fliplog___fliplog_0.3.13.tgz"; + path = fetchurl { + name = "fliplog___fliplog_0.3.13.tgz"; + url = "https://registry.yarnpkg.com/fliplog/-/fliplog-0.3.13.tgz"; + sha1 = "dd0d786e821822aae272e0ddc84012596a96154c"; + }; + } + { + name = "for_in___for_in_1.0.2.tgz"; + path = fetchurl { + name = "for_in___for_in_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + } + { + name = "for_own___for_own_0.1.5.tgz"; + path = fetchurl { + name = "for_own___for_own_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz"; + sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + }; + } + { + name = "forever_agent___forever_agent_0.6.1.tgz"; + path = fetchurl { + name = "forever_agent___forever_agent_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + { + name = "form_data___form_data_2.3.3.tgz"; + path = fetchurl { + name = "form_data___form_data_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + { + name = "forwarded___forwarded_0.1.2.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + } + { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + path = fetchurl { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + } + { + name = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "fs_extra___fs_extra_7.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; + sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_1.2.11.tgz"; + path = fetchurl { + name = "fsevents___fsevents_1.2.11.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz"; + sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3"; + }; + } + { + name = "fstream___fstream_0.1.31.tgz"; + path = fetchurl { + name = "fstream___fstream_0.1.31.tgz"; + url = "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "fuse_box___fuse_box_3.7.1.tgz"; + path = fetchurl { + name = "fuse_box___fuse_box_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/fuse-box/-/fuse-box-3.7.1.tgz"; + sha1 = "d32879ceee4c8bcec9bbd8fcfe5b29e7142371cd"; + }; + } + { + name = "fuse_concat_with_sourcemaps___fuse_concat_with_sourcemaps_1.0.5.tgz"; + path = fetchurl { + name = "fuse_concat_with_sourcemaps___fuse_concat_with_sourcemaps_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/fuse-concat-with-sourcemaps/-/fuse-concat-with-sourcemaps-1.0.5.tgz"; + sha1 = "9c6a521f675cff5cdbb48db1ca9c181ae49a7b97"; + }; + } + { + name = "fuse.js___fuse.js_6.0.4.tgz"; + path = fetchurl { + name = "fuse.js___fuse.js_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.0.4.tgz"; + sha1 = "9f5af976f836247ad5d2c338090d6ce13cf9a4d2"; + }; + } + { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; + }; + } + { + name = "get_value___get_value_2.0.6.tgz"; + path = fetchurl { + name = "get_value___get_value_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + } + { + name = "getopts___getopts_2.2.5.tgz"; + path = fetchurl { + name = "getopts___getopts_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz"; + sha1 = "67a0fe471cacb9c687d817cab6450b96dde8313b"; + }; + } + { + name = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "glob_base___glob_base_0.3.0.tgz"; + path = fetchurl { + name = "glob_base___glob_base_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + }; + } + { + name = "glob_parent___glob_parent_2.0.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "good_listener___good_listener_1.2.2.tgz"; + path = fetchurl { + name = "good_listener___good_listener_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz"; + sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; + }; + } + { + name = "graceful_fs___graceful_fs_3.0.12.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_3.0.12.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz"; + sha1 = "0034947ce9ed695ec8ab0b854bc919e82b1ffaef"; + }; + } + { + name = "har_schema___har_schema_2.0.0.tgz"; + path = fetchurl { + name = "har_schema___har_schema_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + { + name = "har_validator___har_validator_5.1.3.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; + sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_symbols___has_symbols_1.0.1.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; + }; + } + { + name = "has_value___has_value_0.3.1.tgz"; + path = fetchurl { + name = "has_value___has_value_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + } + { + name = "has_value___has_value_1.0.0.tgz"; + path = fetchurl { + name = "has_value___has_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + } + { + name = "has_values___has_values_0.1.4.tgz"; + path = fetchurl { + name = "has_values___has_values_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + } + { + name = "has_values___has_values_1.0.0.tgz"; + path = fetchurl { + name = "has_values___has_values_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "html___html_1.0.0.tgz"; + path = fetchurl { + name = "html___html_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz"; + sha1 = "a544fa9ea5492bfb3a2cca8210a10be7b5af1f61"; + }; + } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } + { + name = "http_errors___http_errors_1.7.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; + sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + }; + } + { + name = "http_signature___http_signature_1.2.0.tgz"; + path = fetchurl { + name = "http_signature___http_signature_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "ie_array_find_polyfill___ie_array_find_polyfill_1.1.0.tgz"; + path = fetchurl { + name = "ie_array_find_polyfill___ie_array_find_polyfill_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/ie-array-find-polyfill/-/ie-array-find-polyfill-1.1.0.tgz"; + sha1 = "5078e533f026831da22bd7476513d9460d65a142"; + }; + } + { + name = "ieee754___ieee754_1.1.13.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; + sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + }; + } + { + name = "import_fresh___import_fresh_3.2.1.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "inquirer___inquirer_3.3.0.tgz"; + path = fetchurl { + name = "inquirer___inquirer_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz"; + sha1 = "9dd2f2ad765dcab1ff0443b491442a20ba227dc9"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_callable___is_callable_1.2.0.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz"; + sha1 = "83336560b54a38e35e3a2df7afd0454d691468bb"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + }; + } + { + name = "is_date_object___is_date_object_1.0.2.tgz"; + path = fetchurl { + name = "is_date_object___is_date_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; + sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + }; + } + { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + }; + } + { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + }; + } + { + name = "is_dotfile___is_dotfile_1.0.3.tgz"; + path = fetchurl { + name = "is_dotfile___is_dotfile_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz"; + sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; + }; + } + { + name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; + path = fetchurl { + name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + }; + } + { + name = "is_extendable___is_extendable_0.1.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + } + { + name = "is_extendable___is_extendable_1.0.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; + sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + }; + } + { + name = "is_extglob___is_extglob_1.0.0.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_glob___is_glob_2.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + }; + } + { + name = "is_number___is_number_2.1.0.tgz"; + path = fetchurl { + name = "is_number___is_number_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + }; + } + { + name = "is_number___is_number_3.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + } + { + name = "is_number___is_number_4.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz"; + sha1 = "0026e37f5454d73e356dfe6564699867c6a7f0ff"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; + path = fetchurl { + name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + } + { + name = "is_primitive___is_primitive_2.0.0.tgz"; + path = fetchurl { + name = "is_primitive___is_primitive_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; + }; + } + { + name = "is_promise___is_promise_2.1.0.tgz"; + path = fetchurl { + name = "is_promise___is_promise_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + } + { + name = "is_regex___is_regex_1.1.0.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; + sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; + }; + } + { + name = "is_symbol___is_symbol_1.0.3.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_windows___is_windows_1.0.2.tgz"; + path = fetchurl { + name = "is_windows___is_windows_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; + sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isobject___isobject_2.1.0.tgz"; + path = fetchurl { + name = "isobject___isobject_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.13.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; + sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + }; + } + { + name = "jsbn___jsbn_0.1.1.tgz"; + path = fetchurl { + name = "jsbn___jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + { + name = "jsesc___jsesc_0.5.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema___json_schema_0.2.3.tgz"; + path = fetchurl { + name = "json_schema___json_schema_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "jsondiffpatch___jsondiffpatch_0.3.11.tgz"; + path = fetchurl { + name = "jsondiffpatch___jsondiffpatch_0.3.11.tgz"; + url = "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.3.11.tgz"; + sha1 = "43f9443a0d081b5f79d413fe20f302079e493201"; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsprim___jsprim_1.4.1.tgz"; + path = fetchurl { + name = "jsprim___jsprim_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + { + name = "kind_of___kind_of_3.2.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + } + { + name = "kind_of___kind_of_4.0.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + } + { + name = "kind_of___kind_of_5.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; + sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "lego_api___lego_api_1.0.8.tgz"; + path = fetchurl { + name = "lego_api___lego_api_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/lego-api/-/lego-api-1.0.8.tgz"; + sha1 = "5e26be726c5e11d540f89e7c6b1abf8c5834bd01"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { + name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; + path = fetchurl { + name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; + sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; + }; + } + { + name = "lodash.curry___lodash.curry_4.1.1.tgz"; + path = fetchurl { + name = "lodash.curry___lodash.curry_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz"; + sha1 = "248e36072ede906501d75966200a86dab8b23170"; + }; + } + { + name = "lodash.debounce___lodash.debounce_3.1.1.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; + sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5"; + }; + } + { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + } + { + name = "lodash.flow___lodash.flow_3.5.0.tgz"; + path = fetchurl { + name = "lodash.flow___lodash.flow_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz"; + sha1 = "87bf40292b8cf83e4e8ce1a3ae4209e20071675a"; + }; + } + { + name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz"; + path = fetchurl { + name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; + sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; + }; + } + { + name = "lodash___lodash_4.17.15.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.15.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; + sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "make_error___make_error_1.3.6.tgz"; + path = fetchurl { + name = "make_error___make_error_1.3.6.tgz"; + url = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz"; + sha1 = "2eb2e37ea9b67c4891f684a1394799af484cf7a2"; + }; + } + { + name = "map_cache___map_cache_0.2.2.tgz"; + path = fetchurl { + name = "map_cache___map_cache_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + } + { + name = "map_visit___map_visit_1.0.0.tgz"; + path = fetchurl { + name = "map_visit___map_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + } + { + name = "match_stream___match_stream_0.0.2.tgz"; + path = fetchurl { + name = "match_stream___match_stream_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz"; + sha1 = "99eb050093b34dffade421b9ac0b410a9cfa17cf"; + }; + } + { + name = "math_random___math_random_1.0.4.tgz"; + path = fetchurl { + name = "math_random___math_random_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz"; + sha1 = "5dd6943c938548267016d4e34f057583080c514c"; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "memoize_one___memoize_one_5.1.1.tgz"; + path = fetchurl { + name = "memoize_one___memoize_one_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz"; + sha1 = "047b6e3199b508eaec03504de71229b8eb1d75c0"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge___merge_1.2.1.tgz"; + path = fetchurl { + name = "merge___merge_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz"; + sha1 = "38bebf80c3220a8a487b6fcfb3941bb11720c145"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + name = "micromatch___micromatch_2.3.11.tgz"; + path = fetchurl { + name = "micromatch___micromatch_2.3.11.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + }; + } + { + name = "micromatch___micromatch_3.1.10.tgz"; + path = fetchurl { + name = "micromatch___micromatch_3.1.10.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; + sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + }; + } + { + name = "mime_db___mime_db_1.43.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.43.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; + sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58"; + }; + } + { + name = "mime_types___mime_types_2.1.26.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.26.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; + sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06"; + }; + } + { + name = "mime___mime_1.6.0.tgz"; + path = fetchurl { + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha1 = "820c86a39334640e99516928bd03fca88057d022"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_0.0.8.tgz"; + path = fetchurl { + name = "minimist___minimist_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + } + { + name = "minimist___minimist_1.2.0.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + path = fetchurl { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_0.5.1.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + } + { + name = "mock_require___mock_require_3.0.3.tgz"; + path = fetchurl { + name = "mock_require___mock_require_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz"; + sha1 = "ccd544d9eae81dd576b3f219f69ec867318a1946"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + name = "mustache___mustache_2.3.2.tgz"; + path = fetchurl { + name = "mustache___mustache_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz"; + sha1 = "a6d4d9c3f91d13359ab889a812954f9230a3d0c5"; + }; + } + { + name = "mute_stream___mute_stream_0.0.7.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + } + { + name = "nan___nan_2.14.0.tgz"; + path = fetchurl { + name = "nan___nan_2.14.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; + sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c"; + }; + } + { + name = "nanomatch___nanomatch_1.2.13.tgz"; + path = fetchurl { + name = "nanomatch___nanomatch_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; + sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + }; + } + { + name = "nanoseconds___nanoseconds_0.1.0.tgz"; + path = fetchurl { + name = "nanoseconds___nanoseconds_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/nanoseconds/-/nanoseconds-0.1.0.tgz"; + sha1 = "69ec39fcd00e77ab3a72de0a43342824cd79233a"; + }; + } + { + name = "natives___natives_1.1.6.tgz"; + path = fetchurl { + name = "natives___natives_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz"; + sha1 = "a603b4a498ab77173612b9ea1acdec4d980f00bb"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + }; + } + { + name = "nopt___nopt_1.0.10.tgz"; + path = fetchurl { + name = "nopt___nopt_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + } + { + name = "normalize_path___normalize_path_2.1.1.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + } + { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + path = fetchurl { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_copy___object_copy_0.1.0.tgz"; + path = fetchurl { + name = "object_copy___object_copy_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + } + { + name = "object_inspect___object_inspect_1.8.0.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; + sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object_visit___object_visit_1.0.1.tgz"; + path = fetchurl { + name = "object_visit___object_visit_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + } + { + name = "object.assign___object.assign_4.1.0.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; + sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + }; + } + { + name = "object.omit___object.omit_2.0.1.tgz"; + path = fetchurl { + name = "object.omit___object.omit_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + }; + } + { + name = "object.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + name = "object.pick___object.pick_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + } + { + name = "object.values___object.values_1.1.1.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + }; + } + { + name = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_2.0.1.tgz"; + path = fetchurl { + name = "onetime___onetime_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "options___options_0.0.6.tgz"; + path = fetchurl { + name = "options___options_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + } + { + name = "orderedmap___orderedmap_1.1.1.tgz"; + path = fetchurl { + name = "orderedmap___orderedmap_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz"; + sha1 = "c618e77611b3b21d0fe3edc92586265e0059c789"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "over___over_0.0.5.tgz"; + path = fetchurl { + name = "over___over_0.0.5.tgz"; + url = "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz"; + sha1 = "f29852e70fd7e25f360e013a8ec44c82aedb5708"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "parse_glob___parse_glob_3.0.4.tgz"; + path = fetchurl { + name = "parse_glob___parse_glob_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + }; + } + { + name = "parse_json___parse_json_5.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; + sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + }; + } + { + name = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + }; + } + { + name = "pascalcase___pascalcase_0.1.1.tgz"; + path = fetchurl { + name = "pascalcase___pascalcase_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_parse___path_parse_1.0.6.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; + sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + }; + } + { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + path = fetchurl { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + } + { + name = "postcss___postcss_6.0.23.tgz"; + path = fetchurl { + name = "postcss___postcss_6.0.23.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz"; + sha1 = "61c82cc328ac60e677645f979054eb98bc0e3324"; + }; + } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "preserve___preserve_0.2.0.tgz"; + path = fetchurl { + name = "preserve___preserve_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + }; + } + { + name = "prettier___prettier_1.19.1.tgz"; + path = fetchurl { + name = "prettier___prettier_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; + sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; + }; + } + { + name = "pretty_time___pretty_time_0.2.0.tgz"; + path = fetchurl { + name = "pretty_time___pretty_time_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-time/-/pretty-time-0.2.0.tgz"; + sha1 = "7a3bdec4049c620cd7c42b7f342b74d56e73d74e"; + }; + } + { + name = "prettysize___prettysize_0.0.3.tgz"; + path = fetchurl { + name = "prettysize___prettysize_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/prettysize/-/prettysize-0.0.3.tgz"; + sha1 = "14afff6a645e591a4ddf1c72919c23b4146181a1"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "prop_types___prop_types_15.7.2.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + }; + } + { + name = "prosemirror_changeset___prosemirror_changeset_2.1.2.tgz"; + path = fetchurl { + name = "prosemirror_changeset___prosemirror_changeset_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.1.2.tgz"; + sha1 = "91dee900eb4618b21ed0c38c8d41dc7539303864"; + }; + } + { + name = "prosemirror_commands___prosemirror_commands_1.1.4.tgz"; + path = fetchurl { + name = "prosemirror_commands___prosemirror_commands_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.4.tgz"; + sha1 = "991563e67623acab4f8c510fad1570f8b4693780"; + }; + } + { + name = "prosemirror_dev_tools___prosemirror_dev_tools_2.1.1.tgz"; + path = fetchurl { + name = "prosemirror_dev_tools___prosemirror_dev_tools_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.1.tgz"; + sha1 = "0c4304b05b437608b3666b72fdb4b21e24fa29fc"; + }; + } + { + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.2.tgz"; + path = fetchurl { + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz"; + sha1 = "28738c4ed7102e814d7a8a26d70018523fc7cd6d"; + }; + } + { + name = "prosemirror_gapcursor___prosemirror_gapcursor_1.1.5.tgz"; + path = fetchurl { + name = "prosemirror_gapcursor___prosemirror_gapcursor_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz"; + sha1 = "0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246"; + }; + } + { + name = "prosemirror_history___prosemirror_history_1.1.3.tgz"; + path = fetchurl { + name = "prosemirror_history___prosemirror_history_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz"; + sha1 = "4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489"; + }; + } + { + name = "prosemirror_inputrules___prosemirror_inputrules_1.1.2.tgz"; + path = fetchurl { + name = "prosemirror_inputrules___prosemirror_inputrules_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz"; + sha1 = "487e46c763e1212a4577397aba7706139084f012"; + }; + } + { + name = "prosemirror_keymap___prosemirror_keymap_1.1.3.tgz"; + path = fetchurl { + name = "prosemirror_keymap___prosemirror_keymap_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.3.tgz"; + sha1 = "be22d6108df2521608e9216a87b1a810f0ed361e"; + }; + } + { + name = "prosemirror_keymap___prosemirror_keymap_1.1.4.tgz"; + path = fetchurl { + name = "prosemirror_keymap___prosemirror_keymap_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz"; + sha1 = "8b481bf8389a5ac40d38dbd67ec3da2c7eac6a6d"; + }; + } + { + name = "prosemirror_model___prosemirror_model_1.9.1.tgz"; + path = fetchurl { + name = "prosemirror_model___prosemirror_model_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz"; + sha1 = "8c08cf556f593c5f015548d2c1a6825661df087f"; + }; + } + { + name = "prosemirror_model___prosemirror_model_1.11.0.tgz"; + path = fetchurl { + name = "prosemirror_model___prosemirror_model_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.0.tgz"; + sha1 = "dc36cdb3ad6442b9f6325c7d89170c624f9dc520"; + }; + } + { + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; + path = fetchurl { + name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz"; + sha1 = "471f9caf2d2bed93641d2e490434c0d2d4330df1"; + }; + } + { + name = "prosemirror_state___prosemirror_state_1.3.2.tgz"; + path = fetchurl { + name = "prosemirror_state___prosemirror_state_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.2.tgz"; + sha1 = "1b910b0dc01c1f00926bb9ba1589f7b7ac0d658b"; + }; + } + { + name = "prosemirror_state___prosemirror_state_1.3.3.tgz"; + path = fetchurl { + name = "prosemirror_state___prosemirror_state_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.3.tgz"; + sha1 = "b2862866b14dec2b3ae1ab18229f2bd337651a2c"; + }; + } + { + name = "prosemirror_tables___prosemirror_tables_1.0.0.tgz"; + path = fetchurl { + name = "prosemirror_tables___prosemirror_tables_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.0.0.tgz"; + sha1 = "ec3d0b11e638c6a92dd14ae816d0a2efd1719b70"; + }; + } + { + name = "prosemirror_tables___prosemirror_tables_1.1.1.tgz"; + path = fetchurl { + name = "prosemirror_tables___prosemirror_tables_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz"; + sha1 = "ad66300cc49500455cf1243bb129c9e7d883321e"; + }; + } + { + name = "prosemirror_transform___prosemirror_transform_1.2.3.tgz"; + path = fetchurl { + name = "prosemirror_transform___prosemirror_transform_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.3.tgz"; + sha1 = "239d17591af24d39ef3f1999daa09e1f1c76b06a"; + }; + } + { + name = "prosemirror_transform___prosemirror_transform_1.2.8.tgz"; + path = fetchurl { + name = "prosemirror_transform___prosemirror_transform_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.8.tgz"; + sha1 = "4b86544fa43637fe381549fb7b019f4fb71fe65c"; + }; + } + { + name = "prosemirror_utils___prosemirror_utils_0.9.6.tgz"; + path = fetchurl { + name = "prosemirror_utils___prosemirror_utils_0.9.6.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz"; + sha1 = "3d97bd85897e3b535555867dc95a51399116a973"; + }; + } + { + name = "prosemirror_view___prosemirror_view_1.14.2.tgz"; + path = fetchurl { + name = "prosemirror_view___prosemirror_view_1.14.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.14.2.tgz"; + sha1 = "23eb89f6101e9671b5e0c19d82ee0ad9de5608de"; + }; + } + { + name = "prosemirror_view___prosemirror_view_1.15.6.tgz"; + path = fetchurl { + name = "prosemirror_view___prosemirror_view_1.15.6.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.6.tgz"; + sha1 = "446bf7662235300c5f47362af2db805c6df3ad24"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; + }; + } + { + name = "psl___psl_1.7.0.tgz"; + path = fetchurl { + name = "psl___psl_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; + sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"; + }; + } + { + name = "pullstream___pullstream_0.4.1.tgz"; + path = fetchurl { + name = "pullstream___pullstream_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz"; + sha1 = "d6fb3bf5aed697e831150eb1002c25a3f8ae1314"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "pure_color___pure_color_1.3.0.tgz"; + path = fetchurl { + name = "pure_color___pure_color_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz"; + sha1 = "1fe064fb0ac851f0de61320a8bf796836422f33e"; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + }; + } + { + name = "qs___qs_6.5.2.tgz"; + path = fetchurl { + name = "qs___qs_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + { + name = "randomatic___randomatic_3.1.1.tgz"; + path = fetchurl { + name = "randomatic___randomatic_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz"; + sha1 = "b776efc59375984e36c537b2f51a1f0aff0da1ed"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + }; + } + { + name = "react_base16_styling___react_base16_styling_0.5.3.tgz"; + path = fetchurl { + name = "react_base16_styling___react_base16_styling_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.5.3.tgz"; + sha1 = "3858f24e9c4dd8cbd3f702f3f74d581ca2917269"; + }; + } + { + name = "react_dock___react_dock_0.2.4.tgz"; + path = fetchurl { + name = "react_dock___react_dock_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/react-dock/-/react-dock-0.2.4.tgz"; + sha1 = "e727dc7550b3b73116635dcb9c0e04d0b7afe17c"; + }; + } + { + name = "react_dom___react_dom_16.13.1.tgz"; + path = fetchurl { + name = "react_dom___react_dom_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz"; + sha1 = "c1bd37331a0486c078ee54c4740720993b2e0e7f"; + }; + } + { + name = "react_emotion___react_emotion_9.2.12.tgz"; + path = fetchurl { + name = "react_emotion___react_emotion_9.2.12.tgz"; + url = "https://registry.yarnpkg.com/react-emotion/-/react-emotion-9.2.12.tgz"; + sha1 = "74d1494f89e22d0b9442e92a33ca052461955c83"; + }; + } + { + name = "react_is___react_is_16.13.0.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.0.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz"; + sha1 = "0f37c3613c34fe6b37cd7f763a0d6293ab15c527"; + }; + } + { + name = "react_json_tree___react_json_tree_0.11.2.tgz"; + path = fetchurl { + name = "react_json_tree___react_json_tree_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/react-json-tree/-/react-json-tree-0.11.2.tgz"; + sha1 = "af70199fcbc265699ade2aec492465c51608f95e"; + }; + } + { + name = "react_window___react_window_1.8.5.tgz"; + path = fetchurl { + name = "react_window___react_window_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/react-window/-/react-window-1.8.5.tgz"; + sha1 = "a56b39307e79979721021f5d06a67742ecca52d1"; + }; + } + { + name = "react___react_16.13.1.tgz"; + path = fetchurl { + name = "react___react_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; + sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readable_stream___readable_stream_1.0.34.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.0.34.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz"; + sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + }; + } + { + name = "readdirp___readdirp_2.2.1.tgz"; + path = fetchurl { + name = "readdirp___readdirp_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; + sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; + }; + } + { + name = "realm_utils___realm_utils_1.0.9.tgz"; + path = fetchurl { + name = "realm_utils___realm_utils_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/realm-utils/-/realm-utils-1.0.9.tgz"; + sha1 = "5c76a5ff39e4816af2c133a161f4221d6628eff4"; + }; + } + { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + path = fetchurl { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; + sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; + }; + } + { + name = "regenerate___regenerate_1.4.0.tgz"; + path = fetchurl { + name = "regenerate___regenerate_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz"; + sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; + sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } + { + name = "regex_cache___regex_cache_0.4.4.tgz"; + path = fetchurl { + name = "regex_cache___regex_cache_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz"; + sha1 = "75bdc58a2a1496cec48a12835bc54c8d562336dd"; + }; + } + { + name = "regex_not___regex_not_1.0.2.tgz"; + path = fetchurl { + name = "regex_not___regex_not_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; + sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + }; + } + { + name = "regexpu_core___regexpu_core_4.6.0.tgz"; + path = fetchurl { + name = "regexpu_core___regexpu_core_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; + sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6"; + }; + } + { + name = "regjsgen___regjsgen_0.5.1.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; + sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; + }; + } + { + name = "regjsparser___regjsparser_0.6.3.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz"; + sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "repeat_element___repeat_element_1.1.3.tgz"; + path = fetchurl { + name = "repeat_element___repeat_element_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; + sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + }; + } + { + name = "repeat_string___repeat_string_1.6.1.tgz"; + path = fetchurl { + name = "repeat_string___repeat_string_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + } + { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve_url___resolve_url_0.2.1.tgz"; + path = fetchurl { + name = "resolve_url___resolve_url_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + } + { + name = "resolve___resolve_1.15.1.tgz"; + path = fetchurl { + name = "resolve___resolve_1.15.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz"; + sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"; + }; + } + { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rope_sequence___rope_sequence_1.3.2.tgz"; + path = fetchurl { + name = "rope_sequence___rope_sequence_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz"; + sha1 = "a19e02d72991ca71feb6b5f8a91154e48e3c098b"; + }; + } + { + name = "run_async___run_async_2.4.0.tgz"; + path = fetchurl { + name = "run_async___run_async_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz"; + sha1 = "e59054a5b86876cfae07f431d18cbaddc594f1e8"; + }; + } + { + name = "rx_lite_aggregates___rx_lite_aggregates_4.0.8.tgz"; + path = fetchurl { + name = "rx_lite_aggregates___rx_lite_aggregates_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; + sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + }; + } + { + name = "rx_lite___rx_lite_4.0.8.tgz"; + path = fetchurl { + name = "rx_lite___rx_lite_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz"; + sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safe_regex___safe_regex_1.1.0.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "scheduler___scheduler_0.19.1.tgz"; + path = fetchurl { + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; + }; + } + { + name = "select___select_1.1.2.tgz"; + path = fetchurl { + name = "select___select_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz"; + sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "send___send_0.17.1.tgz"; + path = fetchurl { + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + }; + } + { + name = "sentence_splitter___sentence_splitter_3.2.0.tgz"; + path = fetchurl { + name = "sentence_splitter___sentence_splitter_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.0.tgz"; + sha1 = "fb2cd2f61f40006643ba83d9acf4609233c1c68c"; + }; + } + { + name = "serve_static___serve_static_1.14.1.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + }; + } + { + name = "set_value___set_value_2.0.1.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + }; + } + { + name = "setimmediate___setimmediate_1.0.5.tgz"; + path = fetchurl { + name = "setimmediate___setimmediate_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + }; + } + { + name = "shorthash___shorthash_0.0.2.tgz"; + path = fetchurl { + name = "shorthash___shorthash_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/shorthash/-/shorthash-0.0.2.tgz"; + sha1 = "59b268eecbde59038b30da202bcfbddeb2c4a4eb"; + }; + } + { + name = "signal_exit___signal_exit_3.0.2.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + } + { + name = "slice_stream___slice_stream_1.0.0.tgz"; + path = fetchurl { + name = "slice_stream___slice_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz"; + sha1 = "5b33bd66f013b1a7f86460b03d463dec39ad3ea0"; + }; + } + { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + path = fetchurl { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + }; + } + { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + path = fetchurl { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + }; + } + { + name = "snapdragon___snapdragon_0.8.2.tgz"; + path = fetchurl { + name = "snapdragon___snapdragon_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; + sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + name = "source_map_support___source_map_support_0.5.16.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.16.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; + sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042"; + }; + } + { + name = "source_map_url___source_map_url_0.4.0.tgz"; + path = fetchurl { + name = "source_map_url___source_map_url_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; + }; + } + { + name = "sourcemap_blender___sourcemap_blender_1.0.5.tgz"; + path = fetchurl { + name = "sourcemap_blender___sourcemap_blender_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sourcemap-blender/-/sourcemap-blender-1.0.5.tgz"; + sha1 = "d361f3d12381c4e477178113878fdf984a91bdbc"; + }; + } + { + name = "split_string___split_string_3.1.0.tgz"; + path = fetchurl { + name = "split_string___split_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; + sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "sshpk___sshpk_1.16.1.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + { + name = "static_extend___static_extend_0.1.2.tgz"; + path = fetchurl { + name = "static_extend___static_extend_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + } + { + name = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + } + { + name = "stream_browserify___stream_browserify_2.0.2.tgz"; + path = fetchurl { + name = "stream_browserify___stream_browserify_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "structured_source___structured_source_3.0.2.tgz"; + path = fetchurl { + name = "structured_source___structured_source_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz"; + sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; + }; + } + { + name = "stylis_rule_sheet___stylis_rule_sheet_0.0.10.tgz"; + path = fetchurl { + name = "stylis_rule_sheet___stylis_rule_sheet_0.0.10.tgz"; + url = "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz"; + sha1 = "44e64a2b076643f4b52e5ff71efc04d8c3c4a430"; + }; + } + { + name = "stylis___stylis_3.5.4.tgz"; + path = fetchurl { + name = "stylis___stylis_3.5.4.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz"; + sha1 = "f665f25f5e299cf3d64654ab949a57c768b73fbe"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "terser___terser_4.6.4.tgz"; + path = fetchurl { + name = "terser___terser_4.6.4.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz"; + sha1 = "40a0b37afbe5b57e494536815efa68326840fc00"; + }; + } + { + name = "thenby___thenby_1.3.3.tgz"; + path = fetchurl { + name = "thenby___thenby_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/thenby/-/thenby-1.3.3.tgz"; + sha1 = "016c3427772a284bbfef982d978f7574fd15ee9d"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; + path = fetchurl { + name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; + sha1 = "1d1a56edfc51c43e863cbb5382a72330e3555423"; + }; + } + { + name = "tlite___tlite_0.1.9.tgz"; + path = fetchurl { + name = "tlite___tlite_0.1.9.tgz"; + url = "https://registry.yarnpkg.com/tlite/-/tlite-0.1.9.tgz"; + sha1 = "e886e4a305b7522242e2453b7ca4fb84f2d9de0f"; + }; + } + { + name = "tmp___tmp_0.0.33.tgz"; + path = fetchurl { + name = "tmp___tmp_0.0.33.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; + sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { + name = "to_object_path___to_object_path_0.3.0.tgz"; + path = fetchurl { + name = "to_object_path___to_object_path_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + } + { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + } + { + name = "to_regex___to_regex_3.0.2.tgz"; + path = fetchurl { + name = "to_regex___to_regex_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; + sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } + { + name = "touch___touch_2.0.2.tgz"; + path = fetchurl { + name = "touch___touch_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz"; + sha1 = "ca0b2a3ae3211246a61b16ba9e6cbf1596287164"; + }; + } + { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "traverse___traverse_0.3.9.tgz"; + path = fetchurl { + name = "traverse___traverse_0.3.9.tgz"; + url = "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz"; + sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + }; + } + { + name = "ts_node___ts_node_8.10.2.tgz"; + path = fetchurl { + name = "ts_node___ts_node_8.10.2.tgz"; + url = "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz"; + sha1 = "eee03764633b1234ddd37f8db9ec10b75ec7fb8d"; + }; + } + { + name = "tslib___tslib_1.11.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; + sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; + }; + } + { + name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; + path = fetchurl { + name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz"; + sha1 = "75f140bde947d35d8f0d238e0ebf809d64592c37"; + }; + } + { + name = "tslint_react___tslint_react_5.0.0.tgz"; + path = fetchurl { + name = "tslint_react___tslint_react_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/tslint-react/-/tslint-react-5.0.0.tgz"; + sha1 = "d0ae644e8163bdd3e134012e9353094904e8dd44"; + }; + } + { + name = "tslint___tslint_5.20.1.tgz"; + path = fetchurl { + name = "tslint___tslint_5.20.1.tgz"; + url = "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz"; + sha1 = "e401e8aeda0152bc44dd07e614034f3f80c67b7d"; + }; + } + { + name = "tsutils___tsutils_2.29.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_2.29.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; + sha1 = "32b488501467acbedd4b85498673a0812aca0b99"; + }; + } + { + name = "tsutils___tsutils_3.17.1.tgz"; + path = fetchurl { + name = "tsutils___tsutils_3.17.1.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; + sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "typescript_tslint_plugin___typescript_tslint_plugin_0.5.5.tgz"; + path = fetchurl { + name = "typescript_tslint_plugin___typescript_tslint_plugin_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz"; + sha1 = "673875c43640251f1ab3d63745d7d49726ff961c"; + }; + } + { + name = "typescript___typescript_3.8.3.tgz"; + path = fetchurl { + name = "typescript___typescript_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; + sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; + }; + } + { + name = "uglify_js___uglify_js_3.8.0.tgz"; + path = fetchurl { + name = "uglify_js___uglify_js_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz"; + sha1 = "f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805"; + }; + } + { + name = "ultron___ultron_1.0.2.tgz"; + path = fetchurl { + name = "ultron___ultron_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz"; + sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + }; + } + { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + }; + } + { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + }; + } + { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + path = fetchurl { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; + sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + }; + } + { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + path = fetchurl { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; + sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + }; + } + { + name = "union_value___union_value_1.0.1.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { + name = "unset_value___unset_value_1.0.0.tgz"; + path = fetchurl { + name = "unset_value___unset_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + } + { + name = "unstated___unstated_2.1.1.tgz"; + path = fetchurl { + name = "unstated___unstated_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/unstated/-/unstated-2.1.1.tgz"; + sha1 = "36b124dfb2e7a12d39d0bb9c46dfb6e51276e3a2"; + }; + } + { + name = "unzip___unzip_0.1.11.tgz"; + path = fetchurl { + name = "unzip___unzip_0.1.11.tgz"; + url = "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz"; + sha1 = "89749c63b058d7d90d619f86b98aa1535d3b97f0"; + }; + } + { + name = "uri_js___uri_js_4.2.2.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; + sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + }; + } + { + name = "urix___urix_0.1.0.tgz"; + path = fetchurl { + name = "urix___urix_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + } + { + name = "use___use_3.1.1.tgz"; + path = fetchurl { + name = "use___use_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; + sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "utils_extend___utils_extend_1.0.8.tgz"; + path = fetchurl { + name = "utils_extend___utils_extend_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/utils-extend/-/utils-extend-1.0.8.tgz"; + sha1 = "ccfd7b64540f8e90ee21eec57769d0651cab8a5f"; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + name = "verror___verror_1.10.0.tgz"; + path = fetchurl { + name = "verror___verror_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + { + name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz"; + path = fetchurl { + name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz"; + sha1 = "a7bf74ef3254d0a0c272fab15c82128e378b3be9"; + }; + } + { + name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz"; + path = fetchurl { + name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz"; + sha1 = "b8aab6afae2849c84a8983d39a1cf742417afe2f"; + }; + } + { + name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz"; + path = fetchurl { + name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz"; + sha1 = "d3b5952246d30e5241592b6dde8280e03942e743"; + }; + } + { + name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz"; + path = fetchurl { + name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz"; + sha1 = "0d2feddd33f92aadf5da32450df498d52f6f14eb"; + }; + } + { + name = "vscode_uri___vscode_uri_1.0.8.tgz"; + path = fetchurl { + name = "vscode_uri___vscode_uri_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz"; + sha1 = "9769aaececae4026fb6e22359cb38946580ded59"; + }; + } + { + name = "w3c_keyname___w3c_keyname_2.2.2.tgz"; + path = fetchurl { + name = "w3c_keyname___w3c_keyname_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.2.tgz"; + sha1 = "7ea63170454bb19f1a3c6b628fc3dc8889276e91"; + }; + } + { + name = "watch___watch_1.0.2.tgz"; + path = fetchurl { + name = "watch___watch_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz"; + sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "ws___ws_1.1.5.tgz"; + path = fetchurl { + name = "ws___ws_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz"; + sha1 = "cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51"; + }; + } + { + name = "yaml___yaml_1.7.2.tgz"; + path = fetchurl { + name = "yaml___yaml_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz"; + sha1 = "f26aabf738590ab61efaca502358e48dc9f348b2"; + }; + } + { + name = "yn___yn_3.1.1.tgz"; + path = fetchurl { + name = "yn___yn_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz"; + sha1 = "1e87401a09d767c1d5eab26a6e4c185182d2eb50"; + }; + } + { + name = "zenscroll___zenscroll_4.0.2.tgz"; + path = fetchurl { + name = "zenscroll___zenscroll_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/zenscroll/-/zenscroll-4.0.2.tgz"; + sha1 = "e8d5774d1c0738a47bcfa8729f3712e2deddeb25"; + }; + } + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 316c486133..b5ba0c15ff 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1mpvikps5l2vynw7afrpkp4ah0q6q2q4q8d074b4vfwhaj1v6v75"; - x86_64-darwin = "0r65wfyzc90lhd0i61xkb8kq9339b3ddyqp5dx7wf0aydgi203br"; - aarch64-linux = "0d4kqjhyq8s7ini25m2igf37bzb2dw01jv62nps3yx3cr52vzyn2"; - aarch64-darwin = "0h5g3h8z1wl7pz6ddlchnwqns956pyi1c3fjivsff0f0yhmdlva7"; - armv7l-linux = "0fyxmq3i4kc1x013xs9flcbkmzzy9sqhjhcj5n38w6mswsb97qrv"; + x86_64-linux = "069jdwqs9z2z95mjs9nx58rp1516dyyqn5bc0vgr7xvlbis97lq0"; + x86_64-darwin = "1bd32dkpyfgknxqn76jcwpa47rac9q14glbf5sb1rh9rfav0m1m8"; + aarch64-linux = "1axxnys3pd2qrvj6mqpa5cih44b4dbpgi8mvn616d8d45jgdnc1r"; + aarch64-darwin = "0bdp0k20lfwpsl1a3dz6c97s0b5bp3rhb66jwgbyyc16zrz79r1z"; + armv7l-linux = "077w5hvc4brb56zs0w37nr4a8vlcij5z3yrv3rz16p58nnkj56hs"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.61.0"; + version = "1.61.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 8ca19d95a7..7f8a0aba0a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "072wdzl8gp4ygprgza4cfg46fvrd13zx9za5fa8s6vsd9w1l95l7"; - x86_64-darwin = "083sipxp9r7g6p6la15jjlib52l8xjbfxn2cb05scigq3zsyffy7"; - aarch64-linux = "1s82f6ba57r7bnjhbanmih5g7wa001sf6php1402w06cxxy7dz00"; - armv7l-linux = "113nk1rqw07giqq8pnc11dymzxdhj3nn3q2p0fppnm3lpccaq9hs"; + x86_64-linux = "0ic7h5aq1lyplk01bydqwrvz40h59sf0n0q4gxj844k4qidy14md"; + x86_64-darwin = "15s3vj7740ksb82gdjqpxw6cyd45ymdpacamkqk800929cv715qs"; + aarch64-linux = "0n3bxggfzlr1cqarq861yfqka3qfgpwvk8j22l7dv4vki06f8jzy"; + armv7l-linux = "0jksfdals8xf3vh5hqrd40pj5qn8byjrakjnrv926qznxjj152bn"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.61.0"; + version = "1.61.1"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix index 174733a4fd..a9c258ce92 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A boxy 3D model editor powered by Electron"; homepage = "https://blockbench.net/"; license = licenses.gpl3Only; - maintainers = [ maintainers.ronthecookie ]; + maintainers = [ maintainers.ckie ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index 50e1babda2..d412c6fded 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.11.4"; + version = "3.12.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3ZsPiUXX34Ev/a3OyMO94dyXZyMy4AVt5Cp/ELZLIGw="; + sha256 = "sha256-Pe/8AwOE5ktXNhxDfHm0ga4Uie9EyHroVugbsQ2OOD8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index fc1fb67bd3..36dad89766 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "457"; + version = "458"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-ZXBVJc+9dFzi75JYl3U3ic0MKolWMsdR3UkLe5EOzsw="; + sha256 = "sha256-oVNgXelFMVT5V41SRlnN+pnYzOWbdDKQQcvRWFZqEro="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix index 27eb174cdf..93a7d75ce4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix @@ -113,7 +113,6 @@ stdenv.mkDerivation { ''; homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/frontends.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/frontends.nix index c094524209..d34ab9856f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/frontends.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/frontends.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { description = "Scanner Access Now Easy"; homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix index 1deaab4dfe..e394acf2b0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [peti]; platforms = with lib.platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index 78b30ad44e..7b74dd745f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.3"; + version = "0.30.14"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wkahbnnfxmi1jc5zmm3h761nrnkdks8lk0rj38bfkwg90h6zqwd"; + sha256 = "sha256-McLkgzkI02GcssNnWgXw2lnCuqduKLkFOF/VbADBKJU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index 991eee4316..ac3922e17d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "1password"; - version = "8.2.0"; + version = "8.3.0"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "1hnpvvval8a9ny5x5zffn5lf5qrwc4hcs3jvhqmd7m4adh2i6y2i"; + sha256 = "1cakv316ipwyw6s3x4a6qhl0nmg17bxhh08c969gma3svamh1grw"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix index 4f8c5f8bb8..16f5673bed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "sha256-hiOS0cTaPqllb31p+6nU4GYvw/E1Hdn8yd3sppzGkqg="; + sha256 = "sha256-ALIrNnhpX46xdQdfJdx/9e/QtdyBEgi5xLrbuOBJR7o="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index db807ffe1c..f16e2a87a6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { IPSEC. ''; platforms = platforms.unix; - maintainers = [ maintainers.peti ]; license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix index 4c2e262c9a..93886b3a2c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-gzU5AqjCIZlhLbnj/xuSGJ69ZhLv9zQxlM0Nn+MIX/U="; + sha256 = "sha256-+x3uN7Uj0fqO0kpHlOVnsshgEJA1z/6ZElKSTyLzfG4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix b/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix index c182db8fdd..557cd45c42 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "http://nostatic.org/grip"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ marcweber peti ]; + maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix index 3ff33a14f2..797dfe504c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-b5029032/Hubstaff-1.6.2-b5029032.sh"; - version = "1.6.2-b5029032"; - sha256 = "1q3gimg6bcpdnm1fkn1vq3b6shwgi6y84bixisyfcva5px7dmi4s"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-328c666b/Hubstaff-1.6.2-328c666b.sh"; + version = "1.6.2-328c666b"; + sha256 = "0fmlblw19qk9s9xsl0dl705cnns825wrlc7navii4bvbsn6ycl5v"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix index 135132bd43..8b72647574 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix @@ -74,6 +74,5 @@ stdenv.mkDerivation rec { homepage = "http://ikiwiki.info/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.peti ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index 38513937d0..bd35d44b7c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -121,4 +121,16 @@ in buildFHSUserEnv { ln -sf ${lutris-unwrapped}/share/applications $out/share ln -sf ${lutris-unwrapped}/share/icons $out/share ''; + + meta = { + inherit (lutris-unwrapped.meta) + homepage + description + platforms + license + maintainers + broken; + + mainProgram = "lutris"; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix index 952a7b00d0..435bbda24d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix @@ -2,47 +2,51 @@ , stdenv , fetchFromGitHub , gtk4 -, gtksourceview +, hicolor-icon-theme , json-glib , libadwaita , libgee , meson , ninja , nix-update-script -, pantheon , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "notejot"; - version = "3.1.5"; + version = "3.2.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-wsHQvN+sqAMs1QldiRoc9JlF4d54JFqNkqC+lyuHC7M="; + hash = "sha256-WyW1tGhO3+OykNa8BRavi93cBMOSBJw0M+0bwQHJOjU="; }; + patches = [ + # build: use gtk4-update-icon-cache + # https://github.com/lainsce/notejot/pull/307 + ./use-gtk4-update-icon-cache.patch + ]; + nativeBuildInputs = [ meson ninja - vala pkg-config python3 - wrapGAppsHook + vala + wrapGAppsHook4 ]; + buildInputs = [ gtk4 - gtksourceview + hicolor-icon-theme json-glib libadwaita libgee - pantheon.elementary-icon-theme - pantheon.granite ]; postPatch = '' @@ -50,6 +54,10 @@ stdenv.mkDerivation rec { patchShebangs build-aux/post_install.py ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/lainsce/notejot"; description = "Stupidly-simple sticky notes applet"; @@ -57,8 +65,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; }; - - passthru.updateScript = nix-update-script { - attrPath = pname; - }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch b/third_party/nixpkgs/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch new file mode 100644 index 0000000000..9431c43cef --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch @@ -0,0 +1,20 @@ +diff --git a/build-aux/post_install.py b/build-aux/post_install.py +index 1278304..fface6d 100644 +--- a/build-aux/post_install.py ++++ b/build-aux/post_install.py +@@ -2,11 +2,13 @@ + import os + import subprocess + +-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') ++install_prefix = os.environ['MESON_INSTALL_PREFIX'] ++icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor') ++schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas') + + if not os.environ.get('DESTDIR'): + print('Compiling gsettings schemas…') + subprocess.call(['glib-compile-schemas', schemadir], shell=False) + + print('Rebuilding desktop icons cache...') +- subprocess.call(['gtk-update-icon-cache', '/usr/share/icons/hicolor/'], shell=False) ++ subprocess.call(['gtk4-update-icon-cache', '-qtf', icondir], shell=False) diff --git a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix index fe739cb581..688d5acdd1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -8,7 +8,6 @@ , gettext , yelp-tools , itstool -, libxmlxx3 , python , pygobject3 , gtk3 @@ -35,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000"; + sha256 = "dpflFEXhn9d05osWCtr2aHuAgXLeBBdgLhaXZra21L0="; }; patches = [ @@ -58,7 +57,6 @@ buildPythonApplication rec { autoreconfHook wrapGAppsHook pkg-config - libxmlxx3 gettext yelp-tools itstool diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix index 664bf9ba72..c3001c3337 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ttyper"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "max-niederman"; repo = pname; rev = "v${version}"; - sha256 = "1fsb77ky92fyv3ll6zrbxbd69gm85xnc6bivj7sc3sv5cxhgr7a5"; + sha256 = "sha256-9vcoK2mFEivTSZE3KoQRHUr3AfQ/aN5eWP//Jagw3gU="; }; - cargoSha256 = "1sqdql0kfr1vsww6hkrp7yjlzx0mnhfma51z699hkx9c492sf1wk"; + cargoSha256 = "sha256-VzO32b5oAoXR/Ei9up00XRM63I5kuG68TeX4KBCXIdo="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix index 531c108cdb..2765cd5ad7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix @@ -10,11 +10,11 @@ let isFullPackage = mediaSupport; in stdenv.mkDerivation rec { pname = if isFullPackage then "vifm-full" else "vifm"; - version = "0.11"; + version = "0.12"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh"; + sha256 = "1h5j4y704nciyzg3aaav8sl3r5h9mpwq8f28cj65nnxk6a7n3a9k"; }; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix index 77ff11b986..f8dbc9c65e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "1.8.9"; + version = "2.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-1cU9HdPXrJ4ibSjOitO8iJfMIaGub/jjlb2lssYFfcU="; + sha256 = "sha256-MIFgNUuuneIIkPRVRarbx6UMoB/3sdJtKvbacUnwHX8="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index e269d6313a..a9331041dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -6,7 +6,7 @@ # Native build inputs: , ninja, pkg-config -, python2, python3, perl +, python3, perl , gnutar, which , llvmPackages # postPatch: @@ -34,6 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl +, epoxy # postPatch: , glibc # gconv + locale @@ -56,6 +57,10 @@ let python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools ]); + clangFormatPython3 = fetchurl { + url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; + sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l"; + }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -122,7 +127,7 @@ let nativeBuildInputs = [ ninja pkg-config - python2 python3WithPackages perl + python3WithPackages perl gnutar which llvmPackages.bintools ]; @@ -147,6 +152,8 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl + ] ++ optionals (chromiumVersionAtLeast "96") [ + epoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] @@ -209,6 +216,9 @@ let # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc + # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: + base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format + patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index a7ef9e495b..8cc2725e79 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "95.0.4638.40", - "sha256": "1v1n113rh5nzfbk5xaq4kp7fdg5n9rca978a9700nmrd0gqpd2hn", - "sha256bin64": "0xadlal8fb7hqjcq6d931if555spw72wa4d23m0fqcan31sky3i0", + "version": "95.0.4638.49", + "sha256": "11fiq6p2d99hl166pf39g83pk7m7ibi1zz19wj7qmcc7ql7006jz", + "sha256bin64": "04s81fnr01jq74fpl5n6jg8iw5iw6sdwyz40zja68h1crxh5d6d6", "deps": { "gn": { "version": "2021-08-11", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "96.0.4662.6", - "sha256": "14vr0nlp195h0hwfsd43fifl9r3qr875fw2da3gi9l5yi0pxns2q", - "sha256bin64": "1lq114rsgxqrdh18f2x3i0iwdn5ijxw3jb6nrxjxx0c3bvlzhsw8", + "version": "96.0.4664.9", + "sha256": "0hlniaglnd19cb3k2wi9mmf56ws8i89lm5y2dbjpr7vqnmj6qc39", + "sha256bin64": "1crl8gbhjyaa0yhkvm4va0g9dyljra8n5zg9bd1znmjlk0c124x3", "deps": { "gn": { "version": "2021-09-24", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh index c1ce4b3815..9c211f626a 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq -set -eu -o pipefail +set -x -eu -o pipefail cd $(dirname "${BASH_SOURCE[0]}") @@ -14,7 +14,7 @@ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archi SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz) setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix } setKV version ${VERSION} @@ -24,8 +24,15 @@ setKV vendorSha256 "" cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's/ //g') +VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -setKV vendorSha256 ${VENDOR_SHA256} + +if [ -n "${VENDOR_SHA256:-}" ]; then + setKV vendorSha256 ${VENDOR_SHA256} +else + echo "Update failed. VENDOR_SHA256 is empty." + exit 1 +fi + diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix index edd19a25f9..342fd9e686 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -2,10 +2,12 @@ { - helm-diff = callPackage ./helm-diff.nix {}; + helm-diff = callPackage ./helm-diff.nix { }; - helm-s3 = callPackage ./helm-s3.nix {}; + helm-git = callPackage ./helm-git.nix { }; - helm-secrets = callPackage ./helm-secrets.nix {}; + helm-s3 = callPackage ./helm-s3.nix { }; + + helm-secrets = callPackage ./helm-secrets.nix { }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix new file mode 100644 index 0000000000..05ded10444 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, findutils +, git +, gnugrep +, gnused +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "helm-git"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "aslafy-z"; + repo = pname; + rev = "v${version}"; + sha256 = "0hvycqibmlw2zw3nm8rn73v5x1zcgm2jrfdlljbvc1n4n5vnzdrg"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # NOTE: helm-git is comprised of shell scripts. + dontBuild = true; + + installPhase = '' + install -dm755 $out/helm-git + install -m644 -Dt $out/helm-git plugin.yaml + cp helm-git helm-git-plugin.sh $out/helm-git/ + + patchShebangs $out/helm-git/helm-git{,-plugin.sh} + wrapProgram $out/helm-git/helm-git \ + --prefix PATH : ${lib.makeBinPath [ coreutils findutils git gnugrep gnused ]} + + runHook postInstall + ''; + + meta = with lib; { + description = "The Helm downloader plugin that provides GIT protocol support"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh index 1795b48f33..7956e807e9 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq -set -eu -o pipefail +set -x -eu -o pipefail WORKDIR=$(mktemp -d) trap "rm -rf ${WORKDIR}" EXIT @@ -45,7 +45,7 @@ CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix } setKV k3sVersion ${K3S_VERSION} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix new file mode 100644 index 0000000000..a41c3c0ad3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix @@ -0,0 +1,44 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kn"; + version = "0.26.0"; + + src = fetchFromGitHub { + owner = "knative"; + repo = "client"; + rev = "v${version}"; + sha256 = "sha256-hquxv1BluR535WvMtJlVyP7JuARDNGDjPAbdSSj2juo="; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/kn" ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-X knative.dev/client/pkg/kn/commands/version.Version=v${version}" + "-X knative.dev/client/pkg/kn/commands/version.VersionEventing=v${version}" + "-X knative.dev/client/pkg/kn/commands/version.VersionServing=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd kn \ + --bash <($out/bin/kn completion bash) \ + --zsh <($out/bin/kn completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/kn version | grep ${version} > /dev/null + ''; + + meta = with lib; { + description = "The Knative client kn is your door to the Knative world. It allows you to create Knative resources interactively from the command line or from within scripts"; + homepage = "https://github.com/knative/client"; + changelog = "https://github.com/knative/client/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock index d882e3cd2d..7cc11b1af6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -111,7 +111,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - x86_64-linux + ruby DEPENDENCIES krane diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-edge.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-edge.sh index 0ad960edeb..8bf49452b3 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-edge.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-edge.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq -set -eu -o pipefail +set -x -eu -o pipefail cd $(dirname "$0") @@ -14,7 +14,7 @@ VERSION=$(echo ${TAG} | sed 's/^edge-//') SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz) setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./edge.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./edge.nix } setKV version ${VERSION} @@ -25,9 +25,9 @@ cd ../../../../../ set +e VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e +cd - > /dev/null if [ -n "${VENDOR_SHA256:-}" ]; then - cd - > /dev/null setKV vendorSha256 ${VENDOR_SHA256} else echo "Update failed. VENDOR_SHA256 is empty." diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-stable.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-stable.sh index 96280b5071..37314ac1c4 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-stable.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-stable.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq -set -eu -o pipefail +set -x -eu -o pipefail cd $(dirname "$0") @@ -14,7 +14,7 @@ VERSION=$(echo ${TAG} | sed 's/^stable-//') SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz) setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix } setKV version ${VERSION} @@ -25,11 +25,11 @@ cd ../../../../../ set +e VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e +cd - > /dev/null if [ -n "${VENDOR_SHA256:-}" ]; then - cd - > /dev/null - setKV vendorSha256 ${VENDOR_SHA256} + setKV vendorSha256 ${VENDOR_SHA256} else - echo "Update failed. VENDOR_SHA256 is empty." - exit 1 + echo "Update failed. VENDOR_SHA256 is empty." + exit 1 fi diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 7ed122117e..2a6d642d0c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QkUE4oImP0eg5tofGEUonKzffICG4b3SuPJz9S2ZNfE="; + sha256 = "sha256-FRu1h6DT43rPaa9dcgz83w9K+xtzJgB4l/eTu+Fbb+c="; }; - vendorSha256 = "sha256-mPOyF1S/g1FpUHHNc+cy0nxk6rK9txnZPYHOSvvfu70="; + vendorSha256 = "sha256-QFACe1/5MVbXKTknEyqjWclEQgJSZAJ/QljhLq/tWe4="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock index bef5bbef40..08e6b71498 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -38,14 +38,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.18.36" +version = "1.18.60" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.21.36,<1.22.0" +botocore = ">=1.21.60,<1.22.0" jmespath = ">=0.7.1,<1.0.0" s3transfer = ">=0.5.0,<0.6.0" @@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.21.36" +version = "1.21.60" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -70,7 +70,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "certifi" -version = "2021.5.30" +version = "2021.10.8" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -89,7 +89,7 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.0.4" +version = "2.0.7" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -151,7 +151,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "jinja2" -version = "3.0.1" +version = "3.0.2" description = "A very fast and expressive template engine." category = "dev" optional = false @@ -173,7 +173,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "libvirt-python" -version = "7.7.0" +version = "7.8.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -391,7 +391,7 @@ six = ">=1.5" [[package]] name = "pytz" -version = "2021.1" +version = "2021.3" description = "World timezone definitions, modern and historical" category = "dev" optional = false @@ -549,7 +549,7 @@ test = ["pytest"] [[package]] name = "typeguard" -version = "2.12.1" +version = "2.13.0" description = "Run-time type checker for Python" category = "main" optional = false @@ -569,7 +569,7 @@ python-versions = "*" [[package]] name = "urllib3" -version = "1.26.6" +version = "1.26.7" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false @@ -603,16 +603,16 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.18.36-py3-none-any.whl", hash = "sha256:a7fccb61d95230322dd812629455df14167307c569077fa89d297eae73605ffb"}, - {file = "boto3-1.18.36.tar.gz", hash = "sha256:4df1085f5c24504a1b1a6584947f27b67c26eda123f29d3cecce9b2fd683e09b"}, + {file = "boto3-1.18.60-py3-none-any.whl", hash = "sha256:8f3face72d2ac6ad36bd7724410548891ce338b350e6f98574890a7b1d425d78"}, + {file = "boto3-1.18.60.tar.gz", hash = "sha256:45709a04ec5fb67ce5a8eaade3eb0ab24d6eb08d9a9ca6bdb2153047896197fc"}, ] botocore = [ - {file = "botocore-1.21.36-py3-none-any.whl", hash = "sha256:e3e522fbe0bad1197aa7182451dc05f650310e77cf0a77749f6a5e82794c53de"}, - {file = "botocore-1.21.36.tar.gz", hash = "sha256:5b9a7d30e44b8a0a2bbbde62ae01bf6c349017e836985a0248552b00bbce7fae"}, + {file = "botocore-1.21.60-py3-none-any.whl", hash = "sha256:890a5835ac00415ff78f1c7118a774aae83c0c70742284b68abd1176f9d05761"}, + {file = "botocore-1.21.60.tar.gz", hash = "sha256:3e746ca75fb7539ba3f001169264fa54dfaded2477ffc8bd979ce1e1df200620"}, ] certifi = [ - {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, - {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, + {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, + {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, ] cffi = [ {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, @@ -662,8 +662,8 @@ cffi = [ {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, - {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, + {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, + {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -676,6 +676,8 @@ cryptography = [ {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"}, {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, @@ -701,15 +703,15 @@ imagesize = [ {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"}, ] jinja2 = [ - {file = "Jinja2-3.0.1-py3-none-any.whl", hash = "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4"}, - {file = "Jinja2-3.0.1.tar.gz", hash = "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4"}, + {file = "Jinja2-3.0.2-py3-none-any.whl", hash = "sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c"}, + {file = "Jinja2-3.0.2.tar.gz", hash = "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"}, ] jmespath = [ {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, ] libvirt-python = [ - {file = "libvirt-python-7.7.0.tar.gz", hash = "sha256:cc8d6528cef7cf395c5d97566328f16faef6b5653a500b0e88c9c0fc36b72cdb"}, + {file = "libvirt-python-7.8.0.tar.gz", hash = "sha256:9d07416d66805bf1a17f34491b3ced2ac6c42b6a012ddf9177e0e3ae1b103fd5"}, ] markupsafe = [ {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, @@ -804,8 +806,8 @@ python-dateutil = [ {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pytz = [ - {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, - {file = "pytz-2021.1.tar.gz", hash = "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da"}, + {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"}, + {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, ] requests = [ {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, @@ -852,8 +854,8 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] typeguard = [ - {file = "typeguard-2.12.1-py3-none-any.whl", hash = "sha256:cc15ef2704c9909ef9c80e19c62fb8468c01f75aad12f651922acf4dbe822e02"}, - {file = "typeguard-2.12.1.tar.gz", hash = "sha256:c2af8b9bdd7657f4bd27b45336e7930171aead796711bc4cfc99b4731bb9d051"}, + {file = "typeguard-2.13.0-py3-none-any.whl", hash = "sha256:0bc44d1ff865b522eda969627868b0e001c8329296ce50aededbea03febc79ee"}, + {file = "typeguard-2.13.0.tar.gz", hash = "sha256:04e38f92eb59410c9375d3be23df65e0a7643f2e8bcbd421423d808d2f9e99df"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, @@ -861,6 +863,6 @@ typing-extensions = [ {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ - {file = "urllib3-1.26.6-py2.py3-none-any.whl", hash = "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4"}, - {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, + {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"}, + {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"}, ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix index 092a620b98..53430cdf94 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.11"; - sha256 = "15h7w020p576zl91s5mr4npcmngrqqfj9xzlx6bk9i1cp6h4w0jy"; + version = "1.0.12"; + sha256 = "04fqliz7y4zzs4xraid54mqxwgrzh138nmfcs876vp534slvikpi"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix index 6363852068..b8c58e9c34 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -6,7 +6,7 @@ callPackage ./genericModule.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.1.5"; - sha256 = "03gxh12bd5mj1l4q3xilil806dsqaqmz93ff7ysf441frgkx3iy3"; + version = "1.1.6"; + sha256 = "1q6fqay1s9qwimjwlldc8hr6009cgx3ghz142mdx36jjv9isj9ln"; vendorSha256 = "0rfd22rf76mwj489zhswah4g3dhhz6davm336xgm9dbnyaz9d8r0"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 15ce26b6db..7be9c9cc74 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1095,12 +1095,13 @@ "version": "0.1.0" }, "vault": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v2.11.0", - "sha256": "1yzakc7jp0rs9axnfdqw409asrbjhq0qa7xn4xzpi7m94g1ii12d", - "version": "2.11.0" + "rev": "v2.24.1", + "sha256": "1xk14q06js774lqyylkbp53dnlsbgh3vi38mqqmndh80xigs6d99", + "version": "2.24.1", + "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48" }, "vcd": { "owner": "terraform-providers", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index cab256d927..ba034056c9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,8 +195,8 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.8"; - sha256 = "1755m3h9iz086znjpkhxjbyl3jaxpsqmk73infn9wbhql8pq2wil"; + version = "1.0.9"; + sha256 = "0g97l53xrcafjrzz5inij4q4aaadibn5ilr5j39a6569pkvcvsh3"; vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index 8b81d11343..e9c85450f4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.137"; + version = "3.1.139"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "15zl97laijn42rhh524rfb3h1rky461hwfnlny2maa3h61889xrv"; + sha256 = "0gnj89q5mv5qiy6zsp85sswmwzm0y73nffjj3vrccx5lmxd955nv"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 5b14fba5b4..874fbd6375 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -2,7 +2,7 @@ freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, -hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }: +hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk, libappindicator-gtk3 }: let rpath = lib.makeLibraryPath [ @@ -21,6 +21,7 @@ let gnome2.GConf gtk3 pango + libappindicator-gtk3 libuuid libX11 libXScrnSaver diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix index 9d8a0d68e7..9b15e12d66 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,33 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, openssl -, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive - -, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null -, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null -, traySupport ? true, gtk2 ? null -, pgpSupport ? true, gpgme ? null -, pythonPluginSupport ? true, python ? null -, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null +{ lib +, stdenv +, fetchFromGitHub +, autoconf-archive +, autoreconfHook +, cmocka +, curl +, expat +, expect +, glib +, glibcLocales +, libmesode +, libmicrohttpd +, libotr +, libuuid +, ncurses +, openssl +, pkg-config +, readline +, sqlite +, autoAwaySupport ? true, libXScrnSaver ? null, libX11 +, notifySupport ? true, libnotify, gdk-pixbuf +, omemoSupport ? true, libsignal-protocol-c, libgcrypt +, pgpSupport ? true, gpgme +, pythonPluginSupport ? true, python +, traySupport ? true, gtk }: assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; assert notifySupport -> libnotify != null && gdk-pixbuf != null; -assert traySupport -> gtk2 != null; +assert traySupport -> gtk != null; assert pgpSupport -> gpgme != null; assert pythonPluginSupport -> python != null; assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; -with lib; - stdenv.mkDerivation rec { pname = "profanity"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "0xmzsh0szm8x3hgw65j0cd2bp8cmrnq5pjz49lqajircyzflsngm"; + hash = "sha256-8WGHOy0fSW8o7vMCYZqqpvDsn81JZefM6wGfjQ5iKbU="; }; patches = [ @@ -37,26 +51,42 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - autoreconfHook autoconf-archive glibcLocales pkg-config + autoconf-archive + autoreconfHook + glibcLocales + pkg-config ]; buildInputs = [ - expect readline libuuid glib openssl expat ncurses libotr - curl libmesode cmocka libmicrohttpd sqlite - ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] - ++ optionals notifySupport [ libnotify gdk-pixbuf ] - ++ optionals traySupport [ gtk2 ] - ++ optionals pgpSupport [ gpgme ] - ++ optionals pythonPluginSupport [ python ] - ++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ]; + cmocka + curl + expat + expect + glib + libmesode + libmicrohttpd + libotr + libuuid + ncurses + openssl + readline + sqlite + ] ++ lib.optionals autoAwaySupport [ libXScrnSaver libX11 ] + ++ lib.optionals notifySupport [ libnotify gdk-pixbuf ] + ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ] + ++ lib.optionals pgpSupport [ gpgme ] + ++ lib.optionals pythonPluginSupport [ python ] + ++ lib.optionals traySupport [ gtk ]; # Enable feature flags, so that build fail if libs are missing - configureFlags = [ "--enable-c-plugins" "--enable-otr" ] - ++ optionals notifySupport [ "--enable-notifications" ] - ++ optionals traySupport [ "--enable-icons-and-clipboard" ] - ++ optionals pgpSupport [ "--enable-pgp" ] - ++ optionals pythonPluginSupport [ "--enable-python-plugins" ] - ++ optionals omemoSupport [ "--enable-omemo" ]; + configureFlags = [ + "--enable-c-plugins" + "--enable-otr" + ] ++ lib.optionals notifySupport [ "--enable-notifications" ] + ++ lib.optionals traySupport [ "--enable-icons-and-clipboard" ] + ++ lib.optionals pgpSupport [ "--enable-pgp" ] + ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ] + ++ lib.optionals omemoSupport [ "--enable-omemo" ]; preAutoreconf = '' mkdir m4 @@ -66,18 +96,15 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.utf8"; - meta = { + meta = with lib; { + homepage = "http://www.profanity.im/"; description = "A console based XMPP client"; longDescription = '' Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi. ''; - homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; - platforms = platforms.unix; - changelog = "https://github.com/profanity-im/profanity/releases/tag/${version}"; - downloadPage = "https://github.com/profanity-im/profanity/releases/"; maintainers = [ maintainers.devhell ]; - updateWalker = true; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 22ee49b926..fae4eff734 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -40,15 +40,43 @@ assert builtins.elem (lib.toLower chatType) [ assert enablePsiMedia -> enablePlugins; -mkDerivation rec { +mkDerivation { pname = "psi-plus"; - version = "1.5.1549"; + + # Version mask is “X.X.XXXX-R” where “X.X.XXXX” is a mandatory version of Psi + # and “-R” ending is optional revision number. + # + # The “psi-plus-snapshots” generally provides snapshots of these separate + # repositories glued together (there are also dependencies/libraries): + # + # 1. Psi + # 2. Plugins pack for Psi + # 3. “psimedia” plugin + # 4. Resources for Psi (icons, skins, sounds) + # + # “X.X.XXXX” is literally a version of Psi. + # So often when for instance plugins are updated separately a new snapshot is + # created. And that snapshot would also be linked to “X.X.XXXX” version. + # So many commits may have the same associated version of the snapshot. + # But mind that only one Git tag is created for “X.X.XXXX” version. + # + # It’s not yet defined in the Psi+ project what value to use as a version for + # any further releases that don’t change Psi version. + # + # Let’s do what Debian does for instance (appends “-R” where “R” is a revision + # number). + # E.g. https://tracker.debian.org/news/1226321/psi-plus-14554-5-migrated-to-testing/ + # + # This has been communicated with the Psi+ main devs in this XMPP MUC chat: + # psi-dev@conference.jabber.ru + # + version = "1.5.1556-2"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; - rev = version; - sha256 = "0jpv6qzfg6xjwkrnci7fav27nxm174i9l5g4vmsbchqpwfk90z2m"; + rev = "635879010b6697f7041a7bbea1853a1f4673c7f7"; + sha256 = "18xvljcm0a9swkyz4diwxi4xaj0w27jnhfgpi8fv5fj11j0g1b3a"; }; cmakeFlags = [ @@ -96,7 +124,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://psi-plus.com"; - description = "XMPP (Jabber) client"; + description = "XMPP (Jabber) client based on Qt5"; maintainers = with maintainers; [ orivej misuzu unclechu ]; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index c36159bfab..ea5ca8bebf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.7.1"; + version = "1.7.3"; in appimageTools.wrapType2 { name = "session-desktop-appimage-${version}"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "126dx37099pjaqgfv5gbmvn5iiwv2a8lvfbqy5i9h1w1gqnihwq6"; + sha256 = "0s0zvj9ddrngdzsx8hd07pq3150sq8ab1hbpsi9i2ir99sv1p7gn"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix index d169e1fdea..04f1732f7a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alpine"; - version = "2.24"; + version = "2.25"; src = fetchurl { url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz"; - sha256 = "1vxw19nx10y7nx01d9i6gah2f3y5r2idbq56l13bdqi91bx9y6k5"; + sha256 = "0xppxhcbafq9qa1rns5zl0n238gai08xhvcf2as0nx7nh84ib2k5"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index 50b3b66f15..23b636458c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,27 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, fetchpatch +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: stdenv.mkDerivation rec { - version = "20210205"; + version = "20211015"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY="; + sha256 = "sha256-ObYeh9Q/WZ1N60pxR2LoDNCU8rP4tQt/oIxnqALqMhs="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-32055.patch"; - url = "https://github.com/neomutt/neomutt/commit/fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc.patch"; - sha256 = "0bb7gisjynq3w7hhl6vxa469h609bcz6fkdi8vf740pqrwhk68yn"; - }) - ]; - buildInputs = [ cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 01ad09cd25..19354df40a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -1,28 +1,54 @@ -{ lib, fetchurl, appimageTools }: +{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, makeWrapper, +electron, libsecret }: -let +stdenv.mkDerivation rec { pname = "tutanota-desktop"; version = "3.88.4"; - name = "tutanota-desktop-${version}"; + src = fetchurl { - url = "https://mail.tutanota.com/desktop/tutanota-desktop-linux.AppImage"; - name = "tutanota-desktop-${version}.AppImage"; - sha256 = "sha256-MwvH6SGZwcvxAr5olklqKTF2p2pv8+F5qwpmwN3uZkc="; + url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; + name = "tutanota-desktop-${version}.tar.gz"; + sha256 = "sha256-UOb63+NfW6mHKaj3PDEzvz5hcmJBIISq02rtwgSZMjo="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { - inherit name src; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + dontConfigure = true; + dontBuild = true; - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + desktopItems = makeDesktopItem { + name = pname; + exec = "tutanota-desktop"; + icon = "tutanota-desktop"; + comment = meta.description; + desktopName = "Tutanota Desktop"; + genericName = "Email Reader"; + }; - install -m 444 -D ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications - substituteInPlace $out/share/applications/tutanota-desktop.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/opt/tutanota-desktop $out/share/tutanota-desktop + + cp -r ./ $out/opt/tutanota-desktop + mv $out/opt/tutanota-desktop/{locales,resources} $out/share/tutanota-desktop + + for icon_size in 64 512; do + icon=resources/icons/icon/$icon_size.png + path=$out/share/icons/hicolor/$icon_size'x'$icon_size/apps/tutanota-desktop.png + install -Dm644 $icon $path + done + + makeWrapper ${electron}/bin/electron \ + $out/bin/tutanota-desktop \ + --add-flags $out/share/tutanota-desktop/resources/app.asar \ + --run "mkdir /tmp/tutanota" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]} + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix index ddf06a784f..3560e8066d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "opsdroid"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "opsdroid"; repo = "opsdroid"; rev = "v${version}"; - sha256 = "1p1x7jbp0jx8anfwvavyn3x8i1vfhmbzyzrm014n26v5y39gabj1"; + sha256 = "15l2jvcpb9l8sgdd9zsvxqglf1r3vap0pp9cklpfa9jj0aik6nx9"; }; disabled = !python3Packages.isPy3k; diff --git a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix index 7c9a697243..15688d383b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.9.0.5150"; + version = "2.9.1.5500"; src = fetchurl { url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "0nf68x840p30yng4fh1nlyiqg40z0rkcv0lskpz8dd4pj1iw5jjs"; + sha256 = "0h4dclxr6kmhmx318wvxz36lhyqw84q0mg4c6di6p230mp8b1l4v"; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix index 88304e56a4..dc3e8b25e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { meta = base.meta // { description = "A fast incremental file transfer utility"; - maintainers = with lib.maintainers; [ peti ehmry kampfschlaefer ]; + maintainers = with lib.maintainers; [ ehmry kampfschlaefer ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/antiword/default.nix b/third_party/nixpkgs/pkgs/applications/office/antiword/default.nix index 67a37b2d51..f0aa323554 100644 --- a/third_party/nixpkgs/pkgs/applications/office/antiword/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/antiword/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation { description = "Convert MS Word documents to plain text or PostScript"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.peti ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix index d4dad44d7d..5bd8450a0b 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { homepage = "http://www.gnucash.org/"; - maintainers = [ lib.maintainers.peti lib.maintainers.domenkozar ]; + maintainers = [ lib.maintainers.domenkozar ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/khronos/default.nix b/third_party/nixpkgs/pkgs/applications/office/khronos/default.nix index b3a3890553..f319b419fb 100644 --- a/third_party/nixpkgs/pkgs/applications/office/khronos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/khronos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , meson @@ -6,25 +7,24 @@ , vala , pkg-config , desktop-file-utils -, pantheon , python3 , glib , gtk4 , json-glib , libadwaita , libgee -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "khronos"; - version = "3.5.9"; + version = "3.6.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "sha256-3FatmyANB/tNYSN2hu5IVkyCy0YrC3uA2d/3+5u48w8="; + sha256 = "sha256-AETyVCBUuBzHwDgTkGRIokFYwcmXrb/F85J5GEIu4dE="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -43,12 +43,14 @@ stdenv.mkDerivation rec { json-glib libadwaita libgee - pantheon.granite ]; postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py + # https://github.com/lainsce/khronos/pull/75 + substituteInPlace build-aux/post_install.py \ + --replace 'gtk-update-icon-cache' 'gtk4-update-icon-cache' ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/office/minetime/default.nix b/third_party/nixpkgs/pkgs/applications/office/minetime/default.nix deleted file mode 100644 index 1971a78294..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/minetime/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ appimageTools, fetchurl, lib, runCommand, stdenv, gsettings-desktop-schemas, gtk3, zlib }: - -let - name = "${pname}-${version}"; - pname = "minetime"; - version = "1.8.10"; - appimage = fetchurl { - url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage"; - sha256 = "1a80lgk6v9kv9xb2y3i08gk25jm0pqyl57kfr5p1rbc33prhmcgw"; - }; - extracted = appimageTools.extractType2 { - inherit name; - src = appimage; - }; - patched = runCommand "minetime-patchelf" {} '' - cp -av ${extracted} $out - - x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService - chmod +w $x - - patchelf \ - --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ - $x - ''; -in -appimageTools.wrapAppImage rec { - inherit name; - src = patched; - - profile = '' - export LC_ALL=C.UTF-8 - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; - - multiPkgs = null; # no 32bit needed - extraPkgs = ps: - appimageTools.defaultFhsEnvArgs.multiPkgs ps - ++ (with ps; [ at-spi2-core at-spi2-atk libsecret libnotify ]); - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; - - meta = with lib; { - description = "Modern, intuitive and smart calendar application"; - homepage = "https://minetime.ai"; - license = licenses.unfree; - # Should be cross-platform, but for now we just grab the appimage - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ dtzWill ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix index 37f04e0ba5..6b76c2de4b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { description = "Real-time 3D simulation of space"; changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 02ef96e2e1..898885047a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -37,6 +37,6 @@ mkDerivation rec { homepage = "http://stellarium.org/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ peti ma27 ]; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix index 5a46e8f638..6a39995855 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.peti ]; hydraPlatforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix index f0cb1efb30..c6b1f66524 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { install -Dm0755 build/cadical "$out/bin/cadical" install -Dm0755 build/mobical "$out/bin/mobical" install -Dm0644 src/ccadical.h "$dev/include/ccadical.h" + install -Dm0644 src/cadical.hpp "$dev/include/cadical.hpp" install -Dm0644 build/libcadical.a "$lib/lib/libcadical.a" mkdir -p "$out/share/doc/${pname}/" install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}/" diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 723b67872c..16db7384df 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -44,7 +44,7 @@ let "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; - "8.14+rc1".sha256 = "0jrkgj7c2959dsinw4x7q4ril1x24qq08snl25hgx33ls4sym5zb"; + "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix index fc2c1e5cba..cbc85c5544 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.nix @@ -1,20 +1,31 @@ -{ lib, stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, eprover, ocaml, camlp4, perl, zlib }: stdenv.mkDerivation rec { pname = "leo2"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; - sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv"; + sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ eprover ocaml perl zlib ]; + buildInputs = [ eprover ocaml camlp4 perl zlib ]; - sourceRoot = "leo2/src"; + patches = [ (fetchpatch { + url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch"; + stripLen = 1; + extraPrefix = "lib/"; + sha256 = "sha256:01ln7hi6nvvkqkhn9hciqizizz5qspvqffgksvgmzn9x7kdd9pnh"; + }) + ]; - preConfigure = "patchShebangs configure"; + preConfigure = '' + cd src + patchShebangs configure + substituteInPlace Makefile.pre \ + --replace '+camlp4' "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" + ''; buildFlags = [ "opt" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/yices/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/yices/default.nix index 55b773b976..c5fc3a7383 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/yices/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/yices/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "yices"; - version = "2.6.3"; + # We never want X.Y.${odd} versions as they are moving development tags. + version = "2.6.2"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "yices2"; rev = "Yices-${version}"; - sha256 = "01fi818lbkwilfcf1dz2dpxkcc1kh8ls0sl5aynyx9pwfn2v03zl"; + sha256 = "1jx3854zxvfhxrdshbipxfgyq1yxb9ll9agjc2n0cj4vxkjyh9mn"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -25,12 +26,16 @@ stdenv.mkDerivation rec { # Usual shenanigans patchPhase = "patchShebangs tests/regress/check.sh"; - # Includes a fix for the embedded soname being libyices.so.2.5, but - # only installing the libyices.so.2.5.x file. + # Includes a fix for the embedded soname being libyices.so.X.Y, but + # only installing the libyices.so.X.Y.Z file. installPhase = let ver_XdotY = lib.versions.majorMinor version; in '' make install LDCONFIG=true + # guard against packaging of unstable versions: they + # have a soname of hext (not current) release. + echo "Checking expected library version to be ${version}" + [ -f $out/lib/libyices.so.${version} ] ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}} ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix index 263130c281..c26964bb31 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = with maintainers; [ peti ] ++ teams.sage.members; + maintainers = with maintainers; teams.sage.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix index 6b6bfd7d6e..0c3ef25909 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/eukleides/default.nix @@ -63,6 +63,5 @@ lib.fix (eukleides: stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix index 2b82a8f817..3f295b416f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix @@ -113,6 +113,5 @@ stdenv.mkDerivation ({ ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index 2205e96383..57e4a6f1d3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "https://wxmaxima-developers.github.io/wxmaxima/"; platforms = platforms.linux; - maintainers = [ maintainers.peti ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index ceb2c36d96..9fa8e6e625 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-TjBUVP9/hMB8yFnupSxwHDr5bmtiMFwsDi1axsD5ykA="; + sha256 = "sha256-70FmFN76azRqnAZ9SLgr/V8moqkWoBbDB6IdSXM7Vmg="; }; - vendorSha256 = "sha256-ZsMzLJ+eHAKNxhVFpQxRyTv/rcWvxA/luKPjXT+Zt4Y="; + vendorSha256 = "sha256-004TspNwjCWnrD86HEf5wGpt8OCP5qIrTwlGWSRNUmg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index fb5113dad0..97b96f7461 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "0sx45y1d1v6y66msjc1lw9jhjppgbxqj145kivmd7lr6ccw68kav"; + sha256 = "sha256-drfMD9tQe1dc61MH3Cxu9oin137f4FsZJY3X2kDHdh4="; }; nativeBuildInputs = [ installShellFiles ]; @@ -33,16 +33,15 @@ buildPythonApplication rec { installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh ''; + postInstallCheck = '' + git init + test "$($out/bin/git-machete version)" = "git-machete version ${version}" + ''; + passthru = { updateScript = nix-update-script { attrPath = pname; }; - - tests = { - version = testVersion { - package = git-machete; - }; - }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index a5a20b3aa9..6bdefb8cb3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -367,6 +367,6 @@ stdenv.mkDerivation { ''; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ primeos peti wmertens globin ]; + maintainers = with lib.maintainers; [ primeos wmertens globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 20219be776..b46cfb8ee8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dRHlbxNV4nS50WbJP5lD1zB7NkZmv7nlPUm3RlQIBtc="; + sha256 = "sha256-NzE2eT3QxnbDW63Cnv6M7IlYgb2XuymphwaL1PTfcyQ="; }; - cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE="; + cargoSha256 = "sha256-9SWovdjYfeneqOVl+I+tuJTIC/htC7h1tXi2KUbdYb8="; nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 0fd180c441..6aa639be86 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -1,12 +1,9 @@ { lib , fetchFromGitHub -, crystal_1_0 +, crystal }: -let - crystal = crystal_1_0; - -in crystal.buildCrystalPackage rec { +crystal.buildCrystalPackage rec { pname = "thicket"; version = "0.1.5"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index 4126eabed2..849965e15f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.17.1"; + version = "2.17.2"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-ZVwMfjlKga47oXf6g/P2IAMu6Fcuj8BbRahniTZXmTg="; + sha256 = "sha256-JfT0jW6aUZAYESQI0tFfnITFv20Jk7DWbvz8Ipt4t1Y="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 6578d5e2a0..ff1689f28f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.3.2", - "repo_hash": "1vsppz5akx5l54riacqbzkgdy47j9r71550mg2ay5ihy6iqxa2xr", + "version": "14.3.3", + "repo_hash": "1sh8lf6arqljzc0hmajl2r2j38ahk9hl6kikg9inw72xycrll7dk", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.3.2-ee", + "rev": "v14.3.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.3.2", + "GITALY_SERVER_VERSION": "14.3.3", "GITLAB_PAGES_VERSION": "1.44.0", "GITLAB_SHELL_VERSION": "13.21.1", - "GITLAB_WORKHORSE_VERSION": "14.3.2" + "GITLAB_WORKHORSE_VERSION": "14.3.3" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index 26d8cb1732..88c92df71e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -80,11 +80,6 @@ let # Fixup "resolved"-entries in yarn.lock to match our offline cache ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock - # fixup_yarn_lock currently doesn't correctly fix the dagre-d3 - # url, so we have to do it manually - ${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \ - '"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index b8d8c4dfb8..26deabcc23 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -20,7 +20,7 @@ let }; }; }; - version = "14.3.2"; + version = "14.3.3"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -32,7 +32,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-00Sgv1b3dwbN7ic//7NtrdiliunOnXRJ0GTQHYFjuqo="; + sha256 = "sha256-WC361E+p3i02n2YCOwUzRxCWFt5UMEfJi6tHZPj1dgo="; }; vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 84b0b2580e..3e3bc25162 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.3.2"; + version = "14.3.3"; src = fetchFromGitLab { owner = data.owner; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index dd2970c3ed..51ccc8a03c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1650,4 +1650,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.2.24 + 2.2.20 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix index 9859163031..f3400f7e8e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # should be odd-unstable but we are tracking unstable versions for now }; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock index e90405c9a8..00ac026e86 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock @@ -77,7 +77,7 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.0.3) @@ -90,12 +90,12 @@ GEM nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) - parallel (1.20.1) + parallel (1.21.0) parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) public_suffix (4.0.6) - puma (5.4.0) + puma (5.5.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -120,7 +120,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) railties (5.2.6) actionpack (= 5.2.6) @@ -146,11 +146,11 @@ GEM railties (>= 5.1, < 6.2) roadie (>= 3.1, < 5.0) rotp (6.2.0) - rouge (3.26.0) - rqrcode (2.0.0) + rouge (3.26.1) + rqrcode (2.1.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) - rqrcode_core (1.1.0) + rqrcode_core (1.2.0) rubocop (1.12.1) parallel (~> 1.10) parser (>= 3.0.0.0) @@ -160,7 +160,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.10.0) + rubocop-ast (1.12.0) parser (>= 3.0.1.1) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) @@ -190,8 +190,8 @@ GEM thread_safe (0.3.6) tzinfo (1.2.9) thread_safe (~> 0.1) - unicode-display_width (2.0.0) - webdrivers (4.6.0) + unicode-display_width (2.1.0) + webdrivers (4.6.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) @@ -245,7 +245,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 2.7.3p183 + ruby 2.7.4p191 BUNDLED WITH 2.1.4 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix index eb6218826b..5a964f51e3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let - version = "4.2.2"; + version = "4.2.3"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1xlqf7g5imjmc3as2aajvbrs217jh3qpdvvpsd9mka9rk4kykyz6"; + sha256 = "033slhr5kmz5b29v7n52336i0r7y4m9si748b22r85s2jpf37xkj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix index 376084e80d..dbbef0f218 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix @@ -301,10 +301,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3"; + sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; method_source = { groups = ["default"]; @@ -420,10 +420,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; type = "gem"; }; - version = "1.20.1"; + version = "1.21.0"; }; parser = { dependencies = ["ast"]; @@ -470,10 +470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; + sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; type = "gem"; }; - version = "5.4.0"; + version = "5.5.2"; }; racc = { groups = ["default" "test"]; @@ -545,10 +545,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; + sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.2"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -680,10 +680,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; + sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; type = "gem"; }; - version = "3.26.0"; + version = "3.26.1"; }; rqrcode = { dependencies = ["chunky_png" "rqrcode_core"]; @@ -691,20 +691,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "073w0qgjydkqpsqsb9yr8qg0mhvwlzx6z53hqr2b5zifvb9wzh02"; + sha256 = "0444sgvx3ahvgr3c9swpy32kcdpciwgcqahp3pb4m7d23xp1qjdc"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; rqrcode_core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d632w2pd34bw9l3bsfnyqaa8vgbz9pxpj29gpf8parqr7wq922k"; + sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; rubocop = { dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -723,10 +723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x6za0j9wwxr14rkkkmpbnwj04lak4yjmkyrdl8c31m9acba80zw"; + sha256 = "0x0xfq2mpg194rcanbjrgvjbh94s9kq72jynxx61789s628kxy59"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -870,10 +870,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bilbnc8j6jkb59lrf177i3p1pdyxll0n8400hzqr35vl3r3kv2m"; + sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; @@ -881,10 +881,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hi6pgkfwgz1bzfclyrr449xy9y2f2bcrnnnlb5ghvvrqkgn0dry"; + sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp"; type = "gem"; }; - version = "4.6.0"; + version = "4.6.1"; }; websocket-driver = { dependencies = ["websocket-extensions"]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix index 814ffacefc..715ae0978c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "verco"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "vamolessa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZfiGDEx6gjYziatbQSpqghmpXMXSPPBtTVYjll922t8="; + sha256 = "sha256-H8rDaRVU3G3iuBv0Tz/YOuYbL2k8wEoEIIEG7hjU6eM="; }; - cargoSha256 = "sha256-jrA6vGw+lyfix8L3INBamrJ4pab5denPzWwjF0dRXB0="; + cargoSha256 = "sha256-4Ou/stedL3WCY4Awsl++lc5fZ9gxd4uorf4G2/0DiPc="; meta = with lib; { description = "A simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix index 1e2abb45a5..76d4ec85a0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; - maintainers = with maintainers; [ peti jshcmpbll ]; + maintainers = with maintainers; [ jshcmpbll ]; license = licenses.gpl2; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix index 3a613f26ae..ce9a72aebf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate fluidsynth wayland wayland-protocols ncurses srt - ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 + ] ++ optional (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) live555 ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ]) ++ optional jackSupport libjack2 @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64) then live555 else null; + LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) then live555 else null; # vlc depends on a c11-gcc wrapper script which we don't have so we need to # set the path to the compiler diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix index d8b6dfc2ef..54378dbe13 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix @@ -2,6 +2,7 @@ , csmSupport ? false, seabios ? null , secureBoot ? false , httpSupport ? false +, tpmSupport ? false }: assert csmSupport -> seabios != null; @@ -30,9 +31,10 @@ edk2.mkDerivation projectDscPath { hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; buildFlags = - lib.optional secureBoot "-DSECURE_BOOT_ENABLE=TRUE" + lib.optional secureBoot "-D SECURE_BOOT_ENABLE=TRUE" ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] - ++ lib.optionals httpSupport [ "-DNETWORK_HTTP_ENABLE=TRUE" "-DNETWORK_HTTP_BOOT_ENABLE=TRUE" ]; + ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] + ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; postPatch = lib.optionalString csmSupport '' cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix new file mode 100644 index 0000000000..3ce3d9a880 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "docker-compose"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "compose"; + rev = "v${version}"; + sha256 = "sha256-6OjA3f6c9s/86UPxy9EqLIc/0ZuW6UhKyQdkM7YoTsU="; + }; + + vendorSha256 = "sha256-6h36TZmo0RvB3YzZRmsrs2Fbl+8zPTuL9LxWkuNgRqw="; + + doCheck = false; + installPhase = '' + install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose + ''; + + meta = with lib; { + description = "Docker CLI plugin to define and run multi-container applications with Docker"; + license = licenses.asl20; + maintainers = [ maintainers.babariviere ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index 24bd7a1339..8345b2b42d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -8,16 +8,16 @@ rec { , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? true + , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool - , sqlite, iproute2, lvm2, systemd, docker-buildx + , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp , nixosTests - , clientOnly ? !stdenv.isLinux + , clientOnly ? !stdenv.isLinux, symlinkJoin }: let docker-runc = runc.overrideAttrs (oldAttrs: { @@ -117,6 +117,10 @@ rec { ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; }); + + plugins = optionals buildxSupport [ docker-buildx ] + ++ optionals composeSupport [ docker-compose_2 ]; + pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in buildGoPackage ((optionalAttrs (!clientOnly) { @@ -141,14 +145,14 @@ rec { ]; buildInputs = optionals (!clientOnly) [ sqlite lvm2 btrfs-progs systemd libseccomp - ] ++ optionals (buildxSupport) [ docker-buildx ]; + ] ++ plugins; postPatch = '' patchShebangs man scripts/build/ substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - '' + optionalString buildxSupport '' + '' + optionalString (plugins != []) '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ - ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} + "${pluginsRef}/libexec/docker/cli-plugins" ''; # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables diff --git a/third_party/nixpkgs/pkgs/data/fonts/gdouros/default.nix b/third_party/nixpkgs/pkgs/data/fonts/gdouros/default.nix index eb6635ec3a..a707d6f25a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/gdouros/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/gdouros/default.nix @@ -2,36 +2,36 @@ let fonts = { - aegan = { version = "10.00"; file = "Aegean.zip"; sha256 = "0k47nhzw4vx771ch3xx8mf6xx5vx0hg0cif5jdlmdaz4h2c3rawz"; description = "Aegean"; }; - aegyptus = { version = "8.00"; file = "Aegyptus.zip"; sha256 = "13h2pi641k9vxgqi9l11mjya10ym9ln54wrkwxx6gxq63zy7y5mj"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; - akkadian = { version = "7.18"; file = "Akkadian.zip"; sha256 = "1bplcvszbdrk85kqipn9lzhr62647wjibz1p8crzjvsw6f9ymxy3"; description = "Sumero-Akkadian Cuneiform"; }; - assyrian = { version = "2.00"; file = "AssyrianFont.zip"; sha256 = "0vdvb24vsnmwzd6bw14akqg0hbvsk8avgnbwk9fkybn1f801475k"; description = "Neo-Assyrian in Unicode with OpenType"; }; - eemusic = { version = "2.00"; file = "EEMusic.zip"; sha256 = "1y9jf105a2b689m7hdjmhhr7z5j0qd2w6dmb3iic9bwaczlrjy7j"; description = "Byzantine Musical Notation in Unicode with OpenType"; }; - maya = { version = "4.18"; file = "Maya.zip"; sha256 = "08z2ch0z2c43fjfg5m4yp3l1dp0cbk7lv5i7wzsr3cr9kr59wpi9"; description = "Maya Hieroglyphs"; }; - symbola = { version = "12.00"; file = "Symbola.zip"; sha256 = "1i3xra33xkj32vxs55xs2afrqyc822nk25669x78px5g5qd8gypm"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; - textfonts = { version = "9.00"; file = "Textfonts.zip"; sha256 = "0wzxz4j4fgk81b88d58715n1wvq2mqmpjpk4g5hi3vk77y2zxc4d"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; - unidings = { version = "9.19"; file = "Unidings.zip"; sha256 = "1bybzgdqhmq75hb12n3pjrsdcpw1a6sgryx464s68jlq4zi44g78"; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; + aegan = { version = "13.00"; file = "Aegean.zip"; sha256 = "1w4ks341jw12p6zi1fy1hb3kqiqv61yn8i2hr9ybng9n8xdw03li"; description = "Aegean"; }; + aegyptus = { version = "13.00"; file = "Aegyptus.zip"; sha256 = "16j8rj3mr2cddag7laxvzpm5w3yk467fwzsk60nq8pnh6ab1v05y"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; + akkadian = { version = "13.00"; file = "Akkadian.zip"; sha256 = "1f2v9cjk307c5lw0si9hwjcll5wb9nwwy5im0y16kvpgwh2ccshc"; description = "Sumero-Akkadian Cuneiform"; }; + assyrian = { version = "13.00"; file = "Assyrian.zip"; sha256 = "18nx6ayfk3ba6wg1rp37r9fll5ajrwq2mp5w2l3y1q1kk92frkid"; description = "Neo-Assyrian in Unicode with OpenType"; }; + eemusic = { version = "13.00"; file = "EEMusic.zip"; sha256 = "1kk5rd3wd7y13z9bqcg1k9idbwad4l3hfmi3lbfk4y1w895vgxk2"; description = "Byzantine Musical Notation in Unicode with OpenType"; }; + maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; sha256 = "0fzzrlkd4m2dj2phg97nz782w0afmw0f0ykdvlwyp29j1ak7yyp1"; description = "Maya Hieroglyphs"; }; + symbola = { version = "13.00"; file = "Symbola.zip"; sha256 = "04pxh5agvlkyg8mvv2szwshnmzi3n0m7va4xsyq401zbsa147rmi"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; + textfonts = { version = "13.00"; file = "Textfonts.zip"; sha256 = "1xp8qlfpvcf5n96zgm07zij3ndlzvqjlii8gx9sbj5aa56rxkdgb"; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; + unidings = { version = "13.00"; file = "Unidings.zip"; sha256 = "0cvnxblk9wsr8mxm5lrdpdm456vi7lln7qh53b67npg4baf0as63"; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; }; mkpkg = name_: {version, file, sha256, description}: fetchzip rec { name = "${name_}-${version}"; - url = "http://users.teilar.gr/~g1951d/${file}"; + url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; postFetch = '' mkdir -p $out/share/{fonts,doc} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.docx \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.odt \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any rmdir "$out/share/doc/${name}" $out/share/doc || true # remove dirs if empty ''; inherit sha256; meta = { inherit description; - # see http://users.teilar.gr/~g1951d/License.pdf + # see https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf # quite draconian: non-commercial, no modifications, # no redistribution, "a single instantiation and no # network installation" license = lib.licenses.unfree; - homepage = "http://users.teilar.gr/~g1951d/"; + homepage = "https://dn-works.com/ufas/"; }; }; in diff --git a/third_party/nixpkgs/pkgs/data/fonts/inconsolata/default.nix b/third_party/nixpkgs/pkgs/data/fonts/inconsolata/default.nix index 327b7fa2ca..57069fadbc 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/inconsolata/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/inconsolata/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, google-fonts }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "inconsolata"; + version = "unstable-2021-01-19"; - inherit (google-fonts) src version; + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a"; + sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; + }; installPhase = '' - install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf + install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix index 00de4f6760..c0f65ab7ea 100644 --- a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2021-07-14"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2"; + sha256 = "0qbbg0hcdda7apk892b8nhbrsvji12nv97ss7lv412xwcmxsj9fp"; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index a1af75ba6a..ad72f3e357 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "ba457d86df5e8781485cf1b109f249ecf00ee4c6", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ba457d86df5e8781485cf1b109f249ecf00ee4c6.tar.gz", - "sha256": "1h1qnllhdfp6n71b36jw8kaw7kani76z3mmbigrvy8cmkbvj2mdc", - "msg": "Update from Hackage at 2021-10-08T09:46:02Z" + "commit": "67f421ee170f4f161832c146be8ef87499ff0d37", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67f421ee170f4f161832c146be8ef87499ff0d37.tar.gz", + "sha256": "0rzwh0iff4xn499vvzv960gmrd85z6amjbbsyhb5qcldcap5jpjs", + "msg": "Update from Hackage at 2021-10-11T20:00:11Z" } diff --git a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix index f33fa2db54..42979c8c81 100644 --- a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "04a9c56w4hm8lwa8hzy5lwj4yli19gzy5wp5iinsm61qas9xgy69"; + sha256 = "01p1g0gy6d1c8aa9y7inhn6zhm0qy0fzmwlniiv07h15g32appvd"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix index 809b45a0fd..1eb6a5f39e 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "11.1"; + version = "11.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0jzjrx21i9bny4117nlwkrvjc4cg2w6r42ra66hxzaazcs9hvny2"; + sha256 = "1krfjk76yjyzsxkhymc1dpy3y7ykawdxzwb282wgbb480dpg8s05"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix b/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix index c158cc8a00..83764e3c8b 100644 --- a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-07-27"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "17x4lqlv6whx8vg0c1nm89j7671l033apn4alqyhjb9qx5w2fa43"; + sha256 = "12dwmgq0kadjfky5bjm62vwgdlw3nmrrhqqs5iw15w0pn3mbmd5c"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix index a00b239641..1f2cb9dc52 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -13,6 +13,7 @@ , wrapGAppsHook , glib , gtk3 +, libhandy , libxml2 , gtk-vnc , gtk-frdp @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "40.0.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-vpvLoHzz+vWs4M5UzSL4YJtNx3ZuJe5f2cGAw5WbTRE="; + hash = "sha256-M5/1VaEI0gt6sPO/GCmWMWAYYOeO+peLpqudGO3DtGA="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { glib gtk-vnc gtk3 + libhandy libxml2 gtk-frdp ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix index 11cd3735e1..39eb033833 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "40.4"; + version = "41.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M0IFAODgYPF4pDUGMZfULa57Z+OcxDepZRCjPd9+lfs="; + sha256 = "lautDW/urJVg2zq4C6fF6rsf3xyg47PJMzmvBUU6JNg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix index 3d2f19b02e..7d15e6b41e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , intltool , fetchFromGitLab , meson @@ -11,7 +12,6 @@ , desktop-file-utils , gtk-doc , wrapGAppsHook -, gnome , itstool , libxml2 , yelp-tools @@ -25,6 +25,7 @@ , runCommand , symlinkJoin , gobject-introspection +, nix-update-script }: let @@ -93,8 +94,8 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; + updateScript = nix-update-script { + attrPath = "gnome.gucharmap"; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix index 7d1d4e90ab..0178c04b53 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "j/rPfA6inO3qBndzCGHUh2qPesTaTGI0u3X3/TcFoQg="; + sha256 = "/OVi4rJsvPwMZ4U43MgfncFc5g1aie5DWJB79jQwTEA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 6efefd1fb0..5b1d110d46 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "unstable-2021-07-07"; + version = "unstable-2021-10-03"; - # temporarily switched to https://github.com/micheleg/dash-to-dock/pull/1402 because upstream doesn't work with GNOME 40 yet. + # temporarily switched to commit hash because GNOME 40 version is not released yet. src = fetchFromGitHub { - owner = "ewlsh"; + owner = "micheleg"; repo = "dash-to-dock"; - rev = "e4beec847181e4163b0a99ceaef4c4582cc8ae4c"; - hash = "sha256-7UVnLXH7COnIbqxbt3CCscuu1YyPH6ax5DlKdaHCT/0="; + rev = "9605dd69fe86d4f92416299c3f62605e75827dd3"; + sha256 = "0vrkiq5z2f11gqlfyis2rsnp6j25hwsp24s21vr55qkzkfszsigg"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix index b65bc7df8e..fac10cf31d 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -24,6 +24,7 @@ let inherit (lib) getBin getLib; in mkDerivation { name = "plasma-workspace"; + passthru.providedSessions = [ "plasma" "plasmawayland" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index 11bf1cc963..29e826c88d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -219,28 +219,34 @@ let in rec { - binaryCrystal_0_36 = genericBinary { - version = "0.36.1"; + binaryCrystal_1_0 = genericBinary { + version = "1.0.0"; sha256s = { - x86_64-linux = "065vzq34g7hgzl2mrzy9gwwsfikc78nj7xxsbrk67r6rz0a7bk1q"; - i686-linux = "18m4b1lnd682i5ygbg6cljqjny60nn2mlrzrk765h2ip6fljqbm1"; - x86_64-darwin = "0xggayk92zh64pb5sz77n12hkcd1hg8kw90z7gb18594q551sf1v"; + x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; + i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; + x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; }; }; - crystal_0_36 = generic { - version = "0.36.1"; - sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk="; - binary = binaryCrystal_0_36; - }; - crystal_1_0 = generic { version = "1.0.0"; sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; - binary = crystal_0_36; + binary = binaryCrystal_1_0; }; - crystal = crystal_1_0; + crystal_1_1 = generic { + version = "1.1.1"; + sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ="; + binary = crystal_1_0; + }; + + crystal_1_2 = generic { + version = "1.2.0"; + sha256 = "sha256-38mmsolzmCnv+MFUMc+AEiklDLBHIr/jqXMLzc0nVq4="; + binary = crystal_1_1; + }; + + crystal = crystal_1_2; crystal2nix = callPackage ./crystal2nix.nix { }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index e1c441e7af..c192c603c8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -314,7 +314,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ peti veprbl ]; + maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index 3b92ecddc0..70278c237d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -330,7 +330,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ peti veprbl ]; + maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index e0ef8e3178..1809d7ae42 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -344,8 +344,6 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ peti ]; - platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix index 16a7552dd4..6868ca9f8d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gprolog/default.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { declarativity of logic programming. ''; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix new file mode 100644 index 0000000000..f9b8020c92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix @@ -0,0 +1,62 @@ +{ lib +, fetchFromGitLab +, coq +, cacert +}: + +coq.ocamlPackages.buildDunePackage rec { + pname = "ligo"; + version = "0.26.0"; + src = fetchFromGitLab { + owner = "ligolang"; + repo = "ligo"; + rev = "d48098c6724bc0a62170c2f9ff73c792c71c8452"; + sha256 = "sha256-uu5985llYsi/9ExKZetk48FqU0sJQB1EirdT/pUw0DA="; + }; + + # The build picks this up for ligo --version + LIGO_VERSION=version; + + useDune2 = true; + + buildInputs = with coq.ocamlPackages; [ + coq + menhir + menhirLib + qcheck + ocamlgraph + ppx_deriving + ppx_deriving_yojson + ppx_expect + tezos-base + tezos-shell-services + tezos-010-PtGRANAD-test-helpers + tezos-protocol-010-PtGRANAD-parameters + tezos-protocol-010-PtGRANAD + tezos-protocol-environment + yojson + getopt + terminal_size + pprint + linenoise + data-encoding + bisect_ppx + cmdliner + ]; + + checkInputs = [ + cacert + coq.ocamlPackages.ca-certs + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://ligolang.org/"; + downloadPage = "https://ligolang.org/docs/intro/installation"; + description = "A friendly Smart Contract Language for Tezos"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ulrikstrid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 7fadc6d6dc..6267678c46 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${./wasm.patch} ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 7fadc6d6dc..6267678c46 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${./wasm.patch} ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix index adb7490785..a226c7edba 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix @@ -1,9 +1,5 @@ -{ lib, fetchFromGitHub, crystal_1_0, openssl }: +{ lib, fetchFromGitHub, crystal, openssl }: -let - crystal = crystal_1_0; - -in crystal.buildCrystalPackage rec { version = "0.14.0"; pname = "mint"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index fb134962b7..ba64e53876 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -91,10 +91,11 @@ let doCheck = false; # fails, requires dbus daemon passthru = { - updateScript = gnome.updateScript { - attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; - packageName = pname; - }; + updateScript = gnome.updateScript { + attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; + packageName = pname; + freeze = true; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/yap/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yap/default.nix index da10125c24..4428d4dbba 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yap/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yap/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "A ISO-compatible high-performance Prolog compiler"; license = lib.licenses.artistic2; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.linux; broken = !stdenv.is64bit; # the linux 32 bit build fails. }; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix index 57a1beead4..4c571f483e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.12"; } + { cases = [ (range "8.10" "8.14") "1.12.0" ]; out = "1.12"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix index 965ae1b6ec..c50f8672e0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix @@ -5,12 +5,14 @@ mkCoqDerivation { pname = "goedel"; owner = "coq-community"; - release."8.12.0".rev = "v8.12.0"; + releaseRev = (v: "v${v}"); + release."8.12.0".sha256 = "sha256-4lAwWFHGUzPcfHI9u5b+N+7mQ0sLJ8bH8beqQubfFEQ="; + release."8.13.0".sha256 = "0sqqkmj6wsk4xmhrnqkhcsbsrqjzn2gnk67nqzgrmjpw5danz8y5"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.11" "8.13"; out = "8.12.0"; } + { case = range "8.11" "8.14"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix index 65af999d08..6ed8e114d8 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -8,10 +8,11 @@ with lib; mkCoqDerivation rec { defaultVersion = with versions; switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (isEq "8.13") (isEq "1.12") ]; out = "1.0.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.14") (isEq "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; + release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; propagatedBuildInputs = [ mathcomp-algebra ]; diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix index 4d3859a77d..8c44e34e3e 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/fpga/trellis/default.nix @@ -31,6 +31,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" + # TODO: should this be in stdenv instead? + "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; preConfigure = '' @@ -39,6 +41,12 @@ in stdenv.mkDerivation rec { cd libtrellis ''; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/ecppack $out/share/trellis/misc/basecfgs/empty_lfe5u-85f.config /tmp/test.bin + ''; + meta = with lib; { description = "Documentation and bitstream tools for Lattice ECP5 FPGAs"; longDescription = '' @@ -49,7 +57,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/YosysHQ/prjtrellis"; license = licenses.isc; - maintainers = with maintainers; [ q3k thoughtpolice emily ]; + maintainers = with maintainers; [ q3k thoughtpolice emily rowanG077 ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index de595427da..812029e597 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1022ff2x9jvi2a0820lbgmmh54cxh1vbn0qfdwr50w7ggvjp88i6"; + sha256 = "1yn84q0iy81b2sczbf4gx8b56f9ghb9kgwjc0n7l5xn5lb2wqlqa"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -1990,7 +1990,7 @@ EOT # Needs Cabal >= 3.4 chs-cabal = super.chs-cabal.override { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }; # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 714b889f2c..4d0c332089 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -44,15 +44,15 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # cabal-install-parsers is written for Cabal 3.6 - cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_1_0; }; + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_0; }; # older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4 cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override { - Cabal = self.Cabal_3_4_0_0; + Cabal = self.Cabal_3_4_1_0; }; # Jailbreak to fix the build. diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 0d1efbf711..25d8e44b45 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -51,7 +51,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and random, but an older # version of base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # Ignore overly restrictive upper version bounds. @@ -98,7 +98,7 @@ self: super: { darcs = dontDistribute super.darcs; # The package needs the latest Cabal version. - cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_1_0; }); + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_2_0; }); # cabal-fmt requires Cabal3 cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index df96afc0e0..f8e6cdb819 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -45,7 +45,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # Jailbreaks & Version Updates @@ -72,6 +72,17 @@ self: super: { vector-binary-instances = doJailbreak super.vector-binary-instances; vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; + weeder = self.weeder_2_3_0; + generic-lens-core = self.generic-lens-core_2_2_0_0; + generic-lens = self.generic-lens_2_2_0_0; + + # Doesn't allow Dhall 1.39.* + weeder_2_3_0 = super.weeder_2_3_0.override { + dhall = self.dhall_1_40_1; + }; + + # Upstream also disables test for GHC 9: https://github.com/kcsongor/generic-lens/pull/130 + generic-lens_2_2_0_0 = dontCheck super.generic-lens_2_2_0_0; # Apply patches from head.hackage. alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7471021f0a..0bd4b31a15 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1284,6 +1284,7 @@ broken-packages: - escape-artist - escoger - espial + - esqueleto-pgcrypto - ess - estimators - EstProgress @@ -1534,7 +1535,6 @@ broken-packages: - funcons-values - function-instances-algebra - functor - - functor-combinators - functor-friends - functor-infix - functorm @@ -1676,6 +1676,7 @@ broken-packages: - git-cuk - git-date - gitdo + - github - github-backup - github-data - github-tools @@ -3847,7 +3848,6 @@ broken-packages: - process-leksah - process-listlike - processmemory - - procex - procrastinating-variable - procstat - prof2pretty @@ -4384,6 +4384,7 @@ broken-packages: - shopify - shortcut-links - shorten-strings + - short-vec - show-prettyprint - Shpadoinkle-backend-snabbdom - Shpadoinkle-isreal @@ -4716,6 +4717,7 @@ broken-packages: - SVD2HS - svfactor - svg-builder-fork + - svgcairo - svgutils - svm-light-utils - svm-simple @@ -5288,6 +5290,7 @@ broken-packages: - warc - warp-dynamic - warp-grpc + - warp-quic - warp-static - warp-systemd - wasm diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 073fc552f1..2e0fa14b66 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -98,6 +98,8 @@ default-package-overrides: - ghc-api-compat == 8.10.7 # 2021-09-14: Pin hiedb to version needed by ghcide - hiedb == 0.4.0.* + # 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes + - weeder < 2.3.0 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9c3f7a77e8..7d516aa93d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -534,6 +534,7 @@ dont-distribute-packages: - base64-bytes - baserock-schema - batchd + - batching - battlenet-yesod - battleships - bayes-stack @@ -732,7 +733,9 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc + - clash-ghc_1_4_4 - clash-lib + - clash-lib_1_4_4 - clash-multisignal - clash-prelude-quickcheck - clash-shake @@ -935,6 +938,7 @@ dont-distribute-packages: - delta - delta-h - dep-t-advice + - dependent-literals-plugin - dependent-state - dephd - deptrack-devops @@ -1117,6 +1121,7 @@ dont-distribute-packages: - filesystem-enumerator - find-clumpiness - findhttp + - finite-table - firstify - fix-parser-simple - fixed-point-vector @@ -2426,6 +2431,7 @@ dont-distribute-packages: - nomyx-language - nomyx-library - nomyx-server + - notifications-tray-icon - notmuch-haskell - notmuch-web - numeric-ode @@ -2453,6 +2459,7 @@ dont-distribute-packages: - one-liner_2_0 - online - online-csv + - opc-xml-da-client - open-adt-tutorial - open-union - openpgp-Crypto @@ -2559,6 +2566,7 @@ dont-distribute-packages: - polh-lexicon - polydata - polysemy-RandomFu + - polysemy-check - polysemy-http - polysemy-log-co - polysemy-methodology-co-log @@ -2907,13 +2915,13 @@ dont-distribute-packages: - servant-auth-token-persistent - servant-auth-token-rocksdb - servant-auth-wordpress - - servant-cli - servant-client-namedargs - servant-csharp - servant-db-postgresql - servant-ede - servant-event-stream - servant-examples + - servant-github-webhook - servant-http2-client - servant-matrix-param - servant-polysemy @@ -2941,6 +2949,7 @@ dont-distribute-packages: - shelduck - shellmate-extras - shine-varying + - short-vec-lens - showdown - shpider - shuffle diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index bdb1a8dda4..5fc968ccdd 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -978,4 +978,21 @@ self: super: builtins.intersectAttrs super { doCheck = with pkgs.stdenv; hostPlatform == buildPlatform && buildPlatform.isx86; }; + + # procex relies on close_range which has been introduced in Linux 5.9, + # the test suite seems to force the use of this feature (or the fallback + # mechanism is broken), so we can't run the test suite on machines with a + # Kernel < 5.9. To check for this, we use uname -r to obtain the Kernel + # version and sort -V to compare against our minimum version. If the + # Kernel turns out to be older, we disable the test suite. + procex = overrideCabal super.procex (drv: { + postConfigure = '' + minimumKernel=5.9 + higherVersion=`printf "%s\n%s\n" "$minimumKernel" "$(uname -r)" | sort -rV | head -n1` + if [[ "$higherVersion" = "$minimumKernel" ]]; then + echo "Used Kernel doesn't support close_range, disabling tests" + unset doCheck + fi + '' + (drv.postConfigure or ""); + }); } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 7d8e69f2b7..cf6245bf32 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -2745,7 +2745,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_4_0_0" = callPackage + "Cabal_3_4_1_0" = callPackage ({ mkDerivation, array, async, base, base-compat, base-orphans , binary, bytestring, clock, containers, deepseq, Diff, directory , filepath, integer-logarithms, mtl, optparse-applicative, parsec @@ -2755,8 +2755,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "3.4.0.0"; - sha256 = "1za1cl14fkw8y89hhw6sqirzmkixjaa4wpqsibyk0fvnjs59jydq"; + version = "3.4.1.0"; + sha256 = "1rqpq6l4b9990rmlgcyz44awps6r37ccyi6bgk7dhcsflad6prj4"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -2775,15 +2775,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_6_1_0" = callPackage + "Cabal_3_6_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.6.1.0"; - sha256 = "0yjdp78775752k10q4j5dbvqj37xaa2b3anmfld53mgr17k182a7"; + version = "3.6.2.0"; + sha256 = "0hmw2wkypd42qyyfi6rhbsxmymbxg9rrw683yg39627vlw33v44y"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -3369,6 +3369,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "Color_0_3_3" = callPackage + ({ mkDerivation, base, colour, criterion, data-default-class + , deepseq, hspec, hspec-discover, HUnit, JuicyPixels, massiv + , massiv-test, QuickCheck, random, vector + }: + mkDerivation { + pname = "Color"; + version = "0.3.3"; + sha256 = "14sf71lhqc1w6s3p1k8a99xgzcwfnr3v5irvfkr09rvv7fd66nva"; + libraryHaskellDepends = [ base data-default-class deepseq vector ]; + testHaskellDepends = [ + base colour hspec HUnit JuicyPixels massiv massiv-test QuickCheck + random vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base colour criterion deepseq random ]; + description = "Color spaces and conversions between them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Combinatorrent" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, cereal , containers, deepseq, directory, filepath, hopenssl, hslogger @@ -9439,6 +9460,8 @@ self: { pname = "HTTP"; version = "4000.3.16"; sha256 = "0bgyj3ahqlyg0jw6qsm2sncp8mklc4h0dj91s043vb3ig01iq2fn"; + revision = "1"; + editedCabalFile = "0wagwgzfy2mqkha88fjl37ah0l7h4biz34v65993xd502ly68hk0"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -18082,8 +18105,8 @@ self: { pname = "SecureHash-SHA3"; version = "0.1.1.0"; sha256 = "0dva3bzfzyzh8kxljyipd041a2w1zhxjvxmhnw2mlv2jcywnk2hz"; - revision = "2"; - editedCabalFile = "0rvalvvjadb0i0rh9z5lgw2hca4a9yw3cg2f6gcx7h30f5dp8x1j"; + revision = "3"; + editedCabalFile = "0jsx09bjk98nvfy0fvr5n2dyx8s22xnq66dvniyl572g5kfyknwm"; libraryHaskellDepends = [ base bytestring ]; description = "simple static linked SHA3 using private symbols and the ref impl"; license = lib.licenses.bsd2; @@ -24450,6 +24473,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson_2_0_1_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat + , base-compat-batteries, base-orphans, base16-bytestring + , bytestring, containers, data-fix, deepseq, Diff, directory, dlist + , filepath, generic-deriving, ghc-prim, hashable + , indexed-traversable, integer-logarithms, primitive, QuickCheck + , quickcheck-instances, scientific, semialign, strict, tagged + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, text, th-abstraction, these, time, time-compat + , unordered-containers, uuid-types, vector, witherable + }: + mkDerivation { + pname = "aeson"; + version = "2.0.1.0"; + sha256 = "0zlplkgsv1czp4rvi9k6pyyrfgd6vcdkj9vq84dr9zf7pzi8fl1s"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries bytestring containers + data-fix deepseq dlist ghc-prim hashable indexed-traversable + primitive scientific semialign strict tagged template-haskell text + th-abstraction these time time-compat unordered-containers + uuid-types vector witherable + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers data-fix Diff directory dlist filepath + generic-deriving ghc-prim hashable integer-logarithms QuickCheck + quickcheck-instances scientific strict tagged tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text these time + time-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -24604,6 +24662,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-compat_0_3_10" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , base-compat, base-orphans, bytestring, containers, exceptions + , hashable, QuickCheck, quickcheck-instances, scientific, tagged + , tasty, tasty-hunit, tasty-quickcheck, text, time + , time-locale-compat, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.10"; + sha256 = "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-iso8601 base base-compat bytestring + containers exceptions hashable scientific tagged text time + time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat base-orphans bytestring + containers exceptions hashable QuickCheck quickcheck-instances + scientific tagged tasty tasty-hunit tasty-quickcheck text time + time-locale-compat unordered-containers vector + ]; + description = "Compatibility layer for aeson"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-decode" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, data-default , hedgehog, text, time, unordered-containers, vector @@ -24712,10 +24797,8 @@ self: { }: mkDerivation { pname = "aeson-extra"; - version = "0.5"; - sha256 = "0nlp6bwb8zynfncfzr05fi9acfs8n2fkz4anm2c0g97dk2ziq213"; - revision = "2"; - editedCabalFile = "02c6rjwm8dyijfcj2wvhx1s9pd3d37g9yqgih4x80na533naps31"; + version = "0.5.1"; + sha256 = "13d01hppx71cm7f901n1bd0hxj69ikbp57i6ckfygc6da0mg49jc"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions hashable parsec @@ -24994,6 +25077,24 @@ self: { license = lib.licenses.mit; }) {}; + "aeson-optics_1_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , optics-core, optics-extra, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "aeson-optics"; + version = "1.1.1"; + sha256 = "1na5nsbp4sds8q289knzj4rgiwabbinxm0ihh66jfz0sjiia4wp7"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring optics-core + optics-extra scientific text unordered-containers vector + ]; + description = "Law-abiding optics for aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-options" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -25062,6 +25163,8 @@ self: { pname = "aeson-pretty"; version = "0.8.8"; sha256 = "09n7gs91y1fbw6gjszrd2na3isnvk3y5rsi90lzjrwywnqfadkl1"; + revision = "1"; + editedCabalFile = "0xr8f76vmcdvlg8wvw0jdrzpzqy73d4rvf633wfwhmslfr7f5jvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25096,6 +25199,29 @@ self: { license = lib.licenses.mit; }) {}; + "aeson-qq_0_8_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim + , haskell-src-meta, hspec, hspec-discover, parsec, scientific + , template-haskell, text, vector + }: + mkDerivation { + pname = "aeson-qq"; + version = "0.8.4"; + sha256 = "0dpklq2xdhrkg1rdc7zfdjnzm6c3qxx2i1xskrqdxpqi84ffnlyh"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat haskell-src-meta parsec + scientific template-haskell text vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec + parsec scientific template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "JSON quasiquoter for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-quick" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, microlens, tasty, tasty-hunit, text @@ -25189,6 +25315,37 @@ self: { broken = true; }) {}; + "aeson-schemas_1_3_5" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq + , first-class-families, hashable, hint, interpolate, megaparsec + , QuickCheck, raw-strings-qq, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-orphans + , th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.3.5"; + sha256 = "1fdq109yjmvixri7hamj8z0iryxxdja8kkm6pk54mi0az0vx9743"; + libraryHaskellDepends = [ + aeson base first-class-families hashable megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base deepseq first-class-families hashable hint + interpolate megaparsec QuickCheck raw-strings-qq tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text th-orphans + th-test-utils unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq first-class-families hashable + megaparsec template-haskell text th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -27924,8 +28081,8 @@ self: { pname = "amazonka-core"; version = "1.6.1"; sha256 = "0hx250dja1l4n4y5115w0qngzlqj8f6p861sdaykh0yjm4nzb621"; - revision = "1"; - editedCabalFile = "1656dyw6fk3gvph6v3xzvdp3p8xny3ji0gxg7qxvmvn60gj9ricv"; + revision = "2"; + editedCabalFile = "15mwn2cv4f99rb53wzk7hplb6ncpcl7crsvj8dx71ymm60cf2kxr"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -30453,8 +30610,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.1.1.0"; - sha256 = "07b4sxx36r604j2q3xyk1y962c6fgy091ly4gc27v49zhmfrmypr"; + version = "1.2.0.0"; + sha256 = "167zld2dwb1l81w1n8iiqdgxx8805sirr9lsacn1ni8cfzzl2gf6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35120,15 +35277,28 @@ self: { }) {}; "attenuation" = callPackage - ({ mkDerivation, base, profunctors }: + ({ mkDerivation, base, constraints }: mkDerivation { pname = "attenuation"; - version = "0.1.0.0"; - sha256 = "0swiqnh34654rljydbd91nbkpgi1x816b7y3f57i4qnync29nsd0"; + version = "0.2.0"; + sha256 = "0qp203qchmllxsrcfz04lxnssrij203i5q8byy159vc8cspd03nq"; revision = "1"; - editedCabalFile = "1bh0ydj5fywx8zcgvfb40092jb09njj2kk09kg7gfvq2fvpz5whr"; - libraryHaskellDepends = [ base profunctors ]; - description = "Representational subtyping relations and variance roles"; + editedCabalFile = "11h8m92hb0spgzvbijkgfbhbhrnf76a8w2z6yw8zahk0bgdqxrzi"; + libraryHaskellDepends = [ base constraints ]; + description = "Subtyping relations and variance roles"; + license = lib.licenses.asl20; + }) {}; + + "attenuation-profunctors" = callPackage + ({ mkDerivation, attenuation, base, constraints, profunctors }: + mkDerivation { + pname = "attenuation-profunctors"; + version = "0.1.0"; + sha256 = "11zhh9iwb7r2jfp9bn8bqx1wzl4mln9v80gb2jijp0rryag25ili"; + libraryHaskellDepends = [ + attenuation base constraints profunctors + ]; + description = "Attenuation support for Profunctors"; license = lib.licenses.asl20; }) {}; @@ -35729,6 +35899,8 @@ self: { pname = "authenticate"; version = "1.3.5"; sha256 = "10df40ycd4r45p58xzdh0vcsa401909fa99nkgd18fx5alqh84sz"; + revision = "1"; + editedCabalFile = "0lmb1m5d1l2scnm2fqxfk348m8xqbc7f7kvk7zvpsvcdcpxinafz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring case-insensitive conduit containers html-conduit http-conduit http-types network-uri @@ -36497,6 +36669,8 @@ self: { pname = "aws"; version = "0.22"; sha256 = "1l3f94mpih7slz37ikyjkyrwvlf110w87997d8sbnbd8glwlcb8r"; + revision = "1"; + editedCabalFile = "1xj2chcn73v45wxb3lr0b3px6p3gbbzvwgx1mqrds4lp2yy7a1cr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38790,8 +38964,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "9"; - editedCabalFile = "003vi0psr8s5whjy1qw43swiw1g1l1mxa962xqz9fdpxbmvlanfy"; + revision = "10"; + editedCabalFile = "0d9nd34ga5xhgkvbysqzyn03w3zi42hgfjk6cza2ymiqxrl2yk9m"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -39136,6 +39310,7 @@ self: { ]; description = "An Applicative Functor deferring actions to run in a batch later"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "battlenet" = callPackage @@ -40982,6 +41157,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-instances_1_0_2" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring + , case-insensitive, hashable, QuickCheck, quickcheck-instances + , scientific, tagged, tasty, tasty-quickcheck, text, text-binary + , time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1.0.2"; + sha256 = "10z29k35clq74ma2f0yrkbyf14wdax1zzgb6mn26ja4vp9f5wc14"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + scientific tagged text text-binary time-compat unordered-containers + vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary bytestring case-insensitive hashable QuickCheck + quickcheck-instances scientific tagged tasty tasty-quickcheck text + time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-io" = callPackage ({ mkDerivation, async, base, binary, bytestring, concurrency , deque, exceptions, hspec, process, stm, transformers @@ -41256,6 +41457,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-tagged_0_3_1" = callPackage + ({ mkDerivation, array, base, base16-bytestring, binary + , binary-instances, bytestring, containers, criterion, deepseq + , QuickCheck, quickcheck-instances, singleton-bool, structured + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "binary-tagged"; + version = "0.3.1"; + sha256 = "01d1wb8h5mz76l09r2azphvhm1y3nar8pqrh2waxn797bd2dh6fp"; + libraryHaskellDepends = [ + array base base16-bytestring binary bytestring containers + structured tagged + ]; + testHaskellDepends = [ + base binary binary-instances bytestring QuickCheck + quickcheck-instances singleton-bool tagged tasty tasty-hunit + tasty-quickcheck transformers + ]; + benchmarkHaskellDepends = [ + base binary binary-instances bytestring criterion deepseq text + unordered-containers + ]; + description = "Tagged binary serialisation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-tree" = callPackage ({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq , doctest, ghc-prim, HUnit, QuickCheck, random, test-framework @@ -43815,8 +44045,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "3"; - editedCabalFile = "0bdl3xbxj2dpg5gv1h0561hhjjs6pp3bkgrg18gpl3pbksmr9q8j"; + revision = "4"; + editedCabalFile = "0lxslpm4s98ddh12py9810k2q872vizphfrszp8gxkkvfzflbb5b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -47127,6 +47357,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "bugsnag-hs_0_2_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client + , text, time, unordered-containers + }: + mkDerivation { + pname = "bugsnag-hs"; + version = "0.2.0.5"; + sha256 = "1gm38w8vjgxmn2a9a7xr364pcv7vsvd3brf90hwbwh7y88q6jdn2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring http-client text time unordered-containers + ]; + testHaskellDepends = [ aeson base bytestring hedgehog ]; + description = "A Bugsnag client for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bugzilla" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, data-default, http-conduit, http-types, iso8601-time @@ -47991,10 +48239,8 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.7.0"; - sha256 = "13dc4cwiga63wmnw9hl332d8gvqjl4yl0p09z2pkmwl81br7ybrc"; - revision = "1"; - editedCabalFile = "0jwax6jdzfcy007dqwdza1r4q8s12ly2gpzpaqy8gi52ap6xc05x"; + version = "0.3.8.0"; + sha256 = "0rfqpnc1awnpn50yfjxgwb65byhdcg5rivg3mbsd5clmq337cz12"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -49428,8 +49674,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "3.6.0.0"; - sha256 = "0ishq4n1jn0kll8257akrzm95lg9ryhyp9pzypcikgvqhl0sz741"; + version = "3.6.2.0"; + sha256 = "0dihpm4h3xh13vnpvwflnb7v614qdvljycc6ffg5cvhwbwfrxyfw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -49552,6 +49798,8 @@ self: { pname = "cabal-install-parsers"; version = "0.4.3"; sha256 = "0gpnfv80rhrws12b1klyi5fkqvn8pgnl2hxh5fbnfp8fbrwklfjq"; + revision = "1"; + editedCabalFile = "18ngagasjind29r0840rnsjzzki92q01yi1p0fw4i5p129mczc8n"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko @@ -49701,6 +49949,34 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "cabal-plan_0_7_2_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat + , base16-bytestring, bytestring, containers, directory, filepath + , mtl, optics-core, optparse-applicative, parsec, process + , semialign, singleton-bool, text, these, topograph, transformers + , vector + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.7.2.1"; + sha256 = "0n45bakzf1r1nyvs76fmrj0cf74knqnpyb2i82baxia0falbp48r"; + configureFlags = [ "-fexe" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal async base base-compat bytestring containers + directory mtl optics-core optparse-applicative parsec process + semialign singleton-bool text these topograph transformers vector + ]; + description = "Library and utility for processing cabal's plan.json file"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-progdeps" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -50990,8 +51266,8 @@ self: { }: mkDerivation { pname = "camfort"; - version = "1.1.1"; - sha256 = "173k5mf2w4ba553j8qh5biljw3xhrk0qipix72cx8xd0vadkh62f"; + version = "1.1.2"; + sha256 = "13a6x4j4f95izwz7g5sykpb2pq4lzwcswi31986gkyl6nicn5cfj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56080,6 +56356,37 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-ghc_1_4_4" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim + , ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp + , lens, mtl, primitive, process, reflection, split + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.4.4"; + sha256 = "0dcyf8q5n37v1arq7dyxbgg80j1dnh3i444v9p1p9rs93l2vfnab"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory exceptions extra + filepath ghc ghc-boot ghc-prim ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable + haskeline integer-gmp lens mtl primitive process reflection split + template-haskell text time transformers uniplate unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "Clash: a functional hardware description language - GHC frontend"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring @@ -56123,6 +56430,49 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-lib_1_4_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array + , attoparsec, base, base16-bytestring, binary, bytestring + , clash-prelude, concurrent-supply, containers, cryptohash-sha256 + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, pretty-show, prettyprinter + , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.4.4"; + sha256 = "1s04m806mdx12mbg30qrx8w75mavs5r8g7dmf5k1v9jn97jk4gvs"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array attoparsec base + base16-bytestring binary bytestring clash-prelude concurrent-supply + containers cryptohash-sha256 data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers pretty-show prettyprinter + primitive process reducers template-haskell temporary terminal-size + text text-show time transformers trifecta unordered-containers + utf8-string vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson aeson-pretty base base16-bytestring bytestring clash-prelude + concurrent-supply containers data-default deepseq ghc + ghc-typelits-knownnat haskell-src-exts lens pretty-show + quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell + text transformers unordered-containers + ]; + description = "Clash: a functional hardware description language - As a library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -56180,6 +56530,48 @@ self: { broken = true; }) {}; + "clash-prelude_1_4_4" = callPackage + ({ mkDerivation, array, arrows, base, bifunctors, binary + , bytestring, Cabal, cabal-doctest, constraints, containers + , criterion, data-binary-ieee754, data-default-class, deepseq + , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hedgehog, hint + , integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, text-show, th-abstraction + , th-lift, th-orphans, time, transformers, type-errors, uniplate + , vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.4.4"; + sha256 = "14304dc9s91blh8ljv8hd3h6gsz0nr83fzf83xkr6mxkdlhzknd4"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array arrows base bifunctors binary bytestring constraints + containers data-binary-ieee754 data-default-class deepseq ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + text-show th-abstraction th-lift th-orphans time transformers + type-errors uniplate vector + ]; + testHaskellDepends = [ + base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base + tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Clash: a functional hardware description language - Prelude library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -66442,8 +66834,8 @@ self: { pname = "criterion"; version = "1.5.10.0"; sha256 = "0akws27z3i9381xrb0p0h5qicz4w5nnxy8jq7gk68gi50gj0flxq"; - revision = "1"; - editedCabalFile = "0j5cmc0w5m4fy28531f79dmbv3la51zh7k14l3kq3ix835crmmbz"; + revision = "2"; + editedCabalFile = "11jdxivx971fbwrg8g0pq365kg6zr6gs06zc5jcjhj34pyr6xpdr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66467,6 +66859,44 @@ self: { license = lib.licenses.bsd3; }) {}; + "criterion_1_5_11_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, binary-orphans, bytestring + , cassava, code-page, containers, criterion-measurement, deepseq + , directory, exceptions, filepath, Glob, HUnit, js-chart + , microstache, mtl, mwc-random, optparse-applicative, parsec + , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers, transformers-compat, vector + , vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.5.11.0"; + sha256 = "1lwawng4rmhmqqn8gsalfn4xj2n19gwz7pl4wjssicl5qgmnvp8s"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat-batteries binary + binary-orphans bytestring cassava code-page containers + criterion-measurement deepseq directory exceptions filepath Glob + js-chart microstache mtl mwc-random optparse-applicative parsec + statistics text time transformers transformers-compat vector + vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat-batteries optparse-applicative + ]; + testHaskellDepends = [ + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + description = "Robust, reliable performance measurement and analysis"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "criterion-cmp" = callPackage ({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava , containers, filepath, optparse-applicative, vector @@ -67362,6 +67792,28 @@ self: { broken = true; }) {cryptohash-sha256-pure = null;}; + "cryptohash-sha256_0_11_102_1" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , SHA, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "cryptohash-sha256"; + version = "0.11.102.1"; + sha256 = "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"; + configureFlags = [ "-fuse-cbits" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base base16-bytestring bytestring SHA tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "Fast, pure and practical SHA-256 implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptohash-sha512" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , SHA, tasty, tasty-hunit, tasty-quickcheck @@ -67689,8 +68141,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.4.1"; - sha256 = "0dyafw91ycsr71sxf7z3fbvfbp9vh8l260l9ygfxlrg37971l4pj"; + version = "5.4.3"; + sha256 = "00hd0sb1787cx7yppg2f3zkd3y8d75fsmf460qnsxc77m4qw5388"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -67707,8 +68159,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.7"; - sha256 = "1qx9qig18y89k4sxpn333hvqz74c6f56nbvaf8dfbawx5asar0jm"; + version = "0.3.8"; + sha256 = "0q94d228zsjrnjzl3w11i4cqdnx3w1mcvsrf3w6jrvysrn1zskbz"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse deriving-compat hashable transformers wl-pprint @@ -67740,8 +68192,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.5"; - sha256 = "1bid3wxg879l69w8c1vcana0xxrggxv30dw9bqi8zww2w23id54q"; + version = "0.2.7"; + sha256 = "1mh1mfyi2vx8ykyc1ca8vpbi545fkp7f0ss5nw6dkykl6zm7pj6d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -73669,8 +74121,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.4.4.0"; - sha256 = "1qknqh9j7nvyy15zfi3prx6bifp2nd72kgfd085p478z887i71r4"; + version = "0.4.5.0"; + sha256 = "0hmyfq7xkz3l7d2f3d9ax782b6h0vvq1cfcxxnj1dg29hrnpd1ja"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ base doctest mtl rank2classes sop-core tasty tasty-hunit @@ -73689,8 +74141,8 @@ self: { }: mkDerivation { pname = "dep-t-advice"; - version = "0.4.6.0"; - sha256 = "1v1nn0qbr3l7hh3f5aw6ril8ifzg6r8im7gpyj5plfbp272v4gs9"; + version = "0.4.6.1"; + sha256 = "1afr4qjzxvf4h56l0m1zjxy2m9vxs51wj1rcvxpqr3q9hvdg17vx"; libraryHaskellDepends = [ base dep-t sop-core transformers ]; testHaskellDepends = [ barbies base dep-t doctest mtl rank2classes sop-core tasty @@ -73751,10 +74203,12 @@ self: { pname = "dependent-literals"; version = "0.1.1.0"; sha256 = "0dw2xc5l8cmhsmr2akyyhyfj8m3qx02pz81fn52ii9mkhzs6rcjb"; + revision = "2"; + editedCabalFile = "1l3fns5gi8l5bav6z3ymvp93i1cq59f9b6p3dc496c0rmkh01kjq"; libraryHaskellDepends = [ base fin-int numeric-kinds sint snumber tagged wrapped ]; - description = "Provides library support for pseudo-dependently-typed int literals"; + description = "Library for dependent-literals-plugin"; license = lib.licenses.asl20; }) {}; @@ -73766,13 +74220,16 @@ self: { pname = "dependent-literals-plugin"; version = "0.1.0.1"; sha256 = "1rpjlcv3g150rcmxidn48n25xxv2ghdz4x9jnap1swkz0fb10i3a"; + revision = "2"; + editedCabalFile = "1bfsv402cxwhwz22gqj8p0grr4wb9ynsd2swnwy1m6xdsfi1wdy4"; libraryHaskellDepends = [ base ghc syb ]; testHaskellDepends = [ base dependent-literals fin-int numeric-kinds short-vec sint snumber wrapped ]; - description = "Rewrites integer literals to a pseudo-dependently-typed form"; + description = "Dependent integer literals"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "dependent-map_0_2_4_0" = callPackage @@ -79573,6 +80030,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "doclayout_0_3_1" = callPackage + ({ mkDerivation, base, containers, criterion, emojis, mtl, safe + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "doclayout"; + version = "0.3.1"; + sha256 = "0cbb8l1m7w1ycf0pv8y9cbly9qxw3w5ngqbghj6qd5kk02my9zwj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers emojis mtl safe text ]; + testHaskellDepends = [ + base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ base criterion mtl text ]; + description = "A prettyprinting library for laying out text documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text @@ -79656,20 +80133,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "doctemplates_0_10" = callPackage + "doctemplates_0_10_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text - , text-conversions, unordered-containers, vector + , text-conversions, vector }: mkDerivation { pname = "doctemplates"; - version = "0.10"; - sha256 = "1nwav01dqxhbbmf4si8ks70lmhkldmy70m1dw89xrndvcgcynmrx"; + version = "0.10.0.1"; + sha256 = "08l8lgmvn83xwbdlh4m2jljj5gcyxiq1vjd1ggysv36d81swsg1x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe - scientific text text-conversions unordered-containers vector + scientific text text-conversions vector ]; testHaskellDepends = [ aeson base bytestring containers doclayout filepath Glob tasty @@ -85345,6 +85822,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "emojis_0_1_2" = callPackage + ({ mkDerivation, base, containers, HUnit, text }: + mkDerivation { + pname = "emojis"; + version = "0.1.2"; + sha256 = "09x2xrppwypi369y7rzf3ln2g7c3g9qfckn2gydxpfzglcp9rziw"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base HUnit text ]; + description = "Conversion between emoji characters and their names"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "empty" = callPackage ({ mkDerivation }: mkDerivation { @@ -87118,6 +87608,8 @@ self: { ]; description = "Esqueleto support for the pgcrypto PostgreSQL module"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ess" = callPackage @@ -88855,6 +89347,8 @@ self: { pname = "exiftool"; version = "0.2.0.0"; sha256 = "138d25fxqz3vg62mfgmva52flyzjxd8dxr0kc7ayfil1zk3bp4jg"; + revision = "1"; + editedCabalFile = "0sgi3w8x1zlch0v3zpxrjhisxd1s6wj1qznjlm0gz2r5d1pzc03z"; libraryHaskellDepends = [ aeson base base64 bytestring hashable process scientific string-conversions temporary text unordered-containers vector @@ -93172,15 +93666,13 @@ self: { }: mkDerivation { pname = "fin-int"; - version = "0.1.0.0"; - sha256 = "0ksjc8jz3l5jh6xd7aam424vpcq1ah7dcq2r5vmh4c7hcd48fakv"; - revision = "1"; - editedCabalFile = "0fq6cliihr0dhks62nim33f0sxqs2rwn4yd7gdd67h07acimcrzf"; + version = "0.2.0"; + sha256 = "0ra5lcd3ybmv1a0l7bisjlgi7b8mywa6c6pj7n82ppyi6rqssdlh"; libraryHaskellDepends = [ attenuation base data-default-class deepseq portray portray-diff QuickCheck sint ]; - description = "The type of finite sets with elements identified by the ordinals"; + description = "Finite sets of static size"; license = lib.licenses.asl20; }) {}; @@ -93482,6 +93974,8 @@ self: { pname = "finite-table"; version = "0.1.0.1"; sha256 = "17bn5wmv5sz89yh3lh39i1armi168wxxnz6l9smcfmw334lidlv6"; + revision = "1"; + editedCabalFile = "17marqdap2mhlv90khnhygy78mn4gj9068gbz2ld4xv7q2kf3vlm"; libraryHaskellDepends = [ adjunctions base cereal data-default-class deepseq distributive fin-int indexed-traversable lens portray portray-diff short-vec @@ -93495,6 +93989,7 @@ self: { ]; description = "Types isomorphic to Fin, and Tables indexed by them"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "finite-typelits" = callPackage @@ -98849,8 +99344,6 @@ self: { ]; description = "Tools for functor combinator-based program design"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "functor-combinators_0_4_1_0" = callPackage @@ -98880,7 +99373,6 @@ self: { description = "Tools for functor combinator-based program design"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "functor-combo" = callPackage @@ -106507,8 +106999,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210903"; - sha256 = "1p6zgk98jmxvqdin5xsdxhgq276bjdr2spi0wabj8x0ziry97rvl"; + version = "8.20211011"; + sha256 = "02s7921ihmbndp7lk1nhhiljky02ikq4qax4mhg609qjhbl6piwd"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -107036,8 +107528,8 @@ self: { }: mkDerivation { pname = "github"; - version = "0.26"; - sha256 = "1vbskrkhmz4d3fccn3w12zgz2dbl40b2gljsm7lyd5k8hz50kds8"; + version = "0.27"; + sha256 = "0vlqsdhhjnfw9wk5vn1i8cmwa45vgczhz4nn46mwgs600xfn94am"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -107053,6 +107545,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "github-backup" = callPackage @@ -107170,7 +107664,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "github-rest_1_1_0" = callPackage + "github-rest_1_1_1" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client , http-client-tls, http-types, jwt, mtl, scientific, tasty , tasty-golden, tasty-hunit, tasty-quickcheck, text, time @@ -107178,8 +107672,8 @@ self: { }: mkDerivation { pname = "github-rest"; - version = "1.1.0"; - sha256 = "0xyvmc8hj3rfglnhg6xcrdsd9gbii8yzh8qw5xjdyccmdsibckx3"; + version = "1.1.1"; + sha256 = "1wf4gs3324h4pfal5qcpb65lfpm4kpmxmv4fiv6asrvhas9cwglm"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types jwt mtl scientific text time transformers unliftio unliftio-core @@ -107424,15 +107918,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_3_1_1" = callPackage + "gitlab-haskell_0_3_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-client , http-conduit, http-types, tasty, tasty-hunit, temporary, text , time, transformers, unix }: mkDerivation { pname = "gitlab-haskell"; - version = "0.3.1.1"; - sha256 = "146azh83v963njnkbcf6lacj95qx89wcvi294s3nc89bp72z8igz"; + version = "0.3.2.0"; + sha256 = "1ibsb4wyavyb6s64czy1pdbcskfwn96wcky4vlpr0r1f8gjpym5s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-client http-conduit @@ -111432,6 +111926,8 @@ self: { pname = "google-drive"; version = "0.4.1"; sha256 = "1whpifspbvqgw9hg367fjhp14ci61nnirskivawpv2airzn45xzk"; + revision = "1"; + editedCabalFile = "02hpkgp1k5gsc6rrx6gzzskcrdjzqbcdcppxkmv36lq0r1sj5afw"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra directory filepath http-conduit http-types mtl random resourcet text time @@ -124840,8 +125336,8 @@ self: { pname = "hastache"; version = "0.6.1"; sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc"; - revision = "5"; - editedCabalFile = "0fwd1jd6sqkscmy2yq1w3dcl4va4w9n8mhs6ldrilh1cj6b54r3f"; + revision = "6"; + editedCabalFile = "1d9a6algvdyhjl94ikbz6ccnpbh0f68x8dp6bmx6lljq4b2srx51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130898,22 +131394,22 @@ self: { }) {}; "hinotify-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, filepath-bytestring - , hinotify, mtl, resourcet, stm, stm-chans, stm-conduit + ({ mkDerivation, async, base, bytestring, conduit, containers + , directory, filepath, filepath-bytestring, hinotify, hspec + , resourcet, stm, stm-chans, stm-conduit, temporary, unix }: mkDerivation { pname = "hinotify-conduit"; - version = "0.1.0.0"; - sha256 = "1gy914b7npldn0dvhra7cf6fx1bdv18w9p66ypdigy2x36dvfb8d"; - revision = "2"; - editedCabalFile = "0d7fpksxwfa7jjklb70lpnr6cnpa6s9qz98n6ci1d2w2y5xrbql4"; + version = "0.1.0.1"; + sha256 = "1377ws4rmafkjrnyn9x0a5wj98v5ysc85yzq6frg12aslc1bmvx9"; libraryHaskellDepends = [ - base bytestring conduit filepath-bytestring hinotify mtl resourcet - stm stm-chans stm-conduit + base bytestring conduit containers directory filepath + filepath-bytestring hinotify resourcet stm stm-chans stm-conduit ]; testHaskellDepends = [ - base bytestring conduit filepath-bytestring hinotify mtl resourcet - stm stm-chans stm-conduit + async base bytestring conduit containers directory filepath + filepath-bytestring hinotify hspec resourcet stm stm-chans + stm-conduit temporary unix ]; description = "inotify conduit sources"; license = lib.licenses.bsd3; @@ -132611,8 +133107,8 @@ self: { pname = "hlint"; version = "3.2.7"; sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g"; - revision = "1"; - editedCabalFile = "1wc66vjdcf0xdwiw7r2ias1xx328ipjw0227w1xfr48if5lgc4k1"; + revision = "2"; + editedCabalFile = "0p2d3pi268jkb3hz750apjn917kr40hhamc2apgiv08chqyk82bj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -132639,6 +133135,8 @@ self: { pname = "hlint"; version = "3.3.4"; sha256 = "030hvf0hmnf5pamrcqvr97zmm185b1vs0y28nq6vzlyyg15ap6qq"; + revision = "1"; + editedCabalFile = "10h1asqbk2qqmxac34amwjz9ybz2vahpa0dsrdljg3zw1r1yzkb8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135130,6 +135628,8 @@ self: { pname = "hoogle"; version = "5.0.18.2"; sha256 = "1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7"; + revision = "1"; + editedCabalFile = "11ig5z81h27ify5sx2dyrx4kiv61gzd96k9qi8a11hvnk2w51a9y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135951,6 +136451,8 @@ self: { pname = "hpack"; version = "0.34.4"; sha256 = "1xszy00al5zzga64gh7nvgqc93242f61kqy8lb09jkm98a8fs4bl"; + revision = "1"; + editedCabalFile = "0gq6ax8a7yc5lp0n24kd60kq0dgpgsgcgl970jrf1hqnzf53pspk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136565,6 +137067,8 @@ self: { pname = "hpqtypes-extras"; version = "1.12.0.0"; sha256 = "0pxidphf0qzfy5zv1q7qhp49bgglf3pqd6r91qq0iawnvgzcyi7z"; + revision = "2"; + editedCabalFile = "0gprlxfjdc6lxf2xazfr1wrna9whw6sh1jpv5rhp8bw0haslzl6j"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra fields-json hpqtypes lifted-base log-base monad-control mtl @@ -139768,8 +140272,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "3"; - editedCabalFile = "04mda3bwr2a00f5nbkqc84d46lmqfsk3gibzg3amdh74ngb451xq"; + revision = "4"; + editedCabalFile = "0249qf58s5dvqf98xqbqqigav055dgj5cx4dmz4ssl8ckk2dizdk"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -143551,6 +144055,31 @@ self: { license = lib.licenses.publicDomain; }) {}; + "http-link-header_1_2_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, directory + , errors, hspec, hspec-attoparsec, http-api-data, network-uri + , QuickCheck, text, transformers + }: + mkDerivation { + pname = "http-link-header"; + version = "1.2.1"; + sha256 = "15pcav5k7j4pvqwkyyrqgcm7yxqippx4yiprsg9fpml4kywcr2ca"; + libraryHaskellDepends = [ + attoparsec base bytestring errors http-api-data network-uri text + ]; + testHaskellDepends = [ + attoparsec base bytestring errors hspec hspec-attoparsec + http-api-data network-uri QuickCheck text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion directory errors http-api-data + network-uri text transformers + ]; + description = "A parser and writer for the HTTP Link header per RFC 5988"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-listen" = callPackage ({ mkDerivation, base, bytestring, exceptions, HTTP, network , transformers @@ -150484,27 +151013,23 @@ self: { "inline-asm" = callPackage ({ mkDerivation, base, bytestring, containers, either, ghc-prim - , hspec, hspec-core, megaparsec, mtl, parser-combinators + , hspec, hspec-core, megaparsec, mtl, parser-combinators, primitive , QuickCheck, template-haskell, uniplate }: mkDerivation { pname = "inline-asm"; - version = "0.4.0.2"; - sha256 = "01npi02i8wf9b0pa18cgl78ma6r9xqz0i7dc3khkj1725w5wkhvp"; + version = "0.5.0.0"; + sha256 = "02zxgkaa4wgacgj6si4158cxgk3cdf0gkvl5avmyrivbcc18xkdi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers either ghc-prim megaparsec mtl - parser-combinators template-haskell uniplate - ]; - executableHaskellDepends = [ - base bytestring containers either ghc-prim megaparsec mtl - parser-combinators template-haskell uniplate + parser-combinators primitive template-haskell uniplate ]; testHaskellDepends = [ base bytestring containers either ghc-prim hspec hspec-core - megaparsec mtl parser-combinators QuickCheck template-haskell - uniplate + megaparsec mtl parser-combinators primitive QuickCheck + template-haskell uniplate ]; description = "Inline some Assembly in ur Haskell!"; license = lib.licenses.bsd3; @@ -150695,8 +151220,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.5"; sha256 = "0bb3ggzic8z5zmvmzp1fsnb572c2v383740b0ddf1fwihpn52c1y"; - revision = "1"; - editedCabalFile = "12x4xi525ikbqvxh2kmnxsl7cqmbz2l8vqc5ym4lap0p21niiazr"; + revision = "2"; + editedCabalFile = "1xjrd1sn3wkhv8f40wi5p53y8n74lkj5pnr4psjlbpqqlr4hy2ya"; libraryHaskellDepends = [ aeson base base-compat deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids semigroups text transformers @@ -151644,8 +152169,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "1.0.1"; - sha256 = "1pw4z3h1ihb82105v1i3809icp024a6cmlic2zfgdhdqf8wvfzv4"; + version = "1.1.0"; + sha256 = "16xx8fw7xf8rrji9n34r3xchjpd6sh3wnlbz70a3mhbdl3yp55vq"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -151950,6 +152475,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "invertible-grammar_0_1_3_2" = callPackage + ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter + , profunctors, semigroups, tagged, template-haskell, text + , transformers + }: + mkDerivation { + pname = "invertible-grammar"; + version = "0.1.3.2"; + sha256 = "14i0xf5j01j6ayvxix32qr2m0bz3818q26z3b4xyw41ikbhxmkp2"; + libraryHaskellDepends = [ + base bifunctors containers mtl prettyprinter profunctors semigroups + tagged template-haskell text transformers + ]; + description = "Invertible parsing combinators framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "invertible-hlist" = callPackage ({ mkDerivation, base, HList, invertible }: mkDerivation { @@ -152456,25 +152999,24 @@ self: { , doctest, envy, flow, Glob, http-media, lens, lens-aeson , monad-logger, network-ip, QuickCheck, regex-compat, rio, servant , servant-client, servant-multipart, servant-multipart-api - , servant-multipart-client, servant-server, swagger2, text, vector - , yaml + , servant-multipart-client, swagger2, text, vector, yaml }: mkDerivation { pname = "ipfs"; - version = "1.3.2"; - sha256 = "11gy8szp41l1y6mnvj6knb5lhlax859gri9j31w5lzhidj0045df"; + version = "1.4.0"; + sha256 = "1lz5wbjlxd053805cc0l51hj69rwj4a2i4b5y72gmajjqrcw4hcd"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob http-media lens monad-logger network-ip regex-compat rio servant servant-client servant-multipart servant-multipart-api servant-multipart-client - servant-server swagger2 text vector + swagger2 text vector ]; testHaskellDepends = [ aeson base bytestring directory directory-tree doctest envy flow Glob http-media lens lens-aeson monad-logger network-ip QuickCheck regex-compat rio servant servant-client servant-multipart - servant-multipart-api servant-multipart-client servant-server - swagger2 text vector yaml + servant-multipart-api servant-multipart-client swagger2 text vector + yaml ]; description = "Access IPFS locally and remotely"; license = lib.licenses.asl20; @@ -156475,6 +157017,27 @@ self: { license = lib.licenses.mit; }) {}; + "jsonifier_0_1_2" = callPackage + ({ mkDerivation, aeson, base, buffer-builder, bytestring, gauge + , hedgehog, numeric-limits, ptr-poker, rerebase, scientific, text + , text-builder + }: + mkDerivation { + pname = "jsonifier"; + version = "0.1.2"; + sha256 = "14cgk8h7lasnm0z9qlddkn166vk557msnkrpahdzqpl7arwdddid"; + libraryHaskellDepends = [ + base bytestring ptr-poker scientific text + ]; + testHaskellDepends = [ aeson hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ + aeson buffer-builder gauge rerebase text-builder + ]; + description = "Fast and simple JSON encoding toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jsonnet" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , containers, data-fix, deriving-compat, directory, exceptions @@ -157390,10 +157953,8 @@ self: { }: mkDerivation { pname = "kansas-comet"; - version = "0.4"; - sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "22"; - editedCabalFile = "0ii81jv62cbrvj8dpj86m2rs75jjjwnp9kka63y8bvdbacchycvj"; + version = "0.4.1"; + sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -164071,6 +164632,23 @@ self: { license = lib.licenses.mit; }) {}; + "lens-aeson_1_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, lens + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "lens-aeson"; + version = "1.1.2"; + sha256 = "0pdjjyjwlavcgm2wrv1fiz09l41hisl2xj6y67xbdix1h6h07hxz"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring lens scientific text + unordered-containers vector + ]; + description = "Law-abiding lenses for aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-core" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -169621,8 +170199,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.10.0.1"; - sha256 = "0h4b7hjxcc75swj43wx0axcp5znsndkrnhn9c8fm7f7a2gmvb8l1"; + version = "0.11.0.0"; + sha256 = "155lzi9x33rhiymfy1271k0dz7c4qm1r48cz6kc7gcwxvrfh8dxi"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control mtl semigroups stm text time transformers-base @@ -169696,8 +170274,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.12.1.0"; - sha256 = "07z0p5jcd5gjhk4dyf9ny74l68ja58ffa80mbfsyaz66ff6k4y6s"; + version = "0.12.1.1"; + sha256 = "0jrfrqydbg549d7gh38mq852kzd0nsaaaq6l5bi4ldfpj443kz8a"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-tls http-types log-base network-uri @@ -169717,8 +170295,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.8.0.1"; - sha256 = "0bc63v9w023xw1fq0pkfnk4ac336hgliayy21ny0zaz9xf39a24l"; + version = "0.8.0.2"; + sha256 = "167asvp7a5v8621sbr6r4j25byg18d125gqd2i4jrq57g5f2mivf"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -174318,23 +174896,19 @@ self: { license = lib.licenses.bsd3; }) {}; - "massiv_1_0_0_0" = callPackage + "massiv_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions - , mersenne-random-pure64, mwc-random, primitive, QuickCheck, random - , scheduler, splitmix, template-haskell, unliftio-core, vector + , primitive, random, scheduler, unliftio-core, vector }: mkDerivation { pname = "massiv"; - version = "1.0.0.0"; - sha256 = "0cb9riab486gz9xxx44sx5pagfjc8kv8936avywxpwpn3dhbxg6a"; + version = "1.0.1.0"; + sha256 = "1s47x3cya73mp4gxqn271yp8z23pfgw170pnlxbka61ap4kykmkk"; libraryHaskellDepends = [ base bytestring deepseq exceptions primitive random scheduler unliftio-core vector ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 mwc-random QuickCheck random - splitmix template-haskell - ]; + testHaskellDepends = [ base doctest ]; description = "Massiv (Массив) is an Array Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -174412,15 +174986,15 @@ self: { broken = true; }) {}; - "massiv-persist_1_0_0_0" = callPackage + "massiv-persist_1_0_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, hspec , hspec-discover, massiv, massiv-test, persist, primitive , QuickCheck }: mkDerivation { pname = "massiv-persist"; - version = "1.0.0.0"; - sha256 = "0kgw4ac6ywgx44mqyfyhhxpaxzyph9pgz27nvr625j4hg84mx552"; + version = "1.0.0.1"; + sha256 = "1j5vzk5m2r1cs5v5pzmf1i7p8zdlf29g0gdklf6snl9llk755pgy"; libraryHaskellDepends = [ base bytestring deepseq massiv persist primitive ]; @@ -174475,14 +175049,14 @@ self: { broken = true; }) {}; - "massiv-serialise_1_0_0_0" = callPackage + "massiv-serialise_1_0_0_1" = callPackage ({ mkDerivation, base, deepseq, doctest, hspec, hspec-discover , massiv, massiv-test, QuickCheck, serialise, vector }: mkDerivation { pname = "massiv-serialise"; - version = "1.0.0.0"; - sha256 = "18ahbfq54mggar7wknghdjybd4pbqjzgfaghv5lp5daccbxahgyd"; + version = "1.0.0.1"; + sha256 = "0zmikmfjjshf9p0fawcg05832hxdzj04kqqh11bz1kqcc1yc7yk0"; libraryHaskellDepends = [ base deepseq massiv serialise vector ]; testHaskellDepends = [ base doctest hspec massiv massiv-test QuickCheck serialise @@ -177843,6 +178417,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "microstache_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, filepath, hspec, parsec, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "microstache"; + version = "1.0.2"; + sha256 = "0pirywb9304j2ylasskwq20k6d2srk616sh41l4s37yajsjggx5i"; + libraryHaskellDepends = [ + aeson base containers deepseq directory filepath parsec text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec parsec text + ]; + description = "Mustache templates for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microtimer" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -182533,8 +183128,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "2"; - editedCabalFile = "1fvpzhfjpf2j01p2rwds6m82d2q0j77ak5v467nxsc8f161rfz21"; + revision = "3"; + editedCabalFile = "1j57vvb2vs0jd5jsq2dh0q5wpvxibwn43dwkg1l3ysl46k5sv58i"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -185849,6 +186444,8 @@ self: { pname = "mustache"; version = "2.3.1"; sha256 = "0j5kzlirirnj2lscxgc6r9j0if8s3pvxswjblma6yxpw6qyzk2xc"; + revision = "1"; + editedCabalFile = "05qsxxpbqacfbvdzmz2y2yh3rpf2f0n2rvhvmhn33gsvydxvadbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188346,6 +188943,21 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) libsodium;}; + "netcode-io_0_0_3" = callPackage + ({ mkDerivation, base, bindings-DSL, libsodium }: + mkDerivation { + pname = "netcode-io"; + version = "0.0.3"; + sha256 = "132rih1fd2qdshnpb8q3glhwgc8790pm8xpm3786hnrl3di1384z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ libsodium ]; + description = "Bindings to the low-level netcode.io library."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libsodium;}; + "netcore" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bimap, binary, binary-strict , bytestring, containers, fgl, HList, hslogger, HUnit, mtl @@ -192044,6 +192656,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "notmuch" = callPackage @@ -192793,8 +193406,10 @@ self: { pname = "numeric-kinds"; version = "0.1.0.0"; sha256 = "0rdx39wa7kklx9a7i5rdwf541fxpz9v3n32rvy2fa6i7n4hr64s4"; + revision = "1"; + editedCabalFile = "0zbn5yxga0sknpa83a6v2gx3dhi1rgxlxh0p3d1gd37x2zyd8lxf"; libraryHaskellDepends = [ base ]; - description = "Type-level numeric types, classes, and instances"; + description = "Type-level numeric types and classes"; license = lib.licenses.asl20; }) {}; @@ -192817,14 +193432,14 @@ self: { pname = "numeric-logarithms"; version = "0.1.0.0"; sha256 = "1izd7gc9xdrs7a1wbzmhhkv8s9rw2mcq77agvr351dc5jyzdnwiy"; - revision = "1"; - editedCabalFile = "0a37gmm0xgjzh05i7ix3nkgr5d2qa824nsh2wg78ikyksfq46vfv"; + revision = "2"; + editedCabalFile = "11lxh2lz3adwdb1hgxgqh2p2igqzbclpwal072fhdk1hcz987acq"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base integer-gmp QuickCheck test-framework test-framework-quickcheck2 ]; - description = "Efficient rounded log2 algorithms on integral and rational types"; + description = "Integral and rational log2 algorithms"; license = lib.licenses.asl20; }) {}; @@ -194916,6 +195531,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "opc-xml-da-client" = callPackage + ({ mkDerivation, acc, attoparsec, attoparsec-data, base, base64 + , binary, bytestring, caerbannog, containers, data-default, domain + , domain-optics, hashable, hashable-time, http-client, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, time, transformers + , unordered-containers, vector, vector-instances, xml-conduit + , xml-parser + }: + mkDerivation { + pname = "opc-xml-da-client"; + version = "0.1"; + sha256 = "0wi2qv4594fz3z6jqdmqnxv17w1yp5ds8xwflnxawb6lpadprskp"; + libraryHaskellDepends = [ + acc attoparsec attoparsec-data base base64 bytestring containers + data-default domain domain-optics hashable hashable-time + http-client QuickCheck rerebase scientific text text-builder time + transformers unordered-containers vector vector-instances + xml-conduit xml-parser + ]; + testHaskellDepends = [ + attoparsec binary caerbannog data-default http-client QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + text-builder xml-conduit xml-parser + ]; + doHaddock = false; + description = "OPC XML-DA Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "open-adt" = callPackage ({ mkDerivation, base, constraints, recursion-schemes, row-types , template-haskell @@ -196242,6 +196888,8 @@ self: { pname = "operational"; version = "0.2.4.0"; sha256 = "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i"; + revision = "1"; + editedCabalFile = "1b5vjp87lh34lpp9i4mrwcmr6rs45r6azdamwinlhrxynn91n8ri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl ]; @@ -196816,6 +197464,25 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "optparse-generic_1_4_6" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , system-filepath, text, time, transformers, transformers-compat + , void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.4.6"; + sha256 = "1ihr5ly5xkhhds7frifgy1djay1d7yvdc617qqb7h61h4930kl3k"; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative system-filepath text time + transformers transformers-compat void + ]; + description = "Auto-generate a command-line parser for your datatype"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -197498,8 +198165,8 @@ self: { }: mkDerivation { pname = "os-release"; - version = "1.0.2"; - sha256 = "0wjf1z76pqfv091b88zc3w0hmqv8i2i6qsx21cfcgaym4r3zqpjf"; + version = "1.0.2.1"; + sha256 = "0fyf6mjk4lmxvjgkvsz7ypx2ir67ry816wa6j7s27a1754cz6cw3"; libraryHaskellDepends = [ aeson base megaparsec safe-exceptions text unordered-containers ]; @@ -203578,6 +204245,8 @@ self: { pname = "persistent"; version = "2.13.1.2"; sha256 = "09si4h64i9drqr80a2sxpxhmsinacqx9bvsc3jah5zlm915q092y"; + revision = "1"; + editedCabalFile = "0xasbm1m5az7anp1wqfr69j0b7jycg82qdcq4kd97lqdn7rqvhsp"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -205202,8 +205871,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.1.4.0"; - sha256 = "1dsfnjjri15mhm31ny82j26djbsw6lgvvqpq9k7fzgj0inb5slns"; + version = "0.2.0.0"; + sha256 = "1v2v571rjmfxqzdnm7z2v3dygknlk5nyvfyv7dkgzf7apmlmnpd2"; libraryHaskellDepends = [ base heaps mmsyn2-array phonetic-languages-constraints-array phonetic-languages-ukrainian-array @@ -205249,8 +205918,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.2.1.0"; - sha256 = "1i05h0rd6svffwpwzsrryzf6yvjwxd0g3f4wasz8mkh1sdgj0r5g"; + version = "0.3.0.0"; + sha256 = "1ajgp4wyfdzvvnj5272r0cpl9jykps5bwzn93asmfbilzfdjaynz"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics ]; @@ -209232,6 +209901,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-check" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , kind-generics, kind-generics-th, polysemy, polysemy-plugin + , QuickCheck + }: + mkDerivation { + pname = "polysemy-check"; + version = "0.3.0.0"; + sha256 = "1m7m1mi7fbf1nj98c91qxhbnhyqxgb8y7ryj7bk1llinmp2lmwaz"; + libraryHaskellDepends = [ + base containers kind-generics kind-generics-th polysemy QuickCheck + ]; + testHaskellDepends = [ + base containers hspec kind-generics kind-generics-th polysemy + polysemy-plugin QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "QuickCheck for Polysemy"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-chronos" = callPackage ({ mkDerivation, aeson, base, chronos, containers, hedgehog , polysemy, polysemy-test, polysemy-time, relude, tasty @@ -210481,12 +211172,14 @@ self: { pname = "portray"; version = "0.2.0"; sha256 = "1kzzvwqphlg1dmd486ijkv6vsqmxnp8h05mwc8590yjxdln5vzdw"; + revision = "1"; + editedCabalFile = "0bl0kagjn1k58pq6zbdj2zyzhpdpzs7ra1vrr8a1qdkb11gmp4n2"; libraryHaskellDepends = [ base containers text wrapped ]; testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit text wrapped ]; - description = "A pseudo-Haskell syntax type and typeclass producing it"; + description = "Rendering to pseudo-Haskell syntax"; license = lib.licenses.asl20; }) {}; @@ -210496,10 +211189,12 @@ self: { pname = "portray-diff"; version = "0.1.0.1"; sha256 = "1da884cj865q6g1bd1fhcazyl1nzxb0pk2nvhcpp4iqkjvhyd8hw"; + revision = "1"; + editedCabalFile = "1dfl488jq79l0k8d8s2q1wxdibvnrrl64sz8gdy9mp0nkd6vaszl"; libraryHaskellDepends = [ base containers dlist portray text wrapped ]; - description = "Visualize the structural differences between two values"; + description = "Pretty structural diffs between two values"; license = lib.licenses.asl20; }) {}; @@ -210510,10 +211205,12 @@ self: { pname = "portray-diff-hunit"; version = "0.1.0.0"; sha256 = "0gig1gvw0s7cl4jbffqh53r7lfs08clkcjpdypjjbpk0815pk34h"; + revision = "1"; + editedCabalFile = "023p7j386zbcmzsbdk7xk85ygi8qq4llh6zp6811grsyq3hfnsa1"; libraryHaskellDepends = [ base HUnit portray-diff portray-pretty pretty ]; - description = "Equality assertion functions for HUnit based on portray-diff"; + description = "HUnit assertions based on portray-diff"; license = lib.licenses.asl20; }) {}; @@ -210523,10 +211220,12 @@ self: { pname = "portray-diff-quickcheck"; version = "0.1.0.0"; sha256 = "1kif82y8bapf5d3awkfv7wp3ih89q3p14djanyz6jfapryhccm12"; + revision = "1"; + editedCabalFile = "0nf5wxwvs9sad3bphb8dci5d3nr982nr05y99fmsy3vdifi366l2"; libraryHaskellDepends = [ base portray-diff portray-pretty QuickCheck ]; - description = "Equality assertion functions for QuickCheck based on portray-diff"; + description = "QuickCheck tests with portray-diff"; license = lib.licenses.asl20; }) {}; @@ -210538,12 +211237,14 @@ self: { pname = "portray-pretty"; version = "0.1.0.2"; sha256 = "1gh50r77yz1l8qkhdz96bds2l0d5zi75fkir27x3si406h7sdic9"; + revision = "1"; + editedCabalFile = "0v30gdwjb0339q5phkbnwxj687w33rgivy772j37vp51zpiylnak"; libraryHaskellDepends = [ base portray portray-diff pretty text ]; testHaskellDepends = [ base HUnit portray portray-diff pretty test-framework test-framework-hunit text ]; - description = "A portray backend using the pretty package"; + description = "Portray backend for pretty"; license = lib.licenses.asl20; }) {}; @@ -210556,6 +211257,8 @@ self: { pname = "portray-prettyprinter"; version = "0.2.0"; sha256 = "16g55vjcfawx1jxmgy3zgl6bqv67h831z00912fbfh878s1s24ic"; + revision = "1"; + editedCabalFile = "1w7y8j2sx9wjyv5iknxjyq3r02l1kym85k1gq6carr49lf05s567"; libraryHaskellDepends = [ base portray portray-diff prettyprinter prettyprinter-ansi-terminal text @@ -210565,7 +211268,7 @@ self: { prettyprinter-ansi-terminal QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - description = "A portray backend using the prettyprinter package"; + description = "Portray backend for prettyprinter"; license = lib.licenses.asl20; }) {}; @@ -211006,6 +211709,34 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_12_4_2" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances + , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.4.2"; + sha256 = "1bklkkf0r5dimdxgmgcviircv87ahv0g4nmkl34kc13pwn6l7xjm"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -211364,8 +212095,8 @@ self: { pname = "postgresql-simple"; version = "0.6.4"; sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; - revision = "2"; - editedCabalFile = "1kwjlj0bsc1yd4dgfc0ydawq9acfjlf0bymwc830dryp16wpj9zv"; + revision = "3"; + editedCabalFile = "1gx4vjk99lr10bcvdismr84i6rpl5ny0j08f7f7rq9j8hivj0frp"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -214504,8 +215235,6 @@ self: { testHaskellDepends = [ async base bytestring hspec unix ]; description = "Ergonomic process launching with extreme flexibility and speed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "procrastinating-structure" = callPackage @@ -215672,8 +216401,8 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.7.0.0"; - sha256 = "1dg73jwc9mis7igxdj3chkb8fz9a25wxw3d6nz11r98z3ambd8rs"; + version = "0.7.1.0"; + sha256 = "0b5wn89d23p87swjbafndrbmklix360amcq5jsl73zaqlh3vy4sy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim lens-family parsec @@ -215692,8 +216421,8 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.9"; - sha256 = "0ndh8jr9aybjpf1p6a6zs2qjci0z7h3c3v3i5hf28ls8w2g8zr4x"; + version = "0.1.2.10"; + sha256 = "1dx82fx4q2q58xavkw62ws34vikpg5g6p0w3mpvn0pigwykjnzda"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -215763,8 +216492,8 @@ self: { ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.1.7"; - sha256 = "0fskg0y66qp81z2x2r6jyvrisn7asmbynnq1zq2j97dn7003nqpa"; + version = "0.1.1.8"; + sha256 = "1y5ygqzwyvphxyj6qr5cnknjk06rs6h0xlbwa864p6hjwlayapcn"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; @@ -215781,8 +216510,8 @@ self: { }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.7.0.0"; - sha256 = "1db0z3394g1fzw80ilxldbvy7m3a4piks0fk2wmlaw5k6bza82c7"; + version = "0.7.1.0"; + sha256 = "0yrwif600lr2pmqfninwap348k4xg5mvzx9cqp99gdgkknfb88hn"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ base lens-family proto-lens proto-lens-runtime text @@ -215799,8 +216528,8 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.7.0.0"; - sha256 = "1k060lr5d54mzj6c7d2k19vg2432mfnp66wr7gs1qcgpj19q9yvs"; + version = "0.7.1.0"; + sha256 = "14lbal80mrwla51h3yax8v1hsd05mh5xyipc051n0jkxdifs1cv5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath ]; @@ -215819,8 +216548,8 @@ self: { }: mkDerivation { pname = "proto-lens-runtime"; - version = "0.7.0.0"; - sha256 = "0qxangmbldzdvm9qdvhw1cnjakx0zrxrq0nbscqvih2m2yzaxhad"; + version = "0.7.0.1"; + sha256 = "03dxnawrsz22s52qzfwgnzs18r7mdb1jvirsck2g62bh5incg80a"; libraryHaskellDepends = [ base bytestring containers deepseq filepath lens-family proto-lens text vector @@ -215835,8 +216564,8 @@ self: { }: mkDerivation { pname = "proto-lens-setup"; - version = "0.4.0.4"; - sha256 = "09ka0x4ril0lw3ppx2q26zw2r9g2cszsyqrbwy0amw78g1kxma8v"; + version = "0.4.0.5"; + sha256 = "1zl6srfsa4nizrrrbm7b69200w42rfmxmyzdzgb3cl0675ks2r28"; libraryHaskellDepends = [ base bytestring Cabal containers deepseq directory filepath process proto-lens-protoc temporary text @@ -219877,8 +220606,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.4"; - sha256 = "1kqinh0vwbl5qh55ai41nmkbcfbhmjdwp5pp0xap03cd0nmn84xq"; + version = "0.3.5"; + sha256 = "1b1xwsh01d5p685r85w0mlnf6ldqzy57vrbcsnr9lgdn6bjhvlih"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -220333,8 +221062,8 @@ self: { }: mkDerivation { pname = "ralist"; - version = "0.3.0.0"; - sha256 = "1qy6y7fcylbp6lym7y1k0bg28imhrfxrkvlfrm9mxg3lhvl71mrf"; + version = "0.4.0.0"; + sha256 = "1axn2mh1jiz5d39ygf0hg7a0bkywnld4j8jjkflycks1yr7mxha1"; libraryHaskellDepends = [ base deepseq indexed-traversable transformers ]; @@ -233640,22 +234369,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "scheduler_2_0_0" = callPackage - ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions - , genvalidity-hspec, hspec, hspec-discover, mwc-random, primitive - , pvar, QuickCheck, template-haskell, unliftio, unliftio-core - , vector + "scheduler_2_0_0_1" = callPackage + ({ mkDerivation, atomic-primops, base, deepseq, exceptions + , genvalidity-hspec, hspec, hspec-discover, primitive, pvar + , QuickCheck, unliftio, unliftio-core }: mkDerivation { pname = "scheduler"; - version = "2.0.0"; - sha256 = "1i0fz2gj2q12gfl1h8ar0ikkqksznr1rij7fsx1v0qi6qg9d7cc3"; + version = "2.0.0.1"; + sha256 = "1hdqm04m3n5y3xrhilj0hykrmqdsjz5p6k2p9y1005khkj5dag9f"; libraryHaskellDepends = [ atomic-primops base deepseq exceptions primitive pvar unliftio-core ]; testHaskellDepends = [ - base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck - template-haskell unliftio vector + base deepseq genvalidity-hspec hspec QuickCheck unliftio ]; testToolDepends = [ hspec-discover ]; description = "Work stealing scheduler"; @@ -234148,8 +234875,8 @@ self: { pname = "scotty"; version = "0.12"; sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "5"; - editedCabalFile = "0fvxkpggysz6wfpllqwzx5xywgb2fnfmknw9xhvmxgk765v60jrn"; + revision = "6"; + editedCabalFile = "15gwvx9gdk4vxh1x2n5xvnrix8m0wl96a4aqbdmdfrka43sywfma"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types @@ -236187,6 +236914,8 @@ self: { pname = "semigroupoids"; version = "5.3.6"; sha256 = "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n"; + revision = "1"; + editedCabalFile = "0inbks8x588bpcw7kyap69iy0zrkygycp8hwgrd9yhbxlvj9hmh9"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive hashable tagged template-haskell transformers @@ -237500,10 +238229,8 @@ self: { }: mkDerivation { pname = "servant-benchmark"; - version = "0.1.2.0"; - sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; - revision = "3"; - editedCabalFile = "17pj6n143lpk5nsr6j8j1a6fj45y1bv61jcm16m0fwsdmhv01866"; + version = "0.2.0.0"; + sha256 = "0dxyq9n0v09287nz1nqb2m0bdyabdzqig9avpmx4viyf9xzyh6bd"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml @@ -237621,7 +238348,6 @@ self: { ]; description = "Command line interface for Servant API clients"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-client" = callPackage @@ -238175,6 +238901,7 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "servant-haxl-client" = callPackage @@ -238693,8 +239420,8 @@ self: { }: mkDerivation { pname = "servant-pagination"; - version = "2.3.0"; - sha256 = "0kza7lr3akx3zviqbxlw74f1y66y8c6kys52n49brvrhqwnv4xwd"; + version = "2.4.1"; + sha256 = "181an5p0qfzbv3cirnaq8bw778iib4qhv53y60z1ssn16v2vxhq5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239565,8 +240292,8 @@ self: { }: mkDerivation { pname = "servant-to-elm"; - version = "0.4.2.0"; - sha256 = "1hbz6c9233wgpgmgnplg9qv5hrniynkn5n4zsmkyansw07gmaw05"; + version = "0.4.3.0"; + sha256 = "1s63x270bci7nyz595azff1ny868jjpqbilmy01rzbspjrfhwi7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240542,6 +241269,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "sexp-grammar_2_3_3_1" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , criterion, data-fix, deepseq, happy, invertible-grammar + , prettyprinter, QuickCheck, recursion-schemes, scientific + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , utf8-string + }: + mkDerivation { + pname = "sexp-grammar"; + version = "2.3.3.1"; + sha256 = "08sqpk5qgq3mqlxvz24sw43m52khynpf41cnd4yif4b4ri583mb9"; + libraryHaskellDepends = [ + array base bytestring containers data-fix deepseq + invertible-grammar prettyprinter recursion-schemes scientific + semigroups text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring containers invertible-grammar prettyprinter + QuickCheck scientific semigroups tasty tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + description = "Invertible grammar combinators for S-expressions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sexp-show" = callPackage ({ mkDerivation, base, pretty-show }: mkDerivation { @@ -241364,6 +242121,8 @@ self: { pname = "shakespeare"; version = "2.0.25"; sha256 = "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4"; + revision = "1"; + editedCabalFile = "0na31a7h3sq8ndrx79waywsfj5667pm0masy10gxzhzwmf6i3s1l"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -242179,8 +242938,8 @@ self: { pname = "short-vec"; version = "0.1.0.0"; sha256 = "0w651jipwxh7k4ng5rvq507br4347hzy8x8c47c1g7haryj80gzq"; - revision = "2"; - editedCabalFile = "1w56zmw085509grvk5ddlrv12pqpzfpmdprjd44lv4sgzv09bzfk"; + revision = "4"; + editedCabalFile = "1rwzaxdpkrn1v7p8jph4m91vyphdzm9h2yppnmanp636p0sjxzf4"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive fin-int indexed-traversable integer-gmp portray portray-diff QuickCheck @@ -242197,8 +242956,10 @@ self: { gauge indexed-traversable integer-gmp portray portray-diff QuickCheck semigroupoids sint ]; - description = "A length-indexed vector type build on 'SmallArray#'"; + description = "Length-indexed vectors using SmallArray#"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "short-vec-lens" = callPackage @@ -242209,11 +242970,14 @@ self: { pname = "short-vec-lens"; version = "0.1.0.0"; sha256 = "1afz1izz19xrjy0cdhmpy7b667waa5v8jh1ps3jpjfpgbmysjz3g"; + revision = "1"; + editedCabalFile = "1bkvx7csgqdn16kamih5h797pcg3ppcf6gln7lf01bw9pd5hpkkb"; libraryHaskellDepends = [ base fin-int indexed-traversable lens short-vec sint ]; description = "Lenses and related functionality for the `short-vec` package"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "shortbytestring" = callPackage @@ -248097,8 +248861,10 @@ self: { pname = "snumber"; version = "0.1.0.0"; sha256 = "0f340hzhhmiy342c5250m61f3gkcnfymjbd2a13alzdh7pmhb2mg"; + revision = "1"; + editedCabalFile = "0cc7chg4qhqlrkdv2m7y514gs9lm1hixwaw543dv47vqb12063im"; libraryHaskellDepends = [ base numeric-kinds ]; - description = "Indexed numeric types linking type-level and value-level numbers"; + description = "Integer singletons with flexible representation"; license = lib.licenses.asl20; }) {}; @@ -252134,6 +252900,8 @@ self: { pname = "stackcollapse-ghc"; version = "0.0.1.4"; sha256 = "1scqjjp1cpz3zzvqa6wmfz11qrhsbqwgq7h8qjg0d8ri3r9z82lb"; + revision = "1"; + editedCabalFile = "0k4gayvmjdfvfbyxjcmw1hk9vi90l0f9p3npi4rv2wwn1pl00vgm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -255653,8 +256421,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "string-interpreter"; - version = "0.5.3.0"; - sha256 = "0ny0py7fhcbv1zkr96ngypb9mf241avds0i77lynnpig96j1ay14"; + version = "0.5.4.1"; + sha256 = "1dgmqircw5gz62crxzx3d7gk2xyvmcwqdy15rpjgy2q7q5brcv7h"; libraryHaskellDepends = [ base ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; @@ -256311,6 +257079,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "structured_0_1_1" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, binary + , bytestring, containers, hashable, scientific, tagged, text + , time-compat, transformers, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "structured"; + version = "0.1.1"; + sha256 = "1mz02ys85z79nj24ylsmgh8v2m7zv2rixf7w0iqnwc49lax52w4q"; + libraryHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + hashable scientific tagged text time-compat transformers + unordered-containers uuid-types vector + ]; + description = "Structure (hash) of your data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "structured-cli" = callPackage ({ mkDerivation, base, data-default, exceptions, haskeline, mtl , split, transformers @@ -257715,6 +258503,8 @@ self: { libraryPkgconfigDepends = [ librsvg ]; description = "Binding to the libsvg-cairo library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) librsvg;}; "svgone" = callPackage @@ -258226,7 +259016,7 @@ self: { license = "unknown"; }) {}; - "sydtest_0_4_0_0" = callPackage + "sydtest_0_4_1_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -258235,8 +259025,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.4.0.0"; - sha256 = "1r3isd8rjlzx7j1j5drgd1zjxdp8a1hvwsla513hpv32mkbqf0za"; + version = "0.4.1.0"; + sha256 = "1g63qq1hisfpnic9sl2a8bry1wyr6ccdcq0l2dagdnggripjgdl1"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -261471,8 +262261,8 @@ self: { pname = "taskwarrior"; version = "0.3.0.0"; sha256 = "1h24d799q1s6b36hd40bxa4c9m1izkgh6j7p2jv1p6cxngz28ni0"; - revision = "5"; - editedCabalFile = "1h7ybnxx5f0w1h13wzbx30ycf578dnv12wx4pqn3pfxqz1jz3gjg"; + revision = "6"; + editedCabalFile = "02jag4yib1fqf2fp9p323hb3vsbkrqm1k9zp2wag6ysl5kvvq1x6"; libraryHaskellDepends = [ aeson base bytestring containers process random text time unordered-containers uuid @@ -263549,6 +264339,8 @@ self: { pname = "ten"; version = "0.1.0.2"; sha256 = "0djvcb2l9dnnjbhivchi6yyaj5i96jmy7yhr9x3paiz1l54brrqx"; + revision = "1"; + editedCabalFile = "1dcr49q8g3wr1glhlawvg4bbz3mykvwnx7z9pw1ssvk9w7839z6r"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive hashable portray portray-diff some text transformers wrapped @@ -263558,7 +264350,7 @@ self: { HUnit portray portray-diff some test-framework test-framework-hunit text transformers wrapped ]; - description = "Typeclasses like Functor, etc. over arity-1 type constructors."; + description = "Functors et al. over arity-1 type constructors"; license = lib.licenses.asl20; }) {}; @@ -263583,6 +264375,8 @@ self: { pname = "ten-unordered-containers"; version = "0.1.0.2"; sha256 = "0y4aw77ix2ay43l8n17322hbmm1npcdr1bl7kdza377jd1ci20px"; + revision = "1"; + editedCabalFile = "196gjc39c0x4p444byh7mwnhf9ci7dxhmxl602ha52fr554cdh0j"; libraryHaskellDepends = [ base hashable portray portray-diff some ten unordered-containers wrapped @@ -263592,7 +264386,7 @@ self: { portray-pretty some ten ten-lens test-framework test-framework-hunit text transformers unordered-containers wrapped ]; - description = "A package providing one unordered container"; + description = "Higher-kinded hash containers"; license = lib.licenses.asl20; }) {}; @@ -265702,6 +266496,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-short_0_1_4" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim + , hashable, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "text-short"; + version = "0.1.4"; + sha256 = "1p56cjm6f883ajb54y8hmrl01sqda6a36xvbmgjv3mb9gxv953v4"; + libraryHaskellDepends = [ + base binary bytestring deepseq ghc-prim hashable template-haskell + text + ]; + testHaskellDepends = [ + base binary bytestring quickcheck-instances tasty tasty-hunit + tasty-quickcheck template-haskell text + ]; + description = "Memory-efficient representation of Unicode text strings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion @@ -267329,6 +268145,8 @@ self: { pname = "threepenny-gui"; version = "0.9.1.0"; sha256 = "00sjkfa9qfnnwqfdw68yb8hq6nm1y5qv9896rzn5aachr7mlfpx2"; + revision = "1"; + editedCabalFile = "0zdpkp0pl6z4aabikbq30md392gk988fxwcqw10khv1icm143pcc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -271979,6 +272797,34 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_2_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, bytestring, bytestring-builder, containers + , criterion, deepseq, Diff, hashable, parsec, parsers, pretty + , primitive, QuickCheck, scientific, semialign, strict, tagged + , tasty, tasty-golden, tasty-quickcheck, text, these, time + , trifecta, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.2.1"; + sha256 = "0bybi4qp7nj9117yza5qqgw2f7s6rk3i7q642jqd7sdn3bx5cnap"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + bytestring-builder containers deepseq hashable parsec parsers + pretty primitive QuickCheck scientific semialign strict tagged text + these time unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-compat parsec primitive + QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -283869,6 +284715,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "wai-feature-flags_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, splitmix, text + , unordered-containers, wai, warp + }: + mkDerivation { + pname = "wai-feature-flags"; + version = "0.1.0.2"; + sha256 = "03w8hskgajvkhjsrj7ynxcx92qghqfd9rfxb5v4wm7wb6lag8qvh"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring splitmix text unordered-containers wai + ]; + executableHaskellDepends = [ base wai warp ]; + description = "Feature flag support for WAI applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -285684,6 +286550,8 @@ self: { ]; description = "Warp based on QUIC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "warp-static" = callPackage @@ -287299,6 +288167,32 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "weeder_2_3_0" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , dhall, directory, filepath, generic-lens, ghc, lens, mtl + , optparse-applicative, regex-tdfa, text, transformers + }: + mkDerivation { + pname = "weeder"; + version = "2.3.0"; + sha256 = "1l3g0afb0k91qb64kpj18nb53njbv3s5w06rkjf58p7qk6ynk9ig"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers dhall directory + filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa + text transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers + ]; + description = "Detect dead code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "weekdaze" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , cryptohash, data-default, deepseq, directory, extra, factory @@ -288198,6 +289092,8 @@ self: { pname = "witherable"; version = "0.4.1"; sha256 = "1jj2dq0ddaa2v3hksnrv1z1ll19fa4npsqlp7fs4nn5g6833y58b"; + revision = "1"; + editedCabalFile = "02l2gbcab7w72hqlbs1ikylgb1970a0iyrikn847nncivbzrc3gj"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -289152,8 +290048,10 @@ self: { pname = "wrapped"; version = "0.1.0.1"; sha256 = "00fvammhn4dlna5d1dc8lpwrdrigj9cnlyi8scwslibr6bjsjzfp"; + revision = "1"; + editedCabalFile = "0qfl0k0bsxhf5zibfdfm08jn82j1nm8pdnmv23znmhv77hpm4li8"; libraryHaskellDepends = [ base ]; - description = "Provides a single standardized place to hang DerivingVia instances"; + description = "Newtypes to carry DerivingVia instances"; license = lib.licenses.asl20; }) {}; @@ -289163,8 +290061,10 @@ self: { pname = "wrapped-generic-default"; version = "0.1.0.1"; sha256 = "10hbz8m98cw8lr2xj0wkc017pnypagb11ss1ihpp6lnc4w1hpj3f"; + revision = "1"; + editedCabalFile = "0i75biqz6qml17yzg3k4q0ms5vzvwph37da1wl3l5v8cjnw2yrs7"; libraryHaskellDepends = [ base data-default-class wrapped ]; - description = "Provides an orphan instance Default (Wrapped Generic a)"; + description = "A Generic instance of Default"; license = lib.licenses.asl20; }) {}; @@ -291884,16 +292784,16 @@ self: { }) {}; "xmonad-dbus" = callPackage - ({ mkDerivation, base, dbus, utf8-string }: + ({ mkDerivation, base, dbus }: mkDerivation { pname = "xmonad-dbus"; - version = "0.1.0.0"; - sha256 = "18phy3wxags8cmgs9bdkhwb4gy8fr72j25b18nk44q8956a3060p"; + version = "0.1.0.1"; + sha256 = "15sqfk4y4arrv0bjzkrw49z1p7k3fqkn4w8pak2j7rki3915iyd4"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base dbus utf8-string ]; - executableHaskellDepends = [ base dbus utf8-string ]; - testHaskellDepends = [ base dbus utf8-string ]; + libraryHaskellDepends = [ base dbus ]; + executableHaskellDepends = [ base dbus ]; + testHaskellDepends = [ base dbus ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -292955,6 +293855,8 @@ self: { pname = "yaml"; version = "0.11.6.0"; sha256 = "0hxg9mfi1dn9a7kp3imzfvnk7jj4sdjdxi6xyqz9ra7lqg14np3r"; + revision = "1"; + editedCabalFile = "1yydwna0x7fj1zw0zkz3n1cfvnwdykblk19wz5bw9rcwp0i0mzkb"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -292973,6 +293875,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "yaml_0_11_7_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.11.7.0"; + sha256 = "0s08kw0hqxixxripwjmz7b4yh9130dws3jaj460x8ds8q4b6khbx"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath libyaml mtl resourcet scientific template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq + resourcet scientific template-haskell temporary text transformers + unordered-containers vector + ]; + description = "Support for parsing and rendering YAML documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix index 846d6a045a..e9b6bdf83c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix @@ -8,31 +8,34 @@ stdenv.mkDerivation rec { pname = "dbqn" + lib.optionalString buildNativeImage "-native"; - version = "0.pre+unstable=2021-10-05"; + version = "0.pre+date=2021-10-08"; src = fetchFromGitHub { owner = "dzaima"; repo = "BQN"; - rev = "c31ceef52bbf380e747723f5ffd09c5f006b21c5"; - sha256 = "1nzqgwpjawcky85mfrz5izs9lfb3aqlm96dc8syrxhgg20xrziwx"; + rev = "0001109a1c5a420421b368c79d34b1e93bfe606e"; + hash = "sha256-riHHclTLkrVbtzmcz9ungAIc7kaoFHS77+SNatsfNhc="; }; nativeBuildInputs = [ - makeWrapper jdk + makeWrapper ]; dontConfigure = true; + postPatch = '' + patchShebangs --build ./build8 + ''; + buildPhase = '' runHook preBuild - patchShebangs --build ./build8 ./build8 '' + lib.optionalString buildNativeImage '' native-image --report-unsupported-elements-at-runtime \ - -H:CLibraryPath=${lib.getLib jdk}/lib \ - -J-Dfile.encoding=UTF-8 -jar BQN.jar dbqn + -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ + -jar BQN.jar dbqn '' + '' runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix index 9563115843..d061a6cb9c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix @@ -8,30 +8,34 @@ stdenv.mkDerivation rec { pname = "dapl" + lib.optionalString buildNativeImage "-native"; - version = "0.2.0+unstable=2021-06-30"; + version = "0.2.0+date=2021-10-16"; src = fetchFromGitHub { owner = "dzaima"; repo = "APL"; - rev = "28b3667beb23c6472266bb2b6eb701708fa421c6"; - hash = "sha256-2kM9XDMclxJNOZngwLvoDQG23UZQQ6ePK/j215UumCg="; + rev = "5eb0a4205e27afa6122096a25008474eec562dc0"; + hash = "sha256-UdumMytqT909JRpNqzhYPuKPw644m/vRUsEbIVF2a7U="; }; nativeBuildInputs = [ - makeWrapper jdk + makeWrapper ]; dontConfigure = true; + postPatch = '' + patchShebangs --build ./build + ''; + buildPhase = '' runHook preBuild - patchShebangs --build ./build ./build '' + lib.optionalString buildNativeImage '' native-image --report-unsupported-elements-at-runtime \ - -H:CLibraryPath=${lib.getLib jdk}/lib -jar APL.jar dapl + -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ + -jar APL.jar dapl '' + '' runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix index a780e6ba49..de61714f24 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix @@ -16,7 +16,8 @@ let overrides = packageOverrides; }; -plat = if stdenv.isLinux then "linux" +plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" + else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" else if stdenv.isDarwin then "macosx" else if stdenv.hostPlatform.isMinGW then "mingw" else if stdenv.isFreeBSD then "freebsd" diff --git a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix index db5284e912..5f29e04112 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix @@ -42,6 +42,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; platforms = platforms.unix; - maintainers = [ maintainers.peti ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/argtable/default.nix b/third_party/nixpkgs/pkgs/development/libraries/argtable/default.nix index a16885ab25..f22f81c877 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/argtable/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/argtable/default.nix @@ -1,22 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake }: stdenv.mkDerivation rec { pname = "argtable"; - version = "3.1.5"; - srcVersion = "v${version}.1c1bb23"; + version = "3.2.1"; + srcVersion = "v${version}.52f24e5"; src = fetchFromGitHub { owner = "argtable"; repo = "argtable3"; rev = srcVersion; - sha256 = "sha256-sL6mnxsuL1K0DY26jLF/2Czo0RxHYJ3xU3VyavISiMM="; + hash = "sha256-HFsk91uJXQ0wpvAQxP4/yZwRQx9kLH7KgB3Y/+zcZC0="; }; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + postPatch = '' patchShebangs tools/build ''; @@ -37,4 +42,7 @@ stdenv.mkDerivation rec { platforms = with platforms; all; }; } -# TODO [ AndersonTorres ]: a NixOS test suite +# TODO: a NixOS test suite +# TODO: multiple outputs +# TODO: documentation +# TODO: build both shared and static libs diff --git a/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix b/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix index 03dd009d26..6b22c34e0c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "atkmm_2_36"; packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix new file mode 100644 index 0000000000..5969de5468 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-auth"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-auth"; + rev = "v${version}"; + sha256 = "120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 library implementation of AWS client-side authentication"; + homepage = "https://github.com/awslabs/aws-c-auth"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix index 6f3df977ef..d0bcfc9010 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index ae47959dd3..323b600140 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.9"; + version = "0.6.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bnKIL51AW+0T87BxEazXDZElYqiwOUHQVEDKOCUzsbM="; + sha256 = "sha256-Bbb6YbPMpzVy+Pa9OGe62TXihTbUeKTlPS29sa70aQ8="; }; nativeBuildInputs = [ cmake ]; @@ -23,10 +23,20 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; + # aws-c-common misuses cmake modules, so we need + # to manually add a MODULE_PATH to its consumers + setupHook = ./setup-hook.sh; + # Prevent the execution of tests known to be flaky. - preCheck = '' + preCheck = let + ignoreTests = [ + "promise_test_multiple_waiters" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839 + ]; + in '' cat <CTestCustom.cmake - SET(CTEST_CUSTOM_TESTS_IGNORE promise_test_multiple_waiters) + SET(CTEST_CUSTOM_TESTS_IGNORE ${toString ignoreTests}) EOW ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/setup-hook.sh new file mode 100644 index 0000000000..e670f7cf85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/setup-hook.sh @@ -0,0 +1,5 @@ +addAwsCCommonModuleDir() { + cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}" +} + +postHooks+=(addAwsCCommonModuleDir) diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix new file mode 100644 index 0000000000..9d885278ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-common +, cmake +}: + +stdenv.mkDerivation rec { + pname = "aws-c-compression"; + version = "0.2.14"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-compression"; + rev = "v${version}"; + sha256 = "0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-common + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of huffman encoding/decoding"; + homepage = "https://github.com/awslabs/aws-c-compression"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix index b6468a8dae..24cb52d61a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix new file mode 100644 index 0000000000..0bde86d674 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-http"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-http"; + rev = "v${version}"; + sha256 = "1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of the HTTP/1.1 and HTTP/2 specifications"; + homepage = "https://github.com/awslabs/aws-c-http"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index 012d96fca4..938c6c7977 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.5"; + version = "0.10.9"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+H6dUKgpgXG1fh8r6k7TpVFMBso4G762zRfLAZD+Nss="; + sha256 = "sha256-16MhOQlvFwbiSBNI1NWGjrLh0z/fCnAGmc8JguZQPZM="; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix new file mode 100644 index 0000000000..92e5ad44b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, ninja +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-mqtt"; + version = "0.7.8"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-mqtt"; + rev = "v${version}"; + sha256 = "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of the MQTT 3.1.1 specification"; + homepage = "https://github.com/awslabs/aws-c-mqtt"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix new file mode 100644 index 0000000000..514fdee1d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-auth +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-s3"; + version = "0.1.27"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-s3"; + rev = "v${version}"; + sha256 = "sha256-GtBUC5cKMN9rd5GQbYoipVvxrUCCNKbb5vhHUGQpeH8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-auth + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 library implementation for communicating with the S3 service"; + homepage = "https://github.com/awslabs/aws-c-s3"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix index 75b26695e2..9042dc5615 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-checksums/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix new file mode 100644 index 0000000000..68414931e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-auth +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-event-stream +, aws-c-http +, aws-c-io +, aws-c-mqtt +, aws-c-s3 +, aws-checksums +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-crt-cpp"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-crt-cpp"; + rev = "v${version}"; + sha256 = "0ijvyg3hrh1d0npca62syz8qy6nkqh90fq54cqyln0p333z16q52"; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace '-Werror' "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + aws-c-auth + aws-c-cal + aws-c-common + aws-c-compression + aws-c-event-stream + aws-c-http + aws-c-io + aws-c-mqtt + aws-c-s3 + aws-checksums + s2n-tls + ]; + + cmakeFlags = [ + "-DBUILD_DEPS=OFF" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C++ wrapper around the aws-c-* libraries"; + homepage = "https://github.com/awslabs/aws-crt-cpp"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 69cb1cc22a..d58fabfd5e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib +, aws-crt-cpp , aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -17,15 +18,23 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.8.130"; + version = "1.9.121"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs="; + sha256 = "sha256-VQpWauk0tdJ1QU0HmtdTwQdKbiAuTTXXsUo2cqpqmdU="; }; + postPatch = '' + # Includes aws-c-auth private headers, so only works with submodule build + rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # TestRandomURLMultiThreaded fails + rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp + ''; + # FIXME: might be nice to put different APIs in different outputs # (e.g. libaws-cpp-sdk-s3.so in output "s3"). outputs = [ "out" "dev" ]; @@ -33,6 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ + aws-crt-cpp curl openssl zlib ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix index 2d8d13482e..fdc8f7c21f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -137,7 +137,6 @@ stdenv.mkDerivation { badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" ++ optionals (versionOlder version "1.73") lib.platforms.riscv; - maintainers = with maintainers; [ peti ]; }; preConfigure = optionalString useMpi '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/buddy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/buddy/default.nix index d6ab4fe0df..47b61fe035 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/buddy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/buddy/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = "as-is"; platforms = lib.platforms.unix; # Once had cygwin problems - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix index 69e16a8922..09a407fc3b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -5,27 +5,29 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.8"; + version = "2.9.9"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "sha256-nEICs1oAIXu6/5O4R3mbwig1OY+HDIWWeQjrcYnCwT0="; + hash = "sha256-DWyqVN7v+j2XCArv4jmrD45XKWMNhd2DddJHH3gQWQY="; }; + outputs = [ "out" "doc" ]; + installPhase = '' runHook preInstall + install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples install -m 644 CImg.h $out/include/ cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ cp README.txt $doc/share/doc/cimg/ + runHook postInstall ''; - outputs = [ "out" "doc" ]; - meta = with lib; { homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix index 360094ea76..410c0afd8a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix @@ -39,6 +39,14 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix for falling back to GeoIP when WiFi devices are not found + # https://gitlab.freedesktop.org/geoclue/geoclue/-/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494 + # NOTE: this should be removed when the next version is released + (fetchpatch { + url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494.patch"; + sha256 = "hv7t2Hmpv2oDXiPWA7JpYD9q+cuuk+En/lJJickvFII="; + }) + # Make the Mozilla API key configurable # https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported) (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index ff3e9ee52e..a556b64f1d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -1,26 +1,69 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, exiv2 +, glib +, gnome +, gobject-introspection +, vala +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +}: stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.12.3"; + version = "0.14.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jt5cqL8b4QBULrR7XnBy+xnKVHhgMHh7DPKbHMMWfM="; + sha256 = "5YJ5pv8gtvZPpJlhXaXptXz2W6eFC3L6/fFyIanW1p4="; }; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib ]; - propagatedBuildInputs = [ exiv2 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + # Python binding overrides + python3 + python3.pkgs.pygobject3 + ]; + + propagatedBuildInputs = [ + exiv2 + ]; mesonFlags = [ "-Dgtk_doc=true" + "-Dpython3_girdir=${placeholder "out"}/${python3.sitePackages}/gi/overrides" ]; doCheck = true; + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running unit tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/gexiv2/libgexiv2.so.2 $out/lib/libgexiv2.so.2 + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -31,7 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.gnome.members; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix index db713cf9ea..1ba18898ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.68.1"; + version = "2.70.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ZmTifJqcyoHCnjVof0ny4NFzovyemMNCgxH3B9tTL4w="; + sha256 = "sha256-gAj9iu3cyGej+X8RPeYl9ulu+Yz3hgN5gTqcD+/9tSA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix index dfa454b925..f409935372 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.1"; + version = "2.66.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ab1rUydxbKL1EatYCpaf178M0sJM4V4dDlMFktP/IJw="; + sha256 = "sha256-sqTNe5rph3lMu1ob7MEM7LZRgrm7hBhoYl1ruxI+2x0="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix index 73061a3d2e..ea6a7ee423 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix @@ -75,7 +75,6 @@ let self = stdenv.mkDerivation rec { platforms = platforms.all; badPlatforms = [ "x86_64-darwin" ]; - maintainers = [ maintainers.peti ]; }; }; in self diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gmp/6.x.nix index 177c156705..6228b6aaab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmp/6.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmp/6.x.nix @@ -82,7 +82,7 @@ let self = stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.peti maintainers.vrthra ]; + maintainers = [ maintainers.vrthra ]; }; }; in self diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix index 4194064a5a..1f2966695d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix index c5decffe74..8a07f31b81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix @@ -9,6 +9,7 @@ , cairo , gtk3 , glib +, gnome }: stdenv.mkDerivation rec { @@ -39,6 +40,14 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/default.nix index 1bc763349a..03268fb024 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; + versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix index 4e706f4098..7642080086 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; attrPath = "goocanvasmm2"; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # stable version has not been released yet, last update 2015 }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix index 13ec503fae..ed8f8edd65 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.13"; + version = "0.3.14"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HEMF1nNkqTBUODbMGYLzDpRpc7j/avPv4x2HcJq1IPg="; + sha256 = "aGhEs07HOySTH/bMT2Az8AcpR6bbYKzcf7Pq8Velgcg="; }; patches = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "A collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix index 172ae39536..16897c6f04 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix @@ -1,40 +1,62 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, vala +, glib +, liboauth +, gtk3 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, libxml2 +, gnome +, gobject-introspection +, libsoup +, totem-pl-parser +}: -let +stdenv.mkDerivation rec { pname = "grilo"; - version = "0.3.13"; # if you change minor, also change ./setup-hook.sh -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.3.14"; # if you change minor, also change ./setup-hook.sh outputs = [ "out" "dev" "man" "devdoc" ]; outputBin = "dev"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2021-39365.patch"; - url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/cd2472e506dafb1bb8ae510e34ad4797f63e263e.patch"; - sha256 = "1i1p21vlms43iawg4dl1dibnpsbnkx27kcfvllnx76q07bfrpwzm"; - }) - ]; - setupHook = ./setup-hook.sh; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "A2nQsAuw9Zul966oz8Zl843xSltBgtKMfB4s0VtRh0M="; + }; + mesonFlags = [ "-Denable-gtk-doc=true" ]; nativeBuildInputs = [ - meson ninja pkg-config gettext gobject-introspection vala - gtk-doc docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkg-config + gettext + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + liboauth + gtk3 + libxml2 + libsoup + totem-pl-parser ]; - buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { updateScript = gnome.updateScript { @@ -47,7 +69,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 7123aa0d3a..76adcc1fae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = "gst_all_1.gstreamermm"; + attrPath = "gst_all_1.gstreamermm"; + packageName = "gstreamermm"; versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix index e6c6d93919..b7c2d5d3aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix @@ -9,19 +9,19 @@ , glib , gtk3 , freerdp -, nix-update-script +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "3.37.1-unstable-2020-10-26"; + version = "unstable-2021-10-01"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "805721e82ca1df6a50da3b5bd3b75d6747016482"; - sha256 = "q/UFKYj3LUkAzll3KeKd6oec0GJnDtTuFMTTatKFlcs="; + rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0"; + sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko="; }; nativeBuildInputs = [ @@ -39,8 +39,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = unstableGitUpdater { + # The updater tries src.url by default, which does not exist for fetchFromGitHub (fetchurl). + url = "${meta.homepage}.git"; + branch = "gtk-frdp-0-1"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 7999d62b91..499615a79c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -202,6 +202,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtk+"; attrPath = "gtk3"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix index 2e43e58db4..734cf833fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "${pname}3"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix index 0a654d9518..67afc4026d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.2.0"; + version = "4.4.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12x9j82y37r4v0ngs22rzp4wmw7k2bbb9d3bymcczzz7y8w4q328"; + sha256 = "LrRkMmCW5qQMgunNB0Fk2BA/teB4ZWecCmSeQXRwDdo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index e5563d37f1..0095b6ca9e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { packageName = "gtksourceview"; attrPath = "gtksourceview4"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 3011a126c1..5bdcc029c5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "gtksourceviewmm4"; packageName = pname; versionPolicy = "none"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix index 2b91240325..cdc96f3f1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtksourceviewmm"; versionPolicy = "none"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index c6271b13a8..6002b8c84b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.3.4"; + version = "21.3.5"; outputs = [ "out" "dev" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr"; + sha256 = "1wc8qhz1j4z42jmnsr38y15kc0jhfqfx8ssnb5055kmmmvzwk1sh"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index 405598c696..5889c6ee3a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -12,13 +12,16 @@ , vala , gobject-introspection , fribidi +, glib , gtk4 +, gnome +, gsettings-desktop-schemas , xvfb-run }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.0.0-alpha.2"; + version = "1.0.0.alpha.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - sha256 = "1yvjdzs5ipmr4gi0l4k6dkqhl9b090kpjc3ll8bv1a6i7yfaf53s"; + sha256 = "sha256-4ED2m8hZMWbu5sFbkH0W6q05+cYCCkx+ubeDqg3W3a0="; }; nativeBuildInputs = [ @@ -54,13 +57,31 @@ stdenv.mkDerivation rec { ]; checkInputs = [ + gnome.adwaita-icon-theme xvfb-run ]; doCheck = true; checkPhase = '' - xvfb-run meson test + runHook preCheck + + testEnvironment=( + # Disable portal since we cannot run it in tests. + ADW_DISABLE_PORTAL=1 + + # AdwSettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme. + # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name. + # See adw_settings_constructed function in https://gitlab.gnome.org/GNOME/libadwaita/commit/60ec69f0a5d49cad8a6d79e4ecefd06dc6e3db12 + "XDG_DATA_DIRS=${glib.getSchemaPath gsettings-desktop-schemas}/../.." + + # Tests need a cache directory + "HOME=$TMPDIR" + ) + env "''${testEnvironment[@]}" xvfb-run \ + meson test --print-errorlogs + + runHook postCheck ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix index b3f6e1a7cd..63acabb320 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix @@ -87,6 +87,7 @@ assert postgresSupport -> postgresql != null; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix index ad5e0cbecd..34735e644e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgdamm/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # Should be odd-unstable but stable version has not been released yet. }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index 8a38aa36c0..2d4a1004d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -35,6 +35,7 @@ , python3 , readline , soci +, boost , speex , sqlite , lib, stdenv @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { pango readline soci + boost speex sqlite udev diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix index cbc2c8a617..d4583c74df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.6"; + version = "2.10.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths="; + sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "libsigcxx"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix index 6fd7f3e696..b958ba3076 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { glib-networking.out ]; updateScript = gnome.updateScript { - attrPath = "libsoup3"; + attrPath = "libsoup_3"; packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 6d2150103a..f902d32037 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index dca856dbb5..0e5785e8c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -84,23 +84,24 @@ let in stdenv.mkDerivation rec { pname = "libvirt"; - version = "7.7.0"; + version = "7.8.0"; src = if buildFromTarball then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "1cjj48dn4ww13ayicd2g863a5kz0sc5jlbv2991bj54dq6cn0q8v"; + sha256 = "sha256-pyfNCke/ok+n3ih00j86n58Czra0m6FSiPbZoJixmSE="; } else - fetchFromGitLab { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-gv/tORDlzZP3L3YcU6/YPEpqHQSLzEWa6kEX8EzZM28="; - fetchSubmodules = true; - }; + fetchFromGitLab + { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/tSMJFgLPAiQXcZ2qZLM4XZqf96NtW3+zwKyrwGho2s="; + fetchSubmodules = true; + }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix index 39a1d505b6..c78cc192a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwnck/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "3.36.0"; + version = "40.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM="; }; nativeBuildInputs = [ @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "${pname}${lib.versions.major version}"; - versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix index 67c5a0794e..19af942d75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "libxmlxx"; packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix index 41c842220c..b3ff59ad41 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { --replace 'docdir=''${datarootdir}' "docdir=$doc/share" ''; + passthru = { + updateScript = gnome.updateScript { + attrPath = "libxmlxx3"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix new file mode 100644 index 0000000000..a465b047a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libyaml-cpp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "release-${version}"; + sha256 = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8="; + }; + + # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \ + 'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})' + ''; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A YAML parser and emitter for C++"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix index ebfe53b251..0c3eb363a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "libyaml-cpp"; @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; }; - # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \ - 'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})' - ''; + patches = [ + # https://github.com/jbeder/yaml-cpp/issues/774 + # https://github.com/jbeder/yaml-cpp/pull/1037 + (fetchpatch { + url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; + sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; + }) + ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix index 81ad3bd810..6d6e8c519d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix @@ -5,6 +5,7 @@ , lib , soci , sqlite +, boost , stdenv }: @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-11vvvA+pud/eOyYsbRKVvGfiyhwdhNPfRQSfaquUro8="; }; - buildInputs = [ bctoolbox soci belle-sip sqlite ]; + buildInputs = [ bctoolbox soci belle-sip sqlite boost ]; nativeBuildInputs = [ cmake ]; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix index 7b5316b144..6114c4c70d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.52.21"; src = fetchurl { - url = "https://fedorahosted.org/releases/n/e/${pname}/${pname}-${version}.tar.gz"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://fedorahosted.org/newt/"; + homepage = "https://pagure.io/newt"; description = "Library for color text mode, widget based user interfaces"; license = licenses.lgpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index c3f46d8e31..0263ef3096 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -13,6 +13,7 @@ , gflags , protobuf , config +, ocl-icd , enableJPEG ? true , libjpeg @@ -313,6 +314,8 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index 2d3f1c313c..ca44788a28 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -75,6 +75,7 @@ let aarch64-darwin = "./Configure darwin64-arm64-cc"; x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + riscv64-linux = "./Configure linux64-riscv64"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" @@ -170,7 +171,6 @@ let description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; platforms = platforms.all; - maintainers = [ maintainers.peti ]; } // extraMeta; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 2ad169f2a3..1ce6f26721 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, openssl +}: stdenv.mkDerivation rec { pname = "s2n-tls"; @@ -11,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4="; }; + patches = [ + # Fix FindLibCrypto paths (https://github.com/aws/s2n-tls/pull/3067) + (fetchpatch { + url = "https://github.com/aws/s2n-tls/commit/bda649524402be4018c44bff07f6c64502a351ec.patch"; + sha256 = "02jmxsrd506vhjzlrgh1p2z1f1sn4v8klks25zisiykyqkyaczkv"; + }) + ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev"]; @@ -26,8 +39,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). postInstall = '' - substituteInPlace $out/lib/s2n/cmake/shared/s2n-targets.cmake \ - --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + # Glob for 'shared' or 'static' subdir + for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do + substituteInPlace "$f" \ + --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + done ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix index b122a3121e..82237ef143 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/serd/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-r/qA3ux4kh+GM15vw/GLgK7+z0JPaldV6fL6DrBxDt8="; }; + dontAddWafCrossFlags = true; + nativeBuildInputs = [ pkg-config python3 wafHook ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix index 2c87d421ba..5b8f93d7bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix @@ -1,25 +1,31 @@ { cmake , fetchFromGitHub , sqlite +, postgresql +, boost , lib, stdenv }: stdenv.mkDerivation rec { pname = "soci"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "SOCI"; repo = pname; - rev = version; - sha256 = "sha256-d4GtxDaB+yGfyCnbvnLRUYcrPSMkUF7Opu6+SZd8opM="; + rev = "v${version}"; + sha256 = "sha256-NE0ApbX8HG2VAQ9cg9+kX3kJQ4PR1XvWL9BlT8NphmE="; }; # Do not build static libraries cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ sqlite ]; + buildInputs = [ + sqlite + postgresql + boost + ]; meta = with lib; { description = "Database access library for C++"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sord/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sord/default.nix index 820c577908..dee53bd3b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sord/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sord/default.nix @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + ''; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ pcre ]; propagatedBuildInputs = [ serd ]; + dontAddWafCrossFlags = true; meta = with lib; { homepage = "http://drobilla.net/software/sord"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix index a0a1ac0360..9682ac1637 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { license = "as-is"; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index a5553dd0d0..2668de9b46 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg="; + sha256 = "sha256-Bi+C3VSKYq7IUQWFAROskBpiK8UcbPxjIFY2Xof4GYE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index 39ac21b7ad..fc0ba54cbe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , gettext , meson , ninja @@ -44,6 +45,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit asciidoc; }) + ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ + # Upstream: https://gitlab.gnome.org/GNOME/tracker/-/issues/332 + (fetchpatch { + name = "i686-test.patch"; + url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/af707181a2c492a794daec7ce3f3062d67ffd9dc.patch"; + sha256 = "sha256-KOdkTy79w3oiQILrPG00UVrv+VBjAk4Y868I8jtifqk="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix b/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix index 502c50db12..141c9edbd2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "usbredir"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "spice"; repo = "usbredir"; rev = "${pname}-${version}"; - sha256 = "1dz8jms9l6gg2hw0k6p1p1lnchc9mcgmskgvm5gbdvw3j7wrhdbz"; + sha256 = "1ra8vpi6wdq1fvvqzx4ny2ga0p0q1cwz72gr15nghyfp75y3d31l"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix b/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix index fc3be7421a..d6864b80f9 100644 --- a/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6"; + sha256 = "N/GswCvL5ooxuG4HwSmoOb0yduZW3Inrf8CpJ0bv8nI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index bbc9a804aa..ccd0b19e1a 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -1,6 +1,7 @@ { pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }: let + inherit (pkgs) lib; since = (version: pkgs.lib.versionAtLeast nodejs.version version); before = (version: pkgs.lib.versionOlder nodejs.version version); super = import ./composition.nix { @@ -319,23 +320,11 @@ let }; netlify-cli = - let - esbuild = pkgs.esbuild.overrideAttrs (old: rec { - version = "0.13.6"; - - src = fetchFromGitHub { - owner = "netlify"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; - }; - - }); - in super.netlify-cli.override { preRebuild = '' - export ESBUILD_BINARY_PATH="${esbuild}/bin/esbuild" + export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" ''; + meta.maintainers = with lib.maintainers; [ roberth ]; }; ssb-server = super.ssb-server.override { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/color/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/color/default.nix new file mode 100644 index 0000000000..84d2f11d86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/color/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchurl +, buildDunePackage +, gg +}: + +buildDunePackage rec { + pname = "color"; + version = "0.2.0"; + + useDune2 = true; + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/anuragsoni/color/releases/download/${version}/color-${version}.tbz"; + sha256 = "0wg3a36i1a7fnz5pf57qzbdghwr6dzp7nnxyrz9m9765lxsn65ph"; + }; + + propagatedBuildInputs = [ + gg + ]; + + meta = with lib; { + description = "Converts between different color formats"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://github.com/anuragsoni/color"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index 90486c8c39..029d9f4677 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "0.12.90"; + version = "0.12.99"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0f8858w9b421s3dfz8a56g0mik4zyi1lp88lijw4zs2d94dcdl9s"; + sha256 = "0rv8xf5yx88wh95myysqmv29n5rr15zgwsvh8a4xb1pmw3h9kb6q"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 6f1f9b0337..1d25bcae10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.15.3"; + version = "3.16.0"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-cmeCh54dwYwbL1AwGrPwTDp4F6VONclV7iu2Sm1g33Q="; + sha256 = "sha256-/60f++CemVbeUwRSzQ5dZpoQE4btRiRhnVHHDPIn3Xc="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix new file mode 100644 index 0000000000..2b3bc08d1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix @@ -0,0 +1,73 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, freezegun +, poetry-core +, pyjwt +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pytz +, titlecase +, types-pytz +}: + +buildPythonPackage rec { + pname = "aioridwell"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "0kzxh1igncql1rwh12n42qahlc94z0fsd344d1vgni50jg7i34v7"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pyjwt + pytz + titlecase + ]; + + checkInputs = [ + aresponses + freezegun + pytest-aiohttp + pytest-asyncio + pytestCheckHook + types-pytz + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'titlecase = "^2.3"' 'titlecase = "*"' \ + --replace 'pytz = "^2021.3"' 'pytz = "*"' + ''; + + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_ + "examples/" + ]; + + pythonImportsCheck = [ + "aioridwell" + ]; + + meta = with lib; { + description = "Python library for interacting with Ridwell waste recycling"; + homepage = "https://github.com/bachya/aioridwell"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix index 9d919becd4..acf106ab3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.1.2"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "1gyvisccx25py85wwwlljai5qa20jvwyvacgrgkk1h18dkc262fw"; + sha256 = "1pamfc2l95s1q86jvmbp17chjy129gk01kwy8xm88d2ijy8s1caq"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix index a508e7b271..9ea3650794 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "annexremote"; - version = "1.4.5"; + version = "1.6.0"; # use fetchFromGitHub instead of fetchPypi because the test suite of # the package is not included into the PyPI tarball @@ -17,7 +17,7 @@ buildPythonPackage rec { rev = "v${version}"; owner = "Lykos153"; repo = "AnnexRemote"; - sha256 = "0r5chdk2aiqcz7z8r8m1j657cz79f6bbv96xdmhj4m5fiqn672if"; + sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi"; }; propagatedBuildInputs = [ future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix index c2e581832f..0f86c103c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.0.1a9"; + version = "0.0.1a11"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Apycula"; - sha256 = "01shkaxakisgg253jdwjkd81vnjgfws3gi2wyrdxmkcg95wphk5y"; + sha256 = "0fwk1pgphpgj0lazjy40ii08xq2qi6bvrfc30rwfj52yff1s9akn"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 62f383c567..c60122ff18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3cb1b0e28f420232d894d89665d5c0c8241b99e56d806171f4faf5cdfec08ae1"; + sha256 = "c0357c62223fefcfc7a7565389dbd4db900623bf10eccf2bc8e87586ec59b38d"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index bad63d287b..9136ed0a4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "69035c81f280fac5fa9c55f87be3a359b264853727486e3568818bb43988080e"; + sha256 = "3faaecb645e3b2300648a4a452458ec0e31e13d9dc928e710992e43ef4694205"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index d8e8f45d7c..a89e803220 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "23.0.0"; + version = "23.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1eb26b965ba4049ddcf10d4f25818725fc03c491c3be76537d0d74ceb1146b04"; + sha256 = "49dbb0f51006d557cbd0b22999cb9ecf3eabc2be46d96efcc6d651c6b33754b3"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 8454d4463f..c2c4e6328d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "1.1.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "433ad8e83bd8df4abc5af47a0e3a7a4515f79931db4036f2bccd65b5a9e88bfb"; + sha256 = "df14272a1835f743d1889f901e972ed6ec9ea9d6f8966ba2865bf10306a621cc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 9f4966ffe8..f7e6e86a0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -4,7 +4,6 @@ , stdenv , zlib , xz -, ncompress , gzip , bzip2 , gnutar @@ -31,7 +30,7 @@ buildPythonPackage rec { sha256 = "sha256-lfHXutAp06Xr/TSBpDwBUBC/mWI9XuyImoKwA3inqgU="; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ] + propagatedBuildInputs = [ zlib xz gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ] ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ] ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix new file mode 100644 index 0000000000..c5e711bb80 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "braceexpand"; + version = "0.1.7"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version pname; + sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "braceexpand" ]; + + meta = with lib; { + description = "Bash-style brace expansion for Python"; + homepage = "https://github.com/trendels/braceexpand"; + changelog = "https://github.com/trendels/braceexpand/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix index 365f365429..03a1610ac7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Bugzilla XMLRPC access module"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ pierron peti ]; + maintainers = with maintainers; [ pierron ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/Cargo.lock deleted file mode 100644 index 0eb5882cc3..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/Cargo.lock +++ /dev/null @@ -1,520 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "brotli-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "brotli2" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -dependencies = [ - "brotli-sys", - "libc", -] - -[[package]] -name = "cc" -version = "1.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cramjam" -version = "2.3.2" -dependencies = [ - "brotli2", - "flate2", - "lz4", - "mimalloc", - "numpy", - "pyo3", - "snap", - "zstd", -] - -[[package]] -name = "crc32fast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "ctor" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "flate2" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" -dependencies = [ - "cfg-if 1.0.0", - "crc32fast", - "libc", - "miniz_oxide", -] - -[[package]] -name = "ghost" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "inventory" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" -dependencies = [ - "ctor", - "ghost", - "inventory-impl", -] - -[[package]] -name = "inventory-impl" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "jobserver" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" -dependencies = [ - "libc", -] - -[[package]] -name = "libc" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2396cf99d2f58611cd69f0efeee4af3d2e2c7b61bed433515029163aa567e65c" -dependencies = [ - "cc", -] - -[[package]] -name = "lock_api" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "lz4" -version = "1.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "matrixmultiply" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" -dependencies = [ - "rawpointer", -] - -[[package]] -name = "mimalloc" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7c6b11afd1e5e689ac96b6d18b1fc763398fe3d7eed99e8773426bc2033dfb" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "ndarray" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0d5c9540a691d153064dc47a4db2504587a75eae07bf1d73f7a596ebc73c04" -dependencies = [ - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", -] - -[[package]] -name = "num-complex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "numpy" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7073fae1e0b82409533a29c6f804b79783d7b2d3c07728fdc4d884eda8cd4f0" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "ndarray", - "num-complex", - "num-traits", - "pyo3", -] - -[[package]] -name = "parking_lot" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro2" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "pyo3" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4837b8e8e18a102c23f79d1e9a110b597ea3b684c95e874eb1ad88f8683109c3" -dependencies = [ - "cfg-if 1.0.0", - "ctor", - "indoc", - "inventory", - "libc", - "parking_lot", - "paste", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-macros" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47f2c300ceec3e58064fd5f8f5b61230f2ffd64bde4970c81fdd0563a2db1bb" -dependencies = [ - "pyo3-macros-backend", - "quote", - "syn", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b097e5d84fcbe3e167f400fbedd657820a375b034c78bd852050749a575d66" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[package]] -name = "redox_syscall" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" -dependencies = [ - "bitflags", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "snap" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" - -[[package]] -name = "syn" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "unindent" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "zstd" -version = "0.6.1+zstd.1.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "3.0.1+zstd.1.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "1.4.20+zstd.1.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" -dependencies = [ - "cc", - "libc", -] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix index 4d1227dcbc..a88cc233ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix @@ -1,35 +1,34 @@ { lib -, stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , rustPlatform +, stdenv , libiconv -, pytestCheckHook , brotli , lz4 , memory_profiler , numpy , pytest-benchmark +, pytestCheckHook , python-snappy , zstd }: buildPythonPackage rec { pname = "cramjam"; - version = "2.3.2"; + version = "2.4.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "577955f1510d99df0e4d61379c3f05568f594f91e12bc6a7e147d0abfa643a3b"; + src = fetchFromGitHub { + owner = "milesgranger"; + repo = "pyrus-cramjam"; + rev = "v${version}"; + sha256 = "sha256-00KvbiTf8PxYWljLKTRZmPIAbb+PnBleDM4p0AzZhHw="; }; - postPatch = '' - cp ${./Cargo.lock} ./Cargo.lock - ''; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sha256 = "sha256-4y/jeEZjVUbaXtBx5l3Hrbnj3iNYX089K4xexRP+5v0="; }; nativeBuildInputs = with rustPlatform; [ @@ -39,12 +38,12 @@ buildPythonPackage rec { buildInputs = lib.optional stdenv.isDarwin libiconv; checkInputs = [ - pytestCheckHook brotli lz4 memory_profiler numpy pytest-benchmark + pytestCheckHook python-snappy zstd ]; @@ -53,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Thin Python bindings to de/compression algorithms in Rust"; - homepage = "https://crates.io/crates/cramjam"; + homepage = "https://github.com/milesgranger/pyrus-cramjam"; license = with licenses; [ mit ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index 09987ddb3b..f286cd4a7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cucumber-tag-expressions"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "4ef4e0513d4c26d42299ffed010ed5e24125b87fc64de2e74b979d4a84c8f522"; + sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"; }; checkInputs = [ pytest pytest-html ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix index e414d86335..199894f132 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "5.5.0"; + version = "5.6.0"; format = "setuptools"; # pypi source does not contain all fixtures required for tests @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = version; - sha256 = "sha256-PQijGub0sAW0aBYI+Ir89SraXaWx7OcQ+txZSqodJ6w="; + sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index 4f4304fd1d..00eea271b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin peti qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix index cc5a1ba01b..33b33631c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.12"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "b3fdb4337b1e54b8a23fe41c62d91648e26249f9fc00e882d1d09e16207aa204"; + sha256 = "cb079981e2e4fe16d7f41000913225140dc334a84f5b7c5e4fcc6b7e6a028222"; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix index fdd4bd03b7..fc0d0e0921 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.1"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08"; + sha256 = "e541a46a0a899ef4778a4708be22e71cac3efacc09a6ff44bc065c5c9194c054"; }; disabled = pythonOlder "3.5"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix new file mode 100644 index 0000000000..fb3feaae63 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, decorator +, packaging +, pynput +, regex +, lark-parser +, enum34 +, pyperclip +, six +, requests +, psutil +, json-rpc +, werkzeug +, kaldi-active-grammar +, sounddevice +, webrtcvad +, setuptools +, xdotool +, wmctrl +, xorg +}: + +buildPythonPackage rec { + pname = "dragonfly"; + version = "0.32.0"; + + src = fetchFromGitHub { + owner = "dictation-toolbox"; + repo = pname; + rev = version; + sha256 = "BUbIhc8as/DVx8/4VeQS9emOLGcWFujNCxesSEEBqKQ="; + }; + + postPatch = '' + substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark-parser' + substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \ + --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' + substituteInPlace dragonfly/windows/x11_window.py \ + --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \ + --replace 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \ + --replace 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"' + ''; + + propagatedBuildInputs = [ + decorator + packaging + pynput + regex + lark-parser + enum34 + pyperclip + six + requests + psutil + json-rpc + werkzeug + kaldi-active-grammar # for the Kaldi engine + sounddevice + webrtcvad + setuptools # needs pkg_resources at runtime + ]; + + # Too many tests fail because of the unusual environment or + # because of the missing dependencies for some of the engines. + doCheck = false; + + pythonImportsCheck = [ "dragonfly" ]; + + meta = with lib; { + description = "Speech recognition framework allowing powerful Python-based scripting"; + homepage = "https://github.com/dictation-toolbox/dragonfly"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix index 883ff8bcb6..f7cdca2230 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "0sxqw1y070cpg7102a6a1bha8s25vwdgfcjp9nzlrzgd2p6pav41"; + sha256 = "0x18l8jgbki9yqx994w97dagfaqrbxi3sy2l2101is1dfjr0kib6"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index 5e9492f904..ee815e53f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.13"; + version = "0.5.14"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-Z/5YRvHcZgRuSQnaMbNIT93uSYvRzMWpdMy0M7tD2QI="; + sha256 = "06v9ifpgdfx5v8k8jwqd4y985p27s1wxl7908v3aqxv7203acn7w"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix index 984a3743f0..f656e26086 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "8680ee25238e2307596eb3900a0f8c0d9cc91189146ed8039544f1a3a69dfe6e"; + sha256 = "f491c47bb2d74fa157f9d127a1cbb2753a15939a21e78ba8b0bd323d7d101c61"; }; propagatedBuildInputs = [ six cryptography ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix index 0110db18c4..e40e7e37bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.5") [ typing ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + # Tests fail on Python 3.7 due to importlib using a deprecated interface + doCheck = !(pythonOlder "3.8"); + # fixtures fail to initialize correctly checkPhase = '' py.test tests --ignore=tests/integration/test_checker.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix new file mode 100644 index 0000000000..ac0ee80385 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "git-filter-repo"; + version = "2.33.0"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nxfd5yv8ri7w5pzxclxs0yd317nsdcwvw87ancmdkh69xvx1f2f"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "git_filter_repo" + ]; + + meta = with lib; { + description = "Quickly rewrite git repository history"; + homepage = "https://github.com/newren/git-filter-repo"; + license = with licenses; [ mit /* or */ gpl2Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index cceda84be1..8a48df97f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.6.1"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ug96Nj50fg29QHVCD95Cs+bFDnObqAiAdXh4l4qPT/k="; + sha256 = "48b8081700eeaa92f8921d5aff6a5287c0eb47a3cc483f2032105290ce0454b5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 39358062fc..c388429e56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "2454e8dd93093fe6f6ec8e6771f8a7dab19f1d02c629dbbe8972e84b5d9c01e0"; + sha256 = "3804e37865b4d63ac39eac3f8f184225db16bbc69f201b4d54abe6b68f170e60"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 9cc1d8252e..d461392705 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "0.1.3"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5d1847f44a23a2fba815cbfbe7391a0364fd6a5c088fcd5f5a09d454aad8cc7c"; + sha256 = "3d4fb605d2611586a66d16d02803fcb306331f21351b16497ee8c40753be3a27"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 3cba24e12b..203102cafb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.8.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4RQCpgJ+QkTgNAu/9rJmnA0wxOUm3HeAEDLWBbMMuSo="; + sha256 = "bedd376807ab3dde08f2d92caa0e4e5ad7c2ccfc7069561e80964b998a0d8f51"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 94a1a5e342..d7c389bb86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3gbCBb+jnz4hE2T02JsSGxoFSIVg2UDTOaRMKCXh1vg="; + sha256 = "3b53fde67a97718642d29ac26b1b7608e7581b37d1e468f3c2ae38ea6cf7308f"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index ced6464860..43b35ca198 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cxuLaZ4cBdsWsyfRqb4NJ1+RWZSJhvTTclYF9uy6QM4="; + sha256 = "49c91574e04d52fc7c0fade95dd5e6ccb51190ab8b419352d008a617c7799879"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index 23698885ab..e6b88e727f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.4.4"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RqFvdF4sYDTgz0uZfqOn1trcSQX6qrbUH89957zbUoU="; + sha256 = "e56e35fa647d794429c6fc1595b2ebf5f4d627f0b3d6499a000b54be343ea37e"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix index 8891b51342..e781c2127d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "2.4.2"; + version = "2.5.0"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "1yv84girmqm155yjhhkiy1gdflf62110m2kgjiv4vcsjpy2i6has"; + sha256 = "0zw3ihbzkldwijz9phwivnzwylj30a2a4lknfbwm6vkx78rdrb1a"; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 00791ac642..70b1a1fe52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.3"; + version = "10.4.0"; src = fetchPypi { inherit pname version; - sha256 = "ca3b0ae45a2c3a811c0dc39153b8a1ea8a5c8f786c56370a41dfd83a5bff2502"; + sha256 = "64fd249a7fcabea60953fc3e7f08da6a85960aca367c04d078b999b7f6fd0246"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index cc7572499d..741fd996ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.11.3"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; + sha256 = "ff3e8675a982f7754359ec598329ba5635014e2bfd51573b9413605849ef314a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix index 306d242d68..3faf61d169 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.8.3"; + version = "2.8.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8e22d81a53ce3316f0253bf0b7831bd72ac1122ca78896c2ee2e585178c5c9ae"; + sha256 = "4b09189f3094896cfc68596adc95b7f1d92772e1de1424e5dc4dd81def56e8b0"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inifile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inifile/default.nix index 1aac6dad01..0e9cb91ded 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inifile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inifile/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "inifile"; - version = "0.3"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0zgd53czc1irwx6b5zip8xlmyfr40hz2pd498d8yv61znj6lm16h"; + sha256 = "d9e5eb4708ebf13353c4cfce798ad47890a8bcc5fbae04630223d15d79f55e96"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix index e3f09860e8..a3d603a13d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.0.3"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d6f2ac360f51f5314e690272cb26c454e6deab69ef48a7c650ea760247d1d4db"; + sha256 = "0d6eab99067e935336289c564caab541209ddd5e951a111f604b1ec92c710b84"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch new file mode 100644 index 0000000000..4ebe5472b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch @@ -0,0 +1,156 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 66e6d49..78f7b42 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,23 +1,6 @@ + cmake_minimum_required(VERSION 3.13.0) + project(kaldi_binaries) + +-include(ExternalProject) +-include(ProcessorCount) +- +-ProcessorCount(NCPU) +-if(NOT NCPU EQUAL 0) +- set(MAKE_FLAGS -j${NCPU}) +-endif() +- +-set(DST ${PROJECT_SOURCE_DIR}/kaldi_active_grammar/exec) +-if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") +- set(DST ${DST}/macos/) +-elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") +- set(DST ${DST}/linux/) +-else() +- set(DST ${DST}/windows/) +-endif() +- + set(BINARIES + tools/openfst/bin/fstarcsort${CMAKE_EXECUTABLE_SUFFIX} + tools/openfst/bin/fstcompile${CMAKE_EXECUTABLE_SUFFIX} +@@ -29,63 +12,6 @@ set(LIBRARIES + src/lib/libkaldi-dragonfly${CMAKE_SHARED_LIBRARY_SUFFIX} + ) + +-# For MacOS, we handle all the "indirect" shared libraries manually. +-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") +- list(APPEND LIBRARIES +- tools/openfst/lib/libfst${CMAKE_SHARED_LIBRARY_SUFFIX} +- tools/openfst/lib/libfstscript${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-base${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-chain${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-cudamatrix${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-decoder${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-feat${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-fstext${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-gmm${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-hmm${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-ivector${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-lat${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-lm${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-matrix${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-nnet2${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-nnet3${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-online2${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-rnnlm${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-transform${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-tree${CMAKE_SHARED_LIBRARY_SUFFIX} +- src/lib/libkaldi-util${CMAKE_SHARED_LIBRARY_SUFFIX} +- ) +-endif() +- +-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") +- message(FATAL_ERROR "CMake build not supported on Windows") +- # FIXME: copy files? +- # https://cmake.org/cmake/help/latest/command/foreach.html +- # https://stackoverflow.com/questions/34799916/copy-file-from-source-directory-to-binary-directory-using-cmake +-endif() +- +-find_program(MAKE_EXE NAMES make gmake nmake) +- +-if(DEFINED ENV{INTEL_MKL_DIR}) +- # Default: INTEL_MKL_DIR=/opt/intel/mkl/ +- message("Compiling with MKL in: $ENV{INTEL_MKL_DIR}") +- set(KALDI_CONFIG_FLAGS --shared --static-math --use-cuda=no --mathlib=MKL --mkl-root=$ENV{INTEL_MKL_DIR}) +- set(MATHLIB_BUILD_COMMAND true) +-else() +- message("Compiling with OpenBLAS") +- set(KALDI_CONFIG_FLAGS --shared --static-math --use-cuda=no --mathlib=OPENBLAS) +- set(MATHLIB_BUILD_COMMAND cd tools +- && git clone -b v0.3.13 --single-branch https://github.com/xianyi/OpenBLAS +- && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS DYNAMIC_ARCH=1 TARGET=GENERIC USE_LOCKING=1 USE_THREAD=0 all +- && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS PREFIX=install install +- && cd ..) +-endif() +- +-if(DEFINED ENV{KALDI_BRANCH}) +- set(KALDI_BRANCH $ENV{KALDI_BRANCH}) +-else() +- message(FATAL_ERROR "KALDI_BRANCH not set! Use 'origin/master'?") +- # set(KALDI_BRANCH "origin/master") +-endif() + + message("MAKE_EXE = ${MAKE_EXE}") + message("PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}") +@@ -99,63 +25,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") + + # CXXFLAGS are set and exported in kaldi-configure-wrapper.sh + +-if(NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") +- set(STRIP_LIBS_COMMAND find src/lib tools/openfst/lib -name *${CMAKE_SHARED_LIBRARY_SUFFIX} | xargs strip) +- set(STRIP_DST_COMMAND find ${DST} | xargs strip) +- if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") +- list(APPEND STRIP_LIBS_COMMAND -x) +- list(APPEND STRIP_DST_COMMAND -x) +- endif() +- ExternalProject_Add(kaldi +- GIT_CONFIG advice.detachedHead=false +- GIT_REPOSITORY https://github.com/daanzu/kaldi-fork-active-grammar.git +- GIT_TAG ${KALDI_BRANCH} +- GIT_SHALLOW TRUE +- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ +- BUILD_IN_SOURCE TRUE +- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly dragonflybin bin fstbin lmbin +- LIST_SEPARATOR " " +- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} +- ) +-endif() +- +-# Fix dynamic libraries loading paths on macOS. The libraries and +-# executables are built with RPATH settings embedded in them, pointing +-# to the locations in temporary directories used to build the +-# binaries. After package installation is done, these directories are +-# deleted and the dynamic libraries cannot be loaded. The following +-# commands generate a shell script that fixes the paths to the dynamic +-# libraries in the built executables and the libraries themselves. +-# Also the commands add a custom target to invoke the generated script +-# after the external project (kaldi) has been built. An alternative +-# would be to change the kaldi engine build system to accept a path to +-# where the binaries would be placed and point RPATH to that location. +-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") +- string (REPLACE ";" " " BINARIES_STR "${BINARIES}") +- string (REPLACE ";" " " LIBRARIES_STR "${LIBRARIES}") +- file(GENERATE OUTPUT name_fixer +- CONTENT +- "for a in ${BINARIES_STR} ; do +- a_bare=$\{a##*/\} +- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfst.10.dylib \"@loader_path/libfst.dylib\" ${DST}$a_bare +- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfstscript.10.dylib \"@loader_path/libfstscript.dylib\" ${DST}$a_bare +- for b in ${LIBRARIES_STR} ; do +- b_bare=$\{b##*/\} +- install_name_tool -change \"@rpath/$b_bare\" \"@loader_path/$b_bare\" ${DST}$a_bare +- done +- done +- for a in ${LIBRARIES_STR} ; do +- a_bare=$\{a##*/\} +- install_name_tool -id \"@loader_path/$a_bare\" ${DST}$a_bare +- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfst.10.dylib \"@loader_path/libfst.dylib\" ${DST}$a_bare +- install_name_tool -change ${PROJECT_BINARY_DIR}/kaldi-prefix/src/kaldi/tools/openfst-1.6.7/lib/libfstscript.10.dylib \"@loader_path/libfstscript.dylib\" ${DST}$a_bare +- for b in ${LIBRARIES_STR} ; do +- b_bare=$\{b##*/\} +- install_name_tool -change \"@rpath/$b_bare\" \"@loader_path/$b_bare\" ${DST}$a_bare +- done +- done") +- add_custom_target(fixer ALL COMMAND /bin/sh name_fixer) +- add_dependencies(fixer kaldi) +-endif() +- + install(CODE "MESSAGE(\"Installed kaldi engine binaries.\")") diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch new file mode 100644 index 0000000000..60f50d707d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch @@ -0,0 +1,34 @@ +diff --git a/kaldi_active_grammar/utils.py b/kaldi_active_grammar/utils.py +index 0b70c7f..21e1d62 100644 +--- a/kaldi_active_grammar/utils.py ++++ b/kaldi_active_grammar/utils.py +@@ -79,7 +79,7 @@ elif sys.platform.startswith('linux'): platform = 'linux' + elif sys.platform.startswith('darwin'): platform = 'macos' + else: raise KaldiError("unknown sys.platform") + +-exec_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'exec', platform) ++exec_dir = '/' + library_extension = dict(windows='.dll', linux='.so', macos='.dylib')[platform] + subprocess_seperator = '^&' if platform == 'windows' else ';' + +@@ -89,13 +89,13 @@ class ExternalProcess(object): + + shell = ush.Shell(raise_on_error=True) + +- fstcompile = shell(os.path.join(exec_dir, 'fstcompile')) +- fstarcsort = shell(os.path.join(exec_dir, 'fstarcsort')) +- fstaddselfloops = shell(os.path.join(exec_dir, 'fstaddselfloops')) +- fstinfo = shell(os.path.join(exec_dir, 'fstinfo')) +- # compile_graph = shell(os.path.join(exec_dir, 'compile-graph')) +- compile_graph_agf = shell(os.path.join(exec_dir, 'compile-graph-agf')) +- # compile_graph_agf_debug = shell(os.path.join(exec_dir, 'compile-graph-agf-debug')) ++ fstcompile = shell('fstcompile') ++ fstarcsort = shell('fstarcsort') ++ fstaddselfloops = shell('fstaddselfloops') ++ fstinfo = shell('fstinfo') ++ # compile_graph = shell('compile-graph') ++ compile_graph_agf = shell('compile-graph-agf') ++ # compile_graph_agf_debug = shell('compile-graph-agf-debug') + + make_lexicon_fst = shell([sys.executable, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'kaldi', 'make_lexicon_fst%s.py' % ('_py2' if PY2 else ''))]) + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0003-ffi-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0003-ffi-path.patch new file mode 100644 index 0000000000..19fd8692e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0003-ffi-path.patch @@ -0,0 +1,13 @@ +diff --git a/kaldi_active_grammar/ffi.py b/kaldi_active_grammar/ffi.py +index 936ed35..1eb2f3d 100644 +--- a/kaldi_active_grammar/ffi.py ++++ b/kaldi_active_grammar/ffi.py +@@ -15,7 +15,7 @@ from cffi import FFI + from .utils import exec_dir, platform + + _ffi = FFI() +-_library_binary_path = os.path.join(exec_dir, dict(windows='kaldi-dragonfly.dll', linux='libkaldi-dragonfly.so', macos='libkaldi-dragonfly.dylib')[platform]) ++_library_binary_path = os.path.join('@kaldiFork@', dict(windows='kaldi-dragonfly.dll', linux='libkaldi-dragonfly.so', macos='libkaldi-dragonfly.dylib')[platform]) + _c_source_ignore_regex = re.compile(r'(\b(extern|DRAGONFLY_API)\b)|("C")|(//.*$)', re.MULTILINE) # Pattern for extraneous stuff to be removed + + def encode(text): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0004-fork-cmake.patch b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0004-fork-cmake.patch new file mode 100644 index 0000000000..b5ae7bc607 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0004-fork-cmake.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ededc78b8..7ee1879a5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,6 +188,7 @@ add_subdirectory(src/ivector) + add_subdirectory(src/online) + add_subdirectory(src/online2) + add_subdirectory(src/kws) ++add_subdirectory(src/dragonfly) + + add_subdirectory(src/itf) + +@@ -219,6 +220,7 @@ add_subdirectory(src/ivectorbin) + add_subdirectory(src/onlinebin) + add_subdirectory(src/online2bin) + add_subdirectory(src/kwsbin) ++add_subdirectory(src/dragonflybin) + + # add all cuda executables + if(CUDA_FOUND) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0006-fork-configure.patch b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0006-fork-configure.patch new file mode 100644 index 0000000000..8467b83f00 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0006-fork-configure.patch @@ -0,0 +1,26 @@ +diff --git a/src/configure b/src/configure +index 1186c6d12..4ad355e64 100755 +--- a/src/configure ++++ b/src/configure +@@ -1045,9 +1045,6 @@ echo "AS = $AS" >> kaldi.mk + echo "RANLIB = $RANLIB" >> kaldi.mk + echo >> kaldi.mk + +-echo "Checking compiler $CXX ..." +-check_compiler $CXX +- + echo "# Base configuration" >> kaldi.mk + echo >> kaldi.mk + if $dynamic_kaldi ; then +@@ -1066,11 +1063,6 @@ if [ ! -f $FSTROOT/include/fst/fst.h ]; then + failure "Could not find file $FSTROOT/include/fst/fst.h: + you may not have installed OpenFst. See ../tools/INSTALL" + fi +-OPENFST_VER=${OPENFST_VER:-$(grep 'PACKAGE_VERSION' $FSTROOT/Makefile | sed -e 's:.*= ::')} +-OPENFST_VER_NUM=$(echo $OPENFST_VER | sed 's/\./ /g' | xargs printf "%d%02d%02d") +-if [ $OPENFST_VER_NUM -lt 10600 ]; then +- failure "OpenFst-$OPENFST_VER is not supported. You need OpenFst >= 1.6.0.)" +-fi + echo "OPENFSTINC = $FSTROOT/include" >> kaldi.mk + if $static_fst ; then + OPENFSTLIBS="$FSTROOT/lib/libfst.a" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix new file mode 100644 index 0000000000..f7d4738ebc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, scikit-build +, cmake +, ush +, requests +, numpy +, cffi +, openfst +, substituteAll +, callPackage +}: + +let + kaldi = callPackage ./fork.nix { }; +in +buildPythonPackage rec { + pname = "kaldi-active-grammar"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "daanzu"; + repo = pname; + rev = "v${version}"; + sha256 = "ArbwduoH7mMmIjlFfYAFvcpR39rrkVUJhYEyQzZqsbY="; + }; + + KALDI_BRANCH = "foo"; + KALDIAG_SETUP_RAW = "1"; + + patches = [ + # Makes sure scikit-build doesn't try to build the dependencies for us + ./0001-stub.patch + # Uses the dependencies' binaries from $PATH instead of a specific directory + ./0002-exec-path.patch + # Makes it dynamically link to the correct Kaldi library + (substituteAll { + src = ./0003-ffi-path.patch; + kaldiFork = "${kaldi}/lib"; + }) + ]; + + # scikit-build puts us in the wrong folder. That is bad. + preBuild = '' + cd .. + ''; + + buildInputs = [ openfst kaldi ]; + nativeBuildInputs = [ scikit-build cmake ]; + propagatedBuildInputs = [ ush requests numpy cffi ]; + + meta = with lib; { + description = "Python Kaldi speech recognition"; + homepage = "https://github.com/daanzu/kaldi-active-grammar"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ ckie ]; + # Other platforms are supported upstream. + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/fork.nix new file mode 100644 index 0000000000..ba14aec768 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/fork.nix @@ -0,0 +1,94 @@ +{ lib +, stdenv +, blas +, lapack +, openfst +, icu +, pkg-config +, fetchFromGitHub +, git +, python3 +, openblas +, zlib +, gfortran +}: + +let + old-openfst = openfst.overrideAttrs (self: { + src = fetchFromGitHub { + owner = "kkm000"; + repo = "openfst"; + rev = "0bca6e76d24647427356dc242b0adbf3b5f1a8d9"; + sha256 = "1802rr14a03zl1wa5a0x1fa412kcvbgprgkadfj5s6s3agnn11rx"; + }; + buildInputs = [ zlib ]; + }); in + +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + +stdenv.mkDerivation rec { + pname = "kaldi"; + version = "kag-v2.1.0"; + + src = fetchFromGitHub { + owner = "daanzu"; + repo = "kaldi-fork-active-grammar"; + rev = version; + sha256 = "+kT2xJRwDj/ECv/v/J1FpsINWOK8XkP9ZvZ9moFRl70="; + }; + + patches = [ + ./0004-fork-cmake.patch + ./0006-fork-configure.patch + ]; + + enableParallelBuilding = true; + + buildInputs = [ + openblas + old-openfst + icu + ]; + + nativeBuildInputs = [ + pkg-config + python3 + gfortran + ]; + + buildFlags = [ + "dragonfly" + "dragonflybin" + "bin" + "fstbin" + "lmbin" + ]; + + postPatch = '' + # Replace the shebangs for the various build scripts + patchShebangs src + ''; + + configurePhase = '' + cd src + ./configure --shared --fst-root="${old-openfst}" --use-cuda=no --openblas-root="${openblas}" --mathlib=OPENBLAS + ''; + + installPhase = '' + # Fixes "patchelf: wrong ELF type" + find . -type f -name "*.o" -print0 | xargs -0 rm -f + mkdir -p $out/{bin,lib} + cp lib/* $out/lib/ + patchelf \ + --set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \ + $out/lib/* + ''; + + meta = with lib; { + description = "Speech Recognition Toolkit"; + homepage = "https://kaldi-asr.org"; + license = licenses.mit; + maintainers = with maintainers; [ ckie ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix index cd51661bde..95981992fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "6.7.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "0yi27wzb4q371y4bywi4hz37h4x63wjsyaa2mbx0rgc8xl2wm6yz"; + sha256 = "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index 59b7f451c6..4572aee08b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "7.7.0"; + version = "7.8.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-KIeo4CvJS8ZPlEHmrt7BPXdgA2RplHpb0j2ha4gyUxU="; + sha256 = "sha256-GuV++CFkywW0LGconyahfBGY+jjFA27Qu9JGIFt4bus="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix index 46306feb93..0bfa586a8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "bd98e3b501b4c24dc127f4ad93e467f42923fe3eefa99e143b5b93158f024395"; + sha256 = "107ae7babbbda2c2f0e07484f0c53cdeb455e9219235f79dc4e1685d7541e505"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index 0afd8902d9..1753b0dce8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.07.21"; + version = "2021.10.9"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "80ca1db9648e7678f81b373dab04d06025ec6532e68a9be773ddbd159de54e4c"; + sha256 = "907a4a0765ab29ccd1c2247efa0eda7a9bd82d3be3a2ecfdeb9b9e6fbb9aa56e"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix index d5bf645733..3bf996fa71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Mailman archiver plugin for HyperKitty"; homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; license = licenses.gpl3; - maintainers = with maintainers; [ globin peti qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix index 55b3b7bc14..7aafe6e61e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "REST client for driving Mailman 3"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ peti globin qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix index 61b7c68d53..2056bbb0b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.44"; + version = "1.45"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "v${version}"; - sha256 = "1na3vx10lc41gkk14h6s3fm4bnrd2bwf4qbf1l6bfvhs92b9k111"; + sha256 = "1yx4n4zax103fmjzdiqzw37zibsh68b2p2l5qvgcnx2zrrjd31yl"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mockupdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mockupdb/default.nix index 341660e1af..47107f0617 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mockupdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mockupdb/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mockupdb"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "130z5g96r52h362qc5jbf1g3gw3irb2wr946xlhgcv9ww9z64cl8"; + sha256 = "d36d0e5b6445ff9141e34d012fa2b5dfe589847aa1e3ecb8d774074962af944e"; }; propagatedBuildInputs = [ pymongo ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 17f3ff34ba..046f0b3149 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.60"; + version = "1.18.62"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4881fdbb41a74a15076c12285abd925a40e29d9f1b06d92b4d7cb12e8d208ae0"; + sha256 = "a12c44b1a1a9653d6f9148f174a9b7b71785481374ef43d962bd580967b6bca8"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix index 0bc184d138..eb715c91e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.6.4"; + version = "3.6.5"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dd7e8012af25737e6aa7bc26568a319508dca789f13e62afa09798dccc7798b5"; + sha256 = "834d1a8e38496369390be699be9bca4f2a0f2175b50327272b2ec7a98ffda2a0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index 9277a4633f..75eb114ac5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.5.0"; + version = "1.5.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d0a7cfbb34dd93aff299a5a357f6f259a0a407c0e9136bab8e495a36e3f0846d"; + sha256 = "2c57a9ffe6d462b0ad1ea49ac3ce9ebb3e8d43b2adf653dbe47eaf1b13be3c3b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix new file mode 100644 index 0000000000..220265fbc0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, six, timecop }: + +buildPythonPackage rec { + pname = "onetimepass"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tadeck"; + repo = pname; + rev = "v${version}"; + sha256 = "0wmv62l3r8r4428gdzyj80lhgadfqvj220khz1wnm9alyzg60wkh"; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + timecop + ]; + + pythonImportsCheck = [ "onetimepass" ]; + + meta = with lib; { + description = "One-time password library for HMAC-based (HOTP) and time-based (TOTP) passwords"; + homepage = "https://github.com/tadeck/onetimepass"; + license = licenses.mit; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix index 291ceb90e3..82831acca0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.51"; + version = "2.1.52"; src = fetchPypi { inherit pname version; - sha256 = "32c5bf3926c1ac001d57f6b7569fc1fdd7ccfe747190f2e61d6baf610811beb8"; + sha256 = "6ab60a316892e6e7c6a39cdcbd324d2c3d763b2fe60f381a6fe34b671f24b6e0"; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 272b9175fd..8b8d2ed488 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.21.3"; + version = "1.22.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f73f1d477cda12a7b784be73c8a0c06c71e4284ef90cae4883cbc7c524b95fbf"; + sha256 = "c5172252fc92142ec104cd5e7231be4580a1a0a814403707bafbf7bb8383a29a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 39c7e077a6..4235f6eeb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.34"; + version = "8.12.35"; src = fetchPypi { inherit pname version; - sha256 = "2d0f3db2944130f4a842f37a3b252f4a32cc0454a1a2e992c6480c7c17f1b121"; + sha256 = "f426d419aabf6366c27ef1193918cc55217ef0e8be8f09cbf0667131037ca229"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix index 972c0f0bb7..766b7090f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.53.3"; + version = "3.55.0"; src = fetchPypi { inherit pname version; - sha256 = "f4e1c2d48e608850c59f793d6e74ccdebbcbaac7ffe917d45e9646ec0d664d6d"; + sha256 = "86835d1f1a9317ab41aeb1da5e4184975e2306586839d66daf63067c102f8f04"; }; propagatedBuildInputs = [ python-utils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix index 19fa273c04..005974a542 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.9.1"; + version = "21.10.4"; src = fetchPypi { inherit pname version; - sha256 = "8eef4dbfc97d984e63fd609a3f690d005173ec5342be88d10f67dd507affdf32"; + sha256 = "c9593a54d01dc1ab47ef20464aa7d00433690c86ae840c58f458fe6dedd6b41a"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix index 3a5d68f37e..961ca5badb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.1.9"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6fb4d48d5ba9c09cdd1ed732e8a1d48b41bca379e072268af3831774d8391300"; + sha256 = "df02fb0ab74a6e7c4e1d7a3e2ffd7e4760a30cdeccb9fa6dd19f334122ec00f2"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymetar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymetar/default.nix index b4ff976c8e..7742a88904 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymetar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "1.3"; + version = "1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-zhuXOZIIzh5p0CDOsiUNTqeXDoHFcf1BPg868fc7CIg="; + sha256 = "48dbe6c4929961021cb61e49bb9e0605b54c4b61b9fb9ade51076705a08ecd54"; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix index 7256749f8d..4173987a7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "221124cbad8e3cf3ed421a4089d80ac5a29d3215e76cb49effc1df887533d2a8"; + sha256 = "7a7df8412b19cfb3596060faf5a8c5d0bf5b3bd504f8efd900fc4e3918c6f882"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix index 4b7f85482a..a700a7d1fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynput"; - version = "1.7.3"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "4e50b1a0ab86847e87e58f6d1993688b9a44f9f4c88d4712315ea8eb552ef828"; + sha256 = "16fecc4d1e53a28fb7c669c79e189c3f2cde14a08d6b457c3da07075c82f3b4c"; }; nativeBuildInputs = [ sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix index a939caf497..0655d29f6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.4"; + version = "1.5"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "018c20d3983cccfdc9cfed64407d4ba861ef3d64fe324a486f7130431afdefa7"; + sha256 = "04323e63cf57f7ed927fd9bcb1861ef5ecb0d4d7213f2755969d4a1ac3c2de6f"; }; LC_ALL="en_US.utf-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix index 943642bfd6..423f87c1f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytwitchapi"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "v${version}"; - sha256 = "0fq1ky6nbrb47mlznl3vq8m86lqb6p78fvbcy8x3rm3m5zngxnz7"; + sha256 = "0sbzl9a4zxnvnvkmmmfc9c157dgq7y6qfb2cid5nym6jhxkixnqk"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix index 6db3eaae2b..7f3b3f5da8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.9.1"; + version = "2.13.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-Uzz2mWBT5BaMxYeR6YFIP1BqTWye1Hz9CTTg/bg4kSU="; + sha256 = "sha256-v1twWyxd0nhXxvbRCbnH5TP736eeDYE5Nz62sf6HIcA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix index 3c7082d0e6..a2f475f3b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "vmware"; repo = pname; rev = "v${version}"; - sha256 = "0li6g72ps1vxjzqhz10n02fl6cs069173jd9y4ih5am7vwhrwgpa"; + sha256 = "07jwlbi3k5kvpmgygvpkhsnbdp9m2ndwqxk9k6kyzfszwcbdx4bk"; }; # requires old version of vcrpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix index 3cc833b561..3acb55377f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "19pmjd9z3g9xpbri363lzd0gi1xa06aiyw2wjnxwqmd73x6pw695"; + sha256 = "0s6lakbd8h1pa4lfdj18sm13gpywszgpcns4hz026a4kam787kby"; }; checkInputs = [ jsonschema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index 32c6cc4f9f..015ba22781 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.60.0"; + version = "2.63.0"; src = fetchPypi { inherit pname version; - sha256 = "0fbd43343918137460eb1b563a81fe6de9b51c2ae4be0b844cf198c5567cd82e"; + sha256 = "b4d793217181f4ff1d269aa22e44f82e21a060ec9723301e1ae5e7d9082c76c8"; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix index ec4947ebfc..09becb9723 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.4"; + version = "7.1.5"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "d778ec2b92866eddf97d0809968bc5f9887cb5a000a518a4b67d8eb999cb775c"; + sha256 = "9511dce6d23abdaa47d39d8e222c6b49206bf92e19f4acaf4966b2d402bb6541"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix index cbd0893411..d85113b50d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.4.4"; + version = "1.5.0"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "044ae3bec56f31e18dff8cfa62a2c9c028f4c7fe4c0f761e50761184d3b68eef"; + sha256 = "273a6382cc98a404d20779351cd5bb12e746397fbe18a8e9ccec4ae3c0ffa0e2"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index e02da9a07c..384d7e3902 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.60.0"; + version = "2.61.0"; src = fetchPypi { inherit pname version; - sha256 = "8966b7793014380f60c6f121ba333d6f333a55818edaf79c8d70464ce0a7a808"; + sha256 = "8131addd3512a22c4c539dda2d869a8f488e06f1b02d1f3a5f0f4848fc56184e"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svdtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svdtools/default.nix new file mode 100644 index 0000000000..b02058b8d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/svdtools/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, braceexpand +, click +, pyyaml +, lxml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "svdtools"; + version = "0.1.20"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version pname; + sha256 = "028s1bn50mfpaygf1wc2mvf06s50wqfplqrkhrjz6kx8vzrmwj72"; + }; + + propagatedBuildInputs = [ + braceexpand + click + pyyaml + lxml + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "svdtools" ]; + + meta = with lib; { + description = "Python package to handle vendor-supplied, often buggy SVD files"; + homepage = "https://github.com/stm32-rs/svdtools"; + changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timecop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timecop/default.nix new file mode 100644 index 0000000000..272657dfaa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/timecop/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "timecop"; + version = "0.5.0dev"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zbi58sw2yp1qchzfhyi7bsrwxajiypphg65fir98kvj03g011wd"; + }; + + # test_epoch fails, see https://github.com/bluekelp/pytimecop/issues/4 + preCheck = '' + sed -i 's/test_epoch/_test_epoch/' timecop/tests/test_freeze.py + ''; + + meta = with lib; { + description = "A port of the most excellent TimeCop Ruby Gem for Python"; + homepage = "https://github.com/bluekelp/pytimecop"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix index 48fbf84e93..0b9e6547de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix @@ -1,24 +1,44 @@ -{ buildPythonPackage, lib, fetchPypi, regex }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, regex +}: buildPythonPackage rec { pname = "titlecase"; version = "2.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9a1595ed9b88f3ce4362a7602ee63cf074e10ac80d1256b32ea1ec5ffa265fa0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ppannuto"; + repo = "python-titlecase"; + rev = "v${version}"; + sha256 = "169ywzn5wfzwyknqavspkdpwbx31nycxsxkl7iywwk71gs1lskkw"; }; - propagatedBuildInputs = [ regex ]; + propagatedBuildInputs = [ + regex + ]; - # no tests run - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "titlecase" ]; + pytestFlagsArray = [ + "titlecase/tests.py" + ]; + + pythonImportsCheck = [ + "titlecase" + ]; meta = with lib; { + description = "Python library to capitalize strings as specified by the New York Times"; homepage = "https://github.com/ppannuto/python-titlecase"; - description = "Python Port of John Gruber's titlecase.pl"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index af8ef6d956..b3e38c8640 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.17.5"; + version = "3.18.0"; src = fetchPypi { inherit pname version; - sha256 = "f719a3f436a09d4a13411c9df1209e61b788dca64c6478fcd68e0ae5c5671283"; + sha256 = "a391d1a9138fe53fe08aeb6aa15ca7f1a188659b9a6c12af5313c55730eccd6c"; }; propagatedBuildInputs = [ types-futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 772ea06ad5..05fb1b2b9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.10"; + version = "2.25.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PhIZiBaM/8+mHv+vSPkOvF7gI/bMUNBMAUTt16ImW2U="; + sha256 = "sha256-snkoTlH2aOOO4S2WZeTXiQifUy3CoL5KFQjKDv2Yup4="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix new file mode 100644 index 0000000000..d7a90bcb9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook}: + +buildPythonPackage rec { + pname = "ush"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "tarruda"; + repo = "python-ush"; + rev = version; + sha256 = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo="; + }; + + checkInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # seems to be outdated? + "tests/test_glob.py" + ]; + + meta = with lib; { + description = "Powerful API for invoking with external commands"; + homepage = "https://github.com/tarruda/python-ush"; + license = licenses.mit; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix index b9d6b71516..603aae8585 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix @@ -1,4 +1,5 @@ { lib +, backoff , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2021.9.4"; + version = "2021.10.1"; disabled = pythonOlder "3.7"; @@ -16,10 +17,11 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-WywJ70tVniUX9RZTh9aswHgCEvWTggzABhSWoSRydUc="; + sha256 = "sha256-vE25b95tWxsB+uJNVpXtY5AcJZo5qsBm6Jug1ckhz7k="; }; propagatedBuildInputs = [ + backoff pyserial-asyncio ]; @@ -27,7 +29,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ " velbusaio" ]; + pythonImportsCheck = [ + "velbusaio" + ]; meta = with lib; { description = "Python library to support the Velbus home automation system"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix index 5336420c79..868ad5fed9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.20"; + version = "0.21"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ljk2AOwnF7efWcmE942TX3bkbEyu+HWoe4tO1gLy/2U="; + sha256 = "64f2dbcbbed15f9a6da2b85f643997db729cf496cafdb97670fb2fa73a7d8e20"; }; # Couldn't get tests to work because, for instance, they used virtualenv and diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versionfinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versionfinder/default.nix new file mode 100644 index 0000000000..a6c36e07c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/versionfinder/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchFromGitHub, GitPython, pytest, backoff, requests }: + +buildPythonPackage rec { + pname = "versionfinder"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jantman"; + repo = pname; + rev = version; + sha256 = "16mvjwyhmw39l8by69dgr9b9jnl7yav36523lkh7w7pwd529pbb9"; + }; + + propagatedBuildInputs = [ + GitPython + backoff + ]; + + checkInputs = [ + pytest + requests + ]; + + pythonImportsCheck = [ "versionfinder" ]; + + meta = with lib; { + description = "Find the version of another package, whether installed via pip, setuptools or git"; + homepage = "https://github.com/jantman/versionfinder"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix index 0e0d19e4f4..1542a447a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.7.5"; + version = "0.7.6"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-vC2teem231Lw7cglVc+0M+QbgMgZ23JzTYy7wvnhFI4="; + sha256 = "sha256-Gf3hNCXioaLiQ0fZWPe9PO2YQeId4ZLmWsSZ5WvjSk0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index c645cd3590..f287d10ff4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.32.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0DK6uTbuIVqrfsrTF0tAbx1WnVpc97nE0zuwTcFoBf8="; + sha256 = "1cq84ggp32xx79sgrxyqysqs34lhzyv8jdg7d46d9hdvjcwjb5af"; }; - vendorSha256 = "sha256-ox5Wx/9sJhZq4kFuI/GQlmFzuo5xti8yV+FY0bdR6Ek="; + vendorSha256 = "1ay3vf4dqlbizq98nxz2cgi67ck1c6lw7wi28w56607qzbx0yvmg"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix new file mode 100644 index 0000000000..9e24309d98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, python3 +, rustPlatform +, pkg-config +, glib +, libshumate +, gst_all_1 +, gtk4 +, libadwaita +, llvmPackages +, glibc +, pipewire +, wayland +, wrapGAppsHook4 +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "ashpd-demo"; + version = "0.0.1-alpha"; + + src = + let + share = fetchFromGitHub { + owner = "bilelmoussaoui"; + repo = "ashpd"; + rev = version; + sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; + }; + in + "${share}/ashpd-demo"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc + wrapGAppsHook4 + desktop-file-utils + glib # for glib-compile-schemas + ]; + + buildInputs = [ + glib + gtk4 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libadwaita + pipewire + wayland + libshumate + ]; + + # libspa-sys requires this for bindgen + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + # included by libspa-sys requires + BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + # https://github.com/bilelmoussaoui/ashpd/pull/32 + substituteInPlace build-aux/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Tool for playing with XDG desktop portals"; + homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix index 084225a8f5..f810510b56 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix @@ -1,10 +1,11 @@ { lib , fetchFromGitHub -, crystal_1_0 +, crystal }: + let generic = - { version, sha256, crystal }: + { version, sha256 }: crystal.buildCrystalPackage { pname = "shards"; @@ -39,8 +40,12 @@ rec { shards_0_15 = generic { version = "0.15.0"; sha256 = "sha256-/C6whh5RbTBkFWqpn0GqyVe0opbrklm8xPv5MIG99VU="; - crystal = crystal_1_0; }; - shards = shards_0_15; + shards_0_16 = generic { + version = "0.16.0"; + sha256 = "sha256-go8sL4djIDGNwb7FsCcATONnMYahHY8qJUDyUiPLRUY="; + }; + + shards = shards_0_16; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 40c4e459a2..095c2e10b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.8"; + version = "0.7.0"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Aistr85doKEOD0/uTS/7iRzYggb+hC3njVi4mWt8ndM="; + sha256 = "sha256-Cqbo1L3z3bTDIXZ90GXdAulTpGhWLoTc/kYRNghZ/SE="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -39,10 +39,9 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTestPaths = [ - # dbt is not available yet - "test/core/templaters/dbt_test.py" # Don't run the plugin related tests "test/core/plugin_test.py" + "plugins/sqlfluff-templater-dbt" "plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix index 9d6510c89d..b647505fe4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dockle"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H+qJBwKh+jh5ECMPbPgGtXzF+mm73ut0+URqpNBc3SM="; + sha256 = "sha256-0yeHxQW6zX8Mh9JBmp915czEZCmbIom/KYHWLc/O6NY="; }; vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/netlify.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/netlify.nix new file mode 100644 index 0000000000..efd5b917e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/netlify.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "esbuild"; + version = "0.13.6"; + + src = fetchFromGitHub { + owner = "netlify"; + repo = "esbuild"; + rev = "v${version}"; + sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; + }; + + vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + + meta = with lib; { + description = "A fork of esbuild maintained by netlify"; + homepage = "https://github.com/netlify/esbuild"; + license = licenses.mit; + maintainers = with maintainers; [ roberth ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/git-privacy/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-privacy/default.nix new file mode 100644 index 0000000000..c176541743 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/git-privacy/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, git +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "git-privacy"; + version = "2.1.0"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "EMPRI-DEVOPS"; + repo = pname; + rev = "v${version}"; + sha256 = "0hfy43fip1l81672xfwqrz1jryzkjy7h9f2lyikxgibibil0p444"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + click + git-filter-repo + GitPython + pynacl + setuptools + ]; + + checkInputs = with python3.pkgs; [ + git + pytestCheckHook + ]; + + disabledTests = [ + # Tests want to interact with a git repo + "TestGitPrivacy" + ]; + + pythonImportsCheck = [ + "gitprivacy" + ]; + + meta = with lib; { + description = "Tool to redact Git author and committer dates"; + homepage = "https://github.com/EMPRI-DEVOPS/git-privacy"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix index 9f9bb882de..70e127e900 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.8.1"; + version = "2.9.1"; subPackages = [ "cmd/gosec" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AlADSEekcUH/pCGggKlkBDiIYMe1zsoe9hh6fVUwQVA="; + sha256 = "0q9834siya19gj5ckymymyzkd1yn34b4xg5bvcgd7ckcpky143yw"; }; - vendorSha256 = "sha256-HBwIZfvkL9HSwkD1sZzBM7IJFAjLbCxyc95vqR5TFAg="; + vendorSha256 = "1h0bbkp9g5nzzjm8qkaag54n9nl711ckkjwibb1gb9ciqwsad33l"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix index a0b9b813f4..298c55c47e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.6"; + version = "0.10.7"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1f31z5isr34acv3nbsdigk3h426vind2zk5qvy44zmb5qmlb15x9"; + outputHash = "0sk4vwpy06smn0k7035bdz0g2y98l8hxmn4v3gijsqaxvnya36x9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix index 85917a114c..2b9d543fb7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dfu-util"; - version = "0.10"; + version = "0.11"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; src = fetchurl { url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0"; + sha256 = "sha256-tLU7ohqC7349TEffKVKt9fpJT0mbawtXxYxdBK6P8Z4="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix index 132ddf2eac..4d3661b6c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/fsatrace/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jacereda/fsatrace"; description = "filesystem access tracer"; license = licenses.isc; - maintainers = [ maintainers.peti ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/3.7.nix b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/3.7.nix new file mode 100644 index 0000000000..aa49af753b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/3.7.nix @@ -0,0 +1,82 @@ +{lib, stdenv, fetchFromGitHub +, curl, makeWrapper, which, unzip +, lua +# for 'luarocks pack' +, zip +# some packages need to be compiled with cmake +, cmake +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "luarocks"; + version = "3.7.0"; + + src = fetchFromGitHub { + owner = "luarocks"; + repo = "luarocks"; + rev = "v${version}"; + sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d"; + }; + + patches = [ ./darwin-3.7.0.patch ]; + + postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' + substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' + ''; + + preConfigure = '' + lua -e "" || { + luajit -e "" && { + export LUA_SUFFIX=jit + configureFlags="$configureFlags --lua-suffix=$LUA_SUFFIX" + } + } + lua_inc="$(echo "${lua}/include"/*/)" + if test -n "$lua_inc"; then + configureFlags="$configureFlags --with-lua-include=$lua_inc" + fi + ''; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + buildInputs = [ lua curl which ]; + + postInstall = '' + sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* + for i in "$out"/bin/*; do + test -L "$i" || { + wrapProgram "$i" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ + --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ + --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" + } + done + + installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash) + installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh) + ''; + + propagatedBuildInputs = [ zip unzip cmake ]; + + # unpack hook for src.rock and rockspec files + setupHook = ./setup-hook.sh; + + # cmake is just to compile packages with "cmake" buildType, not luarocks itself + dontUseCmakeConfigure = true; + + shellHook = '' + export PATH="src/bin:''${PATH:-}" + export LUA_PATH="src/?.lua;''${LUA_PATH:-}" + ''; + + meta = with lib; { + description = "A package manager for Lua"; + license = licenses.mit ; + maintainers = with maintainers; [raskin teto]; + platforms = platforms.linux ++ platforms.darwin; + downloadPage = "http://luarocks.org/releases/"; + updateWalker = true; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch new file mode 100644 index 0000000000..3252e6ae7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch @@ -0,0 +1,24 @@ +diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua +index 535bd69..b017161 100644 +--- a/src/luarocks/core/cfg.lua ++++ b/src/luarocks/core/cfg.lua +@@ -436,7 +436,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home) + defaults.external_lib_extension = "dylib" + defaults.arch = "macosx-"..target_cpu + defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" +- local version = util.popen_read("sw_vers -productVersion") ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@" + if not (version:match("^%d+%.%d+%.%d+$") or version:match("^%d+%.%d+$")) then + version = "10.3" + end +@@ -448,8 +448,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home) + else + defaults.gcc_rpath = false + end +- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc" +- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc" ++ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang" ++ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang" + defaults.web_browser = "open" + end + diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix index f37815081e..dbcd49dcfb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, makeWrapper, fetchFromGitHub, cctools }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "macdylibbundler"; - version = "20180825"; + version = "1.0.0"; src = fetchFromGitHub { owner = "auriamg"; repo = "macdylibbundler"; - rev = "ce13cb585ead5237813b85e68fe530f085fc0a9e"; - sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; + rev = version; + sha256 = "02w04qvaf9v8yw8bgncx5qj3jx08xdfa855isvq92q27hsb8m8hv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 42a30cce8e..4fe721d919 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - hash = "sha256-iXsV7zt190GH0kTMpdmf8xHk4cqtCVwq6LDICmhe5qU="; + sha256 = "sha256-QLrmUlgrys+Bd2hiaPcfDUtn75XdaMhVThsDRq/ijQQ="; }; - cargoHash = "sha256-Yqn6VpAKw93QvkxuwNcYvrQm0C4TfisRDcmFy95/yw8="; + cargoSha256 = "sha256-Xw0/vEL50vc9ktwjTz09160Fo7rXRVgeRo/EnWJ2PH0="; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index fa8ee6f499..aa93298743 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -24,6 +24,7 @@ tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json)); tree-sitter-latex = (builtins.fromJSON (builtins.readFile ./tree-sitter-latex.json)); tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json)); + tree-sitter-make = (builtins.fromJSON (builtins.readFile ./tree-sitter-make.json)); tree-sitter-markdown = (builtins.fromJSON (builtins.readFile ./tree-sitter-markdown.json)); tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json)); tree-sitter-norg = (builtins.fromJSON (builtins.readFile ./tree-sitter-norg.json)); diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json new file mode 100644 index 0000000000..fcb0b280e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/alemuller/tree-sitter-make", + "rev": "716c294283bc3dda263ccbdf55e38ec30aa0edba", + "date": "2021-04-30T16:37:32-03:00", + "path": "/nix/store/v2dvgqs3fxwh83dhc53xivrx8i0g519y-tree-sitter-make", + "sha256": "1fb6rf6pc6mdawphifhlbzbgppxvq6hj48cz6073schvavgjgchc", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index 4f1e69a585..bb1736b3ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -102,6 +102,10 @@ let orga = "travonted"; repo = "tree-sitter-fennel"; }; + "tree-sitter-make" = { + orga = "alemuller"; + repo = "tree-sitter-make"; + }; "tree-sitter-markdown" = { orga = "ikatyang"; repo = "tree-sitter-markdown"; diff --git a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix index 26d7063c81..6c0465c1cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -2,19 +2,22 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "10ml3va6ip501ibaykbhq8282y1j6r8bc8azc1gqxskk5jvfz1jm"; + sha256 = "1a6rmph96s7c8lpmpkizcvdf0x4jlsr5iqi7qjprxqsf6zak2rfg"; }; outputs = [ "out" ]; makeMakerFlags = [ "INSTALLDIRS=vendor" ]; + # Avoid creating perllocal.pod, which contains a timestamp + installTargets = [ "pure_install" ]; + # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS. patchPhase = '' substituteInPlace pg_format \ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix index 13339e4dc3..f5de052e0e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -3,10 +3,8 @@ , rustPlatform , fetchFromGitHub , libusb1 -, openssl , pkg-config , rustfmt -, Security , AppKit }: @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-f5vUMdyz3vDh2yE0pMKZiknsqTAKkuvTCtlgb6/gaLc="; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix index 76f766685a..da5f019d66 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-OHBxQcXhZkJ1F6xLc7/sPpJhJzuJXb91IUjAtyC3XP8="; + sha256 = "sha256-GRitz9LOdZhbakbLZI2BUfZjqXLrsMK2MQJgixiEHaA="; }; - cargoSha256 = "sha256-LxqxRtMKUKZeuvk1caoYy8rv1bkEOQBM8i5SXMF4GXc="; + cargoSha256 = "sha256-uiANH9HOvy41FiABTTx2D9Rz1z/F7eITc5aiofaMSfI="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 836b959f10..92863d76de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.8.13"; + version = "0.8.14"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "0k88ma00gj8wjdvd7ysbbvqnf5sk1w8d3wqbi6qfxnqrc1k3hlv2"; + sha256 = "11r4gzcsbqlflam2rdixc451qw69c46mkf7g0slq6f127is25fgz"; }; - cargoSha256 = "0mmk0igm2s8sxi65zvikxhz52xhkyd3ljqy61mij7zlx95rf639x"; + cargoSha256 = "1p4iirblk6idvfhn8954v8lbxlzj0gbd8fv4wq03hfrdqisjqcsn"; LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix index 28b875ede9..ed51a6fedc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-PYlHjKMnqnhAJAvmHbH6Bb+qOyNzDH+ewOkXkj2u4CU="; + sha256 = "sha256-qap6TsqaCy+9prWiUow78eBgaWGq5eUkOXBTYFnAZyo="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock index a51aef852d..6b50ab4c79 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -30,14 +30,14 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "arrayvec" @@ -105,7 +105,7 @@ checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" dependencies = [ "bstr", "doc-comment", - "predicates 2.0.1", + "predicates 2.0.3", "predicates-core", "predicates-tree", "wait-timeout", @@ -119,7 +119,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -128,12 +128,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - [[package]] name = "base64" version = "0.9.3" @@ -158,9 +152,9 @@ checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -197,9 +191,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" [[package]] name = "byteorder" @@ -207,6 +201,18 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + [[package]] name = "canvas" version = "0.1.0" @@ -218,9 +224,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.69" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" [[package]] name = "cfg-if" @@ -251,7 +257,7 @@ dependencies = [ "num-integer", "num-traits 0.2.14", "time 0.1.43", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -268,7 +274,7 @@ checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", - "bitflags 1.2.1", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", @@ -292,11 +298,11 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "console_error_panic_hook" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "wasm-bindgen", ] @@ -309,10 +315,20 @@ dependencies = [ ] [[package]] -name = "const_fn" -version = "0.4.8" +name = "core-foundation" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "crossbeam-channel" @@ -360,24 +376,24 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" +checksum = "aaa3b8db7f3341ddef15786d250106334d4a6c4b0ae4a46cd77082777d9849b9" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2", - "winapi", + "socket2 0.4.2", + "winapi 0.3.9", ] [[package]] name = "curl-sys" -version = "0.4.45+curl-7.78.0" +version = "0.4.49+curl-7.79.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb" +checksum = "e0f44960aea24a786a46907b8824ebc0e66ca06bf4e4978408c7499620343483" dependencies = [ "cc", "libc", @@ -385,7 +401,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -423,12 +439,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "doc-comment" version = "0.3.3" @@ -461,6 +471,15 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "encoding_rs" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "enum_primitive" version = "0.1.1" @@ -504,7 +523,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -516,6 +535,12 @@ dependencies = [ "num-traits 0.2.14", ] +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "foreign-types" version = "0.3.2" @@ -541,6 +566,22 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.3.2", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + [[package]] name = "funty" version = "1.1.0" @@ -549,9 +590,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" +checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" dependencies = [ "futures-channel", "futures-core", @@ -564,9 +605,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" +checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" dependencies = [ "futures-core", "futures-sink", @@ -583,9 +624,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" +checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" [[package]] name = "futures-core-preview" @@ -595,9 +636,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" [[package]] name = "futures-executor" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" +checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" dependencies = [ "futures-core", "futures-task", @@ -606,9 +647,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" +checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" [[package]] name = "futures-lite" @@ -617,14 +658,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ "futures-core", - "pin-project-lite", + "pin-project-lite 0.2.7", ] [[package]] name = "futures-macro" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" +checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" dependencies = [ "autocfg", "proc-macro-hack", @@ -635,21 +676,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" +checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" [[package]] name = "futures-task" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" +checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" [[package]] name = "futures-util" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" +checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" dependencies = [ "autocfg", "futures-channel", @@ -659,7 +700,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite", + "pin-project-lite 0.2.7", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -693,6 +734,60 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +[[package]] +name = "gloo" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ce6f2dfa9f57f15b848efa2aade5e1850dc72986b87a2b0752d44ca08f4967" +dependencies = [ + "gloo-console-timer", + "gloo-events", + "gloo-file", + "gloo-timers", +] + +[[package]] +name = "gloo-console-timer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b48675544b29ac03402c6dffc31a912f716e38d19f7e74b78b7e900ec3c941ea" +dependencies = [ + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "088514ec8ef284891c762c88a66b639b3a730134714692ee31829765c5bc814f" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9fecfe46b5dc3cc46f58e98ba580cc714f2c93860796d002eb3527a465ef49" +dependencies = [ + "gloo-events", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-timers" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "guide-supported-types-examples" version = "0.1.0" @@ -701,6 +796,32 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "h2" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", + "tracing-futures", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + [[package]] name = "heck" version = "0.3.3" @@ -727,10 +848,37 @@ dependencies = [ ] [[package]] -name = "httparse" -version = "1.4.1" +name = "http" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +dependencies = [ + "bytes 1.1.0", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +dependencies = [ + "bytes 0.5.6", + "http", +] + +[[package]] +name = "httparse" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" + +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "humansize" @@ -744,6 +892,43 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "0.13.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +dependencies = [ + "bytes 0.5.6", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project", + "socket2 0.3.19", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" +dependencies = [ + "bytes 0.5.6", + "hyper", + "native-tls", + "tokio", + "tokio-tls", +] + [[package]] name = "id-arena" version = "2.2.1" @@ -788,12 +973,37 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "indexmap" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +dependencies = [ + "autocfg", + "hashbrown", +] + [[package]] name = "inflate" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipnet" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" + [[package]] name = "itertools" version = "0.10.1" @@ -805,9 +1015,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "jpeg-decoder" @@ -820,13 +1030,19 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.52" +version = "0.3.55" dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-test", ] +[[package]] +name = "json" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" + [[package]] name = "julia_set" version = "0.1.0" @@ -835,6 +1051,16 @@ dependencies = [ "web-sys", ] +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -843,9 +1069,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "leb128" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "lexical-core" @@ -854,7 +1080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "ryu", "static_assertions", @@ -862,9 +1088,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.99" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" [[package]] name = "libz-sys" @@ -895,9 +1121,9 @@ checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "memchr" @@ -930,6 +1156,37 @@ dependencies = [ "unicase", ] +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + [[package]] name = "multipart" version = "0.18.0" @@ -948,6 +1205,35 @@ dependencies = [ "twoway", ] +[[package]] +name = "native-tls" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + [[package]] name = "no-std" version = "0.1.0" @@ -1051,11 +1337,11 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "openssl" -version = "0.10.35" +version = "0.10.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -1071,18 +1357,18 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-src" -version = "111.15.0+1.1.1k" +version = "111.16.0+1.1.1l" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" +checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.65" +version = "0.9.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" dependencies = [ "autocfg", "cc", @@ -1107,6 +1393,32 @@ dependencies = [ "web-sys", ] +[[package]] +name = "pin-project" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + [[package]] name = "pin-project-lite" version = "0.2.7" @@ -1121,9 +1433,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" [[package]] name = "png" @@ -1158,9 +1470,9 @@ dependencies = [ [[package]] name = "predicates" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3d91237f5de3bcd9d927e24d03b495adb6135097b001cea7403e2d573d00a9" +checksum = "5c6ce811d0b2e103743eec01db1c50612221f173084ce2f7941053e94b6bb474" dependencies = [ "difflib", "itertools", @@ -1175,12 +1487,12 @@ checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7dd0fd014130206c9352efbdc92be592751b2b9274dff685348341082c6ea3d" +checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" dependencies = [ "predicates-core", - "treeline", + "termtree", ] [[package]] @@ -1221,9 +1533,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" dependencies = [ "unicode-xid", ] @@ -1236,9 +1548,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] @@ -1345,7 +1657,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", ] [[package]] @@ -1377,7 +1689,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1389,10 +1701,45 @@ dependencies = [ ] [[package]] -name = "rouille" -version = "3.2.1" +name = "reqwest" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263ea8c0988dbdd89e679d408eaa5505bb886677e997562646c2e2ba4d2e6db" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "base64 0.13.0", + "bytes 0.5.6", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "mime_guess", + "native-tls", + "percent-encoding", + "pin-project-lite 0.2.7", + "serde", + "serde_urlencoded", + "tokio", + "tokio-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rouille" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc1bcf3b32bd9ef568402e750404c369ff172a6a34597c858f8ccf5f3bed013" dependencies = [ "base64 0.13.0", "chrono", @@ -1406,7 +1753,7 @@ dependencies = [ "serde_json", "sha1", "threadpool", - "time 0.2.27", + "time 0.3.3", "tiny_http", "url", ] @@ -1419,19 +1766,23 @@ dependencies = [ ] [[package]] -name = "rustc-demangle" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" +name = "rust-webassembly-weather-reports" +version = "0.1.1" +dependencies = [ + "chrono", + "gloo", + "json", + "reqwest", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] [[package]] -name = "rustc_version" -version = "0.2.3" +name = "rustc-demangle" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] name = "ryu" @@ -1462,7 +1813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1484,34 +1835,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "semver" -version = "0.9.0" +name = "security-framework" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ - "semver-parser", + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] -name = "semver-parser" -version = "0.7.0" +name = "security-framework-sys" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "serde" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -1520,15 +1879,27 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" dependencies = [ "itoa", "ryu", "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "sha1" version = "0.6.0" @@ -1537,18 +1908,29 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "slab" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "socket2" -version = "0.4.1" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "socket2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" dependencies = [ "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1557,70 +1939,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "strsim" version = "0.8.0" @@ -1635,9 +1959,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" +checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa" dependencies = [ "clap", "lazy_static", @@ -1646,9 +1970,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.15" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" +checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba" dependencies = [ "heck", "proc-macro-error", @@ -1659,9 +1983,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.74" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" dependencies = [ "proc-macro2", "quote", @@ -1685,7 +2009,7 @@ dependencies = [ "rand", "redox_syscall", "remove_dir_all", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1697,6 +2021,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termtree" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78fbf2dd23e79c28ccfa2472d3e6b3b189866ffef1aeb91f17c2d968b6586378" + [[package]] name = "textwrap" version = "0.11.0" @@ -1722,45 +2052,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi", + "winapi 0.3.9", ] [[package]] name = "time" -version = "0.2.27" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +checksum = "cde1cf55178e0293453ba2cca0d5f8392a922e52aa958aee9c28ed02becc6d03" dependencies = [ - "const_fn", "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", ] [[package]] @@ -1778,9 +2079,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -1802,6 +2103,47 @@ dependencies = [ "web-sys", ] +[[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "iovec", + "lazy_static", + "memchr", + "mio", + "pin-project-lite 0.1.12", + "slab", +] + +[[package]] +name = "tokio-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.1.12", + "tokio", +] + [[package]] name = "toml" version = "0.5.8" @@ -1812,16 +2154,53 @@ dependencies = [ ] [[package]] -name = "treeline" -version = "0.1.0" +name = "tower-service" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + +[[package]] +name = "tracing" +version = "0.1.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +dependencies = [ + "cfg-if 1.0.0", + "log", + "pin-project-lite 0.2.7", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.43" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02c413315329fc96167f922b46fd0caa3a43f4697b7a7896b183c7142635832" +checksum = "dbaccfa9796293406a02ec790614628c88d0b3246249a620ac1ee7076274716b" dependencies = [ "glob", "lazy_static", @@ -1846,6 +2225,7 @@ version = "0.1.0" dependencies = [ "js-sys", "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", ] @@ -1860,12 +2240,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" @@ -1884,9 +2261,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" @@ -1960,6 +2337,16 @@ dependencies = [ "syn", ] +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" @@ -1968,7 +2355,7 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.75" +version = "0.2.78" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1984,7 +2371,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.75" +version = "0.2.78" dependencies = [ "bumpalo", "lazy_static", @@ -2005,7 +2392,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "assert_cmd", @@ -2033,7 +2420,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "base64 0.9.3", @@ -2055,7 +2442,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "rayon", @@ -2067,7 +2454,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.25" +version = "0.4.28" dependencies = [ "cfg-if 1.0.0", "futures-channel-preview", @@ -2081,7 +2468,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.75" +version = "0.2.78" dependencies = [ "quote", "trybuild", @@ -2092,7 +2479,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.75" +version = "0.2.78" dependencies = [ "proc-macro2", "quote", @@ -2103,7 +2490,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "rayon", @@ -2124,11 +2511,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.75" +version = "0.2.78" [[package]] name = "wasm-bindgen-test" -version = "0.3.25" +version = "0.3.28" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2154,7 +2541,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.25" +version = "0.3.28" dependencies = [ "proc-macro2", "quote", @@ -2162,7 +2549,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "walrus", @@ -2171,7 +2558,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "walrus", @@ -2179,7 +2566,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "log", @@ -2191,7 +2578,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-webidl" -version = "0.2.75" +version = "0.2.76" dependencies = [ "anyhow", "env_logger", @@ -2255,18 +2642,18 @@ checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" [[package]] name = "wasmparser" -version = "0.80.0" +version = "0.80.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f71b80b8193e50910919e7d1bc956d2b4f42b1cb1fad84bacb59332c16f2cf" +checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" [[package]] name = "wasmprinter" -version = "0.2.28" +version = "0.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48e4f2999b9930e9b037e328357d7d2367e0d8ea6e534be90aeff60976c0452" +checksum = "bf83acd0a74a68f7b96acddc6035af45a09659d53f877b73aa22c816ed3e71e7" dependencies = [ "anyhow", - "wasmparser 0.80.0", + "wasmparser 0.80.2", ] [[package]] @@ -2280,25 +2667,25 @@ dependencies = [ [[package]] name = "wast" -version = "37.0.0" +version = "38.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc7b9a76845047ded00e031754ff410afee0d50fbdf62b55bdeecd245063d68" +checksum = "ae0d7b256bef26c898fa7344a2d627e8499f5a749432ce0a05eae1a64ff0c271" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2cc8d9a69d1ab28a41d9149bb06bb927aba8fc9d56625f8b597a564c83f50" +checksum = "adcfaeb27e2578d2c6271a45609f4a055e6d7ba3a12eff35b1fd5ba147bdf046" dependencies = [ - "wast 37.0.0", + "wast 38.0.1", ] [[package]] name = "web-sys" -version = "0.3.52" +version = "0.3.55" dependencies = [ "js-sys", "wasm-bindgen", @@ -2375,6 +2762,12 @@ dependencies = [ "nom 5.1.2", ] +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + [[package]] name = "winapi" version = "0.3.9" @@ -2385,6 +2778,12 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -2397,7 +2796,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -2406,6 +2805,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "wit-parser" version = "0.2.0" @@ -2498,6 +2906,16 @@ dependencies = [ "web-sys", ] +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + [[package]] name = "wyz" version = "0.2.0" diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix index fba7c97939..9eada274be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.75"; + version = "0.2.78"; src = let @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - hash = "sha256-eRAe6/v0Xrtd1d2k6p0WETZ2vkQkiDRZOds7y0DidY0="; + hash = "sha256-1Z5d4gjZUic6Yrd+O8oLWYpJqAYGcByZYP0H1iInXHA="; }; in runCommand "source" { } '' @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-xZrGBRnsBQKvqGkZyU7FQCkx0dHt/hXlrVLSvGKx27k="; + cargoHash = "sha256-RixIEat7EzGzgSQTnPennePpiucmAatrDGhbFSfTajo="; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js index d6b4dcf358..d2152f9c5e 100755 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js @@ -63,7 +63,7 @@ let pkgs = R.pipe( ;(async () => { if (!options['--no-patch']) { - pkgs = await R.map(fixPkgAddMissingSha1, pkgs) + pkgs = await Promise.all(R.map(fixPkgAddMissingSha1, pkgs)) } const origJson = lockfile.parse(data) diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 50632e4610..ce2558a7c0 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oVcp1tICw+Wluzp/nVTv8iWR04ihmwa5lzqKyrPcOPE="; + sha256 = "sha256-1lODB7k0HGfwlrCWh7TKafPezytKo66EnyDHD3eyAl0="; }; - cargoSha256 = "sha256-GkKxm1M0e/yWWuY71BqCLd8KaqJFLpWuh4nrLSWM2nw="; + cargoSha256 = "sha256-qCXGYxvOAbVrlk3X431n+soxcGQBIjZcibMcAP4uAh8="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/games/ddnet/default.nix b/third_party/nixpkgs/pkgs/games/ddnet/default.nix new file mode 100644 index 0000000000..51a242a6cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/ddnet/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, pkg-config +, curl +, freetype +, libGLU +, libnotify +, libogg +, libX11 +, opusfile +, pcre +, python3 +, SDL2 +, sqlite +, wavpack +}: + +stdenv.mkDerivation rec { + pname = "ddnet"; + version = "15.5.4"; + + src = fetchFromGitHub { + owner = "ddnet"; + repo = pname; + rev = version; + sha256 = "sha256-vJMYPaLK2CK+nbojLstXgxqIUaf7jNynpklFgtIpvGM="; + }; + + nativeBuildInputs = [ cmake ninja pkg-config ]; + + buildInputs = [ + curl + freetype + libGLU + libnotify + libogg + libX11 + opusfile + pcre + python3 + SDL2 + sqlite + wavpack + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DAUTOUPDATE=OFF" + "-GNinja" + ]; + + postPatch = '' + substituteInPlace src/engine/shared/storage.cpp \ + --replace /usr/ $out/ + ''; + + meta = with lib; { + description = "A Teeworlds modification with a unique cooperative gameplay."; + longDescription = '' + DDraceNetwork (DDNet) is an actively maintained version of DDRace, + a Teeworlds modification with a unique cooperative gameplay. + Help each other play through custom maps with up to 64 players, + compete against the best in international tournaments, + design your own maps, or run your own server. + ''; + homepage = "https://ddnet.tw"; + license = licenses.asl20; + maintainers = with maintainers; [ sirseruju legendofmiracles ]; + mainProgram = "DDNet"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/gl-gsync-demo/default.nix b/third_party/nixpkgs/pkgs/games/gl-gsync-demo/default.nix new file mode 100644 index 0000000000..a4b30c572a --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/gl-gsync-demo/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, libX11, freeglut, glew, libXNVCtrl, libXext, lib }: + +stdenv.mkDerivation rec { + pname = "gl-gsync-demo"; + version = "unstable-2020-12-27"; + + src = fetchFromGitHub { + owner = "dahenry"; + repo = "gl-gsync-demo"; + rev = "4fd963a8ad880dc2d846394c8c80b2091a119591"; + sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d"; + }; + + buildInputs = [ libX11 freeglut glew libXNVCtrl libXext ]; + + installPhase = '' + runHook preInstall + + install -D gl-gsync-demo -t $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + license = with licenses; mit; + platforms = platforms.linux; + maintainers = with maintainers; [ atemu ]; + description = "A very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux"; + longDescription = '' + The demo simply draws a vertical bar moving accross the screen at constant speed, but deliberately rendered at a variable frame rate. + + The min and max frame rates can be manually changed at runtime, by step of 10 fps and with a min of 10 fps. + + The demo also allows to toggle V-Sync on/off. + ''; + homepage = "https://github.com/dahenry/gl-gsync-demo"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/julius/default.nix b/third_party/nixpkgs/pkgs/games/julius/default.nix index 84e80d7d63..84970d1105 100644 --- a/third_party/nixpkgs/pkgs/games/julius/default.nix +++ b/third_party/nixpkgs/pkgs/games/julius/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "julius"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bvschaik"; repo = "julius"; rev = "v${version}"; - sha256 = "0nfdn8n6ywhm69ckz9a1chl5xxiqyaj3l337wadsbppnpscjihrc"; + sha256 = "0w7kmgz9ya0ck9cxhsyralarg7y6ydx4plmh33r4mkxkamlr7493"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index c2714e8496..dda34a113a 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.1006.1"; + version = "2021.1016.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "zQMXDqWfZ8g4HP3VQgeLogif51vVFLjb+a+7ma7OHIc="; + sha256 = "PaN/+t5qnHaOjh+DfM/Ylw1vESCM3Tejd3li9ml2Z+A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index fccef5864a..d89a24b379 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -158,9 +158,9 @@ (fetchNuGet { name = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; version = "2021.725.0"; sha256 = "00nvk8kw94v0iq5k7y810sa235lqdjlggq7f00c64c3d1zam4203"; }) (fetchNuGet { name = "ppy.ManagedBass"; version = "3.1.3-alpha"; sha256 = "0qdrklalp42pbyb30vpr7c0kwjablsja0s6xplxxkpfd14y8mzk4"; }) - (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1004.0"; sha256 = "01w8z0pz8b0fpa4qqk22lq1cf5pdic2nwrqyqmcz051yyiglmz3q"; }) + (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1014.0"; sha256 = "0j0b9hhglpqgla82c8yxqangjxqabsc9xb0z1jc6lb7rh854xzli"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; version = "2021.805.0"; sha256 = "004c053s6p7339bfw68lvlyk9jkbw6djkf2d72dz8wam546k8dcl"; }) - (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1004.0"; sha256 = "0wxdb72l7gzxzxyjysm1zshvlf0psaaanaqv2km1j3i37cnag0jp"; }) + (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1015.0"; sha256 = "0h2sb35yajgnfhn9729p9r83m8mwv7r03gd55b07wl8vhzb2r3s5"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; version = "1.0.178"; sha256 = "1bv77rrf3g6zr4bzfrrqqzl0vjj4c8izc0sakckda8dlm6h3gxln"; }) (fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.452-alpha"; sha256 = "0l59cfji8w0x2nrp3m7xvfpw4y7z5dhwsq4wq3wf4r6npwnra0hc"; }) (fetchNuGet { name = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) @@ -358,4 +358,5 @@ (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { name = "TagLibSharp"; version = "2.2.0"; sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; }) ] diff --git a/third_party/nixpkgs/pkgs/games/stockfish/default.nix b/third_party/nixpkgs/pkgs/games/stockfish/default.nix index 5aa2408afd..05caaaed63 100644 --- a/third_party/nixpkgs/pkgs/games/stockfish/default.nix +++ b/third_party/nixpkgs/pkgs/games/stockfish/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { Stockfish is one of the strongest chess engines in the world. It is also much stronger than the best human chess grandmasters. ''; - maintainers = with maintainers; [ luispedro peti siraben ]; + maintainers = with maintainers; [ luispedro siraben ]; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix index cfe53e48d6..f43f3fc4f3 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix @@ -49,6 +49,6 @@ in stdenv.mkDerivation rec { homepage = "http://splix.ap2c.org"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau peti ]; + maintainers = with maintainers; [ jfrankenau ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index 8e08be28ed..06b1221dcc 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,13 +21,14 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-14002"; + version = "5.0-15260"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "53222560650e4a99eceafcd537d4e04d1c50b3a6"; - sha256 = "1m71gk9hm011fpv5hmpladf7abkylmawgr60d0czkr276pzg04ky"; + rev = "207c931a04c8e2629a735bc2b3f36b5c89365ca7"; + sha256 = "15r9syk7f62h16klcznw7css6sng8nqkkz4d1qr8d988rdfaiypx"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ] diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index d082ec7e1b..e584331ea6 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7058"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7065"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "d92fff541bf6fddadabf6ab628ddf8fec41cd52e"; - sha256 = "1lsg4v15x8i43pwkgn4y8d2m95m6w7izwm4zhspnq8r2lv18lqb2"; + rev = "c54a14d0b8d445d9d0074861dca816cc801e4008"; + sha256 = "13j91413x1bvg27vcx9sgc7gv00q84d8f5pllih5g5plzld4r541"; }; projectFile = "Ryujinx.sln"; diff --git a/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix b/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix index 43c9af533f..4edbd70a22 100644 --- a/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.5307"; + version = "1.0.5415"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "VsOoW8h7yFgMRVTP6AHs2HOqSwXMnRNgJI8FM/rHp2I="; + sha256 = "XvW+bAuad1IKJPZzVJBkT7vA2BBDFQBvTWtbyK/in6A="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 0ab2161f2d..57f824dc21 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-10-11"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "7413dfd3fc386920217fb43e9a517e99d9cf42b8"; - sha256 = "13a4lgkp9z72qf8ag36f7jl1q02z5xi281z62rc1lwg36nj38m92"; + rev = "16898417e68ffb6034b2a6de0c1b25502bd846d8"; + sha256 = "1zyzw8m8bfs3p06nq582pb5lja204xhzkd60bp1wyyq1q5qv9y3v"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -197,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-09-30"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "25603ba44b1439a7e69637a7ee37c5dba63b5623"; - sha256 = "014pnjinm30jjh4dmxxbfnriijpa83z9g65hilmvwndqf6z7nndj"; + rev = "6ea04b2b1a01e2c00e1b126af2b43a15c2fab441"; + sha256 = "1lzv98cjqla7py5xh4qk7p89qqlfadyspj20vfblv9gsxnhl5acy"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -233,12 +233,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-10-05"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "dc7619fc3c6e3368ae449bf8ae1ad7630a720406"; - sha256 = "0izpxbwa144r9wjiy1m0r19hfwdlm2r3pggn178gj56ll7y2njnk"; + rev = "6f9506c1a8445b902e121a630613b94c8b0cd52a"; + sha256 = "0gxf67a2l1sc5svrs6jkp6rawbjj54dvsqfr0prqindpdivxihic"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -449,12 +449,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-10-11"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "c58af7b7f407fa8d03b1bf273b7018663e05c75c"; - sha256 = "06q2gk0s7i1akh5ijdbwinpm1psq6szndddpdn4cw1r8vhanbwkz"; + rev = "949731d96f14872bb6764f305f38415d70c220a3"; + sha256 = "1lq4c47i55gza7mdn1nzsfxq78vkl5hhsrfv2dk97sbmbyfmr83j"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -641,36 +641,36 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-10-06"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "8d88c92dd5a202a996b4caac7284e4ea2f086765"; - sha256 = "0m7wmnanhmvx4ww5xiz6rfjzk3ci10gk4dda8qd87kdiszq1zay7"; + rev = "2b1d31fef79a4c0ff803f6230859faf76e4409f9"; + sha256 = "1l3lyzgwlr7drxzig01by99vrgi7flvrnln3dmy14pg2x56lsbf3"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; cmp-spell = buildVimPluginFrom2Nix { pname = "cmp-spell"; - version = "2021-08-28"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "f3fora"; repo = "cmp-spell"; - rev = "7157c9fa1029269d97d9ed5632ec575bb71981b4"; - sha256 = "1xrc3zs9jz7dvdfhfx9ikg7abxgvjns0iqr9yzn3jzqm4a37zc62"; + rev = "4ce11f44edc54f7e3087c85c1b7b388f9aece983"; + sha256 = "05akncv4w8p3h25q5dmx8h0jbn2b4l5mz9x62wj7d7qks4fjik4j"; }; meta.homepage = "https://github.com/f3fora/cmp-spell/"; }; cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2021-09-30"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "71fd46be319f96dc35ecda2fb2641a643c1ca3ba"; - sha256 = "08kqzhzx90r06hjbbr5y79bh4xgg4nj73lsam0wcvq6xyjh7qbnn"; + rev = "f788bb17e1de13b49e197b68edb501010b64e975"; + sha256 = "1c21y5vz9afzmx7l0ifv6gc2a6mfmsa8r0igxgyin0jj6ipk5kkl"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -701,12 +701,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2021-10-09"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "7e11f27b0778b23c29ed354c1352cafdfffca6f5"; - sha256 = "06bivxfgbnrshrbs6v6ym0v0nb2i6f06f6r4kmddqqz74jaynb6g"; + rev = "8da7e78e54415753d6b688f96d54290d754f7c6b"; + sha256 = "0s9s2kpfg6mqrl0xdqxl1k17vj4pc433v89i1p5kcrxsydfvdxp3"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -737,24 +737,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-09-12"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "2d9deb2a3b05a0c09f01edda0a4abd542cb3eebd"; - sha256 = "0y1yh5sf0irk9rr0d5vzvf58y5q5i50b9wdpbjy1b4dfvnax00gn"; + rev = "f9188b2652d7bf7131c74532e52ba25340d63b9f"; + sha256 = "093chsnh5fx4qwdw5dnn7h48fn2zlq0skwanlwm6ajws397n194k"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-10-01"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "d288ef453066afd1845c17883e26c4d1c9b6a3ae"; - sha256 = "154gblar7qpkfff2n29cg0xjhxgjdg51djgq3qzj9f0fc1bcm68k"; + rev = "ee767ef4db8e5606c8c4edc304a75053ac943804"; + sha256 = "1rv47115xbbsnkzs18bp60advhd3mz16w1aigfxk30cmajfydwvg"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -942,12 +942,12 @@ final: prev: completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2021-08-02"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "139fb6cfbd9f7384a5489d3e4afdacb8ed977ab0"; - sha256 = "1641gx74mqbsp42m6z695l8xlr56b79vklghjdxywi35xbz4yq22"; + rev = "87b0f86da3dffef63b42845049c648b5d90f1c4d"; + sha256 = "07n5h3jbbjpciwpd6j8dnclvb70a5hwv00605cybcc5l4xvvvsga"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -1206,12 +1206,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2021-10-09"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c982d5129fff4dad1f1cf80cad3fdb5ec98d8bc2"; - sha256 = "0lvxivdj8l221j9mrvvb874wfavy8plln38kv5niz2wmvvwlr061"; + rev = "701b2a9b04055d056cd2e3e1f6f6fa555b0c4cb6"; + sha256 = "1q8nqg5dq3m3m884s67yv2i9b8m94myyx56xyw7f3g4b4ivcsyy4"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1520,12 +1520,12 @@ final: prev: diaglist-nvim = buildVimPluginFrom2Nix { pname = "diaglist.nvim"; - version = "2021-10-11"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "onsails"; repo = "diaglist.nvim"; - rev = "794b4f59d05282944599e3efd66c3dc17fe6b8de"; - sha256 = "002i1vhri24cwf76n0302741rlaagss50nv4rz1sass1gvcikmsf"; + rev = "5221d8e4fd5522fb9e81b8131ff714b464dd0bb2"; + sha256 = "0xsm6s8qr5q52hmbhxr0hxhwar5d04gmwzf2ci82scvf85ar9l9g"; }; meta.homepage = "https://github.com/onsails/diaglist.nvim/"; }; @@ -1616,12 +1616,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-10-04"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "73671fbfc70f0b78c743894b31c009b22a6ddaa3"; - sha256 = "0mbz6901l0i0cy49d63542jfvzk93d2xnbkpnih65x8whhx35vdc"; + rev = "1a91fe0efc1bb1c4564140b6a5be7e3bf5ac0873"; + sha256 = "17a9lnhwf8vsfx2pm5bwzd6khfb3w954kx1w72msfmqf46v3d1ah"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1738,12 +1738,12 @@ final: prev: far-vim = buildVimPluginFrom2Nix { pname = "far.vim"; - version = "2021-02-19"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "e67b1dbe5842b709687c214fea38ca00f0ffe6c6"; - sha256 = "1ljvl7p2k3bgl54srf6kvshqq16qwfa34ppj982fp2bzzal819l1"; + rev = "9b6cc10650128a7830fb92425ad978ae8d6132bc"; + sha256 = "0kyjz4zq9rdyxvrs4l3ficrhpfwb5p01x84x17vcqbrc68kksw04"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -1774,12 +1774,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-10-11"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "470d820354fa2aa6a5a68b7d6205d0d16d8646c5"; - sha256 = "1i8hjb5lgmbhyhzyh0nzkdyc5jkxl5ad737nb8s5xqk1lw59lsas"; + rev = "4ef5e1516395eea731275e0f58b6bfba5c6ac9c1"; + sha256 = "12fci8gkbs3gf7cx68dpczkvsgy7bbax6f5fdl6fbjszpwr96lhw"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1798,12 +1798,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2021-09-19"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "264a73d4df15a9234a4ec74ecd70e9a0b9d45bf7"; - sha256 = "165kac22gmfm8f64rb5xgv8pqap2zh87xvhnd7i1fy34yzj0n514"; + rev = "41197d23b2975fb373b0affc090ff4fe52a7429c"; + sha256 = "0djjik0q4pczw3r6v2xpmww1wv6rw69jxmdpnwfxss2fdpz5a9wl"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1834,12 +1834,12 @@ final: prev: FixCursorHold-nvim = buildVimPluginFrom2Nix { pname = "FixCursorHold.nvim"; - version = "2021-04-16"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "FixCursorHold.nvim"; - rev = "b5158c93563ee6192ce8d903bfef839393bfeccd"; - sha256 = "1y6hv7vl268zbf3bzd72l43jjgi0cq364p15z8ia9jlph1syk9zz"; + rev = "f2572b0163d7b19b4e8a7c76a3eb084921d736de"; + sha256 = "06agspmka503yn75873kk0g5v2m91df1zblsh96gkc4h6wm52liv"; }; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; @@ -1919,12 +1919,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-09-23"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "4b64ba3e4ed30e96125b5725a3475ca6fb417c6c"; - sha256 = "0i5qp89ggwknh99yxrsdb8ywffsdhr2lrigllhl4ad1lrgbfmjz7"; + rev = "59507a9773ea1a24072342da357da0708b303ef9"; + sha256 = "1d5ragvg9jxs3axln3cqj7i37c0vxdyfwl4ll06yslghb77krf6w"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2135,24 +2135,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2021-07-15"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "585f2eab74cb872c421f564274ef050fa74937ab"; - sha256 = "1zc9yr7b53akn639xhczala7vqz7rdy61xnndwn37bdxzvjqm59j"; + rev = "a727080a527cb0f01843b59e9c445d7c4dce0f12"; + sha256 = "0mbnbiikavl6p0jsaal7vmxafrzdcn59xngwszx16qw8f00l76hw"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-10-04"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ceb2dcb23f569ce337deb1b1ce7d4a51434cec32"; - sha256 = "0q7a2pa6am99656a07zpnhqlgzjkn9z0jg6lvc45c7mqavl21xis"; + rev = "552f114caeaec4ce97822cb55dfa7c7e5368136b"; + sha256 = "0qdafm3arjf8bcqpvv085dwzbikad3sr3xzvrn3gfa0dsls8pg6q"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2219,12 +2219,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-10-03"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "b04d83414d113aedf2e4beb1dd030f8a909ee8a8"; - sha256 = "0mdkz8hcdvr6f77y9b7zb04sv3xw1v8j4rpim6fxcbg38q267wcp"; + rev = "05c6983e6d6cb6e35367a13eeda1ffb160f48753"; + sha256 = "1qa22gsa62ginkad21bigj8qgbh8h3car598gl59643y2kc7lip3"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2279,12 +2279,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-10-04"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "8f95a04c0a8d4d7b84b089a11a2c41d58693d89c"; - sha256 = "1nzr0148zi89mq4yil77ns2nrs0ldnl3fh8aqxa89fivy8lg9p64"; + rev = "fa709b95ba0cbc35310125bc2e42ffeb2576bd4d"; + sha256 = "06vzhcciifb8vwzmkbwy4hnzwrj2rgz3zl91xh8dbf1g4fh54w8x"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2399,12 +2399,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2021-09-06"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "a3f11483e1ffd5946914db505c7b917bb6c95515"; - sha256 = "0asabmaacvfyv48rwzgcy4vy5wrp72rjmgn53ann9asfxw9ipjsh"; + rev = "2097f623b6b04f9d03e1d23c08e975e5079be64f"; + sha256 = "0d1brmiqsnq0crm5844m2sj2df7vj0ad1bkdrmyxvgnphq0z443p"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2507,12 +2507,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-10-06"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "948b6ac3303b9e2e75daad0bd0ec844ed6b06d4a"; - sha256 = "1adsy4nkl8dm6bqkc2chy47na3kqh8g1lkmxzvc5wdfw0c27z0i0"; + rev = "0a98fa8dacafe22df0c44658f9de3968dc284d20"; + sha256 = "1mwj3wsp6b1m6amii5pz2b0nbs6ac8w0285wg8gd3g2y3ywihi2g"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2700,12 +2700,12 @@ final: prev: kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2021-08-26"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "09d332c66b7155b14eb22c9129aee44d9d2ff496"; - sha256 = "1cdzsqilnb90wqicjb9v58wiayp8a7wa44q4aw7a5a74yyxysfhy"; + rev = "8f1cd74ad28de7d7c4fda5d8e8557ff240904b42"; + sha256 = "0avd7v0nzz31nf5vj29npw5g7c2rrlirvkyd042qlh5y2vas7b2g"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; @@ -3048,12 +3048,12 @@ final: prev: lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2021-10-07"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "521e4f9217d9bcc388daf184be8b168233e8aeed"; - sha256 = "06g57xwsfz9bs0d7maaba6g09ilcmmmhcamv11jh4b3qn2vqx95s"; + rev = "0f7851772ebdd5cb67a04b3d3cda5281a1eb83c1"; + sha256 = "0jk1xlp8x6vw40dl96zvmdxv0p8100rzx7za58xpahz10232lckx"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; @@ -3096,12 +3096,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-10-10"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "111e7966d746d9f1e9d0e159d37d6aa2bbda8712"; - sha256 = "1n1iz6sb6bx69cxyhsrhy6m0771f2ags52rs7x20737nqij4l1vq"; + rev = "4526e71635b2d238c0f76f058e8c4de3a6b5bd51"; + sha256 = "08xrppvjzc6hnzfkjy1y7k4n5pxgamrzchv9nry6yzi9w3ijnhyb"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3192,24 +3192,24 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2021-08-27"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "45a8eabefd500ab4496ee790d3ac178eb4de9fb9"; - sha256 = "13mlcjkdbhpfgcg45m7whylxsaylgx1lysr5npc7gk6a85l2slzq"; + rev = "5c54258d34b8ae4be70a8fbc09b400eb7be0bee8"; + sha256 = "0gy5c5v80xbgx511xk1zp2scxzmgipwad1zqpsff4grz80vzsa13"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; minsnip-nvim = buildVimPluginFrom2Nix { pname = "minsnip.nvim"; - version = "2021-09-16"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "minsnip.nvim"; - rev = "f145d2d01103eb2e1f895f9baf438f042ad3509e"; - sha256 = "03b20cb4cifrwfsnw2zgpgd9n5wx731ygkg2x2fj5n6hw1klbfzj"; + rev = "ee71cda58f2e5ad6303338f1db3083e59ca35db1"; + sha256 = "1fvz1n6qy3wvn42rmchg58d8l187g52q1ibx757jwrjg6dbaw2xn"; }; meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; @@ -3480,12 +3480,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-09-20"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "cd666d51cb4d03e509039fd35e5744bbf9db431b"; - sha256 = "0q3sdrdi78p09mns9mdpicvhrm8y6n1vna96n0v4yfjknkxa02yw"; + rev = "253dc1d0c7de287440cc5e93c3e60d93cd92f096"; + sha256 = "0xfb4dry3ybv1q2gkqbxkj4y9q6g7hvc4x6z4mvxfks96lcmgrm8"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3528,12 +3528,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-10-08"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "ab2840c8c1a8df92cd37a086948d0528ffdede32"; - sha256 = "0iz85svvq0h38nbkih0spgnlh0gnnhk2y3rs7igc5gjka7k7mc89"; + rev = "727652348bf4f39a354e88d1b2cbf36220d109db"; + sha256 = "07skmgl78vqks21lr64sm808zqbqf2013rf7ph9rkfz5wrn4zcvd"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3660,12 +3660,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2021-10-05"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "750d2246d38cd2839356ab8506fc8328a76d33db"; - sha256 = "0gg11pswi2alz2khd7ygjhq6kb2nnawpd1f2vvgpc3wpqhp6lk92"; + rev = "baf9ac7f20dbc225644ab4825f007bc65e944dce"; + sha256 = "0x0y78kps2p9skqykcrvlgbhmmm5x5c5kkwz1dfc0akzkdjy8505"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -3780,12 +3780,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2021-10-08"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "48baaa1a7eff50349e42674b2ec6cf8a0d395b75"; - sha256 = "1pna56d7c822w4yqn1dcyb08k28c5w0y9qngdxfqjmkjgp1vcpy6"; + rev = "dfaacec99f03a8412538974e8d6a96a0916a3a5f"; + sha256 = "0hjqbisj9kd181qc6jav43r3jk2qyf79n56mxrjzwb8i5rndlr93"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -3816,12 +3816,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn.vim"; - version = "2021-09-30"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "892ca98fa8ecedb4f14988451a5cf539250c8b86"; - sha256 = "192lfhgzci09n1j56nj80nj12a3qx7r6qj21vnvqai0xh59dgy42"; + rev = "f7ebbaa41da15a964758f009e8e05463974a0aee"; + sha256 = "1spma6n0vyavllawd98zccwmkscisq69547qqxqgfz9j69dllrfg"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3840,12 +3840,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2021-09-27"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "46d9df8bf6535c1bc751a4134fc52ea91068cfaa"; - sha256 = "19b4ix8py8vg2jrzhhzcp69jyl6snplii6bpyaasj5nhhjxslmlq"; + rev = "99941237d7b54831ce31026b2bf48f5af7c3eaa3"; + sha256 = "1z46fkjyhfnaw3x8id7xs2fkglkbbv6sp45zmzg0f1r881dismi2"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3876,12 +3876,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-10-10"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "01bb7be2a576003b4f7d23aa3561c5cc65c6b47b"; - sha256 = "1ygr5641jzlr0b835aicfd5f5lq8fvh7iby74v2wf9684zn75sv0"; + rev = "f9d3acd1a4e3b7e6d84951754fbdaadb196ae0fd"; + sha256 = "15jk540qb2zwpq3vh31skdl1gn9v6y28vqv9jrw78fjmhrs99lld"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3924,12 +3924,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-10-11"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "b5d077d2a055485a00846a107c777321feed1d29"; - sha256 = "0ivl7286nni8pvidzgxsklc4x2v6gyx90brvdpg6j18n2xg8i380"; + rev = "2cab63437f05551d79ee959eb88fee1ba437a5a7"; + sha256 = "14zrgri491jshg57wcw8nf5nzviw1b6a88qkx0km1v15knihbc68"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3984,24 +3984,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-10-11"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "fe2b245ea124427a22f6008c45aa43eec37b2661"; - sha256 = "12ggywkgg9a6nccjah5lj31h43f3p5j22dn50agiis814a8syr8k"; + rev = "4ecf2a24265626a2c00427394deb4747c7b9d5dc"; + sha256 = "1p134wb9g2ki0gn7aqhsh64frcx5n00npkcj1lgnzcc4cc95p7d4"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2021-10-03"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "7361b5637930999d01b93b6ab4c45b784fa0618a"; - sha256 = "12xl0dxd341mmbv4lg28s1qlv9xg8vjv79sb9x2dv5g3994jf9q6"; + rev = "977abc8bbf83c5e1c7c476223bcec7b7036c0b5a"; + sha256 = "0jf0kiawhslk5y8h14p9abxsp7iigni6jps3gcirswvxw8clhpxl"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4056,12 +4056,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-10-08"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "385ede69635f5b2eaf48a36d6a4caba6794e508a"; - sha256 = "0pgfagi0fb9ik2ljbbcdyrirbxm87fmf2hybmyycigpw77x8pdv2"; + rev = "fafd7f9a7ab70fd2cb519a98b594859ba4eefcd7"; + sha256 = "11ky72s1vk9bnf6dji913hiifxdvih0a17yljxs03qhnynvlc5p9"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4116,12 +4116,12 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-10-06"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "449dc8b5b34d54504d8331b9fa7eee95520400cc"; - sha256 = "1baa9l71dgn2chbkj6p00rkj8xdq6d8icr93w31wmas6470bwgf2"; + rev = "5576661c8ddd3c881b5f97446b919090033ce74f"; + sha256 = "1zvbiys1wgyc5figabw9p8dvz3jj756wgjdjg7k44cfn5c0vld42"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4176,24 +4176,36 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-10-04"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "fb7fa4adf6c6464784e248b3a12e6ca0b3f4855a"; - sha256 = "1p7i1vq6w9ghp9xhv78rbjj9c5sp01b3qqyhskqdzn1pkgj4pwr8"; + rev = "9838d3a0f9268d89c9f238c67928d3b6a0ceaaf5"; + sha256 = "157x2i6paqz626bvbjly5k1yg2939v6j8riicrw8gxbb3s5z5fh5"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; + nvim-lsp-ts-utils = buildVimPluginFrom2Nix { + pname = "nvim-lsp-ts-utils"; + version = "2021-10-03"; + src = fetchFromGitHub { + owner = "jose-elias-alvarez"; + repo = "nvim-lsp-ts-utils"; + rev = "efa321ad03fbffeca699bc04ca1a59db0c54d16f"; + sha256 = "1bxj37jfcq6vrxpl5cslzmg03aqf2i13i71birvcvlw6n4p3kbbm"; + }; + meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; + }; + nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-10-09"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e609a702eaf2d6bfb1e0fe8c44a5bf84436fb5a6"; - sha256 = "113p3nmnm5fj0ckd3b7zqcxq1nnjc9a7178x0dzjf614vll449yq"; + rev = "28a8e5258cb8140cc50a030b9b3c15e39376028a"; + sha256 = "02n5kacdb6my8mn0iayr5l1rm6nx4pqc6fx6a7l5minww9vh8na2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4224,12 +4236,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-10-10"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "f3eb97c099ddf14b16710a6f17a68d2baf82927f"; - sha256 = "1las5x4nqabf0zivw3bv2912748n97ndqv9k561x9l0d8q18r5yv"; + rev = "4743b32755ff3cb2e03fd4a0a6413bb7ea9e2617"; + sha256 = "06v0swwlk22n0x26bgw1krf26vr7khkc2yjdi4y13saj47c46z4p"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4296,12 +4308,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2021-10-10"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "fda5b82bdf5def17758282978128efaa2d3b243a"; - sha256 = "1v89447yygg8qn30hdcrc3v14xrbvk2m3z228ryik0xm6gyr2im8"; + rev = "ec3f10e2116f344d9cc5c9980bddf7819f27d8ae"; + sha256 = "0vwlxghxyc82w2vmn6nylnvhcvr91k9z0szjwn67f8n1bnii2fn7"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4380,12 +4392,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-10-03"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "9cac1e40e396110ffb2cf04622ea7a7725436dae"; - sha256 = "0s34808s7nkqfz0pznzm517x4rsjy9dc3y2brmxk8gp4vfj7jz13"; + rev = "2bd142b45fbe890d9588a50df3f26212c2b87c80"; + sha256 = "09hcwm10b5rb77rpv0qbwak1x8hhqr0wqnrn118b7768pkqqwka0"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4488,24 +4500,24 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2021-10-10"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "20cb34e8b411f500e52100b58579fe0f401cd4ae"; - sha256 = "11b02l24nv26qz3da969vxlj2dni2y2csbk8vivm0di62gjnd044"; + rev = "836551aee06e07dc77ff0aa5dc1de4ace50596a1"; + sha256 = "0s654i6xlk3nkhjdrdmx202f9ig0xby5p9n98ajkhi6wq2yhfr72"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2021-09-25"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "cc8ecccd324ea0d8f07dc54806057806d0aff1d8"; - sha256 = "19jairk59a0f4p34h84sy8ia1qk2bcbwxk5i49vf5gxmi31pjpy4"; + rev = "e86ce939d85576fb7ce6c1c45fd49c8a570c24cc"; + sha256 = "19wq5xg1yvk5153c1b0zbhdzaga0ja45m3zm6a1wqb437wcqdqlx"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -4584,12 +4596,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2021-09-17"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "643afbb7158b77cbd491fd9874a8758d0484255a"; - sha256 = "14dzmavrak99i2ahwwccxcqkkj9a1b7ch9mlmpg56y6y4v65ss1h"; + rev = "d0d32dc5e92564b63ec905a9423984b5d503c24a"; + sha256 = "1h9ql0ryqblnmiksskh4phah1br1gbfc3zyylc8gczppgnxvgq5p"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -4945,24 +4957,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-10-07"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "b3e8deb0eecece54c3bbe2437343b8884f47fd9f"; - sha256 = "17a8jmdskp0gx9nk3n5qfb0myqhiz35cmjcf080qrfhy304ddglr"; + rev = "3990e5b3609bd883fdc432082f5e1c467ae7d615"; + sha256 = "0hh4wysfm1p8kkh6ji27vmvxvg2nm7fnkicaby6y88v0zf5scham"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2021-09-09"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "3f522bd7375dc780714c1ebe7fe398f4e45f0e52"; - sha256 = "013n3ci6605qa6dvabg02nhln9s5ahh9gvzh07w3ikvb53wp31h4"; + rev = "6445f9131d872d6bf2236ea301e5d400a96f961d"; + sha256 = "0g60vks084jcajv1rsjnkn4idcwvzfbwqwnpkcw0xh009p71wyjd"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5053,12 +5065,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-10-06"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "4a9c749bee7956cd54322ed04749bb7be329eddd"; - sha256 = "0508kanxnbgd6i3mfsf3rcg5glxjpgm3nidbsj5lgcv1w6nxf45g"; + rev = "e3b0ace51db01e6fbecae489645b911a8f4b3441"; + sha256 = "0syshs383j1fhj381fy9d9chrqa11fk333c2kzak08j5l471z486"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5306,12 +5318,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-10-04"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "81e19fc3db1af37ec5acf2d7cb11b97ae48c34b6"; - sha256 = "1g67hpnk366z71an7kl0g8x0ikn9v4yiaqv87b5n6s2ax6h3z9lr"; + rev = "995c6d30ac2846c8230488246057c1ad1aa0b908"; + sha256 = "0vbw5sbm1ldqb38g5if1p1wn41n1vra6lnqc1crz4vl3wiqra6v5"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5632,12 +5644,12 @@ final: prev: tagalong-vim = buildVimPluginFrom2Nix { pname = "tagalong.vim"; - version = "2021-08-19"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "6c8c0f4903daed1c11087a014a8bc23ac4334850"; - sha256 = "1vcymd05pacs3ywf4bq20vhn46a3d4hpl2lwcbc5z1cv18iwd3ip"; + rev = "9d37eeb2463bfa1150a9353d3bf9a4f6d7395ab9"; + sha256 = "0i2vnd0rhp5ix0p78np0vk45pnpidi1y7z6b5z8pwh442ma8f86f"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; @@ -5704,12 +5716,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2021-10-08"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "2001656a0b5d6e2487c16839c431750b4316dbd9"; - sha256 = "0hx0sn2qrvqzcggjgvz2aa0pz0fwv3lzapwn06ac71ccqhlqnjj3"; + rev = "fc72e26b7a47e99e8ccdc21d76fd2ebc18fd34e2"; + sha256 = "0f41f85m8s8smbqin9cflzkvd9cyknjps8hix566cfvx3qsx0ib7"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -5813,12 +5825,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-10-09"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ba41f0eeb13796c26f6c5f3e8c44b2397a466e39"; - sha256 = "1r33m518s8mcm4iwma2vj03ghqx27qpkyzn843zfwkawa4xdv9vh"; + rev = "b5c63c6329cff8dd8e23047eecd1f581379f1587"; + sha256 = "16xd50ihmdlsbjidykqc53zk98vc0yfpj7rkmyha2jkvanxy53yh"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6030,12 +6042,12 @@ final: prev: TrueZen-nvim = buildVimPluginFrom2Nix { pname = "TrueZen.nvim"; - version = "2021-09-11"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "Pocco81"; repo = "TrueZen.nvim"; - rev = "5dfd2c23ce269a7b70708d84f3ce44bfc10d7830"; - sha256 = "100gncjw94di6j9f9wl266s5cp2lywp18gzwzq4mzvp9y4kk7baf"; + rev = "508b977d71650da5c9243698614a9a1416f116d4"; + sha256 = "0sr4y1mg83l28l5ias2pv0gxkcgwailfjn2skx35z63f2il3zkbx"; }; meta.homepage = "https://github.com/Pocco81/TrueZen.nvim/"; }; @@ -6570,12 +6582,12 @@ final: prev: vim-auto-save = buildVimPluginFrom2Nix { pname = "vim-auto-save"; - version = "2019-03-19"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "907th"; repo = "vim-auto-save"; - rev = "8c1d5dc919030aa712ad7201074ffb60961e9dda"; - sha256 = "0dj45g56n0q4advc9sgch11ghb2h5ahk601gndwy02a0937axjh2"; + rev = "d8ff037621e2351278cf0892ca19ee7ce479e802"; + sha256 = "1z075hb5wi7sv9yha4fxfxakcayymicg6av2gc9skaw8y2sx6jzn"; }; meta.homepage = "https://github.com/907th/vim-auto-save/"; }; @@ -6858,12 +6870,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2021-04-15"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "793d816524934e6553c76437120eea5df8e85a1e"; - sha256 = "174wq1sq862s474bhfq0w8lnmcilq75gf2sdp1hws7wj0fvn10h3"; + rev = "f3a5dc78b94874320cc48543e31de08df20c67af"; + sha256 = "0290wcvg0f3z9bcsd2ykqi5rw9wz60hvkc9ladh2xfrndhw77s2x"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -7530,12 +7542,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-10-10"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "b644ab70385d65368097ab952fbfe309ed789daa"; - sha256 = "15yj3hx2yhgxw8634daal63l7j45c57jjinr21d01m3pbck9cmqd"; + rev = "1cb504538bf1e46b16d239cfc7fa22229dd1301b"; + sha256 = "1z5dggdjfc7fi7q58rfbh5whw7qw6jzfxbf87mlnyr9vij72v53q"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -7590,12 +7602,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-10-10"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "69f5fcbd459c113181d18a0ea2641cd47c9e0318"; - sha256 = "06g5zc09mw9bpz6aga7ikilirzgzvbawf4p3ss9gkgxpc9fzxwy1"; + rev = "0615cd2baf15ed0aebacd3546015a89d491553ef"; + sha256 = "0j6hl5561jhhcbxwiwc1030ip4bzqypqnj1ycxhg3vl630d18kla"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8035,12 +8047,12 @@ final: prev: vim-indent-guides = buildVimPluginFrom2Nix { pname = "vim-indent-guides"; - version = "2018-05-14"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "nathanaelkane"; repo = "vim-indent-guides"; - rev = "54d889a63716ee2f1818aa2ec5082db47147147b"; - sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2"; + rev = "765084d38bf102a95ab966fb06472e83fa7deff7"; + sha256 = "0gffchphg5chg3311x0mb8xd4ir8psdmdscqpx37bxz5w9n7qsdp"; }; meta.homepage = "https://github.com/nathanaelkane/vim-indent-guides/"; }; @@ -9201,12 +9213,12 @@ final: prev: vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-11-25"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "26a75886caef937bfad4201d5478571a992984c2"; - sha256 = "1qgwn57hs82a6pjilnqafd4c2za4r3vkys9i9apbxqhcxypx05hl"; + rev = "d0b89c2dc0f6af09d7876963e94e5c7567eacac6"; + sha256 = "1m8kjnj3xz5vmzs0ycbwm700jczmhgf2y1sfjx178b0jachfyq0j"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -9837,12 +9849,12 @@ final: prev: vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2019-11-28"; + version = "2021-10-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "f51a26d3710629d031806305b6c8727189cd1935"; - sha256 = "0aqrqn35xdiy80y7skxfsh3m33n6cdxw6lzz6aspfgzwllx2f0kr"; + rev = "aeb933272e72617f7c4d35e1f003be16836b948d"; + sha256 = "1b0bd5m5lv1p4d299mrwjfs2gk0zqwyaqdaid9hs9yqlxnr8s5nf"; }; meta.homepage = "https://github.com/tpope/vim-surround/"; }; @@ -9934,12 +9946,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-09-30"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "611bf381c212acfe4811ea085fd353f6f3856d66"; - sha256 = "0cnn4zhlabzi39vq6wg3gkilal8grjgr1zgb0pzi604klyk1gyl8"; + rev = "5fe8ada99a3c711c8db65eb341c3f631043c4a26"; + sha256 = "1vz28llgmjybg2hgxlv6d9q69f7lhj32id531p2hlnhxl49s9jbn"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -10270,12 +10282,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-09-14"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "9ac8044206d32bea4dba34e77b6a3b7b87f65df6"; - sha256 = "0m488cfpl7yszyhgz12binrmxysa05wxypdgy83cdxb0npka20ff"; + rev = "32ddc125ec6f5a07fe59b3ab6b4b5f50093102ee"; + sha256 = "0jis4zxs1fjczyj9c38mbicsnpyvxr4hlxg0292zk6qhmgwd8dd6"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -10402,12 +10414,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-09-22"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "6ff20c655dd5b6f6050a234638d83ee7f65ba164"; - sha256 = "08mg6kcayp8m0vfcvk0afppslkszf7fjskb39b94df0sh7ymkw5p"; + rev = "2797c6c9d5278241a5932b5b31168fe2daa894de"; + sha256 = "1rvnm0xk8s9m6s9aycbzlnxbl8f03c3dqn74qrz5pw0r0vclfsv5"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -10594,12 +10606,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-09-30"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "726a06e0d043e5897ade0624da2ecbbceab53484"; - sha256 = "1swc8bzq5fifjkqxp6svzbipx0akmcj9ars7bxcgagzdndpz117s"; + rev = "3aab9711c06186fc8205e920a82f9e357be66666"; + sha256 = "16wssm6b0fsj45h4354xbwjz02gg0kasw7907hdhi4jyhpnn0xxs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10607,12 +10619,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-10-11"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "dae6e5c8e07dd2a769b399d9ace53bab867e6048"; - sha256 = "16jvhf1dg6vxb5w622gn91qd4bll6p06rsf561ijdcp9w1132d4m"; + rev = "4b3ceb9eb7f0e12c239d7ef4262728491aee89ba"; + sha256 = "1q3ygk39pbm2bhq463c0rc7zqm5zzg2ln2k1qka1v2i4ghngaszi"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10727,12 +10739,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2021-10-10"; + version = "2021-10-11"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "615df90caac067673c34f0fb8b399b164ef6449a"; - sha256 = "0y787bm302wrpk187gcr49qw5x28gjzxajjl2dh16acvf5hdzj3w"; + rev = "52ff550ef05a0110f4decc4629e0a58b94ca97b8"; + sha256 = "1xwn6jcgf1wbyzsm64n51m82xpy8s6k7yhyvd7c8byp2gbh7z0r8"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -10848,12 +10860,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-09-19"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4117a99861b537830d717c3113e3d584523bc573"; - sha256 = "1c0p1zk54rcn4ph1h17qyfrsdx90rgw7cc9hp1n8xpb9nhwvx494"; + rev = "69430d7ee6f204e0148102ba9c1b9b31a6315cf8"; + sha256 = "1qqjnhybzf34xmzhhjk5zwv2aly2my51f4r81h54q5xqmkk05sgc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -10909,12 +10921,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2021-09-29"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "e77b52c561eef4e3489dde560efce6def68c35d0"; - sha256 = "0793bb45zmdrcg2xnpy1yfn5ajmi9apca30rxsw5b2yr9mp142wd"; + rev = "0adf3a1407bdf60a6c1446fb6a9a05c9823e4290"; + sha256 = "0sdjznbzwj180g1jgn6rizbq2dq2clpcj1rj1xb3m127w4rgqhyj"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index d10c2b1d2f..6937233cf3 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -290,6 +290,7 @@ josa42/coc-lua josa42/vim-lightline-coc jose-elias-alvarez/minsnip.nvim@main jose-elias-alvarez/null-ls.nvim@main +jose-elias-alvarez/nvim-lsp-ts-utils@main joshdick/onedark.vim@main jpalardy/vim-slime@main jparise/vim-graphql diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix index 89950a5159..4a03c46dce 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/python/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, vscode-utils, extractNuGet -, icu, curl, openssl, lttng-ust, autoPatchelfHook +, icu, curl, openssl, liburcu, lttng-ust, autoPatchelfHook , python3, musl , pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. @@ -12,6 +12,24 @@ assert ctagsUseFixed -> null != ctags; let + liburcu-0-12 = liburcu.overrideAttrs (oldAttrs: rec { + version = "0.12.2"; + src = fetchurl { + url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; + sha256 = "0yx69kbx9zd6ayjzvwvglilhdnirq4f1x1sdv33jy8bc9wgc3vsf"; + }; + }); + + lttng-ust-2-10 = (lttng-ust.override { + liburcu = liburcu-0-12; + }).overrideAttrs (oldAttrs: rec { + version = "2.10.5"; + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/lttng-ust-${version}.tar.bz2"; + sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; + }; + }); + pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python"; ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags"; @@ -54,7 +72,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { icu curl openssl - lttng-ust + lttng-ust-2-10 musl ]; @@ -75,6 +93,19 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { # Patch `packages.json` so that nix's *ctags* is used as default value for `python.workspaceSymbols.ctagsPath`. substituteInPlace "./package.json" \ --replace "\"default\": \"ctags\"" "\"default\": \"${ctagsDefaultsTo}\"" + + # Similar cleanup to what's done in the `debugpy` python package. + # This prevent our autopatchelf logic to bark on unsupported binaries (`attach_x86.so` + # was problematic) but also should make our derivation less heavy. + ( + cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process + declare kept_aside="${{ + "x86_64-linux" = "attach_linux_amd64.so"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}" + mv "$kept_aside" "$kept_aside.hidden" + rm *.so *.dylib *.dll *.exe *.pdb + mv "$kept_aside.hidden" "$kept_aside" + ) ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 922675fa42..5ee2a08f5a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.210"; + version = "4.19.211"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cv126j4sghwgzjm9p5l1brcnxkbgggja2ai37gl8m2s99cj59wv"; + sha256 = "1m3y5gsf5s8bb4jxkri20dlxi8aiqabzaijj2h1svz4r19ca8j7v"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 5a8ef895c2..0da279cfc5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.72"; + version = "5.10.73"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0z2cp8gqnbv7iz8kb5ydfmk019m0gds8wwvwc6kccsk4wypkbmml"; + sha256 = "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix index 465a3f82d5..5722faf3bd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.11"; + version = "5.14.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0capilz3wx29pw7n2m5cn229vy9psrccmdspp27znhjkvwj0m0wk"; + sha256 = "0dswxf1qk70lms5lph15i7nz3ybwiia58v8zzrmi71ajviwjc9wd"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 931f9f56f8..1ff0803114 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.152"; + version = "5.4.153"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1may19d47d06mplpk29dpjsq31sxk8wwbwb2jspj3vay9h9wfi40"; + sha256 = "0jaz57sd51xqc7w8k3f43bfc5mdsh1413mdngqqsgr8isv4hg7vd"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index d8d9edcf4a..8ee8c663b3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -16,7 +16,7 @@ let in linux.override { argsOverride = { - modDirVersion = "${linux.modDirVersion}-gnu"; + modDirVersion = "${linux.modDirVersion}-gnu1"; isLibre = true; src = stdenv.mkDerivation { @@ -35,8 +35,6 @@ in linux.override { ''; }; - extraMeta.broken = true; - passthru.updateScript = ./update-libre.sh; maintainers = [ lib.maintainers.qyliss ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 793579fd2c..08ed46bb0d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.14.9"; + version = "5.14.12"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-CMCZjuK9ofRup05l7HNg87jHTg4jOGrkmtvoxuNGwXE="; + sha256 = "sha256-JVTi319BLHM4CgF7KaN3C/92N4uwh59po1AcOinNpww="; }; structuredExtraConfig = with lib.kernel; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 5ff9a8be77..9c67df13d3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -56,6 +56,7 @@ let # Dependencies that are required to build kernel modules moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf; + installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!${stdenv.shell} -e mkdir -p $4 @@ -88,6 +89,8 @@ let isModular = config.isYes "MODULES"; + buildDTBs = kernelConf.DTB or false; + installsFirmware = (config.isEnabled "FW_LOADER") && (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) && (lib.versionOlder version "4.14"); @@ -175,15 +178,16 @@ let "KBUILD_BUILD_VERSION=1-NixOS" kernelConf.target "vmlinux" # for "perf" and things like that - ] - ++ optional isModular "modules" + ] ++ optional isModular "modules" + ++ optional buildDTBs "dtbs" ++ extraMakeFlags; installFlags = [ "INSTALLKERNEL=${installkernel}" "INSTALL_PATH=$(out)" ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") - ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; + ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware" + ++ optionals buildDTBs ["dtbs_install" "INSTALL_DTBS_PATH=$(out)/dtbs"]; preInstall = '' installFlagsArray+=("-j$NIX_BUILD_CORES") @@ -199,9 +203,7 @@ let postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware - '') + (if (kernelConf.DTB or false) then '' - make $makeFlags "''${makeFlagsArray[@]}" dtbs dtbs_install INSTALL_DTBS_PATH=$out/dtbs - '' else "") + (if isModular then '' + '') + (if isModular then '' mkdir -p $dev cp vmlinux $dev/ if [ -z "''${dontStrip-}" ]; then diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numad/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/numad/default.nix index 0526c02f75..24fc9e1887 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/numad/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/numad/default.nix @@ -1,12 +1,13 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "numad"; version = "0.5"; - src = fetchurl { - url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/numad-${version}.tar.xz"; - sha256 = "08zd1yc3w00yv4mvvz5sq1gf91f6p2s9ljcd72m33xgnkglj60v4"; + src = fetchgit { + url = "https://pagure.io/numad.git"; + rev = "334278ff3d774d105939743436d7378a189e8693"; + sha256 = "sha256-6nrbfooUI1ufJhsPf68li5584oKQcznXQlxfpStuX5I="; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 6d21a4fca6..a8655596c5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,10 +27,10 @@ rec { else legacy_390; beta = generic { - version = "470.42.01"; - sha256_64bit = "04w9nmi3vyww07pmgbd2r1x37s5p6xiy4qg9s06a1kjwzpm59xfd"; - settingsSha256 = "Ohbkm7j0/V0kzcxfsHujBkrdnaefneoLutf2Rju2hIQ="; - persistencedSha256 = "1gfj4ffkidbhgjzdi6sv2sngdcb27w7b0rvfnj129rs36mcxy02j"; + version = "495.29.05"; + sha256_64bit = "sha256-9yVLl9QAxpJQR5ZJb059j2TpOx4xxCeGCk8hmhhvEl4="; + settingsSha256 = "sha256-dcEI+3bxSTwVbHcR6IgvIUFt4vWtK5T4NMGVhmmeVJ0="; + persistencedSha256 = "sha256-OT/hOXEPatc6pAKrxDe0jsmaDFCtVXAbdW4elKe6xE8="; }; # Vulkan developer beta driver diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powertop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/powertop/default.nix index 79594a87c5..b8a0487bc7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/powertop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils +{ lib, stdenv, fetchFromGitHub, gettext, libnl, ncurses, pciutils , pkg-config, zlib, autoreconfHook }: stdenv.mkDerivation rec { @@ -17,14 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; - patches = lib.optional stdenv.hostPlatform.isMusl ( - fetchpatch { - name = "strerror_r.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; - sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; - } - ); - NIX_LDFLAGS = [ "-lpthread" ]; postPatch = '' @@ -36,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Analyze power consumption on Intel-based laptops"; homepage = "https://01.org/powertop"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/servers/dico/default.nix b/third_party/nixpkgs/pkgs/servers/dico/default.nix index 7820dbaff7..13f69fcf4a 100644 --- a/third_party/nixpkgs/pkgs/servers/dico/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dico/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, libtool, gettext, zlib, readline, gsasl -, guile, python2, pcre, libffi, groff }: +, guile, python3, pcre, libffi, groff }: stdenv.mkDerivation rec { pname = "dico"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = - [ libtool gettext zlib readline gsasl guile python2 pcre libffi groff ]; + [ libtool gettext zlib readline gsasl guile python3 pcre libffi groff ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index 6fd7eb42c9..753a361fc1 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "Domain name server"; license = licenses.mpl20; - maintainers = with maintainers; [ peti globin ]; + maintainers = with maintainers; [ globin ]; platforms = platforms.unix; outputsToInstall = [ "out" "dnsutils" "host" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix index 9e7e6c249e..420b092345 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "fb8b962dd9ef744e2551c4f052454bc2a30e39c1f662f4f3522e8f221d8e3d66"; + sha256 = "ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/headphones/default.nix b/third_party/nixpkgs/pkgs/servers/headphones/default.nix index 67b328d661..9c14c46685 100644 --- a/third_party/nixpkgs/pkgs/servers/headphones/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headphones/default.nix @@ -2,13 +2,13 @@ python2.pkgs.buildPythonApplication rec { pname = "headphones"; - version = "0.5.19"; + version = "0.5.20"; src = fetchFromGitHub { owner = "rembo10"; repo = "headphones"; rev = "v${version}"; - sha256 = "0z39gyan3ksdhnjxxs7byamrzmrk8cn15g300iqigzvgidff1lq0"; + sha256 = "0m234fr1i8bb8mgmjsdpkbaa3l16y23ca6s7nyyl5ismmjxhi4mz"; }; dontBuild = true; @@ -18,10 +18,12 @@ python2.pkgs.buildPythonApplication rec { buildInputs = [ python2 ]; installPhase = '' - mkdir -p $out/bin - cp -R {data,headphones,lib,Headphones.py} $out/ + mkdir -p $out/bin $out/opt/headphones + cp -R {data,headphones,lib,Headphones.py} $out/opt/headphones - makeWrapper $out/Headphones.py $out/bin/headphones + echo v${version} > $out/opt/headphones/version.txt + + makeWrapper $out/opt/headphones/Headphones.py $out/bin/headphones ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index 6e6eca69da..3b8a4acbfc 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://httpd.apache.org/"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ lovek323 peti ]; + maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 39f21b1893..86c9ad6c00 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.peti ]; broken = true; # patch 'compile-against-apache24.diff' no longer works }; } diff --git a/third_party/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix b/third_party/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix index 0bf023668a..7c2d8b80de 100644 --- a/third_party/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.1-551-g2ad6eb0b"; + version = "2.1-570-gb802be83"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "XwVcjvBtJkZP46kGMnE4R1ax7Re725GMoV+pCnCNpak="; + sha256 = "0SLaCIjMN2/+Iushyz8OQpRHHBYVqn6+DpwNGbQEzy4="; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/servers/maddy/default.nix b/third_party/nixpkgs/pkgs/servers/maddy/default.nix index 3f495add9f..3381b7858b 100644 --- a/third_party/nixpkgs/pkgs/servers/maddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/maddy/default.nix @@ -29,11 +29,11 @@ buildGoModule rec { mkdir -p $out/lib/systemd/system substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \ - --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/usr/local/bin/maddy" "$out/bin/maddy" \ --replace "/bin/kill" "${coreutils}/bin/kill" substitute dist/systemd/maddy@.service $out/lib/systemd/system/maddy@.service \ - --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/usr/local/bin/maddy" "$out/bin/maddy" \ --replace "/bin/kill" "${coreutils}/bin/kill" ''; diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix index 6f5d065e48..8fd6dc447a 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ]; - maintainers = with maintainers; [ peti fpletz globin ajs124 ]; + maintainers = with maintainers; [ fpletz globin ajs124 ]; platforms = platforms.unix; }; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/default.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/default.nix index 3ef9cafeba..1213347a0a 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ peti qyliss ]; + maintainers = with lib.maintainers; [ qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index 33d31fb8e7..1c20e33bd0 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Archiver for GNU Mailman v3"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ peti globin qyliss ]; + maintainers = with lib.maintainers; [ globin qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix index 222a21bcb7..d807f7f797 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin peti qyliss ]; + maintainers = with maintainers; [ globin qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix index 434f5b3191..10adb49be8 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { meta = with lib; { description = "Django project for Mailman 3 web interface"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ peti qyliss m1cr0man ]; + maintainers = with maintainers; [ qyliss m1cr0man ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix index 348a2088f2..ca86b4b525 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix @@ -38,6 +38,6 @@ perlPackages.buildPerlPackage rec { description = "Open-Source Spam Filter"; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ peti qknight qyliss ]; + maintainers = with lib.maintainers; [ qknight qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix index 7f0e5c78eb..ea4a511f72 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.1.2"; + version = "1.2.2"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "1kz52zhsm0xx63vczzplj15hli4i22qfxl08grb7m50bqk651j1n"; + sha256 = "11xjbkws3vv5r4p6w6qfmm9wrmlhzwmvlx3vcgz99ylz34r19xvc"; }; - vendorSha256 = "05lr2ln87902bwamw4l3rrk2j9sdgv1pcvxyvzbga64rymi9dmjb"; + vendorSha256 = "0wwji220pidrmsjzd9c3n40v237680av750jf6hdvp0aqi63p9nr"; # FIXME: tests fail due to read-only nix store doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix b/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix index 67529b7d5b..044852bdfe 100644 --- a/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix @@ -54,6 +54,6 @@ buildGoModule rec { description = "A free, open source game management panel"; homepage = "https://www.pufferpanel.com/"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ronthecookie ]; + maintainers = with maintainers; [ ckie ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index c769d0abfe..d55888066a 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }: let - pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); + pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.24.15"; + version = "0.25.11"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-ocnINaz7F01vYC27fq6DYXkYGnzsqYD16aChPHuA/Go="; + sha256 = "sha256-0/Ez10IWvh84G//1vCZMLiu4+Y2+XcVLw9Gm9X+DY0s="; }; dontBuild = true; @@ -19,11 +19,15 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; - installPhase = '' - mkdir -p $out/bin - cp -R {autoProcessTV,gui,lib,sickbeard,sickgear.py,SickBeard.py} $out/ + postPatch = '' + substituteInPlace sickgear.py --replace "/usr/bin/env python2" "/usr/bin/env python" + ''; - makeWrapper $out/SickBeard.py $out/bin/sickgear + installPhase = '' + mkdir -p $out/bin $out/opt/sickgear + cp -R {autoProcessTV,gui,lib,sickbeard,sickgear.py} $out/opt/sickgear/ + + makeWrapper $out/opt/sickgear/sickgear.py $out/bin/sickgear ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/teleport/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/default.nix index d9629207a8..29d56fd98f 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/default.nix @@ -1,4 +1,3 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev { lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils }: let webassets = fetchFromGitHub { @@ -10,14 +9,14 @@ let in buildGoModule rec { pname = "teleport"; - version = "7.2.0"; + version = "7.3.0"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-JLYma/LB/3xLWaFcIbe32pAz6P8hBiLlMuTUBVfqfsw="; + sha256 = "sha256-Dy6L0dvbR8wgcRePG1jFmiJV3oYtBZuExD2bf8Uq78Y="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/unifi/default.nix b/third_party/nixpkgs/pkgs/servers/unifi/default.nix index d2cbf8c0d5..5209927c50 100644 --- a/third_party/nixpkgs/pkgs/servers/unifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifi/default.nix @@ -34,7 +34,7 @@ let description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen globin patryk27 ]; + maintainers = with maintainers; [ erictapen globin patryk27 pennae ]; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix b/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix index 4060917ad5..94ef0b23f3 100644 --- a/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.34.1"; + version = "0.35.1"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "sha256-UUqETnvkdLBoxUHUpcfE3bxE7fZJEToDxz2Q6kN1/n4="; + sha256 = "sha256-dKf68WjCynB73RBWneBsMoyowUcrEaBTnMKVKB0sgsg="; }; vendorSha256 = "sha256-ifH+420FIrib+zQtzzHtMMYd84BED+vgnRw4xToYIl4="; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix index 5752d94d6a..9151202d94 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.5307"; + version = "1.0.5415"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "epdVQnuL5dJ7DmoqyjfiLEfZxr4IQwkFEla/Y034sgg="; + sha256 = "DJk+2EAADIz3Jck5Tf3AMWq0pZn3q1JQpDm/VdIz7nc="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/shells/bash/4.4.nix b/third_party/nixpkgs/pkgs/shells/bash/4.4.nix index b3259466dd..84cbba8eac 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/4.4.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/4.4.nix @@ -132,7 +132,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = [ maintainers.peti ]; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/shells/bash/5.1.nix b/third_party/nixpkgs/pkgs/shells/bash/5.1.nix index ddf2edfd1d..efa90b0499 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/5.1.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/5.1.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = with maintainers; [ peti dtzWill ]; + maintainers = with maintainers; [ dtzWill ]; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index 0ebcaa9e86..6571d572a4 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.peti maintainers.xfix ]; + maintainers = [ maintainers.xfix ]; }; } diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 3ebdc4c8e5..14137fa0e6 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Qdol0ohg2Oo3rC59jPvqHZJtQOQ5W+aZVxTxsxrG51E="; + sha256 = "155rn0balgikkhy77gbva6a88pgwm27flzgjyphiwzwnah1mmhca"; }; - cargoSha256 = "sha256-EP4DzfufQ9y0x2rI4MGBLu48VKoUY9ETKPlUt9Abum8="; + cargoSha256 = "1pk56s47mk0f8cww6h1y43jdnf311g35xynz1jvhrk31yyjhb0jl"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index ba9ac9fdab..c284c83b41 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-10-11"; + version = "2021-10-13"; pname = "oh-my-zsh"; - rev = "beeda72826f7288d3edf6cec4114bbda9bbae347"; + rev = "19f9b6f1ade7788b07480be685cf3fcb117cad84"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "Ch1r4fSKR3VGDO/4GLJj2vETOEa6oRb1noEl8N4vJps="; + sha256 = "aC7tn5nNbkmyZ6oGKIQnWE+1LNcZH5P2pPgtnUhru/Y="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/analog/default.nix b/third_party/nixpkgs/pkgs/tools/admin/analog/default.nix index f3318eb550..54d863bb95 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/analog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/analog/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://www.c-amie.co.uk/software/analog/"; license = lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix b/third_party/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix index 6441b0782d..4c6c6971fc 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr"; + sha256 = "sha256-Fv2vM3mdYxBONH4BM/kJGW/pDQxQUV0BC8tCLrWgCBg="; }; nativeBuildInputs = [ libxslt docbook_xsl ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 43ef985c41..39ee5a67a5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -9,8 +9,8 @@ sha256 = "02s759rm633h4v5a1s3jxwvkahfjrbkz561spijrp3mihrws3xhb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-linux-amd64.tar.gz"; - sha256 = "0ainrb9i14wcq64pg99kb0s41bpmczp1h4sz85kj1a4ic0yrfq14"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-linux-amd64.tar.gz"; + sha256 = "0k67bsqiqalqrifd6r7nm6c2g4ckrfhh7a7nfgfmpvqs7cxx1kfm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-linux-amd64.tar.gz"; @@ -21,8 +21,8 @@ sha256 = "1lmy0dmpspzflc9z8p4w1cz47lbqnbkq8dng3v40lpbs75pnprvs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-linux-amd64.tar.gz"; - sha256 = "1w7ppcqkhh9k9iw10f4d93glmphyvachrkj6p8b6i93n0k78rxv7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-linux-amd64.tar.gz"; + sha256 = "0jl4ic18kf0qcys5mhp6ar4p1bj6ndhi11b51dvzdj5lb39dv43q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-linux-amd64.tar.gz"; @@ -37,12 +37,12 @@ sha256 = "1h5159y7xlslnijs8lpi4vqgvj2px6whxk9m17p9n7wiyqbmd5na"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-linux-amd64.tar.gz"; - sha256 = "0kxwx1lk54kdfw49s719g4vwr2iv6fzr82cxi5siykzpf9gfk7bd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-linux-amd64.tar.gz"; + sha256 = "0rmzb3wn5hmx8z8ly85spizinp6ja861k05fhw7l63zhqr8pnls2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-amd64.tar.gz"; - sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-amd64.tar.gz"; + sha256 = "1ixmsxawp0qbyjs37c74gcvj2icpbda6znl17yp9bhiyvnrdvxn7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-amd64.tar.gz"; @@ -81,8 +81,8 @@ sha256 = "0bp7ki3slszmy1vh4a5d4y4fhbvafrazj1cjf081xv91gi99xxz6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-linux-amd64.tar.gz"; - sha256 = "0ga794vwdggscl9lf57dg7cii91j4px0wyha4r43rhn0gbp1zk8y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-linux-amd64.tar.gz"; + sha256 = "1dznd4c8kpy6mwwb170nfl1m2dmrp6f4jalmk3bdfqscm4xhvk3q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-amd64.tar.gz"; @@ -107,8 +107,8 @@ sha256 = "1lisk9wr5p866x2hxvlz7nhz0xybhag7wgqk23x0lariln9z5na6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-darwin-amd64.tar.gz"; - sha256 = "0n5kgmcy4hsg4s4q7jd34z9hz6vcqs64j680jzsxw902cgrj5y9p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-darwin-amd64.tar.gz"; + sha256 = "103syjj8vla8lygyl5h7ilwm9kl6vxzyn6fdrkz0xcvlhqm1xr30"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-darwin-amd64.tar.gz"; @@ -119,8 +119,8 @@ sha256 = "1j7z5dbqzsdq1q8ks9g5pwzyc3ml6avhhp6xj94dzdhskl6pd8w5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-darwin-amd64.tar.gz"; - sha256 = "0sjh5wws6k90w2y5f5bm22c4qxamr658mww3zx11qakdygraijly"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-darwin-amd64.tar.gz"; + sha256 = "15c5rh0ix7zxn128kangd5x2x1n61xv9d443a7cbriibwvdkvv0j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-darwin-amd64.tar.gz"; @@ -135,12 +135,12 @@ sha256 = "0r2ykjwam5m2mfiibhq993s8n5pzmks837cwb57jwgwx8lc3ra4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-darwin-amd64.tar.gz"; - sha256 = "0vpkwlihq6pj554qd3csgf25id2q0pjx4mwkpfj74y08lv6d3v83"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-darwin-amd64.tar.gz"; + sha256 = "06lfimnlns1bfvks0kv5rjcnz6dvdk38npigyigsk9vqs0idcfi3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-amd64.tar.gz"; + sha256 = "1dy4n03xvirg6fihiid786d88qlkyqkvk4fq6ggnxc92620x7342"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-amd64.tar.gz"; @@ -179,8 +179,8 @@ sha256 = "1i73sxh6vf6adg6as1q1mab3fcjm7ma7gixj2b0y0d2a5d78lhpa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-darwin-amd64.tar.gz"; - sha256 = "19w0m6rxf0i996s9hdjym4f1k0jwf8hrlsr0m9x23xzz5r2simar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-darwin-amd64.tar.gz"; + sha256 = "1jxrz82cadmqkd1d26bj5r3bphvzz5z20shjai351hlh9aa3bv2h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-amd64.tar.gz"; @@ -205,8 +205,8 @@ sha256 = "041lmx5d1c8ls48mv56jchvk714rqw7jywywdgm6d6ipq7h5d67k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-linux-arm64.tar.gz"; - sha256 = "06hq79r35bcm7yn8qdvdiy19wsqq3ihbrmjakw2vf6xdglrxxxwr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-linux-arm64.tar.gz"; + sha256 = "0rijbqaw584b5c0kihrs80cv46s06yv3a68yz1dwa8sl7adi7n9p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-linux-arm64.tar.gz"; @@ -217,8 +217,8 @@ sha256 = "0mddv37k87wiygh6x9bnxpcr721qbmbqf6l5zk3xl61n56j8qyb1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-linux-arm64.tar.gz"; - sha256 = "1zlkij96vr3vf071gwdqcwfxlkfvcnkj4q220l3gxzliix0zvfi4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-linux-arm64.tar.gz"; + sha256 = "19aiksm4d4jxs9gw7rdr77ag58fy1v7gkk6r730imgq0d8vsacm1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-linux-arm64.tar.gz"; @@ -233,12 +233,12 @@ sha256 = "1sc8rf930cz6nkyhqn6p0h7450iqzdsrlw2smhp8yyjjvcjmsksf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-linux-arm64.tar.gz"; - sha256 = "0j8dgbfdscp29zj0vd3ial1g87n72jj07afj5lxzgsh8jay1iz2r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-linux-arm64.tar.gz"; + sha256 = "1bvzazdis423vb1r30q15q1irh07kgymv5ikzmvrygf4hm3aph06"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-arm64.tar.gz"; - sha256 = "0y7wysd4j1dp73hrbydzj2bfvpgv8vxiza5m6dbg7nl66w9ng0rc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-arm64.tar.gz"; + sha256 = "12iv8vjnal2ym70rxmdnvi02x6md7fxi8jbzhzfw526pzqs1dc47"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-arm64.tar.gz"; @@ -274,8 +274,8 @@ sha256 = "0mwpbvv62k8fg07447wwfigs4li4n78fswpzwi4alsjrkqlmw9dj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-linux-arm64.tar.gz"; - sha256 = "0kp13hk57apvqmsn1zw1k7r395wdk1308m0kwx4hmcjy6dzifjsq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-linux-arm64.tar.gz"; + sha256 = "1b8fi56wkk753w6ip1nkrksyk8qd5ypdbaq668pk60l3jb0c9mad"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-arm64.tar.gz"; @@ -300,8 +300,8 @@ sha256 = "06qc42gb2w2qjy2mz5shh082607395jq0js34wlqq61jgjzpca5l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-darwin-arm64.tar.gz"; - sha256 = "0nwqrg5in05vvj7ln7gi50vp3bnhkwar8fifpi87b134hl50q935"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-darwin-arm64.tar.gz"; + sha256 = "1wqkm32lkwff5gwn7dbznzx5rcbcysj2mx4ip77whba59ikfchsj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-darwin-arm64.tar.gz"; @@ -312,8 +312,8 @@ sha256 = "0fj1ai1kv8xgmsvfbmy5gsinxag70rx9a9gkifqgcpn3r9mj48ks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-darwin-arm64.tar.gz"; - sha256 = "0nj8gin7ys63v235x8nywmx0vv2bdcqdmmp7z3lxlxp2hk4nm84g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-darwin-arm64.tar.gz"; + sha256 = "09v28dgrs5a4w8qn4v4zwrn7n7cn2475a2jh9qz3g2ljaj0086fd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-darwin-arm64.tar.gz"; @@ -328,12 +328,12 @@ sha256 = "1c3pchbnk6dsnxsl02ypq7s4mmkxdgxszdhql1klpx5js7i1lv8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-darwin-arm64.tar.gz"; - sha256 = "08gcvlfy7kmcx02nf3n4chf6g5lasr2g8gr20gndk0rvihqiwhjz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-darwin-arm64.tar.gz"; + sha256 = "0fafl5zpnzkncvi52qw6f4898yia8p0whvr41m3g8cxcp6nyr0ij"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "0waf4apw5bzn276s34yaxvm3xyk5333l3zcz2j52c56wkadzxvpg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-arm64.tar.gz"; + sha256 = "0jrihnwfh5wvc95nipqv7ak77kq9xj0pk5hlapv9w2ls5pwykv0r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-arm64.tar.gz"; @@ -369,8 +369,8 @@ sha256 = "1hzhlxbwji4p8apx4rnqllsgf1k11w49rplz0syzmzb2fxpkif75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-darwin-arm64.tar.gz"; - sha256 = "038nk93mq59d8ynp1ggmhvmgnilrgqzcbg4hapb9pk7hpbwb269c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-darwin-arm64.tar.gz"; + sha256 = "0nh8305b6qlqr63xaacxs3v804dhrwdz179xlzdgzf9550zdqb39"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix index bd8af80193..cbbd86e016 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -140,7 +140,6 @@ pythonPackages.buildPythonApplication rec { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "https://www.nongnu.org/duplicity"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix index ac552abda0..ee9739bfac 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xfGx9rtpLmotW00pB4822dwBzB2u+QYNSLWtA+JDffU="; + sha256 = "sha256-C1KLwl+hwyoRUK4GrDhj1Wwx4Fut+QuhgTFagyQeldc="; }; - vendorSha256 = "sha256-USWrI2vH0RpGJgxoEfEwqDUwXjxylOOqA9g7GltOdYQ="; + vendorSha256 = "sha256-v81YkImg8GdI5locfsU4dg2JyO7XB24mfHRIZ+k8QBA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/compression/ncompress/builder.sh b/third_party/nixpkgs/pkgs/tools/compression/ncompress/builder.sh deleted file mode 100644 index 7a3f34aae4..0000000000 --- a/third_party/nixpkgs/pkgs/tools/compression/ncompress/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup -installFlags="PREFIX=$out" - -preBuild() { - cp Makefile.def Makefile - sed -i GNUmakefile -e 's/compress %/%/g' -} - -postInstall() { - rm $out/bin/uncompress* $out/bin/zcat* - ln -s compress $out/bin/uncompress - ln -s compress $out/bin/zcat -} - -genericBuild diff --git a/third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix b/third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix index f580709495..c4678cd960 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/ncompress/default.nix @@ -1,20 +1,27 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ncompress"; version = "5.0"; - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://sourceforge/project/ncompress/${pname}-${version}.tar.gz"; - sha256 = "004r086c11sw9vg2j3srgxpz98w8pycjl33bk3pgqnd0s92igrn4"; + src = fetchFromGitHub { + owner = "vapier"; + repo = "ncompress"; + rev = "v${version}"; + sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0="; }; - meta = { + makeFlags = [ "PREFIX=$(out)" ]; + installTargets = "install_core"; + + postInstall = '' + mv $out/bin/uncompress $out/bin/uncompress-ncompress + ''; + + meta = with lib; { homepage = "http://ncompress.sourceforge.net/"; - license = lib.licenses.publicDomain; + license = licenses.publicDomain; description = "A fast, simple LZW file compressor"; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index 30a3b9cc98..657d215147 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for programming graphics intended to replace Metapost"; license = licenses.gpl3Plus; - maintainers = [ maintainers.raskin maintainers.peti ]; + maintainers = [ maintainers.raskin ]; broken = stdenv.isDarwin; # https://github.com/vectorgraphics/asymptote/issues/69 platforms = platforms.linux ++ platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix index 6bab32ff27..5baedaab11 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "directx-shader-compiler"; - version = "1.5.2010"; + version = "1.6.2106"; # Put headers in dev, there are lot of them which aren't necessary for # using the compiler binary. @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "microsoft"; repo = "DirectXShaderCompiler"; rev = "v${version}"; - sha256 = "0ccfy1bfp0cm0pq63ri4yl1sr3fdn1a526bsnakg4bl6z4fwrnnj"; + sha256 = "6kQgAESYiQ06LkiGTfDBYwd/ORLSm1W+BcO+OUp4yXY="; # We rely on the side effect of leaving the .git directory here for the # version-grabbing functionality of the build system. fetchSubmodules = true; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mscgen/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/mscgen/default.nix index 6749a193c0..7eb1d6cce8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/mscgen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/mscgen/default.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/ding-libs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ding-libs/default.nix index 8bb2c28726..9c397bb9be 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ding-libs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ding-libs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.1"; src = fetchurl { - url = "https://fedorahosted.org/released/ding-libs/ding-libs-${version}.tar.gz"; + url = "https://releases.pagure.org/SSSD/${pname}/${pname}-${version}.tar.gz"; sha256 = "1h97mx2jdv4caiz4r7y8rxfsq78fx0k4jjnfp7x2s7xqvqks66d3"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "'D is not GLib' utility libraries"; - homepage = "https://fedorahosted.org/sssd/"; + homepage = "https://pagure.io/SSSD/ding-libs"; platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [ e-user ]; license = [ lib.licenses.gpl3 lib.licenses.lgpl3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix index 489c6fc01b..7e993c35c4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , libiconv , rustPlatform @@ -7,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BoCbN7EY7SmBYCS3OLFrQ1j1MUvZ+/oQAdoHCw9kCQE="; + sha256 = "sha256-7rwiqjjXB1+R+/kauGjiJOX/UtMmQW3U3xGL/rsSiQ0="; }; - cargoSha256 = "sha256-pAYPfRm7QN4mKwnYUMq5Td+bF1tmy3oGObWvMabmnpw="; + cargoSha256 = "sha256-g4z+05jiVaH3KCPVwJmvQbi0OCYtuafyZyVZDRRyPRA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit diff --git a/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix new file mode 100644 index 0000000000..49903559c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, ocamlPackages +, fetchFromGitHub +, makeWrapper +, python3 +}: + +ocamlPackages.buildDunePackage rec { + pname = "flitter"; + # request to tag releases: https://github.com/alexozer/flitter/issues/34 + version = "unstable-2020-10-05"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "alexozer"; + repo = "flitter"; + rev = "666c5483bc93efa6d01e0b7a927461269f8e14de"; + sha256 = "1k3m7bjq5yrrq7vhnbdykni65dsqhq6knnv9wvwq3svb3n07z4w3"; + }; + + # https://github.com/alexozer/flitter/issues/28 + postPatch = '' + for f in src/colors.ml src/duration.ml src/event_loop.ml src/splits.ml; do + substituteInPlace "$f" \ + --replace 'Unix.gettimeofday' 'Caml_unix.gettimeofday' + done + ''; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = with ocamlPackages; [ + core + lwt_ppx + sexp_pretty + color + notty + ]; + + postInstall = '' + wrapProgram $out/bin/flitter \ + --prefix PATH : "${python3.withPackages (pp: [ pp.pynput ])}/bin" + ''; + + meta = with lib; { + description = "A Livesplit-inspired speedrunning split timer for Linux/macOS terminal"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://github.com/alexozer/flitter"; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index d38a0ad713..e56a61338a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-JWTyZRZrW1mFy91D+eZL6iYV0CcNxJUT4JA0hrBKZZU="; + sha256 = "sha256-uVGU8tOHHJYBoWTwx9ilnOKo49R0QHdCABKfGoL7Dkk="; }; - vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw="; + vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0="; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix index b135ed061d..5d812f5867 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lf"; - version = "24"; + version = "25"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0nc7vfkaxxl2a201wnbz74an3siz8cjwrfylx17v6al5n93vxip0"; + sha256 = "sha256-5/OfEWgtB9R3XRJ16ponf+bBVGAXkqPq8IlB8+zyjAQ="; }; vendorSha256 = "sha256-ujQh4aE++K/fn3PJqkAbTtwRyJPSI9TJQ1DvwLF9etU="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix index b85dfc56f3..0240f1ac9e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix @@ -1,13 +1,10 @@ -{ parallel, makeWrapper , runCommand -, perlPackages -, extraPerlPackages ? - with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] -}: +{ lib, runCommand, makeWrapper, parallel, perlPackages +, extraPerlPackages ? with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] +, willCite ? false }: -runCommand "parallel-full" { - nativeBuildInputs = [ makeWrapper ]; - } '' - mkdir -p $out/bin - makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ - --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" - '' +runCommand "parallel-full" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ + --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" \ + ${lib.optionalString willCite "--add-flags --will-cite"} +'' diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 304649a86b..14b9733bf6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.9"; + version = "1.2021.12"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-ezyQGrJwMl2Tqv14GSQzApdDqg1RV8OWdnp4K8a1A5k="; + sha256 = "sha256-t9IQ1D2QJHrQmt/0EWofrqSf6o2YMUdpxFILsV5muog="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix index 70a9595785..d1e02e8b9a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; - maintainers = with maintainers; [ peti vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix index a615330a4a..84c927260c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix @@ -13,6 +13,7 @@ , makeWrapper , pciutils , perl +, perlcritic , shellcheck , smartmontools , systemd @@ -23,17 +24,20 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5"; + sha256 = "sha256-Blwj4cqrrYXohnGyJYe+1NYifxqfS4DoVUHmxFf62i4="; }; # XXX: See patch files for relevant explanations. - patches = [ ./patches/fix-makefile-sed.patch ./patches/tlp-sleep-service.patch ]; + patches = [ + ./patches/0001-makefile-correctly-sed-paths.patch + ./patches/0002-tlp-sleep.service-reintroduce.patch + ]; buildInputs = [ perl ]; nativeBuildInputs = [ makeWrapper gnused ]; @@ -52,8 +56,10 @@ "TLP_WITH_ELOGIND=0" "TLP_WITH_SYSTEMD=1" + "TLP_BATD=/share/tlp/bat.d" "TLP_BIN=/bin" "TLP_CONFDEF=/share/tlp/defaults.conf" + "TLP_CONFREN=/share/tlp/rename.conf" "TLP_FLIB=/share/tlp/func.d" "TLP_MAN=/share/man" "TLP_META=/share/metainfo" @@ -65,12 +71,11 @@ installTargets = [ "install-tlp" "install-man" ] ++ lib.optionals enableRDW [ "install-rdw" "install-man-rdw" ]; - # XXX: This is disabled because it's basically just noise since upstream - # itself does not seem to care about the zillion shellcheck errors. - doCheck = false; - checkInputs = [ checkbashisms shellcheck ]; + doCheck = true; + checkInputs = [ checkbashisms perlcritic shellcheck ]; checkTarget = [ "checkall" ]; + # TODO: Consider using resholve here postInstall = let paths = lib.makeBinPath ( [ @@ -107,12 +112,16 @@ $out/etc/NetworkManager/dispatcher.d/* $out/lib/udev/tlp-* $out/sbin/* + $out/share/tlp/bat.d/* $out/share/tlp/func.d/* $out/share/tlp/tlp-func-base ) for f in "''${fixup_bash[@]}"; do sed -i '2iexport PATH=${paths}:$PATH' "$f" done + + rm -rf $out/var + rm -rf $out/share/metainfo ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch b/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch new file mode 100644 index 0000000000..be8afc0667 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch @@ -0,0 +1,56 @@ +From 5c5d878bf49bae5920c330482217477819ba9bc2 Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer +Date: Fri, 15 Oct 2021 23:22:50 -0700 +Subject: [PATCH 1/2] makefile: correctly sed paths + +The default Makefile for tlp makes a mess with catenating `DESTDIR` to +everything, but then not actualy using the catenated (_ prefixed) +variables to sed it's `.in` files. + +This patch makes sure that it correctly sets the paths, taking `DESTDIR` +in account where it makes sense (e.g. /bin where we want $out/bin) but +not where it doesn't (/etc/tlp.conf should be just that). + +The reason DESTDIR is used at all, as opposed to the more appropriate +PREFIX, is covered in the nix formula, and is (also) due to the Makefile +being a bit "different." +--- + Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index e9bbab4..ab05720 100644 +--- a/Makefile ++++ b/Makefile +@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) + + SED = sed \ + -e "s|@TLPVER@|$(TLPVER)|g" \ +- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \ +- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ +- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ +- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ +- -e "s|@TLP_BATD@|$(TLP_BATD)|g" \ ++ -e "s|@TLP_SBIN@|$(_SBIN)|g" \ ++ -e "s|@TLP_TLIB@|$(_TLIB)|g" \ ++ -e "s|@TLP_FLIB@|$(_FLIB)|g" \ ++ -e "s|@TLP_ULIB@|$(_ULIB)|g" \ ++ -e "s|@TLP_BATD@|$(_BATD)|g" \ + -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ + -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ +- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ +- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \ +- -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ ++ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ ++ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \ ++ -e "s|@TLP_CONF@|$(_CONF)|g" \ + -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ + -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ +- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" ++ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" + + INFILES = \ + tlp \ +-- +2.33.0 + diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch b/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch similarity index 56% rename from third_party/nixpkgs/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch rename to third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch index b37c7280e3..40d89e207d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch @@ -1,23 +1,29 @@ -commit ca94cd56210067e2a55c1f413bd7713f7d338f9f -Author: Bernardo Meurer -Date: Wed Feb 26 10:46:23 2020 -0800 +From a3506c9bc8929645b7b08859e47039b8cc830d22 Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer +Date: Fri, 15 Oct 2021 23:07:40 -0700 +Subject: [PATCH 2/2] tlp-sleep.service: reintroduce - tlp-sleep.service: reintroduce - - This patch reintroduces tlp-sleep as a systemd unit as opposed to a - systemd system-sleep hook script. This is due to the recommendation by - systemd itself to not use the hook scripts. As per the manual: - - > Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/ - > are intended for local use only and should be considered hacks. If - > applications want to react to system suspend/hibernation and resume, - > they should rather use the Inhibitor interface[1]. +This patch reintroduces tlp-sleep as a systemd unit as opposed to a +systemd system-sleep hook script. This is due to the recommendation by +systemd itself to not use the hook scripts. As per the manual: + +> Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/ +> are intended for local use only and should be considered hacks. If +> applications want to react to system suspend/hibernation and resume, +> they should rather use the Inhibitor interface[1]. +--- + Makefile | 6 +++--- + tlp-sleep | 11 ----------- + tlp-sleep.service.in | 19 +++++++++++++++++++ + 3 files changed, 22 insertions(+), 14 deletions(-) + delete mode 100644 tlp-sleep + create mode 100644 tlp-sleep.service.in diff --git a/Makefile b/Makefile -index 95122df..0e9230a 100644 +index ab05720..075b42f 100644 --- a/Makefile +++ b/Makefile -@@ -70,6 +70,7 @@ INFILES = \ +@@ -76,6 +76,7 @@ INFILES = \ tlp.rules \ tlp-readconfs \ tlp-run-on \ @@ -25,7 +31,7 @@ index 95122df..0e9230a 100644 tlp.service \ tlp-stat \ tlp.upstart \ -@@ -99,7 +100,6 @@ SHFILES = \ +@@ -106,7 +107,6 @@ SHFILES = \ tlp-rdw-udev.in \ tlp-rf.in \ tlp-run-on.in \ @@ -33,7 +39,7 @@ index 95122df..0e9230a 100644 tlp-sleep.elogind \ tlp-stat.in \ tlp-usb-udev.in -@@ -147,7 +147,7 @@ ifneq ($(TLP_NO_INIT),1) +@@ -159,7 +159,7 @@ ifneq ($(TLP_NO_INIT),1) endif ifneq ($(TLP_WITH_SYSTEMD),0) install -D -m 644 tlp.service $(_SYSD)/tlp.service @@ -42,7 +48,7 @@ index 95122df..0e9230a 100644 endif ifneq ($(TLP_WITH_ELOGIND),0) install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep -@@ -204,7 +204,7 @@ uninstall-tlp: +@@ -216,7 +216,7 @@ uninstall-tlp: rm $(_ULIB)/rules.d/85-tlp.rules rm -f $(_SYSV)/tlp rm -f $(_SYSD)/tlp.service @@ -53,7 +59,7 @@ index 95122df..0e9230a 100644 rm -f $(_SHCPL)/bluetooth diff --git a/tlp-sleep b/tlp-sleep deleted file mode 100644 -index 3de85ce..0000000 +index e548d55..0000000 --- a/tlp-sleep +++ /dev/null @@ -1,11 +0,0 @@ @@ -61,7 +67,7 @@ index 3de85ce..0000000 - -# tlp - systemd suspend/resume hook -# --# Copyright (c) 2020 Thomas Koch and others. +-# Copyright (c) 2021 Thomas Koch and others. -# This software is licensed under the GPL v2 or later. - -case $1 in @@ -70,13 +76,13 @@ index 3de85ce..0000000 -esac diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in new file mode 100644 -index 0000000..4ac17bd +index 0000000..79c202c --- /dev/null +++ b/tlp-sleep.service.in @@ -0,0 +1,19 @@ +# tlp - systemd suspend/resume service +# -+# Copyright (c) 2020 Thomas Koch and others. ++# Copyright (c) 2021 Thomas Koch and others. +# This software is licensed under the GPL v2 or later. + +[Unit] @@ -93,3 +99,6 @@ index 0000000..4ac17bd + +[Install] +WantedBy=sleep.target +-- +2.33.0 + diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch b/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch deleted file mode 100644 index 942c9a579f..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit c44347b3b813e209fff537b4d46d23430727a5e2 -Author: Bernardo Meurer -Date: Tue Feb 25 21:27:39 2020 -0800 - - makefile: correctly sed paths - - The default Makefile for tlp makes a mess with catenating `DESTDIR` to - everything, but then not actualy using the catenated (_ prefixed) - variables to sed it's `.in` files. - - This patch makes sure that it correctly sets the paths, taking `DESTDIR` - in account where it makes sense (e.g. /bin where we want $out/bin) but - not where it doesn't (/etc/tlp.conf should be just that). - - The reason DESTDIR is used at all, as opposed to the more appropriate - PREFIX, is covered in the nix formula, and is (also) due to the Makefile - being a bit "different." - -diff --git a/Makefile b/Makefile -index b5af74e..95122df 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,17 +47,17 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) - - SED = sed \ - -e "s|@TLPVER@|$(TLPVER)|g" \ -- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \ -- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ -- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ -- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ -+ -e "s|@TLP_SBIN@|$(_SBIN)|g" \ -+ -e "s|@TLP_TLIB@|$(_TLIB)|g" \ -+ -e "s|@TLP_FLIB@|$(_FLIB)|g" \ -+ -e "s|@TLP_ULIB@|$(_ULIB)|g" \ - -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ - -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ -- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ -+ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ - -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ - -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ - -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ -- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" -+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" - - INFILES = \ - tlp \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix index 7389e0c4c5..9d9bb853f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { version = "2.11"; src = fetchurl { - url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-${version}.tar.bz2"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; configureFlags = [ "--with-fuser=${psmisc}/bin/fuser" ]; meta = with lib; { - homepage = "https://fedorahosted.org/tmpwatch/"; + homepage = "https://pagure.io/tmpwatch"; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; license = licenses.gpl2; maintainers = with maintainers; [ vlstill ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xstow/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xstow/default.nix new file mode 100644 index 0000000000..a605dcf911 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/xstow/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, ncurses }: +stdenv.mkDerivation rec { + pname = "xstow"; + version = "1.0.2"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/sourceforge/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "6f041f19a5d71667f6a9436d56f5a50646b6b8c055ef5ae0813dcecb35a3c6ef"; + }; + + buildInputs = [ + ncurses + ]; + + meta = with lib; { + description = "A replacement of GNU Stow written in C++"; + homepage = "http://xstow.sourceforge.net"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ nzbr ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/zthrottle/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zthrottle/default.nix index 66209ead6f..2743dbf76b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zthrottle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zthrottle/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "A program that throttles a pipeline, only letting a line through at most every $1 seconds."; homepage = "https://github.com/anko/zthrottle"; license = licenses.unlicense; - maintainers = [ maintainers.ronthecookie ]; + maintainers = [ maintainers.ckie ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix index 3f3a9b2b72..95c2f97099 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { homepage = "http://nbd.sourceforge.net"; description = "Map arbitrary files as block devices over the network"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.peti ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix index 185176440c..4f59810a76 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "v${version}"; - sha256 = "0vx8ki0wi9xil2iksvxzh8mhx4c5ikkhdcnc8mcwqn14cvjkggja"; + sha256 = "sha256-/gcNVTfLJKA5qzRgAqFSlSI618QBsJTxFE1doOKR7e8="; }; - cargoSha256 = "1nx2lvbjflsjma5q9ck6vq499hf75w91i4h8wlzr83wqk37i7rhc"; + cargoSha256 = "sha256-o5VKj69Wp7zLR3TS+wNA0D8nP6Cynlr4KtW4JSUm0VE="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; diff --git a/third_party/nixpkgs/pkgs/tools/networking/packetdrill/default.nix b/third_party/nixpkgs/pkgs/tools/networking/packetdrill/default.nix index 861e9c0383..b06e4558fb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/packetdrill/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/packetdrill/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, flex, cmake, libpcap }: stdenv.mkDerivation rec { pname = "packetdrill"; version = "unstable-2020-08-22"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { rev = "68a34fa73cf221e5f52d6fa4f203bcd93062be1b"; sha256 = "0djkwb6l2959f44d98vwb092rghf0qmii8391vrpxqb99j6pv4h6"; }; + patches = [ + # Upstream fix for -fno-common toolchains + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/google/packetdrill/commit/c08292838de81a71ee477d5bf9d95b1130a1292b.patch"; + sha256 = "1irbar1zkydmgqb12r3xd80dwj2jfxnxayxpb4nmbma8xm7knb10"; + stripLen = 3; + }) + ]; + setSourceRoot = '' export sourceRoot=$(realpath */gtests/net/packetdrill) ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pdsh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pdsh/default.nix index d7ac9ad54e..531dfeeb4c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pdsh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pdsh/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/swec/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swec/default.nix deleted file mode 100644 index 6751b1cf5e..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/swec/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ fetchurl, lib, stdenv, makeWrapper, perlPackages }: - -stdenv.mkDerivation rec { - pname = "swec"; - version = "0.4"; - - src = fetchurl { - url = "http://files.zerodogg.org/swec/swec-${version}.tar.bz2"; - sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perlPackages.perl perlPackages.LWP perlPackages.URI perlPackages.HTMLParser ]; - checkInputs = [ perlPackages.HTTPServerSimple perlPackages.Parent ]; - - configurePhase = '' - for i in swec tests/{runTests,testServer} - do - sed -i "$i" -e's|/usr/bin/perl|${perlPackages.perl}/bin/perl|g' - done - ''; - - dontBuild = true; - - installPhase = '' - make install prefix="$out" - - mkdir -p "$out/share/swec-${version}" - cp -v default.sdf "$out/share/swec-${version}" - sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/swec-${version}/swec'|g" - - wrapProgram "$out/bin/swec" \ - --prefix PERL5LIB : ${with perlPackages; makePerlPath [ LWP URI HTMLParser ]} - ''; - - doCheck = true; - checkPhase = "make test"; - - meta = { - homepage = "https://random.zerodogg.org/swec/"; - - description = "Simple Web Error Checker (SWEC)"; - - longDescription = - '' SWEC (Simple Web Error Checker) is a program that automates testing - of dynamic websites. It parses each HTML file it finds for links, - and if those links are within the site specified (ie. local, not - external), it will check that page as well. In this respect it - works a lot like a crawler, in that it'll click on any link it finds - (more notes about this later). - - In addition to parsing and locating links, it will also parse the - pages looking for known errors and report those (such as Mason or - PHP errors), and will report if a page can not be read (by either - returning a 404, 500 or similar). - - Since you may often want SWEC to be logged in on your site, you have - to be careful. When logged in, SWEC will still click on all links - it finds, including things like 'join group' or 'delete account' - (though it has some magic trying to avoid the latter). Therefore it - is highly recommended that when you run SWEC as a logged-in user on - a site, use a test server, not the live one. - - Running SWEC on a live site without being logged in as a user is - perfectly fine, it won't do anything a normal crawler wouldn't do - (well, not exactly true, SWEC will ignore robots.txt). - ''; - - license = lib.licenses.gpl3Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/security/agebox/default.nix b/third_party/nixpkgs/pkgs/tools/security/agebox/default.nix index 060961f3a3..fcc63e6f77 100644 --- a/third_party/nixpkgs/pkgs/tools/security/agebox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/agebox/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "agebox"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "slok"; repo = pname; rev = "v${version}"; - sha256 = "1mg16xxvsbm5jxlkdjyi3nsvzj37858d9ksh1wsa9ycxj2qipgw2"; + sha256 = "1gi6lj3dpckhsx6hdpdnr8rclqgfkbdmkzx966nlxyi52bjfzbsv"; }; vendorSha256 = "1gw83bd14ig18y8si3f94iivx2ir1vw4b5b95fp6r7qhfp0rgbih"; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 9d2e23e3bd..86ab11f9f3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-10-13"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-rJRr8MEt3GMNPgC/YvWWs8zh1X0DBstM/UeCMlV7VqI="; + sha256 = "sha256-7bQoBYPfePhanh7SCZ6MO/eWtyD8cfWaYjc9AWOT2rc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix b/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix index 25dc64e618..83b04a9fe7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnupg/22.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { frontend applications and libraries are available. Version 2 of GnuPG also provides support for S/MIME. ''; - maintainers = with maintainers; [ peti fpletz vrthra ]; + maintainers = with maintainers; [ fpletz vrthra ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix index 22ef43d36f..00780306d9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.109"; + version = "1.0.120"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPy0FcDFoBK02pCmDTe5T1QyB9+WC++cBuOI7CtaXtY="; + sha256 = "sha256-aFFJAib0/FTOaPtSLYXIFV3+QfIpzy8fC7rWAQW5yh0="; }; vendorSha256 = "sha256-vN+ci2vCbtDuEEVzZQiFkdi1QkMgnnbbJgD9g6DS7qs="; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 55116147f3..1ea4f8b051 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.9" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.10" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 41c8daf293..1eaf6d48a3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 1e520ab4a5779648de889d198100af4eb556a7f6 - ref: refs/tags/6.1.9 + revision: 822dd1ef2b1a1171d62803add58ee2afce30ea06 + ref: refs/tags/6.1.10 specs: - metasploit-framework (6.1.9) + metasploit-framework (6.1.10) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,13 +128,13 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.512.0) + aws-partitions (1.516.0) aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.266.0) + aws-sdk-ec2 (1.270.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.61.0) @@ -220,7 +220,7 @@ GEM jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.5.1) + json (2.6.0) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -296,7 +296,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.5.0) + puma (5.5.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index 29c8b17798..91b2bd60a3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -14,13 +14,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.9"; + version = "6.1.10"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ZhNy6rp3Jdrua1dZr3dTQxLOVAflWiI0lc/f38d0kqc="; + sha256 = "sha256-VdnczTauHKYexXZs6U5F5v4DP8lJb8wCDy6yiPdEavI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index 7b0e12b509..8ba307e2b5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09v7z0sg09vsysv0hm1552b3laa8sf933c0sqnb35mb4wksj1fv9"; + sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; type = "gem"; }; - version = "1.512.0"; + version = "1.516.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bwkgmdas7ig52cbfdx6vf63j8qk91lizd7sdjdapbfnabbpwmq1"; + sha256 = "1m46n4fn505l0qqwamc5gk88h6aqvjqc7j0pkrcngxcgh5r7hcvf"; type = "gem"; }; - version = "1.266.0"; + version = "1.270.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -594,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry"; type = "gem"; }; - version = "2.5.1"; + version = "2.6.0"; }; little-plugger = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "1e520ab4a5779648de889d198100af4eb556a7f6"; - sha256 = "19wjfk3xzpygjls24np50xacw4j3advsynapdgpdl9bppbm744v6"; + rev = "822dd1ef2b1a1171d62803add58ee2afce30ea06"; + sha256 = "1wka8kvqicif1w1cqvs9r4zh7zp68m7fjv3nqlgac75f6v6xrnam"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.9"; + version = "6.1.10"; }; metasploit-model = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ahk9a2a05985m0037gqlpha5vdkvmwhyk8v1shkbnwkkm30k0mq"; + sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; type = "gem"; }; - version = "5.5.0"; + version = "5.5.2"; }; racc = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix b/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix index daceff1486..fa2d774e11 100644 --- a/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix @@ -42,8 +42,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cuse" + "--localstatedir=/var" ]; + prePatch = '' + # Makefile tries to create the directory /var/lib/swtpm-localcafor, which fails + substituteInPlace samples/Makefile.am \ + --replace 'install-data-local:' 'do-not-execute:' + + # Use the correct path to the certtool binary + # instead of relying on it being in the environment + substituteInPlace samples/swtpm_localca.c --replace \ + '# define CERTTOOL_NAME "certtool"' \ + '# define CERTTOOL_NAME "${gnutls}/bin/certtool"' + ''; + enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index c269da4827..1c8682e93b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-7jJMF8pNCKkiOAY9sZEK0lOqP2/yBVqS3FaKOOz74XI="; + sha256 = "sha256-t/BQu6nq0FcmqTc/vo3bTUbVNDqzePqlOMFkl4pD598="; }; - vendorSha256 = "sha256-j+07Q5dpt8I0sf5B3AVw4343EMWyJDqrzFrdDrBp0DY="; + vendorSha256 = "sha256-9eXDcuVm+N4nenotUtCvyp2qB5uPDwzGHk43Y4uTT14="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index 9758b6fbda..b67d63938c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.3"; + version = "1.8.4"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-x1ZHemRyblfMgmG2zx3AnZmhn2Q952v3nzi3HEvlmE8="; + sha256 = "sha256-zrCRnIScIWJ8ocrgYPNhtvuX3PBLF9HX0dyZU/zY4yk="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1141zjf56fz76ka7bim9qkdk46pa3kk39swxza17g3qxpj21w0jp"; + sha256 = "0sh9q29b0bi5ap6nvll0ykxd5vf4wliksj31cmm4gw5vp90irvl3"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "06bkka2k09alhps5h2dk0dgczgnnd6g4npjp9j103lvzi935zjsy"; + sha256 = "09nhfdw20g46fnrn82my7a59pfa81dxncxhiswmha3cdy8n0p6wb"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1z9pv46pgqnn34mc624x9z41kvr4hrjjdp6y9zv033h0cpxbd0y7"; + sha256 = "01ra0xrgivf01ff87p0gqmi1flnac9y02x7jpv5j6a9czr1sqw1j"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/battop/battery.patch b/third_party/nixpkgs/pkgs/tools/system/battop/battery.patch deleted file mode 100644 index 218359d904..0000000000 --- a/third_party/nixpkgs/pkgs/tools/system/battop/battery.patch +++ /dev/null @@ -1,588 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 57ee609..d156cd2 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,430 +1,429 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 3 -+ - [[package]] - name = "autocfg" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" - - [[package]] - name = "battery" --version = "0.7.4" -+version = "0.7.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4b624268937c0e0a3edb7c27843f9e547c320d730c610d3b8e6e8e95b2026e4" - dependencies = [ -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "core-foundation", -+ "lazycell", -+ "libc", -+ "mach", -+ "nix", -+ "num-traits", -+ "uom", -+ "winapi", - ] - - [[package]] - name = "battop" - version = "0.2.4" - dependencies = [ -- "battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "battery", -+ "humantime", -+ "itertools", -+ "log", -+ "stderrlog", -+ "structopt", -+ "termion", -+ "tui", - ] - - [[package]] - name = "bitflags" --version = "1.0.4" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - - [[package]] - name = "cassowary" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - - [[package]] - name = "cc" - version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" - - [[package]] - name = "cfg-if" - version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "chrono" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" - dependencies = [ -- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer", -+ "num-traits", -+ "time", - ] - - [[package]] - name = "clap" - version = "2.33.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "textwrap", -+ "unicode-width", - ] - - [[package]] - name = "core-foundation" --version = "0.6.4" -+version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" - dependencies = [ -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys", -+ "libc", - ] - - [[package]] - name = "core-foundation-sys" --version = "0.6.2" -+version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - - [[package]] - name = "either" - version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" - - [[package]] - name = "heck" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" - dependencies = [ -- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-segmentation", - ] - - [[package]] - name = "humantime" - version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" - dependencies = [ -- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quick-error", - ] - - [[package]] - name = "itertools" - version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" - dependencies = [ -- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either", - ] - - [[package]] - name = "lazy_static" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" - - [[package]] - name = "lazycell" --version = "1.2.1" -+version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - - [[package]] - name = "libc" --version = "0.2.58" -+version = "0.2.98" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" - - [[package]] - name = "log" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" - dependencies = [ -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.9", - ] - - [[package]] - name = "mach" --version = "0.2.3" -+version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "nix" --version = "0.14.0" -+version = "0.19.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "cc", -+ "cfg-if 1.0.0", -+ "libc", - ] - - [[package]] - name = "num-integer" - version = "0.1.41" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" - dependencies = [ -- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg", -+ "num-traits", - ] - - [[package]] - name = "num-traits" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" - dependencies = [ -- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg", - ] - - [[package]] - name = "numtoa" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" - - [[package]] - name = "proc-macro2" - version = "0.4.30" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" - dependencies = [ -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid", - ] - - [[package]] - name = "quick-error" - version = "1.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" - - [[package]] - name = "quote" - version = "0.6.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", - ] - - [[package]] - name = "redox_syscall" - version = "0.1.54" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" - - [[package]] - name = "redox_termios" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" - dependencies = [ -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall", - ] - - [[package]] - name = "stderrlog" - version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" - dependencies = [ -- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono", -+ "log", -+ "termcolor", -+ "thread_local", - ] - - [[package]] - name = "structopt" - version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" - dependencies = [ -- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap", -+ "structopt-derive", - ] - - [[package]] - name = "structopt-derive" - version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" - dependencies = [ -- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", - ] - - [[package]] - name = "syn" - version = "0.15.34" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", -+ "quote", -+ "unicode-xid", - ] - - [[package]] - name = "termcolor" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" - dependencies = [ -- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wincolor", - ] - - [[package]] - name = "termion" - version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "numtoa", -+ "redox_syscall", -+ "redox_termios", - ] - - [[package]] - name = "textwrap" - version = "0.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" - dependencies = [ -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width", - ] - - [[package]] - name = "thread_local" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" - dependencies = [ -- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static", - ] - - [[package]] - name = "time" - version = "0.1.42" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "redox_syscall", -+ "winapi", - ] - - [[package]] - name = "tui" - version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "cassowary", -+ "either", -+ "itertools", -+ "log", -+ "termion", -+ "unicode-segmentation", -+ "unicode-width", - ] - - [[package]] - name = "typenum" - version = "1.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" - - [[package]] - name = "unicode-segmentation" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" - - [[package]] - name = "unicode-width" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" - - [[package]] - name = "unicode-xid" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - - [[package]] - name = "uom" --version = "0.23.1" -+version = "0.30.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" - dependencies = [ -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits", -+ "typenum", - ] - --[[package]] --name = "void" --version = "1.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" -- - [[package]] - name = "winapi" - version = "0.3.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" - dependencies = [ -- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", - ] - - [[package]] - name = "winapi-i686-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - - [[package]] - name = "winapi-x86_64-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "wincolor" - version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" - dependencies = [ -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi", - ] -- --[metadata] --"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" --"checksum battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6d6fe5630049e900227cd89afce4c1204b88ec8e61a2581bb96fcce26f047b" --"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" --"checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" --"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" --"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" --"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" --"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" --"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" --"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" --"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" --"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" --"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" --"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" --"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" --"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" --"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" --"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" --"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" --"checksum nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d10caafde29a846a82ae0af70414e4643e072993441033b2c93217957e2f867" --"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" --"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" --"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" --"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" --"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" --"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" --"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" --"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" --"checksum stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" --"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" --"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" --"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" --"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" --"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" --"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" --"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" --"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" --"checksum tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" --"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" --"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" --"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" --"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" --"checksum uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef5bbe8385736e498dbb0033361f764ab43a435192513861447b9f7714b3fec" --"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" --"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" --"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" --"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" --"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" -diff --git a/Cargo.toml b/Cargo.toml -index 3d3df77..34b9bc5 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -17,7 +17,7 @@ travis-ci = { repository = "svartalf/rust-battop", branch = "master" } - maintenance = { status = "actively-developed" } - - [dependencies] --battery = "^0.7" -+battery = "^0.7.7" - structopt = { version = "0.2", default-features = false } - log = "0.4.6" - stderrlog = "0.4.1" diff --git a/third_party/nixpkgs/pkgs/tools/system/battop/default.nix b/third_party/nixpkgs/pkgs/tools/system/battop/default.nix deleted file mode 100644 index e28789b835..0000000000 --- a/third_party/nixpkgs/pkgs/tools/system/battop/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "battop"; - version = "0.2.4"; - - src = fetchFromGitHub { - owner = "svartalf"; - repo = "rust-battop"; - rev = "v${version}"; - sha256 = "0p53jl3r2p1w9m2fvhzzrj8d9gwpzs22df5sbm7wwja4pxn7ay1w"; - }; - - # https://github.com/svartalf/rust-battop/issues/11 - cargoPatches = [ ./battery.patch ]; - - cargoSha256 = "0ipmnrn6lmf6rqzsqmaxzy9lblrxyrxzkji968356nxxmwzfbfvh"; - - meta = with lib; { - description = "is an interactive battery viewer"; - homepage = "https://github.com/svartalf/rust-battop"; - license = licenses.asl20; - maintainers = with maintainers; [ hdhog ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix b/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix index 3d5dac7faa..72e6f5ec71 100644 --- a/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ popt ] ++ lib.optionals aclSupport [ acl ]; meta = with lib; { - homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; + homepage = "https://github.com/logrotate/logrotate"; description = "Rotates and compresses system logs"; license = licenses.gpl2Plus; maintainers = [ maintainers.viric ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 1658b4ea4d..e72d7ff5e1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Tools for monitoring the health of hard drives"; homepage = "https://www.smartmontools.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti Frostman ]; + maintainers = with maintainers; [ Frostman ]; platforms = with platforms; linux ++ darwin; mainProgram = "smartctl"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/tree/default.nix b/third_party/nixpkgs/pkgs/tools/system/tree/default.nix index ab76de7476..acf0813b3a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/tree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/tree/default.nix @@ -52,6 +52,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.all; - maintainers = [lib.maintainers.peti]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix b/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix index f44ddc9d0e..82d5eab508 100644 --- a/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix @@ -20,7 +20,12 @@ let buildInputs = [ getopt lua boost ]; - prePatch = lib.optionalString stdenv.cc.isClang '' + prePatch = '' + substituteInPlace src/makefile \ + --replace "shell pkg-config" "shell $PKG_CONFIG" + substituteInPlace makefile \ + --replace 'gzip' 'gzip -n' + '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace src/makefile \ --replace 'CXX=g++' 'CXX=clang++' ''; diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 25a98d299a..fc35016284 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "vale"; - version = "2.10.6"; + version = "2.11.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; src = fetchFromGitHub { - owner = "errata-ai"; - repo = "vale"; - rev = "v${version}"; - sha256 = "sha256-exBrs/MQhfqCxAJrnxECdKnxvsK9LvXIqpnYkR5h7uA="; + owner = "errata-ai"; + repo = "vale"; + rev = "v${version}"; + sha256 = "1g8k9723d1xmx918f60lpla52ly90rz6z0ffzwsb2rh62r3h80h5"; }; - vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc="; + vendorSha256 = "0czxigagjbqdzzgmh1iw3q0d4sj6635384lnn1w5smws8nsqr9ia"; postInstall = '' mkdir -p $data/share/vale diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index 9cbf9ac7e2..bfd0bfb64b 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "sha256-CMvT9DouwERhDtBsLDesxN/QgEEfXLgtJaQLjq+SzOI="; + sha256 = "1x6pxzl2fxv0ldfdlgm5x2pcbkny8cf2b4gpk8yj8hhnn1ypim1w"; }; - cargoSha256 = "sha256-zGsb49yt6SRFfvNHZY+RpjihGpV9ziLsg9BII7WTX2Y="; + cargoSha256 = "0v5jc26icz83ssky85c8l92jcmglq9f2jbihfh4yqanpmwbpp5fl"; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix index 73007b1371..4b64c8e977 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/xmlto/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl2Plus; - homepage = "https://fedorahosted.org/xmlto/"; + homepage = "https://pagure.io/xmlto/"; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh index b31aa95742..dd37e41c53 100755 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq yq-go -set -eu -o pipefail +set -x -eu -o pipefail cd $(dirname "${BASH_SOURCE[0]}") @@ -21,7 +21,7 @@ VERSION=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/${VERSION}.tar.gz) setKV () { - sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix } setKV specVersion ${SPEC_VERSION} diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 8e9edb67ed..46d3b06a14 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -539,9 +539,10 @@ mapAliases ({ mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 + minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 - mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 - mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 @@ -615,6 +616,8 @@ mapAliases ({ osquery = throw "osquery has been removed."; # added 2019-11-24 osxfuse = macfuse-stubs; # added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 + OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16 + OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16 owncloudclient = owncloud-client; # added 2016-08 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 p11_kit = p11-kit; # added 2018-02-25 @@ -896,6 +899,7 @@ mapAliases ({ stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09 surf-webkit2 = surf; # added 2017-04-02 sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; + swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14 swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 swtpm-tpm2 = swtpm; # added 2021-02-26 syncthing-cli = syncthing; # added 2021-04-06 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 4ce1bb73ba..e2f6f1763e 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -1269,6 +1269,8 @@ with pkgs; ashuffle = callPackage ../applications/audio/ashuffle {}; + ashpd-demo = callPackage ../development/tools/ashpd-demo {}; + asls = callPackage ../development/tools/misc/asls { }; astc-encoder = callPackage ../tools/graphics/astc-encoder { }; @@ -1614,6 +1616,8 @@ with pkgs; esbuild = callPackage ../development/tools/esbuild { }; + esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { }; + essentia-extractor = callPackage ../tools/audio/essentia-extractor { }; esh = callPackage ../tools/text/esh { }; @@ -1662,6 +1666,8 @@ with pkgs; git-fire = callPackage ../tools/misc/git-fire { }; + git-privacy = callPackage ../development/tools/git-privacy { }; + git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; git-revise = with python3Packages; toPythonApplication git-revise; @@ -2845,6 +2851,8 @@ with pkgs; fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; + flitter = callPackage ../tools/misc/flitter { }; + frangipanni = callPackage ../tools/text/frangipanni { }; fselect = callPackage ../tools/misc/fselect { }; @@ -6279,6 +6287,8 @@ with pkgs; imgurbash2 = callPackage ../tools/graphics/imgurbash2 { }; + in-formant = callPackage ../applications/audio/in-formant { }; + inadyn = callPackage ../tools/networking/inadyn { }; incron = callPackage ../tools/system/incron { }; @@ -6655,6 +6665,8 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; + ligo = callPackage ../development/compilers/ligo { }; + ldgallery = callPackage ../tools/graphics/ldgallery { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -7404,8 +7416,6 @@ with pkgs; mimetic = callPackage ../development/libraries/mimetic { }; - minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { }; minio-certgen = callPackage ../tools/security/minio-certgen { }; @@ -9552,6 +9562,7 @@ with pkgs; storeBackup = callPackage ../tools/backup/store-backup { }; stow = callPackage ../tools/misc/stow { }; + xstow = callPackage ../tools/misc/xstow { }; stun = callPackage ../tools/networking/stun { }; @@ -9587,8 +9598,6 @@ with pkgs; swapview = callPackage ../os-specific/linux/swapview/default.nix { }; - swec = callPackage ../tools/networking/swec { }; - swtpm = callPackage ../tools/security/swtpm { }; svn2git = callPackage ../applications/version-management/git-and-tools/svn2git { @@ -11278,8 +11287,9 @@ with pkgs; inherit (callPackages ../development/compilers/crystal { llvmPackages = llvmPackages_10; }) - crystal_0_36 crystal_1_0 + crystal_1_1 + crystal_1_2 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; @@ -12636,7 +12646,7 @@ with pkgs; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { - inherit (darwin.apple_sdk.frameworks) Security AppKit; + inherit (darwin.apple_sdk.frameworks) AppKit; }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; @@ -12816,6 +12826,8 @@ with pkgs; svd2rust = callPackage ../development/tools/rust/svd2rust { }; + svdtools = with python3Packages; toPythonApplication svdtools; + swift = callPackage ../development/compilers/swift { }; swiProlog = callPackage ../development/compilers/swi-prolog { @@ -14946,6 +14958,7 @@ with pkgs; inherit (callPackage ../development/tools/build-managers/shards { }) shards_0_15 + shards_0_16 shards; shellcheck = callPackage ../development/tools/shellcheck {}; @@ -15381,20 +15394,32 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; + aws-c-auth = callPackage ../development/libraries/aws-c-auth { }; + aws-c-cal = callPackage ../development/libraries/aws-c-cal { inherit (darwin.apple_sdk.frameworks) Security; }; aws-c-common = callPackage ../development/libraries/aws-c-common { }; + aws-c-compression = callPackage ../development/libraries/aws-c-compression { }; + aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; + aws-c-http = callPackage ../development/libraries/aws-c-http { }; + aws-c-io = callPackage ../development/libraries/aws-c-io { inherit (darwin.apple_sdk.frameworks) Security; }; + aws-c-mqtt = callPackage ../development/libraries/aws-c-mqtt { }; + + aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { }; + aws-checksums = callPackage ../development/libraries/aws-checksums { }; + aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { }; + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; @@ -18166,17 +18191,12 @@ with pkgs; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { }; + libcyaml = callPackage ../development/libraries/libcyaml { }; rang = callPackage ../development/libraries/rang { }; - libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { - src = pkgs.fetchurl { - url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; - sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; - }; - }); - libykclient = callPackage ../development/libraries/libykclient { }; libykneomgr = callPackage ../development/libraries/libykneomgr { }; @@ -20946,8 +20966,12 @@ with pkgs; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; OVMF = callPackage ../applications/virtualization/OVMF { }; - OVMF-CSM = OVMF.override { csmSupport = true; }; - OVMF-secureBoot = OVMF.override { secureBoot = true; }; + OVMFFull = callPackage ../applications/virtualization/OVMF { + secureBoot = true; + csmSupport = true; + httpSupport = true; + tpmSupport = true; + }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -24006,9 +24030,7 @@ with pkgs; csa = callPackage ../applications/audio/csa { }; - csound = callPackage ../applications/audio/csound { - fluidsynth = fluidsynth_1; - }; + csound = callPackage ../applications/audio/csound { }; csound-manual = callPackage ../applications/audio/csound/csound-manual { python = python27; @@ -24191,6 +24213,7 @@ with pkgs; afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; + docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { }; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -25810,6 +25833,8 @@ with pkgs; kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; + kn = callPackage ../applications/networking/cluster/kn { }; + kodestudio = callPackage ../applications/editors/kodestudio { }; kondo = callPackage ../applications/misc/kondo { }; @@ -27189,6 +27214,7 @@ with pkgs; procmail = callPackage ../applications/misc/procmail { }; profanity = callPackage ../applications/networking/instant-messengers/profanity ({ + gtk = gtk3; python = python3; } // (config.profanity or {})); @@ -27494,9 +27520,7 @@ with pkgs; rsclock = callPackage ../applications/misc/rsclock { }; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { - boost = boost166; - llvmPackages = llvmPackages_7; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); @@ -29533,6 +29557,8 @@ with pkgs; inherit (import ../games/deliantra pkgs) deliantra-server deliantra-arch deliantra-maps deliantra-data; + ddnet = callPackage ../games/ddnet { }; + devilutionx = callPackage ../games/devilutionx {}; dhewm3 = callPackage ../games/dhewm3 {}; @@ -29702,6 +29728,10 @@ with pkgs; gltron = callPackage ../games/gltron { }; + gl-gsync-demo = callPackage ../games/gl-gsync-demo { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; + gmad = callPackage ../games/gmad { }; gnonograms = callPackage ../games/gnonograms { }; @@ -31152,7 +31182,7 @@ with pkgs; mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 - { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; }; + { inherit (ocaml-ng.ocamlPackages_4_05) ocaml camlp4; }; leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {}; diff --git a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix index e1387e42b7..efaf06d30a 100644 --- a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix @@ -67,6 +67,10 @@ in inherit lua lib; }; + luarocks-3_7 = callPackage ../development/tools/misc/luarocks/3.7.nix { + inherit lua lib; + }; + # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index c80919e07a..3a1fc6a939 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -183,6 +183,8 @@ let cohttp-mirage = callPackage ../development/ocaml-modules/cohttp/mirage.nix { }; + color = callPackage ../development/ocaml-modules/color { }; + conduit = callPackage ../development/ocaml-modules/conduit { }; conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 1c3bb9f43a..96203b0be0 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -118,6 +118,36 @@ let }; }; + ActionCircuitBreaker = buildPerlPackage { + pname = "Action-CircuitBreaker"; + version = "0.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HANGY/Action-CircuitBreaker-0.1.tar.gz"; + sha256 = "3f8f5d726fae537ab336e00a6819ae4a8596e4c5f243e772a536ef2eb6e606b1"; + }; + buildInputs = [ ActionRetry TryTiny ]; + propagatedBuildInputs = [ Moo ]; + meta = { + homepage = "https://github.com/hangy/Action-CircuitBreaker"; + description = "Module to try to perform an action, with an option to suspend execution after a number of failures"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ActionRetry = buildPerlPackage { + pname = "Action-Retry"; + version = "0.24"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAMS/Action-Retry-0.24.tar.gz"; + sha256 = "a3759742c5bef2d1975ab73d35499d8113324919b24936130255cff07d0294f7"; + }; + propagatedBuildInputs = [ MathFibonacci ModuleRuntime Moo ]; + meta = { + description = "Module to try to perform an action, with various ways of retrying and sleeping between retries"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlgorithmAnnotate = buildPerlPackage { pname = "Algorithm-Annotate"; version = "0.10"; @@ -141,6 +171,20 @@ let }; }; + AlgorithmCheckDigits = buildPerlModule { + pname = "Algorithm-CheckDigits"; + version = "1.3.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-v1.3.5.tar.gz"; + sha256 = "a956d0517180d6d9042f47d73aa6a2728b75fcbd546940d2dbe0a7e7cf428f73"; + }; + buildInputs = [ ProbePerl ]; + meta = { + description = "Perl extension to generate and test check digits"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlgorithmDiff = buildPerlPackage { pname = "Algorithm-Diff"; version = "1.1903"; @@ -510,6 +554,19 @@ let }; }; + URIEscapeXS = buildPerlPackage { + pname = "URI-Escape-XS"; + version = "0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/URI-Escape-XS-0.14.tar.gz"; + sha256 = "c39ac50c6c2b831ae4bf08692e6ca5d4a3f9c57dc4d7f9c4cb0663e2c86c2759"; + }; + meta = { + description = "Drop-In replacement for URI::Escape"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; version = "3.30"; @@ -531,6 +588,19 @@ let }; }; + ApacheDB = buildPerlPackage { + pname = "Apache-DB"; + version = "0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LZ/LZE/Apache-DB-0.18.tar.gz"; + sha256 = "6527f4f1598270bea07bec787b71bdf0ec2b572548be7438cf74f2b9a600bfed"; + }; + meta = { + description = "Run the interactive Perl debugger under mod_perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ApacheLogFormatCompiler = buildPerlModule { pname = "Apache-LogFormat-Compiler"; version = "0.36"; @@ -1497,6 +1567,38 @@ let }; }; + BSON = buildPerlPackage { + pname = "BSON"; + version = "1.12.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-v1.12.2.tar.gz"; + sha256 = "f4612c0c354310741b99ab6d26451226823150ca27109b1b391232d5cfdda6db"; + }; + buildInputs = [ JSONMaybeXS PathTiny TestDeep TestFatal ]; + propagatedBuildInputs = [ CryptURandom Moo TieIxHash boolean namespaceclean ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-bson"; + description = "BSON serialization and deserialization (EOL)"; + license = lib.licenses.asl20; + }; + }; + + BSONXS = buildPerlPackage { + pname = "BSON-XS"; + version = "0.8.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-XS-v0.8.4.tar.gz"; + sha256 = "28f7d338fd78b6f9c9a6080be9de3f5cb23d888b96ebf6fcbface9f2966aebf9"; + }; + buildInputs = [ ConfigAutoConf JSONMaybeXS PathTiny TestDeep TestFatal TieIxHash ]; + propagatedBuildInputs = [ BSON boolean JSONXS JSONPP CpanelJSONXS ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-bson-xs"; + description = "XS implementation of MongoDB's BSON serialization (EOL)"; + license = lib.licenses.asl20; + }; + }; + BUtils = buildPerlPackage { pname = "B-Utils"; version = "0.27"; @@ -3205,6 +3307,23 @@ let }; }; + CLDRNumber = buildPerlModule { + pname = "CLDR-Number"; + version = "0.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PA/PATCH/CLDR-Number-0.19.tar.gz"; + sha256 = "c6716488e65fe779ff79a83f0f2036ad94463efe3d0f349c6b99112975bd85fc"; + }; + buildInputs = [ SoftwareLicense TestDifferences TestException TestWarn ]; + propagatedBuildInputs = + [ ClassMethodModifiers MathRound Moo namespaceclean ]; + meta = { + homepage = "https://github.com/patch/cldr-number-pm5"; + description = "Localized number formatters using the Unicode CLDR"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CLIHelpers = buildPerlPackage { pname = "CLI-Helpers"; version = "1.8"; @@ -3310,6 +3429,21 @@ let }; }; + ColorLibrary = buildPerlPackage { + pname = "Color-Library"; + version = "0.021"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz"; + sha256 = "58cbf7e333d3a4a40297abc43412b321da449c6816020e4fa6625ab079fc90a5"; + }; + buildInputs = [ TestMost TestWarn TestException TestDeep TestDifferences ModulePluggable ]; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable ]; + meta = { + description = "An easy-to-use and comprehensive named-color library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CommandRunner = buildPerlModule { pname = "Command-Runner"; version = "0.103"; @@ -4841,6 +4975,21 @@ let }; }; + DataDumperAutoEncode = buildPerlModule { + pname = "Data-Dumper-AutoEncode"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BA/BAYASHI/Data-Dumper-AutoEncode-1.00.tar.gz"; + sha256 = "2d9a0262ad443d321dc489ef6dfa7b3eed11a2708a75d397d371bb2585e5eca1"; + }; + buildInputs = [ ModuleBuildPluggable ModuleBuildPluggableCPANfile ]; + propagatedBuildInputs = [ IOInteractiveTiny ]; + meta = { + description = "Dump with recursive encoding"; + license = lib.licenses.artistic2; + }; + }; + DataDumperConcise = buildPerlPackage { pname = "Data-Dumper-Concise"; version = "2.023"; @@ -6470,6 +6619,18 @@ let }; }; + DevelSize = buildPerlPackage { + pname = "Devel-Size"; + version = "0.83"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.83.tar.gz"; + sha256 = "757a67e0aa59ae103ea5ca092cbecc025644ebdc326731688ffab6f8823ef4b3"; + }; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelStackTraceAsHTML = buildPerlPackage { pname = "Devel-StackTrace-AsHTML"; version = "0.15"; @@ -7441,6 +7602,22 @@ let }; }; + EncodePunycode = buildPerlPackage { + pname = "Encode-Punycode"; + version = "1.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Encode-Punycode-1.002.tar.gz"; + sha256 = "ca3aceecdb80b5d45aa10e1cde8fec4e90b4f8c9189c7504dd8658f071f77194"; + }; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ NetIDNEncode ]; + meta = { + homepage = "http://search.cpan.org/dist/Encode-Punycode"; + description = "Encode plugin for Punycode (RFC 3492)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + enum = buildPerlPackage { pname = "enum"; version = "1.11"; @@ -7526,6 +7703,21 @@ let }; }; + ExcelWriterXLSX = buildPerlPackage { + pname = "Excel-Writer-XLSX"; + version = "1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-1.09.tar.gz"; + sha256 = "d679c6ac19e93c32ab77594c793e41b948c7bb3873b600e70ad637d093dca187"; + }; + propagatedBuildInputs = [ ArchiveZip ]; + meta = { + homepage = "http://jmcnamara.github.com/excel-writer-xlsx/"; + description = "Create a new file in the Excel 2007+ XLSX format"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ExceptionBase = buildPerlModule { pname = "Exception-Base"; version = "0.2501"; @@ -8022,6 +8214,35 @@ let }; }; + Filechmod = buildPerlPackage { + pname = "File-chmod"; + version = "0.42"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.42.tar.gz"; + sha256 = "6cafafff68bc84215168b55ede0d191dcb57f9a3201b51d61edb2858a2407795"; + }; + meta = { + homepage = "https://metacpan.org/dist/File-chmod"; + description = "Implements symbolic and ls chmod modes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + FilechmodRecursive = buildPerlPackage { + pname = "File-chmod-Recursive"; + version = "1.0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MITHUN/File-chmod-Recursive-v1.0.3.tar.gz"; + sha256 = "9348ca5c5b88deadcc483b9399ef7c2e0fc2504f9058db65f3c3c53c41139aa7"; + }; + propagatedBuildInputs = [ Filechmod ]; + meta = { + homepage = "https://github.com/mithun/perl-file-chmod-recursive"; + description = "Run chmod recursively against directories"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileCopyRecursive = buildPerlPackage { pname = "File-Copy-Recursive"; version = "0.45"; @@ -9260,6 +9481,22 @@ let }; }; + GraphicsColor = buildPerlPackage { + pname = "Graphics-Color"; + version = "0.31"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GP/GPHAT/Graphics-Color-0.31.tar.gz"; + sha256 = "faa8fed5b2d80e5160af976e5db2242c0b3555542ce1042575ff6b694587a33d"; + }; + buildInputs = [ TestNumberDelta ModulePluggable ]; + propagatedBuildInputs = [ ColorLibrary Moose MooseXAliases MooseXClone MooseXStorage MooseXTypes ]; + meta = { + homepage = "https://github.com/gphat/graphics-color"; + description = "Device and library agnostic color spaces"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GraphicsTIFF = buildPerlPackage { pname = "Graphics-TIFF"; version = "16"; @@ -10556,6 +10793,29 @@ let }; }; + ImageOCRTesseract = buildPerlPackage { + pname = "Image-OCR-Tesseract"; + version = "1.26"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/Image-OCR-Tesseract-1.26.tar.gz"; + sha256 = "98d904266a7062f09c9b46f77c4e94529e1fe99339e3f83fda1f92013f007cea"; + }; + nativeBuildInputs = [ pkgs.which pkgs.makeWrapper pkgs.tesseract pkgs.imagemagick ]; + propagatedBuildInputs = [ FileFindRule FileWhich LEOCHARRECLI StringShellQuote ]; + postPatch = '' + substituteInPlace lib/Image/OCR/Tesseract.pm \ + --replace "which('tesseract')" "\"${pkgs.tesseract}/bin/tesseract\"" \ + --replace "which('convert')" "\"${pkgs.imagemagick}/bin/convert"\" + ''; + postInstall = '' + wrapProgram $out/bin/ocr --prefix PATH : ${lib.makeBinPath [ pkgs.tesseract pkgs.imagemagick ]} + ''; + meta = { + description = "Read an image with tesseract ocr and get output"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IMAPClient = buildPerlPackage { pname = "IMAP-Client"; version = "0.13"; @@ -10763,6 +11023,19 @@ let }; }; + IOInteractiveTiny = buildPerlPackage { + pname = "IO-Interactive-Tiny"; + version = "0.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DM/DMUEY/IO-Interactive-Tiny-0.2.tar.gz"; + sha256 = "45c0696505c7e4347845f5cd2512b7b1bc78fbce4cbed2b58008283fc95ea5f9"; + }; + meta = { + description = "Is_interactive() without large deps"; + license = lib.licenses.artistic2; + }; + }; + IOLockedFile = buildPerlPackage { pname = "IO-LockedFile"; version = "0.23"; @@ -11232,6 +11505,20 @@ let buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; }; + JSONCreate = buildPerlPackage { + pname = "JSON-Create"; + version = "0.35"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Create-0.35.tar.gz"; + sha256 = "5faefe0d833b8132568865308f3239d3cdaa1b8a1ecc9b5624dcf1efbe10683e"; + }; + propagatedBuildInputs = [ JSONParse UnicodeUTF8 ]; + meta = { + description = "Create JSON"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + JSONMaybeXS = buildPerlPackage { pname = "JSON-MaybeXS"; version = "1.004003"; @@ -11274,10 +11561,10 @@ let JSONParse = buildPerlPackage { pname = "JSON-Parse"; - version = "0.57"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.57.tar.gz"; - sha256 = "1rqaqpgh068kqj11srw874m5ph5qkaz77ib5fi4hrc402d2qxa45"; + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.61.tar.gz"; + sha256 = "ce8e55e70bef9bcbba2e96af631d10a605900961a22cad977e71aab56c3f2806"; }; meta = { description = "Read JSON into a Perl variable"; @@ -11396,6 +11683,33 @@ let }; }; + LEOCHARRECLI = buildPerlPackage { + pname = "LEOCHARRE-CLI"; + version = "1.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/LEOCHARRE-CLI-1.19.tar.gz"; + sha256 = "37835f11ee35326241b4d30368ae1bc195a50414b3662db3e13b865bd52fcde9"; + }; + propagatedBuildInputs = [ FileWhich Filechmod LEOCHARREDebug Linuxusermod YAML ]; + meta = { + description = "Useful subs for coding cli scripts"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LEOCHARREDebug = buildPerlPackage { + pname = "LEOCHARRE-Debug"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/LEOCHARRE-Debug-1.03.tar.gz"; + sha256 = "c1665aa3abd457cc8624b8c418c6f8bdf58fb3a686f8eed515cf7e93514df192"; + }; + meta = { + description = "Debug sub"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + libapreq2 = buildPerlPackage { pname = "libapreq2"; version = "2.16"; @@ -11770,6 +12084,20 @@ let }; }; + Linuxusermod = buildPerlPackage { + pname = "Linux-usermod"; + version = "0.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIDUL/Linux-usermod-0.69.tar.gz"; + sha256 = "97ca186a3c416bf69ed62da046f1a60d88d89b8e6ed25008b2f96e787dee9d60"; + }; + meta = { + description = "This module adds, removes and modify user and group accounts according to the passwd and shadow files syntax"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.linux; + }; + }; + ListAllUtils = buildPerlPackage { pname = "List-AllUtils"; version = "0.18"; @@ -11888,6 +12216,20 @@ let LANG="C"; }; + LocaleMaketextLexiconGetcontext = buildPerlPackage { + pname = "Locale-Maketext-Lexicon-Getcontext"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SAPER/Locale-Maketext-Lexicon-Getcontext-0.05.tar.gz"; + sha256 = "75cb33df9472a5962de54082f42c6a76b260fc405ba10ca53246fb1f82c09208"; + }; + propagatedBuildInputs = [ LocaleMaketextLexicon ]; + meta = { + description = "PO file parser for Maketext"; + license = lib.licenses.mit; + }; + }; + LocaleMOFile = buildPerlPackage { pname = "Locale-MO-File"; version = "0.09"; @@ -12084,6 +12426,21 @@ let }; }; + LogAnyAdapterTAP = buildPerlPackage { + pname = "Log-Any-Adapter-TAP"; + version = "0.003003"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NERDVANA/Log-Any-Adapter-TAP-0.003003.tar.gz"; + sha256 = "131f0689b2b42b1b31449714c6eda8f811dd96a7c86748f1e03b239cfd0121c0"; + }; + propagatedBuildInputs = [ LogAny TryTiny ]; + meta = { + homepage = "https://github.com/silverdirk/perl-Log-Any-Adapter-TAP"; + description = "Logger suitable for use with TAP test files"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LogContextual = buildPerlPackage { pname = "Log-Contextual"; version = "0.008001"; @@ -12798,6 +13155,19 @@ let }; }; + MathFibonacci = buildPerlPackage { + pname = "Math-Fibonacci"; + version = "1.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIPUL/Math-Fibonacci-1.5.tar.gz"; + sha256 = "70a8286e94558df99dc92f52d83e1e20a7b8f7852bcc3a1de7d9e338260b99ba"; + }; + meta = { + description = "This module provides a few functions related to Fibonacci numbers"; + license = lib.licenses.artistic2; + }; + }; + MathGMP = buildPerlPackage { pname = "Math-GMP"; version = "2.20"; @@ -13507,6 +13877,22 @@ let buildInputs = [ TestSharedFork ]; }; + ModuleBuildPluggableCPANfile = buildPerlModule { + pname = "Module-Build-Pluggable-CPANfile"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Module-Build-Pluggable-CPANfile-0.05.tar.gz"; + sha256 = "4aec6cba240cb6e78016406b6a3a875634cc2aec08ffc5f1572da1cdc40e1e7c"; + }; + buildInputs = [ CaptureTiny TestRequires TestSharedFork ]; + propagatedBuildInputs = [ ModuleBuildPluggable ModuleCPANfile ]; + meta = { + homepage = "https://github.com/kazeburo/Module-Build-Pluggable-CPANfile"; + description = "Include cpanfile"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleBuildPluggablePPPort = buildPerlModule { pname = "Module-Build-Pluggable-PPPort"; version = "0.04"; @@ -14275,6 +14661,22 @@ let }; }; + MongoDB = buildPerlPackage { + pname = "MongoDB"; + version = "2.2.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/MongoDB-v2.2.2.tar.gz"; + sha256 = "201935f92dac94f39c35de73661e8b252439e496f228657db85ff93257c3268f"; + }; + buildInputs = [ JSONMaybeXS PathTiny TestDeep TestFatal TimeMoment ]; + propagatedBuildInputs = [ AuthenSASLSASLprep AuthenSCRAM BSON IOSocketSSL NetSSLeay ClassXSAccessor BSONXS TypeTinyXS MozillaCA Moo NetDNS SafeIsa SubQuote TieIxHash TypeTiny UUIDURandom boolean namespaceclean ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-driver"; + description = "Official MongoDB Driver for Perl (EOL)"; + license = lib.licenses.asl20; + }; + }; + MonitoringPlugin = buildPerlPackage { pname = "Monitoring-Plugin"; version = "0.40"; @@ -14527,6 +14929,22 @@ let }; }; + MooseXStorageFormatJSONpm = buildPerlPackage { + pname = "MooseX-Storage-Format-JSONpm"; + version = "0.093093"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Storage-Format-JSONpm-0.093093.tar.gz"; + sha256 = "ebe0407a7eb1870270e0e2579f097dfd7df2aea3307fb71f324fb69e242cc58f"; + }; + buildInputs = [ Moose TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; + propagatedBuildInputs = [ JSON MooseXRoleParameterized MooseXStorage namespaceautoclean ]; + meta = { + homepage = "https://github.com/rjbs/MooseX-Storage-Format-JSONpm"; + description = "A format role for MooseX::Storage using JSON.pm"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooX = buildPerlPackage { pname = "MooX"; version = "0.101"; @@ -15019,6 +15437,22 @@ let propagatedBuildInputs = [ Moose ]; }; + MooseXStorage = buildPerlPackage { + pname = "MooseX-Storage"; + version = "0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Storage-0.53.tar.gz"; + sha256 = "8704bfe505f66b340f62e85c9ff319c19e9670b26d4b012c91f4e103b1daace0"; + }; + buildInputs = [ TestDeep TestDeepType TestFatal TestNeeds TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; + propagatedBuildInputs = [ ModuleRuntime Moose MooseXRoleParameterized PodCoverage StringRewritePrefix namespaceautoclean IOStringy JSON JSONXS JSONMaybeXS CpanelJSONXS YAML YAMLOld YAMLTiny YAMLLibYAML YAMLSyck ]; + meta = { + homepage = "https://github.com/moose/MooseX-Storage"; + description = "A serialization framework for Moose classes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooseXStrictConstructor = buildPerlPackage { pname = "MooseX-StrictConstructor"; version = "0.21"; @@ -19122,6 +19556,21 @@ let }; }; + SpreadsheetCSV = buildPerlPackage { + pname = "Spreadsheet-CSV"; + version = "0.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DD/DDICK/Spreadsheet-CSV-0.20.tar.gz"; + sha256 = "070bb252a8fe8b938a1ce4fc90525f833d4e619b6d4673b0ae0a23408d514ab6"; + }; + nativeBuildInputs = [ CGI ]; + propagatedBuildInputs = [ ArchiveZip SpreadsheetParseExcel TextCSV_XS XMLParser ]; + meta = { + description = "Drop-in replacement for Text::CSV_XS with spreadsheet support"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SpreadsheetParseExcel = buildPerlPackage { pname = "Spreadsheet-ParseExcel"; version = "0.65"; @@ -20141,12 +20590,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "7.7.0"; + version = "7.8.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; - rev = "v7.7.0"; - sha256 = "sha256-rcokZm4pKZrLlkpAZCpECCepNWm+UyXemJGklokiSzM="; + rev = "v7.8.0"; + sha256 = "sha256-D/sVIKMWy3WnDM97+ofG3ClgGhJJuK2a6NJLC03S4LI="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -20935,6 +21384,38 @@ let }; }; + TestDeepJSON = buildPerlModule { + pname = "Test-Deep-JSON"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MOTEMEN/Test-Deep-JSON-0.05.tar.gz"; + sha256 = "aec8571b9e31b7301e26132c132c6800952dc089c645d76954a3ad1a6b350858"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ ExporterLite JSONMaybeXS TestDeep ]; + meta = { + homepage = "https://github.com/motemen/perl5-Test-Deep-JSON"; + description = "Compare JSON with Test::Deep"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + TestDeepType = buildPerlPackage { + pname = "Test-Deep-Type"; + version = "0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Deep-Type-0.008.tar.gz"; + sha256 = "6e7bea1a2f1e75319a22d1c51996ebac50ca5e3663d1bc223130887e62e959f1"; + }; + buildInputs = [ TestFatal TestNeeds ]; + propagatedBuildInputs = [ TestDeep TryTiny ]; + meta = { + homepage = "https://github.com/karenetheridge/Test-Deep-Type"; + description = "A Test::Deep plugin for validating type constraints"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestDir = buildPerlPackage { pname = "Test-Dir"; version = "1.16"; @@ -22376,6 +22857,19 @@ let }; }; + TextFuzzy = buildPerlPackage { + pname = "Text-Fuzzy"; + version = "0.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/Text-Fuzzy-0.29.tar.gz"; + sha256 = "3df5cfd2ca1a4c5ca7ff7bab3cc8d53ad2064e134cbf11004f3cf8c4b9055bff"; + }; + meta = { + description = "Partial string matching using edit distances"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextGerman = buildPerlPackage { pname = "Text-German"; version = "0.06"; @@ -23154,6 +23648,20 @@ let }; }; + TimeMoment = buildPerlPackage { + pname = "Time-Moment"; + version = "0.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Time-Moment-0.44.tar.gz"; + sha256 = "64acfa042f634fcef8dadf55e7f42ba4eaab8aaeb7d5212eb89815a31f78f6fd"; + }; + buildInputs = [ TestFatal TestNumberDelta TestRequires ]; + meta = { + description = "Represents a date and time of day with an offset from UTC"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TimeOut = buildPerlPackage { pname = "Time-Out"; version = "0.11"; @@ -23354,6 +23862,20 @@ let buildInputs = [ TestMemoryCycle ]; }; + TypeTinyXS = buildPerlPackage { + pname = "Type-Tiny-XS"; + version = "0.022"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.022.tar.gz"; + sha256 = "bcc34a31f7dc1d30cc803889b5c8f90e4773b73b5becbdb3860f5abe7e22ff00"; + }; + meta = { + homepage = "https://metacpan.org/release/Type-Tiny-XS"; + description = "Provides an XS boost for some of Type::Tiny's built-in type constraints"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TypesSerialiser = buildPerlPackage { pname = "Types-Serialiser"; version = "1.01"; @@ -23670,6 +24192,21 @@ let }; }; + UUIDURandom = buildPerlPackage { + pname = "UUID-URandom"; + version = "0.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/UUID-URandom-0.001.tar.gz"; + sha256 = "3f13631b13b9604fb489e2989490c99f103743a837239bdafae9d6baf55f8f46"; + }; + propagatedBuildInputs = [ CryptURandom ]; + meta = { + homepage = "https://github.com/dagolden/UUID-URandom"; + description = "UUIDs based on /dev/urandom or the Windows Crypto API"; + license = lib.licenses.asl20; + }; + }; + VariableMagic = buildPerlPackage { pname = "Variable-Magic"; version = "0.62"; @@ -24016,6 +24553,20 @@ let }; }; + XMLEncoding = buildPerlPackage { + pname = "XML-Encoding"; + version = "2.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHAY/XML-Encoding-2.11.tar.gz"; + sha256 = "a50e41af0a79b882d48816b95681f38a55af1e6a88828dcd96374a8bde2305a1"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = "A perl module for parsing XML encoding maps"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLDOM = buildPerlPackage { pname = "XML-DOM"; version = "1.46"; @@ -24263,6 +24814,21 @@ let }; }; + XMLRules = buildPerlModule { + pname = "XML-Rules"; + version = "1.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JE/JENDA/XML-Rules-1.16.tar.gz"; + sha256 = "3788255c07afe4195a0de72ce050652320d817528ff2d10c611f6e392043868b"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = + "Parse XML and specify what and how to keep/process for individual tags"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLSAX = buildPerlPackage { pname = "XML-SAX"; version = "1.02"; @@ -24484,6 +25050,21 @@ let }; }; + YAMLOld = buildPerlPackage { + pname = "YAML-Old"; + version = "1.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/YAML-Old-1.23.tar.gz"; + sha256 = "fa546fcd9acc5a39bc8871902f7fc1eba50e7dc781c5cd5c0abf1aece6d17ecd"; + }; + buildInputs = [ TestYAML TestBase ]; + meta = { + homepage = "https://github.com/ingydotnet/yaml-old-pm"; + description = "Old YAML.pm Legacy Code"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + YAMLSyck = buildPerlPackage { pname = "YAML-Syck"; version = "1.34"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 10f2bbca09..ccf8056dbd 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -365,6 +365,8 @@ in { aioresponses = callPackage ../development/python-modules/aioresponses { }; + aioridwell = callPackage ../development/python-modules/aioridwell { }; + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; aiorun = callPackage ../development/python-modules/aiorun { }; @@ -1236,6 +1238,8 @@ in { bpython = callPackage ../development/python-modules/bpython { }; + braceexpand = callPackage ../development/python-modules/braceexpand { }; + bracex = callPackage ../development/python-modules/bracex { }; braintree = callPackage ../development/python-modules/braintree { }; @@ -2261,6 +2265,8 @@ in { dpkt = callPackage ../development/python-modules/dpkt { }; + dragonfly = callPackage ../development/python-modules/dragonfly { }; + drf-jwt = callPackage ../development/python-modules/drf-jwt { }; drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; @@ -3019,6 +3025,8 @@ in { git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { }; + git-filter-repo = callPackage ../development/python-modules/git-filter-repo { }; + gitdb = callPackage ../development/python-modules/gitdb { }; github3_py = callPackage ../development/python-modules/github3_py { }; @@ -4013,6 +4021,8 @@ in { Kajiki = callPackage ../development/python-modules/kajiki { }; + kaldi-active-grammar = callPackage ../development/python-modules/kaldi-active-grammar { }; + kaptan = callPackage ../development/python-modules/kaptan { }; karton-asciimagic = callPackage ../development/python-modules/karton-asciimagic { }; @@ -5166,6 +5176,8 @@ in { ondilo = callPackage ../development/python-modules/ondilo { }; + onetimepass = callPackage ../development/python-modules/onetimepass { }; + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; @@ -8853,6 +8865,8 @@ in { suseapi = callPackage ../development/python-modules/suseapi { }; + svdtools = callPackage ../development/python-modules/svdtools { }; + svg2tikz = callPackage ../development/python-modules/svg2tikz { }; svglib = callPackage ../development/python-modules/svglib { }; @@ -9104,6 +9118,8 @@ in { timeago = callPackage ../development/python-modules/timeago { }; + timecop = callPackage ../development/python-modules/timecop { }; + timelib = callPackage ../development/python-modules/timelib { }; time-machine = callPackage ../development/python-modules/time-machine { }; @@ -9474,6 +9490,8 @@ in { userpath = callPackage ../development/python-modules/userpath { }; + ush = callPackage ../development/python-modules/ush { }; + utils = callPackage ../development/python-modules/utils { }; uuid = callPackage ../development/python-modules/uuid { }; @@ -9520,6 +9538,8 @@ in { versioneer = callPackage ../development/python-modules/versioneer { }; + versionfinder = callPackage ../development/python-modules/versionfinder { }; + versiontag = callPackage ../development/python-modules/versiontag { }; versiontools = callPackage ../development/python-modules/versiontools { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix index 0d7ef5628e..3c48db55a1 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix @@ -305,7 +305,7 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = all; - Cabal_3_6_1_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ]; + Cabal_3_6_2_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ]; cabal2nix-unstable = all; funcmp = all; haskell-language-server = all;