diff options
366 files changed, 11635 insertions, 9422 deletions
diff --git a/doc/Makefile b/doc/Makefile index e7ca31b20d71..cdef493502bf 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -87,7 +87,7 @@ functions/library/generated: doc-support/result ln -rfs ./doc-support/result/function-docs functions/library/generated %.section.xml: %.section.md - pandoc $^ -w docbook+smart \ + pandoc $^ -w docbook \ -f markdown+smart \ | sed -e 's|<ulink url=|<link xlink:href=|' \ -e 's|</ulink>|</link>|' \ @@ -98,7 +98,7 @@ functions/library/generated: doc-support/result | cat > $@ %.chapter.xml: %.chapter.md - pandoc $^ -w docbook+smart \ + pandoc $^ -w docbook \ --top-level-division=chapter \ -f markdown+smart \ | sed -e 's|<ulink url=|<link xlink:href=|' \ diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index b1ea05a2381d..3c5823c25891 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1667,4 +1667,48 @@ recursiveUpdate ]]></programlisting> </example> </section> + + <section xml:id="function-library-lib.attrsets.recurseIntoAttrs"> + <title><function>lib.attrsets.recurseIntoAttrs</function></title> + + <subtitle><literal>recurseIntoAttrs :: AttrSet -> AttrSet</literal> + </subtitle> + + <xi:include href="./locations.xml" xpointer="lib.attrsets.recurseIntoAttrs" /> + + <para> + Make various Nix tools consider the contents of the resulting + attribute set when looking for what to build, find, etc. + </para> + + <para> + This function only affects a single attribute set; it does not apply itself recursively for nested attribute sets. + </para> + + <variablelist> + <varlistentry> + <term> + <varname>attrs</varname> + </term> + <listitem> + <para> + An attribute set to scan for derivations. + </para> + </listitem> + </varlistentry> + </variablelist> + + <example xml:id="function-library-lib.attrsets.recurseIntoAttrs-example"> + <title>Making Nix look inside an attribute set</title> +<programlisting><![CDATA[ +{ pkgs ? import <nixpkgs> {} }: +{ + myTools = pkgs.lib.recurseIntoAttrs { + inherit (pkgs) hello figlet; + }; +} +]]></programlisting> + </example> + </section> + </section> diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 32994432d53d..72430522f7d8 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -473,6 +473,20 @@ rec { /* Pick the outputs of packages to place in buildInputs */ chooseDevOutputs = drvs: builtins.map getDev drvs; + /* Make various Nix tools consider the contents of the resulting + attribute set when looking for what to build, find, etc. + + This function only affects a single attribute set; it does not + apply itself recursively for nested attribute sets. + */ + recurseIntoAttrs = + attrs: attrs // { recurseForDerivations = true; }; + + /* Undo the effect of recurseIntoAttrs. + */ + dontRecurseIntoAttrs = + attrs: attrs // { recurseForDerivations = false; }; + /*** deprecated stuff ***/ zipWithNames = zipAttrsWithNames; diff --git a/lib/default.nix b/lib/default.nix index d2fe018aa6af..f8cc5c4d8166 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -73,7 +73,8 @@ let genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting getOutput getBin - getLib getDev chooseDevOutputs zipWithNames zip; + getLib getDev chooseDevOutputs zipWithNames zip + recurseIntoAttrs dontRecurseIntoAttrs; inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index da84bffe116e..598616c3ba91 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1461,6 +1461,16 @@ githubId = 5684605; name = "Cole Scott"; }; + cole-h = { + name = "Cole Helbling"; + email = "cole.e.helbling@outlook.com"; + github = "cole-h"; + githubId = 28582702; + keys = [{ + longkeyid = "rsa4096/0xB37E0F2371016A4C"; + fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C"; + }]; + }; copumpkin = { email = "pumpkingod@gmail.com"; github = "copumpkin"; @@ -4939,6 +4949,12 @@ githubId = 118035; name = "Corbin Simpson"; }; + mothsart = { + email = "jerem.ferry@gmail.com"; + github = "mothsart"; + githubId = 10601196; + name = "Jérémie Ferry"; + }; mounium = { email = "muoniurn@gmail.com"; github = "mounium"; diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index a81a327c09b6..ebf1f493c5ce 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -9,7 +9,6 @@ <programlisting> <xref linkend="opt-services.xserver.desktopManager.xfce.enable" /> = true; <xref linkend="opt-services.xserver.displayManager.defaultSession" /> = "xfce"; -}; </programlisting> </para> <para> diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 31f08d9da341..78618ed18a5d 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -631,6 +631,16 @@ auth required pam_succeed_if.so uid >= 1000 quiet </citerefentry>-script now uses the python test-driver. </para> </listitem> + <listitem> + <para> + The <package>riot-web</package> package now accepts configuration overrides as an attribute set instead of a string. + A formerly used JSON configuration can be converted to an attribute set with <literal>builtins.fromJSON</literal>. + </para> + <para> + The new default configuration also disables automatic guest account registration and analytics to improve privacy. + The previous behavior can be restored by setting <literal>config.riot-web.conf = { disable_guests = false; piwik = true; }</literal>. + </para> + </listitem> </itemizedlist> </section> @@ -693,6 +703,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet via <option>boot.initrd.luks.fido2Support</option>. </para> </listitem> + <listitem> + <para> + Predicatbly named network-interfaces get renamed in stage-1. This means that it's possible + to use the proper interface name for e.g. dropbear-setups. + </para> + <para> + For further reference, please read <link xlink:href="https://github.com/NixOS/nixpkgs/pull/68953">#68953</link> or the corresponding <link xlink:href="https://discourse.nixos.org/t/predictable-network-interface-names-in-initrd/4055">discourse thread</link>. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 8e91e9d2baa9..ec1c8c2d57a1 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -30,7 +30,7 @@ in nixpkgs.config.xorg.abiCompat = "1.19"; services.xserver.drivers = singleton - { name = "amdgpu"; modules = [ package ]; }; + { name = "amdgpu"; modules = [ package ]; display = true; }; hardware.opengl.package = package; hardware.opengl.package32 = package32; diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix index 0aab7bd6b92c..06d3ea324d8d 100644 --- a/nixos/modules/hardware/video/ati.nix +++ b/nixos/modules/hardware/video/ati.nix @@ -21,7 +21,7 @@ in nixpkgs.config.xorg.abiCompat = "1.17"; services.xserver.drivers = singleton - { name = "fglrx"; modules = [ ati_x11 ]; }; + { name = "fglrx"; modules = [ ati_x11 ]; display = true; }; hardware.opengl.package = ati_x11; hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; }; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 1794bb4b433d..7461e231402a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -34,26 +34,57 @@ let enabled = nvidia_x11 != null; cfg = config.hardware.nvidia; - optimusCfg = cfg.optimus_prime; + pCfg = cfg.prime; + syncCfg = pCfg.sync; + offloadCfg = pCfg.offload; + primeEnabled = syncCfg.enable || offloadCfg.enable; in { + imports = + [ + (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "enable" ] [ "hardware" "nvidia" "prime" "sync" "enable" ]) + (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ]) + (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "nvidiaBusId" ] [ "hardware" "nvidia" "prime" "nvidiaBusId" ]) + (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "intelBusId" ] [ "hardware" "nvidia" "prime" "intelBusId" ]) + ]; + options = { - hardware.nvidia.modesetting.enable = lib.mkOption { - type = lib.types.bool; + hardware.nvidia.modesetting.enable = mkOption { + type = types.bool; default = false; description = '' Enable kernel modesetting when using the NVIDIA proprietary driver. Enabling this fixes screen tearing when using Optimus via PRIME (see - <option>hardware.nvidia.optimus_prime.enable</option>. This is not enabled + <option>hardware.nvidia.prime.sync.enable</option>. This is not enabled by default because it is not officially supported by NVIDIA and would not work with SLI. ''; }; - hardware.nvidia.optimus_prime.enable = lib.mkOption { - type = lib.types.bool; + hardware.nvidia.prime.nvidiaBusId = mkOption { + type = types.str; + default = ""; + example = "PCI:1:0:0"; + description = '' + Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci + shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0". + ''; + }; + + hardware.nvidia.prime.intelBusId = mkOption { + type = types.str; + default = ""; + example = "PCI:0:2:0"; + description = '' + Bus ID of the Intel GPU. You can find it using lspci; for example if lspci + shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0". + ''; + }; + + hardware.nvidia.prime.sync.enable = mkOption { + type = types.bool; default = false; description = '' Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME. @@ -66,8 +97,8 @@ in be the only driver there. If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be - specified (<option>hardware.nvidia.optimus_prime.nvidiaBusId</option> and - <option>hardware.nvidia.optimus_prime.intelBusId</option>). + specified (<option>hardware.nvidia.prime.nvidiaBusId</option> and + <option>hardware.nvidia.prime.intelBusId</option>). If you enable this, you may want to also enable kernel modesetting for the NVIDIA driver (<option>hardware.nvidia.modesetting.enable</option>) in order @@ -79,31 +110,23 @@ in ''; }; - hardware.nvidia.optimus_prime.allowExternalGpu = lib.mkOption { - type = lib.types.bool; + hardware.nvidia.prime.sync.allowExternalGpu = mkOption { + type = types.bool; default = false; description = '' Configure X to allow external NVIDIA GPUs when using optimus. ''; }; - hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption { - type = lib.types.str; - default = ""; - example = "PCI:1:0:0"; + hardware.nvidia.prime.offload.enable = mkOption { + type = types.bool; + default = false; description = '' - Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci - shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0". - ''; - }; + Enable render offload support using the NVIDIA proprietary driver via PRIME. - hardware.nvidia.optimus_prime.intelBusId = lib.mkOption { - type = lib.types.str; - default = ""; - example = "PCI:0:2:0"; - description = '' - Bus ID of the Intel GPU. You can find it using lspci; for example if lspci - shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0". + If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be + specified (<option>hardware.nvidia.prime.nvidiaBusId</option> and + <option>hardware.nvidia.prime.intelBusId</option>). ''; }; }; @@ -116,12 +139,19 @@ in } { - assertion = !optimusCfg.enable || - (optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != ""); + assertion = primeEnabled -> pCfg.nvidiaBusId != "" && pCfg.intelBusId != ""; message = '' - When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured. + When NVIDIA PRIME is enabled, the GPU bus IDs must configured. ''; } + { + assertion = offloadCfg.enable -> versionAtLeast nvidia_x11.version "435.21"; + message = "NVIDIA PRIME render offload is currently only supported on versions >= 435.21."; + } + { + assertion = !(syncCfg.enable && offloadCfg.enable); + message = "Only one NVIDIA PRIME solution may be used at a time."; + } ]; # If Optimus/PRIME is enabled, we: @@ -136,36 +166,38 @@ in # - Configure the display manager to run specific `xrandr` commands which will # configure/enable displays connected to the Intel GPU. - services.xserver.drivers = singleton { + services.xserver.useGlamor = mkDefault offloadCfg.enable; + + services.xserver.drivers = optional primeEnabled { + name = "modesetting"; + display = offloadCfg.enable; + deviceSection = '' + BusID "${pCfg.intelBusId}" + ${optionalString syncCfg.enable ''Option "AccelMethod" "none"''} + ''; + } ++ singleton { name = "nvidia"; modules = [ nvidia_x11.bin ]; - deviceSection = optionalString optimusCfg.enable + display = !offloadCfg.enable; + deviceSection = optionalString primeEnabled '' - BusID "${optimusCfg.nvidiaBusId}" - ${optionalString optimusCfg.allowExternalGpu "Option \"AllowExternalGpus\""} + BusID "${pCfg.nvidiaBusId}" + ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""} ''; screenSection = '' Option "RandRRotation" "on" - ${optionalString optimusCfg.enable "Option \"AllowEmptyInitialConfiguration\""} + ${optionalString syncCfg.enable "Option \"AllowEmptyInitialConfiguration\""} ''; }; - services.xserver.extraConfig = optionalString optimusCfg.enable - '' - Section "Device" - Identifier "nvidia-optimus-intel" - Driver "modesetting" - BusID "${optimusCfg.intelBusId}" - Option "AccelMethod" "none" - EndSection - ''; - services.xserver.serverLayoutSection = optionalString optimusCfg.enable - '' - Inactive "nvidia-optimus-intel" - ''; + services.xserver.serverLayoutSection = optionalString syncCfg.enable '' + Inactive "Device-modesetting[0]" + '' + optionalString offloadCfg.enable '' + Option "AllowNVIDIAGPUScreens" + ''; - services.xserver.displayManager.setupCommands = optionalString optimusCfg.enable '' + services.xserver.displayManager.setupCommands = optionalString syncCfg.enable '' # Added by nvidia configuration module for Optimus/PRIME. ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0 ${pkgs.xorg.xrandr}/bin/xrandr --auto @@ -175,11 +207,13 @@ in source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc"; }; - hardware.opengl.package = nvidia_x11.out; - hardware.opengl.package32 = nvidia_libs32; + hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out; + hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_libs32; + hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out; + hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] - ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ]; + ++ filter (p: p != null) [ nvidia_x11.persistenced ]; systemd.tmpfiles.rules = optional config.virtualisation.docker.enableNvidia "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin" @@ -190,10 +224,10 @@ in # nvidia-uvm is required by CUDA applications. boot.kernelModules = [ "nvidia-uvm" ] ++ - lib.optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ]; + optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ]; # If requested enable modesetting via kernel parameter. - boot.kernelParams = optional cfg.modesetting.enable "nvidia-drm.modeset=1"; + boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"; # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. services.udev.extraRules = diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6734929b9d4e..e70a853624bf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -660,6 +660,7 @@ ./services/networking/ngircd.nix ./services/networking/nghttpx/default.nix ./services/networking/nix-serve.nix + ./services/networking/nix-store-gcs-proxy.nix ./services/networking/nixops-dns.nix ./services/networking/nntp-proxy.nix ./services/networking/nsd.nix @@ -807,6 +808,7 @@ ./services/ttys/agetty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix + ./services/wayland/cage.nix ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 238c18242c19..211199d148dc 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -136,6 +136,27 @@ let challenge to ensure the DNS entries required are available. ''; }; + + ocspMustStaple = mkOption { + type = types.bool; + default = false; + description = '' + Turns on the OCSP Must-Staple TLS extension. + Make sure you know what you're doing! See: + <itemizedlist> + <listitem><para><link xlink:href="https://blog.apnic.net/2019/01/15/is-the-web-ready-for-ocsp-must-staple/" /></para></listitem> + <listitem><para><link xlink:href="https://blog.hboeck.de/archives/886-The-Problem-with-OCSP-Stapling-and-Must-Staple-and-why-Certificate-Revocation-is-still-broken.html" /></para></listitem> + </itemizedlist> + ''; + }; + + extraLegoRenewFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Additional flags to pass to lego renew. + ''; + }; }; }; @@ -174,7 +195,7 @@ in renewInterval = mkOption { type = types.str; - default = "weekly"; + default = "daily"; description = '' Systemd calendar expression when to check for renewal. See <citerefentry><refentrytitle>systemd.time</refentrytitle> @@ -288,12 +309,16 @@ in ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains) ++ (if data.dnsProvider != null then [ "--dns" data.dnsProvider ] else [ "--http" "--http.webroot" data.webroot ]) ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)]; - runOpts = escapeShellArgs (globalOpts ++ [ "run" ]); - renewOpts = escapeShellArgs (globalOpts ++ [ "renew" "--days" (toString cfg.validMinDays) ]); + certOpts = optionals data.ocspMustStaple [ "--must-staple" ]; + runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts); + renewOpts = escapeShellArgs (globalOpts ++ + [ "renew" "--days" (toString cfg.validMinDays) ] ++ + certOpts ++ data.extraLegoRenewFlags); acmeService = { description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" "network-online.target" ]; wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; # With RemainAfterExit the service is considered active even @@ -399,7 +424,17 @@ in systemd.tmpfiles.rules = map (data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}") (filter (data: data.webroot != null) (attrValues cfg.certs)); - systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair + systemd.timers = let + # Allow systemd to pick a convenient time within the day + # to run the check. + # This allows the coalescing of multiple timer jobs. + # We divide by the number of certificates so that if you + # have many certificates, the renewals are distributed over + # the course of the day to avoid rate limits. + numCerts = length (attrNames cfg.certs); + _24hSecs = 60 * 60 * 24; + AccuracySec = "${toString (_24hSecs / numCerts)}s"; + in flip mapAttrs' cfg.certs (cert: data: nameValuePair ("acme-${cert}") ({ description = "Renew ACME Certificate for ${cert}"; @@ -408,8 +443,9 @@ in OnCalendar = cfg.renewInterval; Unit = "acme-${cert}.service"; Persistent = "yes"; - AccuracySec = "5m"; - RandomizedDelaySec = "1h"; + inherit AccuracySec; + # Skew randomly within the day, per https://letsencrypt.org/docs/integration-guide/. + RandomizedDelaySec = "24h"; }; }) ); diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index 5566c53897dc..cffa1a5849f9 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -37,6 +37,13 @@ in after = [ "dev-random.device" ]; + # Clean shutdown without DefaultDependencies + conflicts = [ "shutdown.target" ]; + before = [ + "sysinit.target" + "shutdown.target" + ]; + description = "Hardware RNG Entropy Gatherer Daemon"; # rngd may have to start early to avoid entropy starvation during boot with encrypted swap diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 43dc185cdd77..f5e78b182933 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -265,6 +265,11 @@ in { ''; serviceConfig = { Type = "oneshot"; + # RemainAfterExit makes restartIfChanged work for this service, so + # downstream services will get updated automatically when things like + # services.mailman.hyperkitty.baseUrl change. Otherwise users have to + # restart things manually, which is confusing. + RemainAfterExit = "yes"; }; }; @@ -282,6 +287,9 @@ in { serviceConfig = { User = cfg.webUser; Type = "oneshot"; + # Similar to mailman-settings.service, this makes restartTriggers work + # properly for this service. + RemainAfterExit = "yes"; WorkingDirectory = "/var/lib/mailman-web"; }; }; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index d63f38e93b8e..86033d02bf3f 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -96,7 +96,20 @@ in { config = mkOption { default = null; - type = with types; nullOr attrs; + # Migrate to new option types later: https://github.com/NixOS/nixpkgs/pull/75584 + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + (lazyAttrsOf valueType) + (listOf valueType) + ]) // { + description = "Yaml value"; + emptyValue.value = {}; + }; + in valueType; example = literalExample '' { homeassistant = { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index ba852fea4336..56cddfc55b71 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -30,7 +30,17 @@ in Whether to perform certificate verification for https. ''; }; - + constLabels = mkOption { + type = types.listOf types.str; + default = []; + example = [ + "label1=value1" + "label2=value2" + ]; + description = '' + A list of constant labels that will be used in every metric. + ''; + }; }; serviceOpts = { serviceConfig = { @@ -40,6 +50,7 @@ in --nginx.ssl-verify ${toString cfg.sslVerify} \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path ${cfg.telemetryPath} \ + --prometheus.const-labels ${concatStringsSep "," cfg.constLabels} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix index 6f2e149433f3..52c895215fbe 100644 --- a/nixos/modules/services/networking/git-daemon.nix +++ b/nixos/modules/services/networking/git-daemon.nix @@ -104,14 +104,14 @@ in config = mkIf cfg.enable { - users.users = optionalAttrs (cfg.user != "git") { + users.users = optionalAttrs (cfg.user == "git") { git = { uid = config.ids.uids.git; description = "Git daemon user"; }; }; - users.groups = optionalAttrs (cfg.group != "git") { + users.groups = optionalAttrs (cfg.group == "git") { git.gid = config.ids.gids.git; }; diff --git a/nixos/modules/services/networking/nix-store-gcs-proxy.nix b/nixos/modules/services/networking/nix-store-gcs-proxy.nix new file mode 100644 index 000000000000..3f2ce5bca4da --- /dev/null +++ b/nixos/modules/services/networking/nix-store-gcs-proxy.nix @@ -0,0 +1,75 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + opts = { name, config, ... }: { + options = { + enable = mkOption { + default = true; + type = types.bool; + example = true; + description = "Whether to enable proxy for this bucket"; + }; + bucketName = mkOption { + type = types.str; + default = name; + example = "my-bucket-name"; + description = "Name of Google storage bucket"; + }; + address = mkOption { + type = types.str; + example = "localhost:3000"; + description = "The address of the proxy."; + }; + }; + }; + enabledProxies = lib.filterAttrs (n: v: v.enable) config.services.nix-store-gcs-proxy; + mapProxies = function: lib.mkMerge (lib.mapAttrsToList function enabledProxies); +in +{ + options.services.nix-store-gcs-proxy = mkOption { + type = types.attrsOf (types.submodule opts); + default = {}; + description = '' + An attribute set describing an HTTP to GCS proxy that allows us to use GCS + bucket via HTTP protocol. + ''; + }; + + config.systemd.services = mapProxies (name: cfg: { + "nix-store-gcs-proxy-${name}" = { + description = "A HTTP nix store that proxies requests to Google Storage"; + wantedBy = ["multi-user.target"]; + + serviceConfig = { + RestartSec = 5; + StartLimitInterval = 10; + ExecStart = '' + ${pkgs.nix-store-gcs-proxy}/bin/nix-store-gcs-proxy \ + --bucket-name ${cfg.bucketName} \ + --addr ${cfg.address} + ''; + + DynamicUser = true; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + + NoNewPrivileges = true; + LockPersonality = true; + RestrictRealtime = true; + }; + }; + }); + + meta.maintainers = [ maintainers.mrkkrp ]; +} diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index 0222e8ce8b58..c4fa370a5fef 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -77,19 +77,14 @@ in config = mkMerge [ (mkIf cfg.enable { - users.users.${user} = { - description = "sslh daemon user"; - isSystemUser = true; - }; - systemd.services.sslh = { description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = user; - Group = "nogroup"; + DynamicUser = true; + User = "sslh"; PermissionsStartOnly = true; Restart = "always"; RestartSec = "1s"; diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index 069e15a909b7..042c4d5adddd 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -67,5 +67,15 @@ in networking.firewall.allowedUDPPorts = [ cfg.port ]; environment.systemPackages = [ cfg.package ]; + + # Prevent systemd from potentially changing the MAC address + environment.etc."systemd/network/50-zerotier.link".text = '' + [Match] + OriginalName=zt* + + [Link] + AutoNegotiation=false + MACAddressPolicy=none + ''; }; } diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix new file mode 100644 index 000000000000..cac5c042ec16 --- /dev/null +++ b/nixos/modules/services/wayland/cage.nix @@ -0,0 +1,99 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.cage; +in { + options.services.cage.enable = mkEnableOption "cage kiosk service"; + + options.services.cage.user = mkOption { + type = types.str; + default = "demo"; + description = '' + User to log-in as. + ''; + }; + + options.services.cage.extraArguments = mkOption { + type = types.listOf types.str; + default = []; + defaultText = "[]"; + description = "Additional command line arguments to pass to Cage."; + example = ["-d"]; + }; + + options.services.cage.program = mkOption { + type = types.path; + default = "${pkgs.xterm}/bin/xterm"; + description = '' + Program to run in cage. + ''; + }; + + config = mkIf cfg.enable { + + # The service is partially based off of the one provided in the + # cage wiki at + # https://github.com/Hjdskes/cage/wiki/Starting-Cage-on-boot-with-systemd. + systemd.services."cage-tty1" = { + enable = true; + after = [ + "systemd-user-sessions.service" + "plymouth-start.service" + "plymouth-quit.service" + "systemd-logind.service" + "getty@tty1.service" + ]; + before = [ "graphical.target" ]; + wants = [ "dbus.socket" "systemd-logind.service" "plymouth-quit.service"]; + wantedBy = [ "graphical.target" ]; + conflicts = [ "getty@tty1.service" ]; + + restartIfChanged = false; + serviceConfig = { + ExecStart = '' + ${pkgs.cage}/bin/cage \ + ${escapeShellArgs cfg.extraArguments} \ + -- ${cfg.program} + ''; + User = cfg.user; + + ConditionPathExists = "/dev/tty1"; + IgnoreSIGPIPE = "no"; + + # Log this user with utmp, letting it show up with commands 'w' and + # 'who'. This is needed since we replace (a)getty. + UtmpIdentifier = "%n"; + UtmpMode = "user"; + # A virtual terminal is needed. + TTYPath = "/dev/tty1"; + TTYReset = "yes"; + TTYVHangup = "yes"; + TTYVTDisallocate = "yes"; + # Fail to start if not controlling the virtual terminal. + StandardInput = "tty-fail"; + StandardOutput = "syslog"; + StandardError = "syslog"; + # Set up a full (custom) user session for the user, required by Cage. + PAMName = "cage"; + }; + }; + + security.pam.services.cage.text = '' + auth required pam_unix.so nullok + account required pam_unix.so + session required pam_unix.so + session required ${pkgs.systemd}/lib/security/pam_systemd.so + ''; + + hardware.opengl.enable = mkDefault true; + + systemd.targets.graphical.wants = [ "cage-tty1.service" ]; + + systemd.defaultUnit = "graphical.target"; + }; + + meta.maintainers = with lib.maintainers; [ matthewbauer flokli ]; + +} diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index b46a2d189ef9..869c66944897 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -16,7 +16,10 @@ in { - meta.maintainers = pkgs.pantheon.maintainers; + meta = { + doc = ./pantheon.xml; + maintainers = pkgs.pantheon.maintainers; + }; options = { diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml new file mode 100644 index 000000000000..4d92a7446c0d --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -0,0 +1,130 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xml:id="chap-pantheon"> + <title>Pantheon Destkop</title> + <para> + Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite. + </para> + <section xml:id="sec-pantheon-enable"> + <title>Enabling Pantheon</title> + + <para> + All of Pantheon is working in NixOS and the applications should be available, aside from a few <link xlink:href="https://github.com/NixOS/nixpkgs/issues/58161">exceptions</link>. To enable Pantheon, set +<programlisting> +<xref linkend="opt-services.xserver.desktopManager.pantheon.enable"/> = true; +</programlisting> + This automatically enables LightDM and Pantheon's LightDM greeter. If you'd like to disable this, set +<programlisting> +<xref linkend="opt-services.xserver.displayManager.lightdm.greeters.pantheon.enable"/> = false; +<xref linkend="opt-services.xserver.displayManager.lightdm.enable"/> = false; +</programlisting> + but please be aware using Pantheon without LightDM as a display manager will break screenlocking from the UI. The NixOS module for Pantheon installs all of Pantheon's default applications. If you'd like to not install Pantheon's apps, set +<programlisting> +<xref linkend="opt-services.pantheon.apps.enable"/> = false; +</programlisting> + You can also use <xref linkend="opt-environment.pantheon.excludePackages"/> to remove any other app (like <package>geary</package>). + </para> + </section> + <section xml:id="sec-pantheon-wingpanel-switchboard"> + <title>Wingpanel and Switchboard plugins</title> + + <para> + Wingpanel and Switchboard work differently than they do in other distributions, as far as using plugins. You cannot install a plugin globally (like with <option>environment.systemPackages</option>) to start using it. You should instead be using the following options: + <itemizedlist> + <listitem> + <para> + <xref linkend="opt-services.xserver.desktopManager.pantheon.extraWingpanelIndicators"/> + </para> + </listitem> + <listitem> + <para> + <xref linkend="opt-services.xserver.desktopManager.pantheon.extraSwitchboardPlugs"/> + </para> + </listitem> + </itemizedlist> + to configure the programs with plugs or indicators. + </para> + + <para> + The difference in NixOS is both these programs are patched to load plugins from a directory that is the value of an environment variable. All of which is controlled in Nix. If you need to configure the particular packages manually you can override the packages like: +<programlisting> +wingpanel-with-indicators.override { + indicators = [ + pkgs.some-special-indicator + ]; +}; + +switchboard-with-plugs.override { + plugs = [ + pkgs.some-special-plug + ]; +}; +</programlisting> + please note that, like how the NixOS options describe these as extra plugins, this would only add to the default plugins included with the programs. If for some reason you'd like to configure which plugins to use exactly, both packages have an argument for this: +<programlisting> +wingpanel-with-indicators.override { + useDefaultIndicators = false; + indicators = specialListOfIndicators; +}; + +switchboard-with-plugs.override { + useDefaultPlugs = false; + plugs = specialListOfPlugs; +}; +</programlisting> + this could be most useful for testing a particular plug-in in isolation. + </para> + </section> + <section xml:id="sec-pantheon-faq"> + <title>FAQ</title> + + <variablelist> + <varlistentry xml:id="sec-pantheon-faq-messed-up-theme"> + <term> + I have switched from a different desktop and Pantheon’s theming looks messed up. + </term> + <listitem> + <para> + Open Switchboard and go to: <guilabel>Administration</guilabel> → <guilabel>About</guilabel> → <guilabel>Restore Default Settings</guilabel> → <guibutton>Restore Settings</guibutton>. This will reset any dconf settings to their Pantheon defaults. Note this could reset certain GNOME specific preferences if that desktop was used prior. + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="sec-pantheon-faq-slow-shutdown"> + <term> + Using Pantheon sometimes makes my shutdown take a long time. + </term> + <listitem> + <para> + We have not yet determined what processes fight with systemd during shutdown, there are many reports. In elementary OS the default system timeout is lowered to lessen the impact of the issue. If you'd like to do this in NixOS, set +<programlisting> + <xref linkend="opt-systemd.extraConfig"/> = '' + DefaultTimeoutStopSec=10s + DefaultTimeoutStartSec=10s +''; +</programlisting> + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon"> + <term> + I cannot enable both GNOME 3 and Pantheon. + </term> + <listitem> + <para> + This is a known <link xlink:href="https://github.com/NixOS/nixpkgs/issues/64611">issue</link> and there is no known workaround. + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="sec-pantheon-faq-appcenter"> + <term> + Does AppCenter work, or is it available? + </term> + <listitem> + <para> + AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. In the near future you will be able to install Flatpak applications from AppCenter on NixOS. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>. + </para> + </listitem> + </varlistentry> + </variablelist> + </section> +</chapter> diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 7f0de96d2084..74d702ea1c3d 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -573,7 +573,7 @@ in then { modules = [xorg.${"xf86video" + name}]; } else null) knownVideoDrivers; - in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver)); + in optional (driver != null) ({ inherit name; modules = []; driverName = name; display = true; } // driver)); assertions = [ { assertion = config.security.polkit.enable; @@ -740,7 +740,7 @@ in ${cfg.serverLayoutSection} # Reference the Screen sections for each driver. This will # cause the X server to try each in turn. - ${flip concatMapStrings cfg.drivers (d: '' + ${flip concatMapStrings (filter (d: d.display) cfg.drivers) (d: '' Screen "Screen-${d.name}[0]" '')} EndSection @@ -764,42 +764,44 @@ in ${driver.deviceSection or ""} ${xrandrDeviceSection} EndSection + ${optionalString driver.display '' + + Section "Screen" + Identifier "Screen-${driver.name}[0]" + Device "Device-${driver.name}[0]" + ${optionalString (cfg.monitorSection != "") '' + Monitor "Monitor[0]" + ''} + + ${cfg.screenSection} + ${driver.screenSection or ""} + + ${optionalString (cfg.defaultDepth != 0) '' + DefaultDepth ${toString cfg.defaultDepth} + ''} + + ${optionalString + (driver.name != "virtualbox" && + (cfg.resolutions != [] || + cfg.extraDisplaySettings != "" || + cfg.virtualScreen != null)) + (let + f = depth: + '' + SubSection "Display" + Depth ${toString depth} + ${optionalString (cfg.resolutions != []) + "Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}"} + ${cfg.extraDisplaySettings} + ${optionalString (cfg.virtualScreen != null) + "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"} + EndSubSection + ''; + in concatMapStrings f [8 16 24] + )} - Section "Screen" - Identifier "Screen-${driver.name}[0]" - Device "Device-${driver.name}[0]" - ${optionalString (cfg.monitorSection != "") '' - Monitor "Monitor[0]" - ''} - - ${cfg.screenSection} - ${driver.screenSection or ""} - - ${optionalString (cfg.defaultDepth != 0) '' - DefaultDepth ${toString cfg.defaultDepth} - ''} - - ${optionalString - (driver.name != "virtualbox" && - (cfg.resolutions != [] || - cfg.extraDisplaySettings != "" || - cfg.virtualScreen != null)) - (let - f = depth: - '' - SubSection "Display" - Depth ${toString depth} - ${optionalString (cfg.resolutions != []) - "Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}"} - ${cfg.extraDisplaySettings} - ${optionalString (cfg.virtualScreen != null) - "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"} - EndSubSection - ''; - in concatMapStrings f [8 16 24] - )} - - EndSection + EndSection + ''} '')} ${xrandrMonitorSections} diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index cb8fc957a990..0ab6e626b340 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -6,7 +6,11 @@ let cfg = config.boot.initrd.network; - dhcpinterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {})); + dhcpInterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {})); + doDhcp = config.networking.useDHCP || dhcpInterfaces != []; + dhcpIfShellExpr = if config.networking.useDHCP + then "$(ls /sys/class/net/ | grep -v ^lo$)" + else lib.concatMapStringsSep " " lib.escapeShellArg dhcpInterfaces; udhcpcScript = pkgs.writeScript "udhcp-script" '' @@ -62,6 +66,16 @@ in ''; }; + boot.initrd.network.flushBeforeStage2 = mkOption { + type = types.bool; + default = true; + description = '' + Whether to clear the configuration of the interfaces that were set up in + the initrd right before stage 2 takes over. Stage 2 will do the regular network + configuration based on the NixOS networking options. + ''; + }; + boot.initrd.network.udhcpc.extraArgs = mkOption { default = []; type = types.listOf types.str; @@ -89,49 +103,45 @@ in boot.initrd.kernelModules = [ "af_packet" ]; boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs ${pkgs.mkinitcpio-nfs-utils}/bin/ipconfig + copy_bin_and_libs ${pkgs.klibc}/lib/klibc/bin.static/ipconfig ''; boot.initrd.preLVMCommands = mkBefore ( # Search for interface definitions in command line. '' + ifaces="" for o in $(cat /proc/cmdline); do case $o in ip=*) - ipconfig $o && hasNetwork=1 + ipconfig $o && ifaces="$ifaces $(echo $o | cut -d: -f6)" ;; esac done '' # Otherwise, use DHCP. - + optionalString (config.networking.useDHCP || dhcpinterfaces != []) '' - if [ -z "$hasNetwork" ]; then - - # Bring up all interfaces. - for iface in $(ls /sys/class/net/); do - echo "bringing up network interface $iface..." - ip link set "$iface" up - done + + optionalString doDhcp '' + # Bring up all interfaces. + for iface in ${dhcpIfShellExpr}; do + echo "bringing up network interface $iface..." + ip link set "$iface" up && ifaces="$ifaces $iface" + done - # Acquire DHCP leases. - for iface in ${ if config.networking.useDHCP then - "$(ls /sys/class/net/ | grep -v ^lo$)" - else - lib.concatMapStringsSep " " lib.escapeShellArg dhcpinterfaces - }; do - echo "acquiring IP address via DHCP on $iface..." - udhcpc --quit --now -i $iface -O staticroutes --script ${udhcpcScript} ${udhcpcArgs} && hasNetwork=1 - done - fi + # Acquire DHCP leases. + for iface in ${dhcpIfShellExpr}; do + echo "acquiring IP address via DHCP on $iface..." + udhcpc --quit --now -i $iface -O staticroutes --script ${udhcpcScript} ${udhcpcArgs} + done '' - + '' - if [ -n "$hasNetwork" ]; then - echo "networking is up!" - ${cfg.postCommands} - fi - ''); + + cfg.postCommands); + + boot.initrd.postMountCommands = mkIf cfg.flushBeforeStage2 '' + for iface in $ifaces; do + ip address flush "$iface" + ip link down "$iface" + done + ''; }; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index a77dbc609f46..6dfbe66fc647 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -67,7 +67,12 @@ let (assertOnlyFields [ "PrivateKeyFile" "ListenPort" "FwMark" ]) - (assertRange "FwMark" 1 4294967295) + # The following check won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "FwMark" 1 4294967295) ]; # NOTE The PresharedKey directive is missing on purpose here, please @@ -181,7 +186,12 @@ let (assertOnlyFields [ "InterfaceId" "Independent" ]) - (assertRange "InterfaceId" 1 4294967295) + # The following check won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "InterfaceId" 1 4294967295) (assertValueOneOf "Independent" boolValues) ]; @@ -235,6 +245,26 @@ let (assertValueOneOf "AutoJoin" boolValues) ]; + checkRoutingPolicyRule = checkUnitConfig "RoutingPolicyRule" [ + (assertOnlyFields [ + "TypeOfService" "From" "To" "FirewallMark" "Table" "Priority" + "IncomingInterface" "OutgoingInterface" "SourcePort" "DestinationPort" + "IPProtocol" "InvertRule" "Family" + ]) + (assertRange "TypeOfService" 0 255) + # The following check won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "FirewallMark" 1 4294967295) + (assertInt "Priority") + (assertPort "SourcePort") + (assertPort "DestinationPort") + (assertValueOneOf "InvertRule" boolValues) + (assertValueOneOf "Family" ["ipv4" "ipv6" "both"]) + ]; + checkRoute = checkUnitConfig "Route" [ (assertOnlyFields [ "Gateway" "GatewayOnLink" "Destination" "Source" "Metric" @@ -535,6 +565,22 @@ let }; }; + routingPolicyRulesOptions = { + options = { + routingPolicyRuleConfig = mkOption { + default = { }; + example = { routingPolicyRuleConfig = { Table = 10; IncomingInterface = "eth1"; Family = "both"; } ;}; + type = types.addCheck (types.attrsOf unitOption) checkRoutingPolicyRule; + description = '' + Each attribute in this set specifies an option in the + <literal>[RoutingPolicyRule]</literal> section of the unit. See + <citerefentry><refentrytitle>systemd.network</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + ''; + }; + }; + }; + routeOptions = { options = { routeConfig = mkOption { @@ -772,6 +818,16 @@ let ''; }; + routingPolicyRules = mkOption { + default = [ ]; + type = with types; listOf (submodule routingPolicyRulesOptions); + description = '' + A list of routing policy rules sections to be added to the unit. See + <citerefentry><refentrytitle>systemd.network</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + ''; + }; + routes = mkOption { default = [ ]; type = with types; listOf (submodule routeOptions); @@ -929,6 +985,11 @@ let ${attrsToSection x.routeConfig} '')} + ${flip concatMapStrings def.routingPolicyRules (x: '' + [RoutingPolicyRule] + ${attrsToSection x.routingPolicyRuleConfig} + + '')} ${def.extraConfig} ''; }; diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 8736613c3d25..607aec87f01e 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -210,6 +210,8 @@ done # Create device nodes in /dev. @preDeviceCommands@ echo "running udev..." +mkdir -p /etc/systemd +ln -sfn @linkUnits@ /etc/systemd/network mkdir -p /etc/udev ln -sfn @udevRules@ /etc/udev/rules.d mkdir -p /dev/.mdadm @@ -266,7 +268,7 @@ checkFS() { return 0 fi - # Device might be already mounted manually + # Device might be already mounted manually # e.g. NBD-device or the host filesystem of the file which contains encrypted root fs if mount | grep -q "^$device on "; then echo "skip checking already mounted $device" @@ -351,7 +353,7 @@ mountFS() { elif [ "$fsType" = f2fs ]; then echo "resizing $device..." fsck.f2fs -fp "$device" - resize.f2fs "$device" + resize.f2fs "$device" fi ;; esac diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 4c2d130d5a5d..26117cffeda2 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -120,6 +120,7 @@ let # Copy udev. copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd + copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl copy_bin_and_libs ${udev}/bin/udevadm for BIN in ${udev}/lib/udev/*_id; do copy_bin_and_libs $BIN @@ -198,6 +199,14 @@ let ''; # */ + linkUnits = pkgs.runCommand "link-units" { + allowedReferences = [ extraUtils ]; + preferLocalBuild = true; + } '' + mkdir -p $out + cp -v ${udev}/lib/systemd/network/*.link $out/ + ''; + udevRules = pkgs.runCommand "udev-rules" { allowedReferences = [ extraUtils ]; preferLocalBuild = true; @@ -208,7 +217,9 @@ let cp -v ${udev}/lib/udev/rules.d/60-cdrom_id.rules $out/ cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/ + cp -v ${udev}/lib/udev/rules.d/75-net-description.rules $out/ cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/ + cp -v ${udev}/lib/udev/rules.d/80-net-setup-link.rules $out/ cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/ ${config.boot.initrd.extraUdevRulesCommands} @@ -222,7 +233,7 @@ let --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \ --replace ${pkgs.mdadm}/sbin ${extraUtils}/sbin \ --replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \ - --replace ${udev}/bin/udevadm ${extraUtils}/bin/udevadm + --replace ${udev} ${extraUtils} done # Work around a bug in QEMU, which doesn't implement the "READ @@ -257,7 +268,7 @@ let ${pkgs.buildPackages.busybox}/bin/ash -n $target ''; - inherit udevRules extraUtils modulesClosure; + inherit linkUnits udevRules extraUtils modulesClosure; inherit (config.boot) resumeDevice; diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index fd1a5b9f62c5..a33602915867 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -59,6 +59,11 @@ in rec { optional (attr ? ${name} && ! isMacAddress attr.${name}) "Systemd ${group} field `${name}' must be a valid mac address."; + isPort = i: i >= 0 && i <= 65535; + + assertPort = name: group: attr: + optional (attr ? ${name} && ! isPort attr.${name}) + "Error on the systemd ${group} field `${name}': ${attr.name} is not a valid port number."; assertValueOneOf = name: values: group: attr: optional (attr ? ${name} && !elem attr.${name} values) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index d14ba98ec48b..09c7e074e121 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -623,7 +623,11 @@ in after = [ "zfs-import.target" ]; path = [ packages.zfsUser ]; startAt = cfgTrim.interval; - serviceConfig.ExecStart = "${pkgs.runtimeShell} -c 'zpool list -H -o name | xargs --no-run-if-empty -n1 zpool trim'"; + # By default we ignore errors returned by the trim command, in case: + # - HDDs are mixed with SSDs + # - There is a SSDs in a pool that is currently trimmed. + # - There are only HDDs and we would set the system in a degraded state + serviceConfig.ExecStart = ''${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool; done || true' ''; }; }) ]; diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix index 17d5e3376908..99a9f979068d 100644 --- a/nixos/modules/testing/service-runner.nix +++ b/nixos/modules/testing/service-runner.nix @@ -12,7 +12,10 @@ let sub run { my ($cmd) = @_; - my @args = split " ", $cmd; + my @args = (); + while ($cmd =~ /([^ \t\n']+)|(\'([^'])\')\s*/g) { + push @args, $1; + } my $prog; if (substr($args[0], 0, 1) eq "@") { $prog = substr($args[0], 1); @@ -48,15 +51,20 @@ let '') service.environment)} # Run the ExecStartPre program. FIXME: this could be a list. - my $preStart = '${service.serviceConfig.ExecStartPre or ""}'; - if ($preStart ne "") { + my $preStart = <<END_CMD; + ${service.serviceConfig.ExecStartPre or ""} + END_CMD + if (defined $preStart && $preStart ne "\n") { print STDERR "running ExecStartPre: $preStart\n"; my $res = run_wait $preStart; die "$0: ExecStartPre failed with status $res\n" if $res; }; # Run the ExecStart program. - my $cmd = '${service.serviceConfig.ExecStart}'; + my $cmd = <<END_CMD; + ${service.serviceConfig.ExecStart} + END_CMD + print STDERR "running ExecStart: $cmd\n"; my $mainPid = run $cmd; $ENV{'MAINPID'} = $mainPid; @@ -70,8 +78,10 @@ let $SIG{'QUIT'} = \&intHandler; # Run the ExecStartPost program. - my $postStart = '${service.serviceConfig.ExecStartPost or ""}'; - if ($postStart ne "") { + my $postStart = <<END_CMD; + ${service.serviceConfig.ExecStartPost or ""} + END_CMD + if (defined $postStart && $postStart ne "\n") { print STDERR "running ExecStartPost: $postStart\n"; my $res = run_wait $postStart; die "$0: ExecStartPost failed with status $res\n" if $res; @@ -82,8 +92,10 @@ let my $mainRes = $?; # Run the ExecStopPost program. - my $postStop = '${service.serviceConfig.ExecStopPost or ""}'; - if ($postStop ne "") { + my $postStop = <<END_CMD; + ${service.serviceConfig.ExecStopPost or ""} + END_CMD + if (defined $postStop && $postStop ne "\n") { print STDERR "running ExecStopPost: $postStop\n"; my $res = run_wait $postStop; die "$0: ExecStopPost failed with status $res\n" if $res; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2e547780439a..7dd0f23df658 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -39,6 +39,7 @@ in buildbot = handleTest ./buildbot.nix {}; caddy = handleTest ./caddy.nix {}; cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; + cage = handleTest ./cage.nix {}; cassandra = handleTest ./cassandra.nix {}; ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {}; ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; @@ -98,6 +99,7 @@ in fsck = handleTest ./fsck.nix {}; gotify-server = handleTest ./gotify-server.nix {}; grocy = handleTest ./grocy.nix {}; + gitdaemon = handleTest ./gitdaemon.nix {}; gitea = handleTest ./gitea.nix {}; gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; @@ -262,6 +264,7 @@ in samba = handleTest ./samba.nix {}; sanoid = handleTest ./sanoid.nix {}; sddm = handleTest ./sddm.nix {}; + service-runner = handleTest ./service-runner.nix {}; shiori = handleTest ./shiori.nix {}; signal-desktop = handleTest ./signal-desktop.nix {}; simple = handleTest ./simple.nix {}; @@ -282,7 +285,7 @@ in systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; - systemd-networkd-wireguard = handleTest ./systemd-networkd-wireguard.nix {}; + systemd-networkd = handleTest ./systemd-networkd.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; taskserver = handleTest ./taskserver.nix {}; diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 5655a34a8b51..0d979dc2d054 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -41,7 +41,7 @@ import ./make-test-python.nix { systemd.services.git-daemon = { description = "Git daemon for the test"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" "sshd.service" ]; serviceConfig.Restart = "always"; path = with pkgs; [ coreutils git openssh ]; diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix new file mode 100644 index 000000000000..a6f73e00c066 --- /dev/null +++ b/nixos/tests/cage.nix @@ -0,0 +1,43 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "cage"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ matthewbauer flokli ]; + }; + + machine = { ... }: + + { + imports = [ ./common/user-account.nix ]; + services.cage = { + enable = true; + user = "alice"; + program = "${pkgs.xterm}/bin/xterm -cm -pc"; # disable color and bold to make OCR easier + }; + + # this needs a fairly recent kernel, otherwise: + # [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory + # [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory + # [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory + # [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory + # [backend/drm/drm.c:618] Failed to initialize renderer on connector 'Virtual-1': initial page-flip failed + # [backend/drm/drm.c:701] Failed to initialize renderer for plane + boot.kernelPackages = pkgs.linuxPackages_latest; + + virtualisation.memorySize = 1024; + }; + + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.users.alice; + in '' + with subtest("Wait for cage to boot up"): + start_all() + machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock") + machine.wait_until_succeeds("pgrep xterm") + machine.wait_for_text("alice@machine") + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix new file mode 100644 index 000000000000..b610caf06fb2 --- /dev/null +++ b/nixos/tests/gitdaemon.nix @@ -0,0 +1,64 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + hashes = pkgs.writeText "hashes" '' + b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c /project/bar + ''; +in { + name = "gitdaemon"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ tilpner ]; + }; + + nodes = { + server = + { config, ... }: { + networking.firewall.allowedTCPPorts = [ config.services.gitDaemon.port ]; + + environment.systemPackages = [ pkgs.git ]; + + services.gitDaemon = { + enable = true; + basePath = "/git"; + }; + }; + + client = + { pkgs, ... }: { + environment.systemPackages = [ pkgs.git ]; + }; + }; + + testScript = '' + start_all() + + with subtest("create project.git"): + server.succeed( + "mkdir /git", + "git init --bare /git/project.git", + "touch /git/project.git/git-daemon-export-ok", + ) + + with subtest("add file to project.git"): + server.succeed( + "git clone /git/project.git /project", + "echo foo > /project/bar", + "git config --global user.email 'you@example.com'", + "git config --global user.name 'Your Name'", + "git -C /project add bar", + "git -C /project commit -m 'quux'", + "git -C /project push", + "rm -r /project", + ) + + with subtest("git daemon starts"): + server.wait_for_unit("git-daemon.service") + + with subtest("client can clone project.git"): + client.succeed( + "git clone git://server/project.git /project", + "sha256sum -c ${hashes}", + ) + ''; +}) diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix index 4796ff9b7c8d..9c35b7305768 100644 --- a/nixos/tests/initrd-network.nix +++ b/nixos/tests/initrd-network.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "initrd-network"; meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ]; @@ -8,15 +8,26 @@ import ./make-test-python.nix ({ pkgs, ...} : { boot.initrd.network.enable = true; boot.initrd.network.postCommands = '' + ip addr show + ip route show ip addr | grep 10.0.2.15 || exit 1 ping -c1 10.0.2.2 || exit 1 ''; + # Check if cleanup was done correctly + boot.initrd.postMountCommands = lib.mkAfter + '' + ip addr show + ip route show + ip addr | grep 10.0.2.15 && exit 1 + ping -c1 10.0.2.2 && exit 1 + ''; }; testScript = '' start_all() machine.wait_for_unit("multi-user.target") - machine.succeed("ip link >&2") + machine.succeed("ip addr show >&2") + machine.succeed("ip route show >&2") ''; }) diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index e6f52db1d984..17c1a569ba0d 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -121,5 +121,5 @@ import ./make-test-python.nix { client.succeed("check-mail-landed >&2") ''; - meta.timeout = 30; + meta.timeout = 1800; } diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 83883477a5cc..bab091d57acf 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -17,6 +17,12 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { networking.useNetworkd = withNetworkd; networking.dhcpcd.enable = !withNetworkd; networking.useDHCP = !withNetworkd; + + # Check if predictable interface names are working in stage-1 + boot.initrd.postDeviceCommands = '' + ip link + ip link show eth0 ${if predictable then "&&" else "||"} exit 1 + ''; }; testScript = '' diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 563f24726477..3d0d00bfbe63 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -287,7 +287,7 @@ let services.nginx = { enable = true; statusPage = true; - virtualHosts."/".extraConfig = "return 204;"; + virtualHosts."test".extraConfig = "return 204;"; }; }; exporterTest = '' diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix index f17e61814c5e..50523920c60b 100644 --- a/nixos/tests/rsyslogd.nix +++ b/nixos/tests/rsyslogd.nix @@ -3,40 +3,38 @@ pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; { test1 = makeTest { name = "rsyslogd-test1"; - meta.maintainers = [ maintainers.aanderse ]; + meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; - machine = - { config, pkgs, ... }: - { services.rsyslogd.enable = true; - services.journald.forwardToSyslog = false; - }; + machine = { config, pkgs, ... }: { + services.rsyslogd.enable = true; + services.journald.forwardToSyslog = false; + }; # ensure rsyslogd isn't receiving messages from journald if explicitly disabled testScript = '' - $machine->waitForUnit("default.target"); - $machine->fail("test -f /var/log/messages"); + machine.wait_for_unit("default.target") + machine.fail("test -f /var/log/messages") ''; }; test2 = makeTest { name = "rsyslogd-test2"; - meta.maintainers = [ maintainers.aanderse ]; + meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ]; - machine = - { config, pkgs, ... }: - { services.rsyslogd.enable = true; - }; + machine = { config, pkgs, ... }: { + services.rsyslogd.enable = true; + }; # ensure rsyslogd is receiving messages from journald testScript = '' - $machine->waitForUnit("default.target"); - $machine->succeed("test -f /var/log/messages"); + machine.wait_for_unit("default.target") + machine.succeed("test -f /var/log/messages") ''; }; } diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix new file mode 100644 index 000000000000..adb3fcd36d7a --- /dev/null +++ b/nixos/tests/service-runner.nix @@ -0,0 +1,36 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "service-runner"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ roberth ]; + }; + + nodes = { + machine = { pkgs, lib, ... }: { + services.nginx.enable = true; + services.nginx.virtualHosts.machine.root = pkgs.runCommand "webroot" {} '' + mkdir $out + echo 'yay' >$out/index.html + ''; + systemd.services.nginx.enable = false; + }; + + }; + + testScript = { nodes, ... }: '' + url = "http://localhost/index.html" + + with subtest("check systemd.services.nginx.runner"): + machine.fail(f"curl {url}") + machine.succeed( + """ + mkdir -p /run/nginx /var/spool/nginx/logs + ${nodes.machine.config.systemd.services.nginx.runner} & + echo $!>my-nginx.pid + """ + ) + machine.wait_for_open_port(80) + machine.succeed(f"curl {url}") + machine.succeed("kill -INT $(cat my-nginx.pid)") + machine.wait_for_closed_port(80) + ''; +}) diff --git a/nixos/tests/systemd-networkd-wireguard.nix b/nixos/tests/systemd-networkd.nix index be5c0da981d2..319e5e94eceb 100644 --- a/nixos/tests/systemd-networkd-wireguard.nix +++ b/nixos/tests/systemd-networkd.nix @@ -41,15 +41,25 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { { routeConfig = { Gateway = "10.0.0.${nodeId}"; Destination = "10.0.0.0/24"; }; } ]; }; - "90-eth1" = { + "30-eth1" = { matchConfig = { Name = "eth1"; }; - address = [ "192.168.1.${nodeId}/24" ]; + address = [ + "192.168.1.${nodeId}/24" + "fe80::${nodeId}/64" + ]; + routingPolicyRules = [ + { routingPolicyRuleConfig = { Table = 10; IncomingInterface = "eth1"; Family = "both"; };} + { routingPolicyRuleConfig = { Table = 20; OutgoingInterface = "eth1"; };} + { routingPolicyRuleConfig = { Table = 30; From = "192.168.1.1"; To = "192.168.1.2"; SourcePort = 666 ; DestinationPort = 667; };} + { routingPolicyRuleConfig = { Table = 40; IPProtocol = "tcp"; InvertRule = true; };} + { routingPolicyRuleConfig = { Table = 50; IncomingInterface = "eth1"; Family = "ipv4"; };} + ]; }; }; }; }; in import ./make-test-python.nix ({pkgs, ... }: { - name = "networkd-wireguard"; + name = "networkd"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ninjatrappeur ]; }; @@ -76,9 +86,28 @@ testScript = '' start_all() node1.wait_for_unit("systemd-networkd-wait-online.service") node2.wait_for_unit("systemd-networkd-wait-online.service") + + # ================================ + # Wireguard + # ================================ node1.succeed("ping -c 5 10.0.0.2") node2.succeed("ping -c 5 10.0.0.1") # Is the fwmark set? node2.succeed("wg | grep -q 42") + + # ================================ + # Routing Policies + # ================================ + # Testing all the routingPolicyRuleConfig members: + # Table + IncomingInterface + node1.succeed("sudo ip rule | grep 'from all iif eth1 lookup 10'") + # OutgoingInterface + node1.succeed("sudo ip rule | grep 'from all oif eth1 lookup 20'") + # From + To + SourcePort + DestinationPort + node1.succeed( + "sudo ip rule | grep 'from 192.168.1.1 to 192.168.1.2 sport 666 dport 667 lookup 30'" + ) + # IPProtocol + InvertRule + node1.succeed("sudo ip rule | grep 'not from all ipproto tcp lookup 40'") ''; }) diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index ebd0a7a44a6c..f82462c39333 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -30,10 +30,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0rm705zrk9rfv31pwbqxrswi5v6vhnghxa8dgxjmcrh00l8dm6j9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "06vgc89d93fhjcyy9d1v6lf8kr34pl5bbpwbv2jpfahpj9y84bgj"; + cargoSha256 = "0qj0vmxa1d6war1vb3zgkf1drvk7awm970fw6692hd9msa9c1kkf"; nativeBuildInputs = [ desktop-file-utils diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index a6ca5b3639da..2df6b9931cfc 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -59,22 +59,15 @@ assert remoteSupport -> curl != null; stdenv.mkDerivation rec { pname = "deadbeef"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; rev = version; - sha256 = "126i5qlkpv7pvi1mmc9y0jhqs6jjspsj7j615n2ddvsb2jsps81c"; + sha256 = "016wwnh5jqdcfxn1ff6in5dz73c3gdhh3fva8inq7sc3vzdz5khj"; }; - patches = [ - # Fix broken symbol name - # https://github.com/NixOS/nixpkgs/pull/59187#issuecomment-480977993 - # will be fixed in deadbeef 1.8.1 - ./fix-wildmidi.patch - ]; - buildInputs = with stdenv.lib; [ jansson ] ++ optional gtk2Support gtk2 ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index da915f3fc3e4..1ce7115ad85b 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "1qrbv4kk5v6ynx424h1i54qj0w8v6vpw81b759jawxvzzprpgq72"; + sha256 = "1z2x33lzpd26dv1p29ca7vy8mjfzkfpin35iq46spwd9k3sqn1ja"; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/lv2/ mkdir -p $out/lib/vst/ cd bin - for bin in DragonflyHallReverb DragonflyRoomReverb; do + for bin in DragonflyEarlyReflections DragonflyPlateReverb DragonflyHallReverb DragonflyRoomReverb; do cp -a $bin $out/bin/ cp -a $bin-vst.so $out/lib/vst/ cp -a $bin.lv2/ $out/lib/lv2/ ; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 99503fc3942b..0420a52d89b8 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "lmms"; - version = "1.2.0-rc7"; + version = "1.2.1"; src = fetchFromGitHub { owner = "LMMS"; repo = "lmms"; rev = "v${version}"; - sha256 = "1hshzf2sbdfw37y9rz1ksgvn81kp2n23dp74lsaasc2n7wzjwdis"; + sha256 = "08k2nfj0rw9mahr7pr90n79wviqmjmflrgcljc6y3x30v84wbp26"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 2d2062696d77..ddb4646ba54d 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -12,6 +12,10 @@ , desktop-file-utils , totem-pl-parser , gobject-introspection +, glib-networking +, gdk-pixbuf +, glib +, pango , wrapGAppsHook , lastFMSupport ? true , youtubeSupport ? true @@ -19,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.2.16"; + version = "1.2.23"; format = "other"; doCheck = false; @@ -28,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0rl4a5npjh5sm3kih11cs2j7ik894nlygllbw4j5pn9n9v66x51w"; + sha256 = "059z7ri5qwkmfh2kvv8rq5wp80mz75423wc5hnm33wb9sgdd5x47"; }; nativeBuildInputs = [ @@ -42,6 +46,9 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = with gst_all_1; [ + gdk-pixbuf + glib + glib-networking gst-libav gst-plugins-bad gst-plugins-base @@ -50,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { gstreamer gtk3 libsoup + pango totem-pl-parser ] ++ lib.optional lastFMSupport libsecret; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 738b876026a8..a7d61598f3e2 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "SunVox"; - version = "1.9.5"; + version = "1.9.5c"; src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "011cyagbqqkvnrxxq196zsvcyn3gksjfsaas02xl8ncjwfj084di"; + sha256 = "19ilif221nw8lvw0fgpjqzawibyvxk16aaylizwygf7c4j40wayi"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9d4fb66f7322..56624498aeac 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "6.2.1"; + version = "7.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-6.2.1.tar"; - sha256 = "0lg2y28qs8ls70d43ikhy5zcwadh5ddfw4k59p7sqb79w0y3lbnq"; + url = "https://elpa.gnu.org/packages/ada-mode-7.0.1.tar"; + sha256 = "0iqninv4wf4ap8axk9m0gi39j3kq4jpbpdc8hczd34xrp83ml46a"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -343,10 +343,10 @@ elpaBuild { pname = "bnf-mode"; ename = "bnf-mode"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bnf-mode-0.4.2.tar"; - sha256 = "04wl563hxgjbhz6hhwvysdfvdni9fm7kahy5wxkyqxi1sy64gn7d"; + url = "https://elpa.gnu.org/packages/bnf-mode-0.4.3.tar"; + sha256 = "1hdhk6kw50vsixprrri0jb5i1c2y94ihifipqgq6kil7y4blr614"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -557,10 +557,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.9.11"; + version = "0.9.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.11.tar"; - sha256 = "05fmkvsn5byaakl8i26nvnmiiz0766r17pni6x7bfrqby39ls233"; + url = "https://elpa.gnu.org/packages/company-0.9.12.tar"; + sha256 = "1vcgfccdc06alba3jl6dg7ms20wdzdhaqikh7id5lbawb00hc10j"; }; packageRequires = [ emacs ]; meta = { @@ -655,10 +655,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.10"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.10.el"; - sha256 = "0q7j2cmj7vs6hz8cnf7j7lmlcjmig3jn2p6az345z96agl8a5xsq"; + url = "https://elpa.gnu.org/packages/csv-mode-1.12.tar"; + sha256 = "0bya12smlrzwv4cbcmch4kg1fazp4k0ndrh1z17ix9p8c14d0v1j"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -730,10 +730,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.21"; + version = "0.22"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.21.tar"; - sha256 = "1xx1wjfpsnwx2fpydqhwy9k1b5kjk8dqbkzf8lqaj9c4rvjbn50a"; + url = "https://elpa.gnu.org/packages/debbugs-0.22.tar"; + sha256 = "05ik9qv539b5c1nzxkk3lk23bqj4vqgmfmd8x367abhb7c9gix2z"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -925,10 +925,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.12"; + version = "0.6.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.12.tar"; - sha256 = "1nmg2xxhfv53h13kb19xd4x5a7q9ln2rwzxc5v8zkf0g3vaxmhxw"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.13.tar"; + sha256 = "1nxbp7w4xxij07q8manc15b896sl10yh2h1cg88prdqbw1wk62qr"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -985,10 +985,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20191105"; + version = "20200224"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20191105.tar"; - sha256 = "0w53wq8nhl4c5czda5imcv7y97pgbpfmvcvpi6kdwl3jbn9cx396"; + url = "https://elpa.gnu.org/packages/eev-20200224.tar"; + sha256 = "1r1wh001ikg34axihffrhzl0n8r0w42s2hac2jys8sil1hqvx306"; }; packageRequires = [ emacs ]; meta = { @@ -1070,10 +1070,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.1.tar"; - sha256 = "1blx3wsnz94va67437rmqa4i90gm9ig69bbmg9lp6jqyxrm9d7gc"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.2.tar"; + sha256 = "0grm4qw3aaf3hzrfg0vdgb5q67haappbc77qjgsy4jip85z7njmj"; }; packageRequires = []; meta = { @@ -1153,6 +1153,21 @@ license = lib.licenses.free; }; }) {}; + expand-region = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "expand-region"; + ename = "expand-region"; + version = "0.11.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/expand-region-0.11.0.tar"; + sha256 = "1q6xaqkv40z4c6rgdkxqqkvxgsaj8yjqjrxi40kz5y0ck3bjrk0i"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/expand-region.html"; + license = lib.licenses.free; + }; + }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; @@ -1352,10 +1367,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.4.tar"; - sha256 = "1zm4c48x9vjqyn1h60lphhnzzg005wcad5mzn0majk0h59qcr0ff"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.5.tar"; + sha256 = "1har3j8gb65mawrwn93939jg157wbap138qa1z1myznrrish6vzc"; }; packageRequires = [ cl-lib ]; meta = { @@ -1846,10 +1861,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "2.0"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/map-2.0.el"; - sha256 = "1djygpvk1qgldg9my0lh8n2z1n6acz3y5ws7sv2w08hvxdlxz857"; + url = "https://elpa.gnu.org/packages/map-2.1.el"; + sha256 = "0ydz5w1n4vwhhzxxj003s7jv8n1wjijwfryk5z93bwhnr0cak0i0"; }; packageRequires = [ emacs ]; meta = { @@ -2095,10 +2110,10 @@ elpaBuild { pname = "nhexl-mode"; ename = "nhexl-mode"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-1.4.el"; - sha256 = "1c2q4w6hkvc7z4026hiqdcsm2scd6q35x7b0dk80h8qicsbi14c8"; + url = "https://elpa.gnu.org/packages/nhexl-mode-1.5.el"; + sha256 = "0qvxfg7sv4iqyjxzaim6b4v9k5hav36qd4vkf9jwzw6p5fri8w8d"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2245,10 +2260,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.3.1"; + version = "9.3.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.3.1.tar"; - sha256 = "1n79h6ihhsaxxbnl9hw511aav0215m3pa51sa5fh3ddknjfplian"; + url = "https://elpa.gnu.org/packages/org-9.3.6.tar"; + sha256 = "0jwpgfzjvf1hd3mx582pw86hysdryaqzp69hk6azi9kmq4bzk87d"; }; packageRequires = []; meta = { @@ -2260,10 +2275,10 @@ elpaBuild { pname = "org-edna"; ename = "org-edna"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-edna-1.0.2.tar"; - sha256 = "005pmnqr41s2w72gahq9bf4l5kw601i19ypiqfnb8aq0f4acjr3d"; + url = "https://elpa.gnu.org/packages/org-edna-1.1.1.tar"; + sha256 = "1hfkdjbjnhbwb27vgs43ywl4kn2lqc037f4xppp2v0s97850za8r"; }; packageRequires = [ emacs org seq ]; meta = { @@ -2410,10 +2425,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.27"; + version = "0.3.38"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.27.tar"; - sha256 = "1p6s5dq0d1ysm993qax8mi2sv4956ggainfbhsn65gc2718kjd0h"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.38.tar"; + sha256 = "1m8f1z259c66k0hf0cfjqidfd0cra2c2mb7k5lj71v1kfckwj6bh"; }; packageRequires = [ emacs ]; meta = { @@ -2455,10 +2470,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.5.0.el"; - sha256 = "1fjnpwg1fj9j54nymh802vd4viggrg3qnqwh52281n7zv6xfv0qb"; + url = "https://elpa.gnu.org/packages/posframe-0.6.0.el"; + sha256 = "14x2jgjn8di03rrad4x4mn8fhcqibk1j5c0ya0vmv8648fki6i9d"; }; packageRequires = [ emacs ]; meta = { @@ -2746,16 +2761,16 @@ license = lib.licenses.free; }; }) {}; - relint = callPackage ({ elpaBuild, fetchurl, lib, xr }: + relint = callPackage ({ elpaBuild, emacs, fetchurl, lib, xr }: elpaBuild { pname = "relint"; ename = "relint"; - version = "1.11"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.11.tar"; - sha256 = "0c7d35kp5k11fnyjrq9cg8i2r005gs57pmb3rvpf8ilwv0scn1m7"; + url = "https://elpa.gnu.org/packages/relint-1.14.tar"; + sha256 = "0hjzhxcygb2r2s3g2pk3z9x3appy1y8gkw8gpg9cpkl6lpwcsh2f"; }; - packageRequires = [ xr ]; + packageRequires = [ emacs xr ]; meta = { homepage = "https://elpa.gnu.org/packages/relint.html"; license = lib.licenses.free; @@ -2936,10 +2951,10 @@ elpaBuild { pname = "sml-mode"; ename = "sml-mode"; - version = "6.9"; + version = "6.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sml-mode-6.9.el"; - sha256 = "1bdg9ywpvj85hxqah9w1raxlcrhkyx67nw22jwd1bd5j0fhmgqij"; + url = "https://elpa.gnu.org/packages/sml-mode-6.10.el"; + sha256 = "01yf0s474r9xhj6nbs14ljn9ccxb5yy758i17c8nmgmqvm8fx7sb"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3041,10 +3056,10 @@ elpaBuild { pname = "stream"; ename = "stream"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/stream-2.2.4.tar"; - sha256 = "1fdjjxfnpzfv5jsy0wmmnrsk821bg8d3magsng609fb2pkwvk1ij"; + url = "https://elpa.gnu.org/packages/stream-2.2.5.tar"; + sha256 = "00c3n4gyxzv7vczqms0d62kl8zsmjfyxa92mwxn2snyx857a9jfw"; }; packageRequires = [ emacs ]; meta = { @@ -3176,10 +3191,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.3"; + version = "2.4.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.3.tar"; - sha256 = "0m1w4myvd2z293xcdyj7yc75b108f67f98i0jrizhdaj9nlw8j5f"; + url = "https://elpa.gnu.org/packages/tramp-2.4.3.2.tar"; + sha256 = "17kay6rpkgz79jggzj53awkbqfsp5sq93wpssw5vlwnigd4mrkzx"; }; packageRequires = [ emacs ]; meta = { @@ -3236,10 +3251,10 @@ elpaBuild { pname = "undo-tree"; ename = "undo-tree"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/undo-tree-0.7.2.el"; - sha256 = "0gdqh5rkgwlancbjx5whgl5gqkdipdkspkl2bqmrq70sgg5ahrcc"; + url = "https://elpa.gnu.org/packages/undo-tree-0.7.4.el"; + sha256 = "018ixl802f076sfyf4gkacpgrdpybin88jd8vq9zgyvc6x2dalfa"; }; packageRequires = []; meta = { @@ -3352,10 +3367,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2019.12.17.268053413"; + version = "2020.2.23.232634261"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2019.12.17.268053413.el"; - sha256 = "0g42sd5s5xrck077qx0p2sldnr2f9qm8dsr9d0fiaks294sk8li8"; + url = "https://elpa.gnu.org/packages/verilog-mode-2020.2.23.232634261.el"; + sha256 = "07r2nzyfwmpv1299q1v768ai14rdgq7y4bvz5xsnp4qj3g06p0f6"; }; packageRequires = []; meta = { @@ -3565,10 +3580,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "2.2.1"; + version = "3.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-2.2.1.tar"; - sha256 = "1qvhx8bpms7gri7y6wniwqd6nmqxj4lip5l3sphbq2kjf4zq4qd4"; + url = "https://elpa.gnu.org/packages/wisi-3.0.1.tar"; + sha256 = "01961apbirdi4y8qx2wb01f04knkw3hyin3ndrkjlkfslqbsnzzv"; }; packageRequires = [ emacs seq ]; meta = { @@ -3615,10 +3630,10 @@ elpaBuild { pname = "xclip"; ename = "xclip"; - version = "1.9"; + version = "1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.9.el"; - sha256 = "0xbs6fw0dfm5iynhdx62cwixzizjkrwrib6n0fjnsj31kajbkf3y"; + url = "https://elpa.gnu.org/packages/xclip-1.10.el"; + sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i"; }; packageRequires = []; meta = { @@ -3656,16 +3671,16 @@ license = lib.licenses.free; }; }) {}; - xr = callPackage ({ elpaBuild, fetchurl, lib }: + xr = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xr"; ename = "xr"; - version = "1.13"; + version = "1.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.13.tar"; - sha256 = "1km4x92pii8c4bcimks4xzhmwpypdf183z0zh7raj062jz4jb74r"; + url = "https://elpa.gnu.org/packages/xr-1.16.tar"; + sha256 = "1s6pkbr7gkan0r9gfmix75m587d8cg6l11722v70zzgf2z9w2xg9"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/xr.html"; license = lib.licenses.free; @@ -3734,4 +3749,4 @@ license = lib.licenses.free; }; }) {}; - } + } \ No newline at end of file diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 66d5f65953bc..338766b4ebe4 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,20 +31,20 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20190902, - 929 + 20200222, + 948 ], - "commit": "87efcc058f40e8a38a613cb479a2affba9f0ebe5", - "sha256": "0cdh64z1mass9fl05n9xn1q82ka38iar27g5dsidkfhlg6wqxmlk" + "commit": "265b7d65e1bc54d84435e9d79379bc808e9a488b", + "sha256": "1nk2kqv7blahfiihz5vdvsb1j5bji1w5w9zz3lwzrv8i7pdbh34w" }, "stable": { "version": [ 0, - 1, + 2, 1 ], - "commit": "129585c4096e78f46b741c7729915f666bfee501", - "sha256": "0jplfnp4cn5vgj99g0ks0g9k2ij8yz1h24c6ghbz0hxd5bh5g889" + "commit": "ae55ae0397ff3cf28a3ea52111bfc053dffb126d", + "sha256": "179snc2z047afw2h5jqbwdc64vxdngjmg4zca46wap114c4alrm1" } }, { @@ -82,21 +82,20 @@ }, { "ename": "4clojure", - "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", - "sha256": "09bmdxkkp676sn1sbbly44k99i47w83yznq950nkxv6x8753ifgk", + "commit": "3fea8d290fe4d71b954ad6b68a8d182e40ee1e13", + "sha256": "1cqab8kh4varf5hasvhkia39fa8qmmqycica7mbcvp33n8w3941j", "fetcher": "github", - "repo": "losingkeys/4clojure.el", + "repo": "emacsorphanage/4clojure", "unstable": { "version": [ - 20131014, - 2207 + 20200123, + 2008 ], "deps": [ - "json", "request" ], - "commit": "3cdfd356c24cd3518397d29ae833f56a4d20b4ca", - "sha256": "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq" + "commit": "557eecb5da50fedd92840021c8b08d87dfdc782b", + "sha256": "19x653lzc1dxil4ix257hciidbdmbhaxhs6qhlkwi9ygjrlrgvnk" } }, { @@ -234,16 +233,16 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20191204, - 1751 + 20200220, + 1701 ], "deps": [ "erlang", "flymake", "maude-mode" ], - "commit": "30479e8341679711dc960b26d01d5908f8a05bb4", - "sha256": "1dbrz1wxwqjg25pzjhgfs9mnii8mna2ydqvrz6xahvqsvfplmlrf" + "commit": "2db38537e9c481c38477997467bc98ee00607d7a", + "sha256": "006l73nacbr45y81ypj3x91nd1pnqppvgrlc6wmysma14lndazqx" }, "stable": { "version": [ @@ -1065,20 +1064,20 @@ "auto-complete", "rtags" ], - "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", - "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" + "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", + "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" }, "stable": { "version": [ 2, - 37 + 38 ], "deps": [ "auto-complete", "rtags" ], - "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", - "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" + "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", + "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" } }, { @@ -1213,11 +1212,11 @@ "repo": "tam17aki/ace-isearch", "unstable": { "version": [ - 20190630, - 1552 + 20200205, + 1105 ], - "commit": "e296077a5f74782a2d103b08551e0d673217393f", - "sha256": "05cd35rnglz5a1z03s7iqa4sbar1b35mwrx821y7pg7mxl5xbb14" + "commit": "cb6d7306cb5d2d4d36cb3803c0eaf779d88c2666", + "sha256": "1lrgjz7a4s50shc74kx6k958i1ayv5pfncsrjb3n87bvrx9wq6g3" }, "stable": { "version": [ @@ -1361,14 +1360,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20191219, - 1209 + 20200210, + 2031 ], "deps": [ "avy" ], - "commit": "1ae238e1a00c65e47cdd1bc1bd88015332b2b615", - "sha256": "0izdfx834dsgnxdh3gx6f38rmxg1dwwwjknl64f6il0b3dxbnbx9" + "commit": "9b22793789263b2e2fc06ca8b6073bb01211df9b", + "sha256": "0ik2v881rnik58zvxczjg847fvc9vf493h85rv8q72hb7zi9p0gy" }, "stable": { "version": [ @@ -1450,8 +1449,8 @@ "deps": [ "avy-menu" ], - "commit": "708e160747870657ea46815e3913f2c4805737e1", - "sha256": "186464acrg1k80s4mnmi2dj9fjn03a6knb9hzm85prk65wigy2cs" + "commit": "02b22bdb40a5828dbd0a2af290034adb761743f0", + "sha256": "12b6s99d0wzs4q827kn5zr56vrp3x1kf2pxp4cr8z5hikylfswcs" }, "stable": { "version": [ @@ -1474,14 +1473,14 @@ "repo": "abo-abo/ace-window", "unstable": { "version": [ - 20191022, - 1203 + 20200201, + 1753 ], "deps": [ "avy" ], - "commit": "edbbb1b77c3fb939e4d9057443bc1897321d0095", - "sha256": "1n8w6svks0pmslzg5zz1sny4hfnvych06cwzs3bvbmnfm4x6maqh" + "commit": "a36c1472d0ee59c2c1e6fb3ad66304141b154ef5", + "sha256": "1mkf1zi8z435jfpdi239gbn8243lwwsf1mgr6qq60pxbxxw9g13d" }, "stable": { "version": [ @@ -1564,8 +1563,8 @@ "repo": "pauldub/activity-watch-mode", "unstable": { "version": [ - 20190916, - 1212 + 20200130, + 805 ], "deps": [ "cl-lib", @@ -1573,14 +1572,14 @@ "projectile", "request" ], - "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff", - "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm" + "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b", + "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "cl-lib", @@ -1588,8 +1587,8 @@ "projectile", "request" ], - "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff", - "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm" + "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b", + "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx" } }, { @@ -1600,14 +1599,14 @@ "repo": "gonewest818/adafruit-wisdom.el", "unstable": { "version": [ - 20191217, - 511 + 20200217, + 306 ], "deps": [ "request" ], - "commit": "656e360c8121e8c2f5f11b32671a416e1c8e52f4", - "sha256": "09dry0i92m1hhh1xrm1bb28d8plr1ard6wgl90a3d8hnbdl5p0fg" + "commit": "86bb7249bd4b0c8ebaf749f69f00c8faeff11063", + "sha256": "062m653pyzddwjf75a6clsdkihfg35b3phbbff6vdyymg77608f2" }, "stable": { "version": [ @@ -2273,14 +2272,14 @@ "repo": "jtbm37/all-the-icons-dired", "unstable": { "version": [ - 20170418, - 2131 + 20200229, + 2225 ], "deps": [ "all-the-icons" ], - "commit": "980b7747d6c4a7992a1ec56afad908956db0a519", - "sha256": "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy" + "commit": "9d535651412a20105ba58c0fceb3a807891c3606", + "sha256": "1w6rj619rx13jrhd5nvgm5j7ipazngm0sk66ll9c62lja43lmkwh" } }, { @@ -2303,6 +2302,36 @@ } }, { + "ename": "all-the-icons-ibuffer", + "commit": "3b3899fbae1e54e4385e1edfc8cc88d5ff0080d1", + "sha256": "08p4jj932x6xrq8ylx1hl9a3i2x8mm6l1jxi21akgjszf4s41mix", + "fetcher": "github", + "repo": "seagle0128/all-the-icons-ibuffer", + "unstable": { + "version": [ + 20200301, + 654 + ], + "deps": [ + "all-the-icons" + ], + "commit": "04578528f609ee837854f329cbf64ddd40f7a2ae", + "sha256": "0m5y18z2w3c0paq07papj1dc3m7cxhrrjyfav4gbbi5cpmh5sxnp" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "all-the-icons" + ], + "commit": "07a55895ded043fa317c61c3a7013736345e7a38", + "sha256": "14c5rbl48hfdnj186p9g9csf5xrzid2jv90x3n4p8r5nigy5j74m" + } + }, + { "ename": "all-the-icons-ivy", "commit": "9496e6bb6f03f35444fb204860bc50e5e1b36214", "sha256": "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2", @@ -2317,8 +2346,8 @@ "all-the-icons", "ivy" ], - "commit": "babea626db20773de4c408acb2788e2b9c8277e3", - "sha256": "03fssygwia1gv35y6mzifnkg5cb4klaq240jfqmyfji9jq95jzrd" + "commit": "a70cbfa1effe36efc946a823a580cec686d5e88d", + "sha256": "17h7gscrvdi9rygagwzcqzbw6dbfvwmv7jbi8pjkj1c06p3kbq8i" }, "stable": { "version": [ @@ -2335,6 +2364,38 @@ } }, { + "ename": "all-the-icons-ivy-rich", + "commit": "66c873f1b542404d8982385ff7f6defe5b68f0ff", + "sha256": "16q294s61310aisqkhznzml2g05x24grzm93ga1wnyksn20wm9l2", + "fetcher": "github", + "repo": "seagle0128/all-the-icons-ivy-rich", + "unstable": { + "version": [ + 20200301, + 656 + ], + "deps": [ + "all-the-icons", + "ivy-rich" + ], + "commit": "b3dda7af490e606b85e1e0cd9806988ce301dac5", + "sha256": "0bj0m7gbjkgwyh87zhsx2vhbw6g6ncjc1r63ai726scz10h5y0a4" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "all-the-icons", + "ivy-rich" + ], + "commit": "7344a94182cca55d33f3c04e0d9c9e9e91db0637", + "sha256": "03pmfx528dhywas4j40h95r1v3dprn9n3ydhk13jsclmjy471cz9" + } + }, + { "ename": "almost-mono-themes", "commit": "71ca87a0dd28f911dd988e1c208896b1ec5bfcc7", "sha256": "1lv7c63lii8463mmsmxnldkwark2c6n46j9zvf990dhacwl4q1mg", @@ -2342,11 +2403,11 @@ "repo": "cryon/almost-mono-themes", "unstable": { "version": [ - 20190527, - 654 + 20200211, + 2126 ], - "commit": "c3a85c1a665530a5d830665969725cdba8eceb75", - "sha256": "034k32xkr5ma415hlkbl35z0jxc4sa1inf87hg3y6lrlfl83fyjh" + "commit": "2f5935a1a9d042751c7135cac79875886edb2556", + "sha256": "1q1ry37rcpzwwl2bwf3j8nmhap7v72fg0hdzxlls89gm3jl3nb97" } }, { @@ -2534,25 +2595,25 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20200101, - 1701 + 20200215, + 1901 ], "deps": [ "s" ], - "commit": "3af93ca066aa42dd1342f1ee0ab0d02360075613", - "sha256": "1jm5zr4xlz2ik80kmjsvlka8kzxxp6k9g5ymxhc1k726kw808lf8" + "commit": "e512e74e8368f9b1cf83bee16dd2522f3b1dbeea", + "sha256": "08vx7rd36j4ls7a7i2vn7mf74vbzcyrzzv0wzqzyb8ihv4qhjc0g" }, "stable": { "version": [ 3, - 2 + 3 ], "deps": [ "s" ], - "commit": "260e7c013690d412ec8d965c282572505596636d", - "sha256": "0bb8y1dmzyqkrb4mg6zndcsxppby3glridv2aap2pv05gv8kx7mj" + "commit": "394734e42aa8c43940df358e77a69248b42f2a9c", + "sha256": "0ikjzs119g57cwh2v3jmy63lggqc0ib99q5gsl93slkk4y2ihavw" } }, { @@ -2563,8 +2624,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20191204, - 111 + 20200129, + 1718 ], "deps": [ "dash", @@ -2572,8 +2633,8 @@ "pythonic", "s" ], - "commit": "1bc301b2d2bc336988f4a16a891c275a90136ca5", - "sha256": "18albgjh7bcsyw7004pagldz510zwjswlyp9lk2lwqnrrw2wryr5" + "commit": "10299bd9ff38c4f0da1d892905d02ef828e7fdce", + "sha256": "0s5pxfjcsmyrqc5pa2lqx6mxzwy3g8mc3iaxbj313sn1nly26vjw" }, "stable": { "version": [ @@ -2851,11 +2912,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20191221, - 959 + 20200219, + 1558 ], - "commit": "d10b9158573017a02194a6d594387bfa88f03edf", - "sha256": "0sv1flx7s03avirgmq91alg35yyc25l57vfvniyi4raa4ldnp6vp" + "commit": "818f66f4a3d6a33ae90c4e5de12f8dce770e7875", + "sha256": "017yzg3jqf0x7zn7xhdgbr6m97zzcjv6icj5zl5q4zj0ksm9l82q" }, "stable": { "version": [ @@ -3004,14 +3065,14 @@ "repo": "zellio/ansible-vault-mode", "unstable": { "version": [ - 20191123, - 1919 + 20200130, + 2300 ], "deps": [ "seq" ], - "commit": "fb56eb5e85fb5621ecd94b28d069504add010ea9", - "sha256": "0qjjzmnx4pczv6jkafmji2kn2a0rqsxcm8g5jp8lq2cc6dx86ad4" + "commit": "5653e82a2706cc7e9f46d24c6319b00ba6eb7528", + "sha256": "02p970jh7vl2bx8arm04mk313rqgh2s48rm0mn8zbiam8s71m2bm" }, "stable": { "version": [ @@ -3277,10 +3338,10 @@ }, { "ename": "applescript-mode", - "commit": "576e42b33a5245e1aae0f0d879fd18762342db32", - "sha256": "0rj03xw8yx79xj9ahdwfxicxna0a0lykn2n39xng5gnm4bh2n6z4", + "commit": "3fea8d290fe4d71b954ad6b68a8d182e40ee1e13", + "sha256": "1ihf4b2r14ikjkqpibqv1ipjgdq7q1pkhw7rs3ph1gzg5j552waf", "fetcher": "github", - "repo": "ieure/applescript-mode", + "repo": "emacsorphanage/applescript-mode", "unstable": { "version": [ 20090321, @@ -3595,25 +3656,25 @@ "repo": "phillord/assess", "unstable": { "version": [ - 20190102, - 1011 + 20200211, + 1817 ], "deps": [ "m-buffer" ], - "commit": "0781fd79c4040dbceed42dc79edab4ec661c2593", - "sha256": "15ismdk8fl6xjgkjh9nkn8kgg7rpy2ra7924r1iddlfs2q8l8p4w" + "commit": "5bac045b273623772b6a2d820997d50f7ab4e466", + "sha256": "0mq59wz9anvywazl7d01fis1z7z7fsp9c7pymrc8rgmz77xpwnqx" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "m-buffer" ], - "commit": "0781fd79c4040dbceed42dc79edab4ec661c2593", - "sha256": "15ismdk8fl6xjgkjh9nkn8kgg7rpy2ra7924r1iddlfs2q8l8p4w" + "commit": "5bac045b273623772b6a2d820997d50f7ab4e466", + "sha256": "0mq59wz9anvywazl7d01fis1z7z7fsp9c7pymrc8rgmz77xpwnqx" } }, { @@ -3639,11 +3700,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20191226, - 1227 + 20200113, + 1745 ], - "commit": "036b475a29bbbee52f88c7d0332341c2643155fb", - "sha256": "01jpgxzfkj4zqnjh167598qk2pp59vpkd2gmgal27gwm4g3y2q11" + "commit": "86aef2c38e7d35e8509b7feeee3e989d825eba91", + "sha256": "1slxlpxjggyg5q8xppn9csh54j93b2hc4v8lcn85ymw2hp3rsib9" }, "stable": { "version": [ @@ -3663,14 +3724,27 @@ "repo": "chuntaro/emacs-async-await", "unstable": { "version": [ - 20191108, - 539 + 20200117, + 828 ], "deps": [ + "iter2", "promise" ], - "commit": "2a2351d52af8f0141a1849bc36292f068196aa63", - "sha256": "15g862hpjdwja9ii30vps1vk6nxr8allmj890yrfycvalvhrkfm5" + "commit": "deef2bb343463f5196545f1dd8c2a32d0cb3b146", + "sha256": "0aav9qdswnw7ynqlzn0sm34as5fj2d85syxgg8zjabzp6646ay29" + }, + "stable": { + "version": [ + 1, + 1 + ], + "deps": [ + "iter2", + "promise" + ], + "commit": "deef2bb343463f5196545f1dd8c2a32d0cb3b146", + "sha256": "0aav9qdswnw7ynqlzn0sm34as5fj2d85syxgg8zjabzp6646ay29" } }, { @@ -3681,15 +3755,15 @@ "repo": "sei40kr/emacs-atcoder-tools", "unstable": { "version": [ - 20200104, - 624 + 20200109, + 1236 ], "deps": [ "f", "s" ], - "commit": "4c805a03a9b0ee331dfa409472e38b4085a1628e", - "sha256": "0fcamxvz8wvy9b8f03y7hllv88xc25v9dhdjmw58x400pycra19x" + "commit": "cfe61ed18ea9b3b1bfb6f9e7d80a47599680cd1f", + "sha256": "04v775vsy01h7wv2p4nc26d0p9ss8106v4whqfgd0c1rrkh5012p" }, "stable": { "version": [ @@ -3784,8 +3858,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20191119, - 1515 + 20200114, + 1928 ], "deps": [ "dash", @@ -3793,13 +3867,13 @@ "flycheck", "s" ], - "commit": "12e234aeb16e190435133b29e93c69c67ec1ee6b", - "sha256": "04gnqhg1bq02vk6s2p7v2vh4djl5m6bf3jfxhx6q3i9hmayk2ya2" + "commit": "4cf3e4a16255997e7c3c39682a72866a0a37dd4b", + "sha256": "0wqc7bqx9rvk8r7fd3x84h8p01v97s6w2jf29nnjb59xakwp22i7" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "dash", @@ -3807,8 +3881,8 @@ "flycheck", "s" ], - "commit": "a971acb251e343d4c6b0253f69dcce0c2cee0fac", - "sha256": "0p93y151730ga7v9xa5gkp306s32qw53086i829fcbxf83c2wslv" + "commit": "4cf3e4a16255997e7c3c39682a72866a0a37dd4b", + "sha256": "0wqc7bqx9rvk8r7fd3x84h8p01v97s6w2jf29nnjb59xakwp22i7" } }, { @@ -4565,14 +4639,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20190821, - 209 + 20200122, + 857 ], "deps": [ "f" ], - "commit": "b589d7c8653204fe07b3355a51d5b622ac6a647a", - "sha256": "10ini7q91gbkvmk6j7fcybgdv5jrhfpk6dfwyl2vcb1nlkxfbnzc" + "commit": "bfad607be640bed3a107e36c91b091e136c1c9ec", + "sha256": "0nwnmqhfy4378p43a12bc32y4qqw349xjkrdh6x7fkdsd4wpf7f4" } }, { @@ -4665,6 +4739,24 @@ } }, { + "ename": "autobuild", + "commit": "c738dea2608e68ec0758cb9d5fde1af472f49f1e", + "sha256": "0k5s86xcva3v0zg3dcpkrrcvxxk93gfp7nb80dvac8dyk1qx99bd", + "fetcher": "github", + "repo": "erjoalgo/autobuild", + "unstable": { + "version": [ + 20200209, + 2005 + ], + "deps": [ + "cl-lib" + ], + "commit": "b5ac7436be372dffc97280f4b835f61ab6b716d5", + "sha256": "138kzn20gfy6dj15nkfwsz7lz91n6ffsjzz2kkmclnfkazxixjhq" + } + }, + { "ename": "autodisass-java-bytecode", "commit": "a094845521d76754a29435012af5fba9f7975a8e", "sha256": "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc", @@ -4766,8 +4858,8 @@ 20190331, 2230 ], - "commit": "ce213afc026590871ca7d514e563720ef967c938", - "sha256": "0wq4c4dzpkrppic65ma7gfzr9mxsln87csmb1laz3b2g4b19cy6k" + "commit": "052881b101d8c2d11c89ae4f1befe7a999de987e", + "sha256": "0k9sjjsqxnrh0cq6m3cd9rk44n0rjbjgqcbfv6fg33a0gpybvryf" } }, { @@ -4929,8 +5021,8 @@ "deps": [ "avy" ], - "commit": "e1d0097edbfc7c1b056323732e341482551ca660", - "sha256": "0kc98ksm7cfpsf21b3hb2xfkiq0y1hnk1i8900gch7gws2q2fml8" + "commit": "aee6878a8c2f18c3ac3bd34d608783b52cd708e0", + "sha256": "1526a6cqaa16x5gi2fsdi9brqa54n3m0dvrnkd85w6sgaz33cpiz" }, "stable": { "version": [ @@ -5067,11 +5159,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20191027, - 1928 + 20200109, + 2207 ], - "commit": "3e7885d694efef923e7b53827d277c28bfa09320", - "sha256": "048x8mj72c57f62ffsad43mcrc201d8ilh339gnpm2yi8midv0ih" + "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", + "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" } }, { @@ -5364,11 +5456,11 @@ "repo": "fkie-cad/bap-mode", "unstable": { "version": [ - 20190401, - 1546 + 20200128, + 1354 ], - "commit": "9f493b4ec852ec126c80afefa784f8a8d020e309", - "sha256": "0q4grzhrg52i2a3hq9dgsp9i38wi7jcsr09a6k4sxszrf90n030d" + "commit": "8969679f60db0aa918d35f40d959c0a9c723b111", + "sha256": "1i5yhqig104j33cyhkhil4d1wfvnldkvrk2wgxbm4p01xw1rs6cq" } }, { @@ -5523,8 +5615,8 @@ "repo": "AlonTzarafi/battle-haxe", "unstable": { "version": [ - 20190729, - 1219 + 20200222, + 56 ], "deps": [ "async", @@ -5536,8 +5628,8 @@ "helm", "s" ], - "commit": "8c6760969fdc2de0598e22b48c7f14202e08519f", - "sha256": "0vrbayhrsb5rvlbrh7wkbgzzx9iwf0cqh04k330diibh9jcn76f4" + "commit": "64d20c9ea3fd503fdefafda122e7095c192e72a3", + "sha256": "15ykwqg100vjl014awwwzmch84vwqyrlm46c22w9x3dgqk8yxyi2" } }, { @@ -5847,11 +5939,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20191030, - 839 + 20200203, + 1035 ], - "commit": "d2a0a7ba6f8f8eb400c0ee309307602922573630", - "sha256": "1dqdd4hgiyldsggzkrs719xplihnaq1q5n91k7v4bs7szbdbgccn" + "commit": "3ab68d77839060f5e85bbf9455846b68cc63ef00", + "sha256": "049r18sa4646rhp2cidpdnk09c87xxf52d6mffq82xphzsniqarz" }, "stable": { "version": [ @@ -5995,11 +6087,11 @@ "repo": "technomancy/better-defaults", "unstable": { "version": [ - 20200101, - 2257 + 20200209, + 1717 ], - "commit": "e051c5278f71af8414f8c6101695197dd4365cca", - "sha256": "0m4cc9qwwm14drdars5a5hbiv5fapd245n3iry9x5ar76rb20hcb" + "commit": "fc9a03138c959f0d24301c6401f800eb6e7d3af9", + "sha256": "1hi1xxc99z0pkbj8w63fx3qsy4sq5b3gdc2ccyk0gnbzw2sfc93j" }, "stable": { "version": [ @@ -6356,8 +6448,8 @@ "bind-key", "key-chord" ], - "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", - "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" + "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", + "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" }, "stable": { "version": [ @@ -6383,8 +6475,8 @@ 20191110, 416 ], - "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", - "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" + "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", + "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" }, "stable": { "version": [ @@ -6427,11 +6519,11 @@ "repo": "cute-jumper/bing-dict.el", "unstable": { "version": [ - 20190723, - 122 + 20200216, + 110 ], - "commit": "52718ae3a3abfa5e5457239ee7ddf8f0c23a79a7", - "sha256": "1kn8kmljn0pj0hz7dj7r7nxw43xd6acndaqq92d02mla12hiqayz" + "commit": "1d581aaa9622b34f8fb83af5579fa252aa24cfef", + "sha256": "1v0ncgnj9vv2r0qbwiipg63rlhnfjz8q23jx3la2l22l0i2lyivb" }, "stable": { "version": [ @@ -6475,11 +6567,11 @@ "repo": "Wilfred/bison-mode", "unstable": { "version": [ - 20160617, - 552 + 20200226, + 47 ], - "commit": "314af3b7af7eb897fd3932616cb8600a85228cea", - "sha256": "0ymjgwyi73vl81i7v1g2ad09lxp4mhp47r6zcijqa5hbx9l1skik" + "commit": "675df47193accaf30ca44e142523b2b3bb122979", + "sha256": "08yg51pzpry5gy29fdbrrb7s5j5c5fxsrhgy0ncp0vl082fs1bv9" } }, { @@ -6624,8 +6716,8 @@ "deps": [ "eimp" ], - "commit": "a4c538c52f2371f4a184e4c905584c6decf7b407", - "sha256": "1vzpigvkzcglanardsy0pi8ficsdxrfgwnh1jyx12pnxzqyb879m" + "commit": "39562f02acc1113595cb253a85bb3b9da743ddd2", + "sha256": "0wzdln3rqqvckkc63q5sb83kimnyk6hrc4slbxhwapdfk53gz0j9" } }, { @@ -6768,26 +6860,26 @@ "repo": "sergeyklay/bnf-mode", "unstable": { "version": [ - 20190611, - 519 + 20200122, + 2155 ], "deps": [ "cl-lib" ], - "commit": "eb1a2edb2d798e9fb84fcefb7b646f1c5edc18e9", - "sha256": "0s7rq0mhc2kxczs3v2k71zq9imndxw8b4aw1m8zzgbbnq9qn0q3f" + "commit": "11b19fa77ab0a6bb2208c776ccd17887a0325b8c", + "sha256": "10sb8ixfhxnan2cs6xhpy21lniv8yqp5xy0q9dla3z8897clrnw7" }, "stable": { "version": [ 0, 4, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "2f217ecf76fa775da4b28de7dd2b615460d9f8ad", - "sha256": "17nhy9mwaji230d3dhi3d40wibqviapa5h60mlm20mc5b2vb0vyd" + "commit": "fecc2a8fc9cfff9d75da8809c24ef56ca4985dde", + "sha256": "04wj1s483khi2qvnbjcyfihip150qjmizc8qnjsqg60nwcxjh5j5" } }, { @@ -6956,16 +7048,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20191128, - 820 + 20200212, + 1535 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "ed8bc8bbc4ea13f68bd2aec6a59c4765b49fc610", - "sha256": "0rzv687yfv756pvvdjpjh0zgvqgqgg1hjl9h1lls1mc5vndny1rz" + "commit": "19bc70fa6f9e5c001f8ac714ce90af14788f35dd", + "sha256": "0ippdjd4j8y1xx438pvxiw0h0my6zdmvnbpay3fckrssirhi1m6l" }, "stable": { "version": [ @@ -6989,16 +7081,16 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20191205, - 2240 + 20200223, + 1448 ], "deps": [ "dash", "epkg", "magit" ], - "commit": "7efd982e8e84b5761acbed9db98ec21eefca5048", - "sha256": "19ivl467n19ny4138vhzgzdbrsycclxmy34cck5z50nh42is3865" + "commit": "3cfb35f5c54a76f200272ed11b4a39f11a57552c", + "sha256": "1y4c7bdy4vzv630d3yxhgq3v29q5f071d30kig4wwv460nai7c4c" }, "stable": { "version": [ @@ -7199,16 +7291,16 @@ "repo": "rmuslimov/browse-at-remote", "unstable": { "version": [ - 20190213, - 1929 + 20200127, + 145 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "1a9392e9d1fad4e1aafb25b68b4e6857fde8f564", - "sha256": "1shpkzyg0lf3s5199qhy7kcanx55yk27sgbsc1pbkv0crkh8dv14" + "commit": "aeee6bf38f78aaed5dd2efd6305f30a7594e3060", + "sha256": "1hp61vd5vxgyz61l8h59v9yvadpqzrc3ihsd731gl1k9siajg8q2" }, "stable": { "version": [ @@ -7233,11 +7325,11 @@ "repo": "browse-kill-ring/browse-kill-ring", "unstable": { "version": [ - 20171219, - 1908 + 20200210, + 921 ], - "commit": "8debc43e41d7e51532698331c6f283905890b904", - "sha256": "18yg35raks0kbzg5wjay6liingdcv4glyzl9n14sgr9vzc7h96f9" + "commit": "1ef72cc6accd94cd7032c02b1b2c78ae7f1d1965", + "sha256": "0mil32g7hcw376jibs5hdyv00xbaql3m4a27rwqaafg0x59avxdj" }, "stable": { "version": [ @@ -7611,11 +7703,11 @@ "repo": "arnested/bug-reference-github", "unstable": { "version": [ - 20180128, - 1314 + 20200206, + 2158 ], - "commit": "83e028e1b2359f75c8bcd3159f7b56c3fcdf85b9", - "sha256": "0g9wwkjznc9vvzi2z0q7x0fzj0ixnxlgb7gggl1blqjzbswwy394" + "commit": "c9512a010f19633e69f1d4b1597eff7048b21112", + "sha256": "0nyxd9dnvvdvjik94m9frbbhcf9axi50vpcs0mk0xy5raxq3scf7" }, "stable": { "version": [ @@ -7745,15 +7837,15 @@ "repo": "endofunky/bundler.el", "unstable": { "version": [ - 20190701, - 1013 + 20200129, + 1338 ], "deps": [ "cl-lib", "inf-ruby" ], - "commit": "05a91d68e21e129b6c4d5462c888ea249c2ea001", - "sha256": "0x37bilxl3shx5mdm00d3m2z5srfsy3y588w9971i8r7y2sfngna" + "commit": "43efb6be4ed118b06d787ce7fbcffd68a31732a7", + "sha256": "1r7x3xw4l5bp4dfqk2v2nrd2yl0rs064gw75nx99ifm92n7nkmgh" }, "stable": { "version": [ @@ -7880,19 +7972,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200106, - 2136 + 20200229, + 620 ], - "commit": "9b87afc57f5131259957a8bfd5d4bf53917e4beb", - "sha256": "0pncvp89axm6pv83j5lly9pyxcp3yr6v8llzi0ixy9jnf43679ry" + "commit": "b2985171b8f745c8edab3d6fccf72d036519ca86", + "sha256": "129rxvd83i3jzivmqkx9a9lpq3g80716y9mc55hqf60l7wxg9787" }, "stable": { "version": [ 1, - 19 + 20 ], - "commit": "8a284895e9f9856e3b27a7aaff4ce7e9600e36e3", - "sha256": "1v2zjncn92p08fisds761yxrfa7k24wn0qmakgpn4ksyghmzdjlg" + "commit": "adba24e575a07f4db3e9058953b441f390e8f2a2", + "sha256": "0143j6f271l19j41a4pgakxvslip8375jg8pwcvn22gz25s4g45w" } }, { @@ -8326,8 +8418,8 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20190828, - 2340 + 20200211, + 240 ], "deps": [ "anaconda-mode", @@ -8336,8 +8428,8 @@ "ivy", "tree-mode" ], - "commit": "8ccb0323651155e3407ee5649b1a0355fd70ffe2", - "sha256": "0xflaqv88saq6i2wdggrwh06i9svp7v5070rmd860wg1pwi0qm81" + "commit": "768a1b2169dca60a130204065dbc54bdff415b0f", + "sha256": "12f9wc3kp3pafip283yr8qd5s93nmcf84b07i72fv69nxxi4a41q" }, "stable": { "version": [ @@ -8425,7 +8517,7 @@ "error": [ "exited abnormally with code 1\n", "", - "" + "error: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404\n" ] } }, @@ -8795,8 +8887,8 @@ 20151205, 1343 ], - "commit": "51747f7afb5b66675bd9e1e812c93a8aba4d8249", - "sha256": "1kfx4w7bmw42x3g64zj3wpvg9cawgblrrywlp18zl0qygxj4jg5c" + "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b", + "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz" } }, { @@ -8807,16 +8899,16 @@ "repo": "MaskRay/emacs-ccls", "unstable": { "version": [ - 20191219, - 913 + 20200204, + 444 ], "deps": [ "dash", "lsp-mode", "projectile" ], - "commit": "aab3e31fd716daf59f9794e62d473357263e8cc0", - "sha256": "1ykgw21ypyhwlyflppjcgqrj1xw4d9rld4z65qvwhk3f12cv113j" + "commit": "e5cc4c3e6f40c9c9f0f53e99154c08018eb36944", + "sha256": "1yc7jj4g0kh0m1a4r98shvr48wp9i5mawld0xzs9mbfj97dsb96v" } }, { @@ -8842,11 +8934,11 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20151205, - 1343 + 20200210, + 1326 ], - "commit": "51747f7afb5b66675bd9e1e812c93a8aba4d8249", - "sha256": "1kfx4w7bmw42x3g64zj3wpvg9cawgblrrywlp18zl0qygxj4jg5c" + "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b", + "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz" } }, { @@ -8980,15 +9072,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20200103, - 1548 + 20200214, + 1651 ], "deps": [ "cl-lib", "powerline" ], - "commit": "9b2ae1ace8c0d4ad1fa90047105793274baa1d48", - "sha256": "1rcf2jnpvkrmpsqcbrbqrn142dzgixzcv8fa095a2gzp9cdf64rj" + "commit": "96b7c90bdcb6fe3d7c5146b579ab7b9794c2a17b", + "sha256": "01dik5v8b331vplvm3qclg04z2qdcfk0gfb12rz8p503s8y4xisi" }, "stable": { "version": [ @@ -9115,8 +9207,8 @@ 20171115, 2108 ], - "commit": "c505dc774244e8cb10ec479940a04a0580d36f06", - "sha256": "0sn459dj9a0zr4bbbzlwx2hcmd82x535ap4czybjpsnyjn51lpac" + "commit": "911033c7b88a5aa166cfabe36df3c9a2083caf8a", + "sha256": "1imbp99fxyq6zjkfnjmmhra68p0kgg3axhnx57k3xmlfqqw69hw9" }, "stable": { "version": [ @@ -9311,8 +9403,8 @@ "deps": [ "avy-menu" ], - "commit": "e73949b26406a397a70624f6086183cb41ce1353", - "sha256": "1v3zqazw89i0v68ga262s1ljf3g7s838vx6hirdy1xc2qxfqqmlk" + "commit": "22d0e061f170d59d7cf6bcd948c11fa0266b7771", + "sha256": "1m29vg4cispsd8nl8lpmv5fify1208nrf8h7nkl17pplrk7hqhwb" }, "stable": { "version": [ @@ -9382,11 +9474,11 @@ "repo": "davep/cheat-sh.el", "unstable": { "version": [ - 20191027, - 1038 + 20200226, + 1021 ], - "commit": "bd970d7c576b8720d63a1e7fd88ea8a943f2160b", - "sha256": "027ws9hz84d4j00bfl5s0id8jcv2yqjkjmph1890w37miwj62cjf" + "commit": "52293c366044e44c8f6b648a312433345e4718ad", + "sha256": "098b70gvyr74ygzbpyfvpn2zzlij47bzvqqj89igh10s4lxj0lzb" }, "stable": { "version": [ @@ -9754,8 +9846,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200101, - 839 + 20200227, + 1414 ], "deps": [ "clojure-mode", @@ -9766,13 +9858,13 @@ "sesman", "spinner" ], - "commit": "6e00ad359f87e658d7fa2c533731b60d9ce26a35", - "sha256": "1xvzlvv20hmcssk6lijdknqwikf8yfsv4hjp6zbglq60545s1hx2" + "commit": "1a33e62cc56c1d3f4e4c80604140bdef40e3cf57", + "sha256": "0i4kbkl6vck2pnk2p6ars9ifj5b7haigfrmaid9qq8qq2nslczrq" }, "stable": { "version": [ 0, - 23, + 24, 0 ], "deps": [ @@ -9784,8 +9876,8 @@ "sesman", "spinner" ], - "commit": "ce42702154709ef5d991e2732511c50d69de256c", - "sha256": "05yjkqc6d4grq9z5pxmv3anqh4zlhfg4v46jlccp6ynh030g7axs" + "commit": "bfcf9157a970c9423fe27c5021f445b509e71280", + "sha256": "1y7fngd47c5dz6sdf4b5w5lxdw5jmm4wa98l4h48badl8cn6m1vl" } }, { @@ -9958,14 +10050,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20191202, - 1028 + 20200125, + 2110 ], "deps": [ "cl-lib" ], - "commit": "0c79138fb2d37940654649787cb17cb619268748", - "sha256": "0b2zmqrnvg37hwiywnb43zaggi3c7jh6zfdwp7z90hf98il13jpk" + "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4", + "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw" }, "stable": { "version": [ @@ -10060,8 +10152,8 @@ 20191230, 2341 ], - "commit": "b3d28f3c7136be728caa6e57ce7eea16c7066bc9", - "sha256": "0ykz1gkaigb92ap491h8mlgp8vzw4yx67x1hizrrda9z65869avb" + "commit": "fa0f762cf55d42251b23b3096ab69ed32cd97c14", + "sha256": "1z4kplbnld62f396lh1hggdpvhlzk5fll7lcjz0dsh96m4cmx907" } }, { @@ -10095,14 +10187,14 @@ "repo": "skeeto/cl-lib-highlight", "unstable": { "version": [ - 20140127, - 2112 + 20200210, + 1951 ], "deps": [ "cl-lib" ], - "commit": "fd1b308e6e989791d1df14438efa6b77d20f7c7e", - "sha256": "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0" + "commit": "72afc4dd0107c357543244d09903767f49651c5c", + "sha256": "1ndjjdada219fgs68np4r7vg50s2h6060wd6wf0x3pnj8b0ca5wm" }, "stable": { "version": [ @@ -10380,43 +10472,42 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20191223, - 917 + 20200229, + 1105 ], "deps": [ "cider", "clojure-mode", - "edn", "hydra", "inflections", "multiple-cursors", "paredit", + "parseedn", "seq", "yasnippet" ], - "commit": "e24ba6284317dbb3e678fcad325044c628da56da", - "sha256": "1ci08jkjvksy6wr3djij4wv3n8r4dar11z1sn1ap67sngx4q3z3f" + "commit": "92d372393a031e5fa73ef926447afe72b574cb45", + "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4" }, "stable": { "version": [ 2, - 4, + 5, 0 ], "deps": [ "cider", "clojure-mode", - "edn", "hydra", "inflections", "multiple-cursors", "paredit", - "s", + "parseedn", "seq", "yasnippet" ], - "commit": "3d5d1fbf28bfcc00f917cd96d6784968dcbbc962", - "sha256": "1z9278syijnzxfwlghz7bps3jp4cdl0fxg6igwpjfl8ln56hxazk" + "commit": "92d372393a031e5fa73ef926447afe72b574cb45", + "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4" } }, { @@ -10754,11 +10845,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20191106, - 1836 + 20200221, + 2201 ], - "commit": "37e5246c90b747b634cbbc16871a156bb8477e91", - "sha256": "15pjvxgdamq69s344hasjc9gr8qczlcqz0y80la0c9xnbjgqdhns" + "commit": "bdac53baf1c38f83a16091db515047f7d42dac14", + "sha256": "0ikhngr4cq4v6dgj59fffbdd6z9pdfcckgblsk3xs26frqqqxknf" } }, { @@ -10892,17 +10983,19 @@ 20190710, 1319 ], - "commit": "75dfba223f0fbe9b599fe10662a5bc733f4f2623", - "sha256": "05gisydanpwq3mmdnvy6cf6969l42jf2ksanwlx6b5xh2mfpc1ni" + "commit": "61596e1cc861f975ec822f72d34842674b388646", + "sha256": "04m4im5qaxybh9kir1kclljzql3qiadhi1g64byyilgbl81vx6nv" }, "stable": { "version": [ 3, - 16, - 2 + 17, + 0, + -1, + 1 ], - "commit": "512ab500f06d6c645985cc8014c5e6291b9a059f", - "sha256": "0m0sd8ynrrhj8636jgixakpha814r1qpzcqdbnpddvjcvmijqjxv" + "commit": "125f0451a9061c60036c5f92d104ee9fb3111a98", + "sha256": "15spvk8392ngnxxm5v919nnvakw8aw4h1g3i41mhr9fs901z9cis" } }, { @@ -10970,11 +11063,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20191214, - 1006 + 20200226, + 206 ], - "commit": "4af009919ab8965afe8b0daacef1ad13606da5bc", - "sha256": "1sgy6dkwn22nxm0rgrxbkq1sfrdh55ry5sq96xsl9k52gzzh27zz" + "commit": "1baddba41af7edd6d4eb3c24ac85ba4a1b30aa3f", + "sha256": "0hspqc5xhi0mmrwyakqbq7dikn56q05c5xsnpgkx2mjjx7z05jh1" }, "stable": { "version": [ @@ -11072,14 +11165,14 @@ "repo": "xuchunyang/code-stats-emacs", "unstable": { "version": [ - 20190407, - 236 + 20200216, + 2020 ], "deps": [ "request" ], - "commit": "15242297279cb0dee01fbb93ef7536e337e20bb7", - "sha256": "1f2fmxpijggk804pa2m86z2n9kp11n4w5k83a7l2qw6c855ax8lx" + "commit": "055c9ce9c1b630d062305919cbffb9cf88fd24a8", + "sha256": "12rydfm05i1qvav1c73wwlk63i8mvqi148hdx1fks7al4lkhg2nl" }, "stable": { "version": [ @@ -11259,14 +11352,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20190805, - 1455 + 20200129, + 144 ], "deps": [ "dash" ], - "commit": "58fc8706a8f44e8df4678eec8ce15636fd4db758", - "sha256": "04splp4nvfva2cv87gwmga9ak4fk1x8z087lbz0x46qy9sj0dpz4" + "commit": "923ed4789c5ab66369ac4dda7eedb910951684a6", + "sha256": "1d502n6bpdscgpqfanax1h0iirgpq8x56vh6bbpzg9i042i3z7ls" }, "stable": { "version": [ @@ -11402,11 +11495,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20191231, - 616 + 20200220, + 1500 ], - "commit": "09067a0744dd5c0e37d5bd03fc528b0fdfab95a2", - "sha256": "1gv8qq1ngw4s4xm9rbwx94sk2w7l64l0315f797dsc7sgjki0yma" + "commit": "437bdd7a96fee751c6f817aff0100dd44bb07b23", + "sha256": "0cjbl7m6a0mmiiidn7w7hcggc58l5503swfnasbzyd1pzdrnn15y" }, "stable": { "version": [ @@ -11443,11 +11536,19 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20190927, - 1305 + 20200221, + 1655 + ], + "commit": "a7b7c0a32b174988f40378996cd8997f73524f19", + "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz" + }, + "stable": { + "version": [ + 0, + 2 ], - "commit": "12678144d17edf36d34e6bcdc5435593e191d96d", - "sha256": "0fld15h92193bnbmka3ikq27hggxvsikzlzq4pi2n3kknq9hyh56" + "commit": "8e539097185704444a5dd5545924de92c11ba767", + "sha256": "1p16vxai8dj1vy4ahflwij1ldx00jzrjcinpgpc7wgh6ka748v11" } }, { @@ -11529,11 +11630,11 @@ "repo": "cyrus-and/comb", "unstable": { "version": [ - 20190918, - 14 + 20200114, + 1325 ], - "commit": "a68fd0274592e8dcca28a337c9ee913cb84efa9b", - "sha256": "1n2nk8nhvfiz8dw863q91k04jrmafirdi0mj88awq9ibpw453vzz" + "commit": "bd8e11b8593bc48f81ce01c0657d5a7977cafdf6", + "sha256": "0ndz25x1l0rzn5j8xg9ql2s2lgin1893kzf722chyk8147qwb0i8" }, "stable": { "version": [ @@ -11825,20 +11926,20 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20200102, - 2354 + 20200228, + 1919 ], - "commit": "3c11c30c9ab41d8a9c88560071c48fbcdcbcba5d", - "sha256": "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i" + "commit": "94e22c45e92cf220abb9b5a582f85aa99c06004d", + "sha256": "0l3hxj2cf9fw7ma3ac95cigw733h2k0dv987hanfhlx2jckjyma1" }, "stable": { "version": [ 0, 9, - 11 + 12 ], - "commit": "3c11c30c9ab41d8a9c88560071c48fbcdcbcba5d", - "sha256": "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i" + "commit": "490d3e4e7ef3fbc90fb3e8747f902bf839a924cc", + "sha256": "0c31amc6gyfkmb1ii6mm56c75za1yxkj2iyhrjc45nn2mrh7yj7a" } }, { @@ -11849,8 +11950,8 @@ "repo": "pythonic-emacs/company-anaconda", "unstable": { "version": [ - 20181025, - 1305 + 20200129, + 1830 ], "deps": [ "anaconda-mode", @@ -11859,8 +11960,8 @@ "dash", "s" ], - "commit": "398fad19160cc1d0e31dcb1d4a3f88de7a2d355d", - "sha256": "182cijh6l82jj1r7iwd93h3np9c8fvcibjhv7860rk9ik41n7wil" + "commit": "a31354ca8ea35c0b2c1f6bb2b1a02a6cfb5e564b", + "sha256": "05qaxb3qpz3bi6c88qspf50sh15hzc01354zhj0amd07bmqzhwfg" }, "stable": { "version": [ @@ -11887,14 +11988,14 @@ "repo": "krzysztof-magosa/company-ansible", "unstable": { "version": [ - 20191029, - 2127 + 20200228, + 2134 ], "deps": [ "company" ], - "commit": "8d1ffbc357ccb0c307815d0c7f2cbb699f92537b", - "sha256": "0rsdj502mqw9w1g5ylyi4szi789z9k7n8ay9ms4h6f1wi7fjd974" + "commit": "0bbf6561d95fb6e1f34aa971e7db5203f22366b5", + "sha256": "0ygdhrqva1q6qll40bg9bpd4z023vibzzb0xkidjvwhaa40m33b7" }, "stable": { "version": [ @@ -11967,8 +12068,8 @@ "axiom-environment", "company" ], - "commit": "3e7885d694efef923e7b53827d277c28bfa09320", - "sha256": "048x8mj72c57f62ffsad43mcrc201d8ilh339gnpm2yi8midv0ih" + "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", + "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" } }, { @@ -12107,14 +12208,14 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20191108, - 1018 + 20200209, + 47 ], "deps": [ "company" ], - "commit": "3d21eaa511b5f0ca55205f203d28fd10ea1d3b39", - "sha256": "0lj5gkj2dl0c7sva8bi3bng2gm90sjq15g7w8r9nz70666szdr1i" + "commit": "fa5a3f7b765fc0e42a378fa2293be4c2817fe04e", + "sha256": "1wgxmy1pwwc7mvgw9bx3vvaay1pirzghvpqs6d9mnx1wbzn1x29b" }, "stable": { "version": [ @@ -12644,8 +12745,8 @@ "lean-mode", "s" ], - "commit": "f26e40daad2c1bd090e440a2b931205ac3b9b613", - "sha256": "022i1v885pvzz42cwrz7wp5amx25k664pvap7c4487hlrrkp1bg9" + "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609", + "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf" } }, { @@ -12713,27 +12814,27 @@ "repo": "vspinu/company-math", "unstable": { "version": [ - 20190507, - 2006 + 20200131, + 2337 ], "deps": [ "company", "math-symbol-lists" ], - "commit": "600e49449644f6835f9dc3501bc58461999e8ab9", - "sha256": "1ps2lpkzn8mjbpcbvvy1qz3xbgrh6951x8y9bsd1fm32drdph9lh" + "commit": "a796053590012e6a15c8b527b521ffc15d137bd0", + "sha256": "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "company", "math-symbol-lists" ], - "commit": "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4", - "sha256": "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2" + "commit": "a796053590012e6a15c8b527b521ffc15d137bd0", + "sha256": "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1" } }, { @@ -12879,15 +12980,15 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190823, - 1219 + 20200121, + 1218 ], "deps": [ "company", "phpactor" ], - "commit": "b69f2d9b2490c26c782d327344a54c19b5142cb3", - "sha256": "0pkby33g4ih6mssndcv2d59b1xkisw64p14fn131d6cqfwqvcwjn" + "commit": "5ccf65d59e6bbc9cd958dd5988e8fd2143b0d57f", + "sha256": "0k4dzn4a5y4kq7yz3ifvzziv90rp5si380c5ypgxr5iwb1b8a0l3" }, "stable": { "version": [ @@ -12939,8 +13040,8 @@ "company", "pollen-mode" ], - "commit": "9673c72c5f38ab1196f17e694ed48b4ceb1b13be", - "sha256": "0mfz1x80zsjhq1870h7q4s2cncvh6jllci022fb9bllw4mrzh9a5" + "commit": "d0a33591498013886c2c4676e204cd684954e82a", + "sha256": "0lg65hzdjwbc3dav79f3jm7251yyq8ghcbccvkb32vwz281xhjnh" } }, { @@ -12951,15 +13052,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200108, - 450 + 20200225, + 454 ], "deps": [ "company", "posframe" ], - "commit": "23da6d89f018517181afb4a82a711387bf102c48", - "sha256": "0wl2y304crkc5ylgbwqp8zply1r76758mm407rw1mlzijpljzldy" + "commit": "483ca5225681da5fa64ecc219604dc3acbab1059", + "sha256": "1jid82hvhdvvgcwy7ql5dd00bd9j3wgxrim15imjb22vwsq00qj3" }, "stable": { "version": [ @@ -13092,8 +13193,8 @@ "company", "s" ], - "commit": "33935e96540201adab43f3a765d62289eba9e286", - "sha256": "1sp4109fbj6cxq6v9lmkpkrlr6is340ibaqpslkkjyacjv6sv4cm" + "commit": "275ef708f08d3bf0eb30632148e5c6184eeaacdb", + "sha256": "118cgw5lsffqdqz95mnkw36mmnsbg9m52r2np4m7v14mjjwr9fby" } }, { @@ -13147,20 +13248,20 @@ "company", "rtags" ], - "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", - "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" + "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", + "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" }, "stable": { "version": [ 2, - 37 + 38 ], "deps": [ "company", "rtags" ], - "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", - "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" + "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", + "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" } }, { @@ -13213,21 +13314,22 @@ "company", "solidity-mode" ], - "commit": "20d769513f42d8f82a4de7a42db89f59fb1c8fa1", - "sha256": "00y7arkg16yp7p4pvhjq0gkgchvpq65ql8jq42hkamh3gvj8gssq" + "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", + "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" }, "stable": { "version": [ 0, 1, - 9 + 10 ], "deps": [ "cl-lib", - "company" + "company", + "solidity-mode" ], - "commit": "d0ff4dea49540f37301d869f2797fca2492f55d5", - "sha256": "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724" + "commit": "93412f211fad7dfc3b02aa226856fc52b6a15c22", + "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8" } }, { @@ -13274,28 +13376,28 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20191106, - 131 + 20200221, + 2025 ], "deps": [ "company", "stan-mode" ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" }, "stable": { "version": [ 10, - 0, + 1, 0 ], "deps": [ "company", "stan-mode" ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" } }, { @@ -13560,11 +13662,41 @@ "repo": "jjzmajic/compdef", "unstable": { "version": [ - 20191211, - 249 + 20200222, + 338 ], - "commit": "bb210101f2673cb9ff368027b8d272ad5b268648", - "sha256": "18iqhgpcvikk352x5g8m05lxmigpbc079rzwycg25w8n1hi2bvqi" + "commit": "79639b90e537058ab4de1961cee63a26c4ca2a10", + "sha256": "0rgf145x7v0y47knnkhx6dc1vflibs45daprc7wi8qlnjmjmr4vw" + } + }, + { + "ename": "competitive-programming-snippets", + "commit": "0100042ee1356dd709d8bbeec4539ddc64317baa", + "sha256": "1mdkv2pn83mgj7yy4xf8nkm9bvxldiy7gdx4bpv36b9xw5zz6q6r", + "fetcher": "github", + "repo": "sei40kr/competitive-programming-snippets", + "unstable": { + "version": [ + 20200122, + 1558 + ], + "deps": [ + "yasnippet" + ], + "commit": "b0245fcbabf035d89b80150add5d6a47859ab555", + "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min" + }, + "stable": { + "version": [ + 1, + 1, + 4 + ], + "deps": [ + "yasnippet" + ], + "commit": "b0245fcbabf035d89b80150add5d6a47859ab555", + "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min" } }, { @@ -13599,18 +13731,19 @@ "repo": "emacs-php/composer.el", "unstable": { "version": [ - 20180923, - 1140 + 20200214, + 1119 ], "deps": [ + "cl-lib", "f", "php-runtime", "request", "s", "seq" ], - "commit": "269270e13b2be00a9cc7d08bd2a96d6bca64cae2", - "sha256": "1bwrmgkkyq35zm5vb9krhdgirsz5hilif6i1k7nsm4bl1msf0h6m" + "commit": "8b4867e30efcdf10c6d9a74822aa281404377818", + "sha256": "1605fk7nkzjshn6faxw0ycn45a1wbivpmlmyaxcqzjhmawavky6b" }, "stable": { "version": [ @@ -13643,8 +13776,8 @@ "deps": [ "dash" ], - "commit": "bcda169785d02285226cab06cdb3fec4407b7eb3", - "sha256": "14jx6k70595jhb86l2h48k6j2j5m2sc7v8ldyycdiba8i3dj510i" + "commit": "e6e2d9ca71a7a46c0e4ebeb30e4994c2a8b5fe0d", + "sha256": "16x9xbf3km6k8xjivlf2ill7pmvrmaf3c35baznixm6hwdcv4wib" } }, { @@ -13685,8 +13818,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20191121, - 1521 + 20200120, + 1721 ], "deps": [ "dash", @@ -13694,8 +13827,8 @@ "pythonic", "s" ], - "commit": "41e9593cf230a50183a36fa9c0a4853acb2e7505", - "sha256": "07ckq7zvn00izk39wqrl2hgg8pa5p2nra0xdi9p5ra481iiinq47" + "commit": "335474e409774e31125fe320a4a54c8d92bf5fa2", + "sha256": "10aadbvsg6qy11nfkmc5rvivjvyak6501srmjl6lvzxsw8q79fj4" }, "stable": { "version": [ @@ -14141,14 +14274,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200105, - 1947 + 20200224, + 2036 ], "deps": [ "swiper" ], - "commit": "baac6e1c32ee895ea543f341a62204946237fe9c", - "sha256": "0z9mgvvs8dqkbzp3gqpvfwrdh88arvxiqmrgvl3xxcix5w06gqnb" + "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612", + "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq" }, "stable": { "version": [ @@ -14288,14 +14421,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20191211, - 1129 + 20200224, + 410 ], "deps": [ "counsel" ], - "commit": "9d7f0c4aea8f36710fa7957c306a39f7abf49202", - "sha256": "02gygn77x9rm51bqa9mykykjwflmz7cdz3qp1b8kd8qkd2zl3q1q" + "commit": "172c1f1d806f36d10bdeb6284e1adbce6c52091f", + "sha256": "0kbkf5244ajxri4x8aaxsc11jq90lsmpw3jyb5z8yfk1wisdx274" }, "stable": { "version": [ @@ -14473,15 +14606,15 @@ "repo": "ericdanan/counsel-projectile", "unstable": { "version": [ - 20191204, - 1759 + 20200214, + 1450 ], "deps": [ "counsel", "projectile" ], - "commit": "cadc6de7070458781a373b052adddf102bbed302", - "sha256": "04fn3rg68ssa5kj2yv5gr62jlhpsvmspiqssgmaqfnx6rhkd3vpx" + "commit": "b556ed8995f375e57496f3482aef4b0def565de8", + "sha256": "105lvn2bmz6lgxx5y6k9gnhkl4p8igxwgnfz5anxlcv32w7q21pw" }, "stable": { "version": [ @@ -14523,14 +14656,14 @@ "repo": "Lautaro-Garcia/counsel-spotify", "unstable": { "version": [ - 20200104, - 2216 + 20200119, + 1340 ], "deps": [ "ivy" ], - "commit": "e673b7adbaff423f14613f90ec2ed00b0f242792", - "sha256": "0mx8b7x81i6rr5hzym66qhaz65bgbayf2q9rvqgd2rh6l51icbm9" + "commit": "d70bdd7e92a138195234e0c002252c8972807e08", + "sha256": "1q94cgx86fi6xxys9a5j31mg10sg5ds2s8xljp71a3g1hcwk7vkw" } }, { @@ -14635,8 +14768,8 @@ "f", "s" ], - "commit": "803592baf1fb210415d943689af2bf5b79cdd24e", - "sha256": "0wp89sq9jy97cvsihqn9dk62m7rp6154c00214f84xb1vab7bcpw" + "commit": "9e6f4af7a07e281913f9f50f20dbbf6f26807563", + "sha256": "1w27hi64wcd86pw4ds2w4yldfm0wsk15f9mpcinyb68sj1p7sn9y" } }, { @@ -15164,8 +15297,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20191113, - 158 + 20200301, + 31 ], "deps": [ "dash", @@ -15173,8 +15306,8 @@ "multi", "shut-up" ], - "commit": "623127836352b1b83afed71fd542d87e5d3be352", - "sha256": "0nnsh6f02glrjrzs2f2blm0j397c8zkbwvwb61l7y9dx15a3rdrx" + "commit": "f8a1af8cfdf9093911a159f73d39ba4f1f671e6c", + "sha256": "1gni984j1jlv2is0ah4730xalhv96wimm1iziavbsrsm4hcqqcgh" }, "stable": { "version": [ @@ -15571,11 +15704,11 @@ "repo": "n3mo/cyberpunk-theme.el", "unstable": { "version": [ - 20190717, - 1509 + 20200115, + 1720 ], - "commit": "9779fc4c9f89b14c8c8bb238dd4ed6428ed30ba9", - "sha256": "1pgam947hcan24s2p0vswvjvg3kn39z8qmzpz433ilxd4wd2qz1c" + "commit": "07edefdec3956fba9076fe98cdc33df7bf617afc", + "sha256": "0swjbc61ii88j4myxfl5inn2j46jpf7giqd1kf0rjdyrc8zmj08h" }, "stable": { "version": [ @@ -15645,8 +15778,8 @@ 20190713, 1339 ], - "commit": "f72f6a564ff32ec9af83df5c474de0374e29a266", - "sha256": "0vr44v674nsv7jsglmxvwcdm254rmvz4bxkak99rv39lkq2rvc09" + "commit": "78e3705cca65e1456ce26221690dca74c71735c1", + "sha256": "1mr0q76p7yw9wv48qwp66nw95c1k3x2yly1vfvdq3phbb8xr6g4q" }, "stable": { "version": [ @@ -15684,17 +15817,17 @@ 20190111, 2150 ], - "commit": "3dc2b9dfc23638fbef2558d619709b5235d5df08", - "sha256": "0nh552256vh47l6zzjlf2r9wdndhpw0pkhm4mf1yfmkcxmyywyz4" + "commit": "f6bf6aa9c7d2414b54e7289639ae5f43b15ede05", + "sha256": "0sl9vz753np0qb6v5c3nf1kgyd7gyp4yslas5fwfs5j4f3981cdk" }, "stable": { "version": [ 0, 29, - 14 + 15 ], - "commit": "bfcaf163e3dcf472ef2af5dec6ac3fffd0d34e66", - "sha256": "0rzdx15z6y97cr1g1a3pqiiy2vx3jps3zgzz25bd9043nhhnmjcf" + "commit": "26cb654dcf4ed1b1858daf16b39fd13406b1ac64", + "sha256": "1b76f47yhalg4pipiarmax3869bwbv43a4qs8h1qrnibyzpwfy2z" } }, { @@ -15782,11 +15915,11 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20190923, - 1644 + 20200129, + 929 ], - "commit": "fac6c8bdd295138ddfc830dd94637c3e45a0823e", - "sha256": "1mpbshib5il4sxricirqlx37cy2kcfmd3x1szg7xk7i3ghayp0df" + "commit": "9320c6af524f923f20aa95c1a48b7ae41c3005a8", + "sha256": "0wlv3vjhw6v6q5br4bassw34k4kai6nrw10av4y6nkvw58i5b3h7" }, "stable": { "version": [ @@ -15836,11 +15969,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20200107, - 819 + 20200223, + 1128 ], - "commit": "79be83dac9f10a1487ed9a8b75ea2e606ffec639", - "sha256": "0is3jqr0fxd1winqjf6k23fxiflji4r9vgh493fhxzqn4r08yp8q" + "commit": "c6776c5f40587429a4fd6e9c52008bb9242ef692", + "sha256": "0qh21ry2vjsvr7yz110c6ggn8bhxdq2x37mwqalpibyx81clh3nw" } }, { @@ -15851,8 +15984,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20191229, - 1922 + 20200131, + 1211 ], "deps": [ "company", @@ -15863,8 +15996,8 @@ "lcr", "s" ], - "commit": "9289b6f053f343cb841ea7ca74758fe41bf6b74c", - "sha256": "1x36ck1wy19rlqfzcdy2xs888iqs1r1vkllnx8ld4z4aak1sg2mj" + "commit": "4955bc7363e250d22579bc34b0b4ab6611c0766c", + "sha256": "06xagrjl00iwvaf0cli3dhhvvn4x7ysvkir4120lwc9ispzc077m" }, "stable": { "version": [ @@ -15892,8 +16025,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200104, - 946 + 20200223, + 1146 ], "deps": [ "bui", @@ -15901,12 +16034,11 @@ "dash-functional", "f", "lsp-mode", - "s", - "tree-mode", - "treemacs" + "lsp-treemacs", + "s" ], - "commit": "68f9c19bcc4c8f76c2d7258ec15d7b80cf2ade9a", - "sha256": "0zch80h1a151wpwcpj9s3v77p4qma6ah38k7r9cki79phlhz0ca1" + "commit": "e7a5144ce746942b00a21d35a1ca8be71195f5d4", + "sha256": "1ryn49v89d204f7dhdc6igw03vzz5gzqrpqmsdrcxcj5yci2wxyk" }, "stable": { "version": [ @@ -16159,20 +16291,20 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20191109, - 1327 + 20200119, + 2310 ], - "commit": "ea7adeb09c13de58336caa16243e192ea6ee88fb", - "sha256": "045nx37lnp9rncxgdarb6jn81pqrybggjf7ab6aknmh1imppqz0d" + "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", + "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" }, "stable": { "version": [ 2, - 16, + 17, 0 ], - "commit": "258c324d9840901db83b2cabef3fa75bba57c1ba", - "sha256": "150k48llqz2mb66vbznpyj47r6g16amfl7hbg8q46djq8mp7zc2v" + "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", + "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" } }, { @@ -16238,20 +16370,20 @@ "deps": [ "dash" ], - "commit": "ea7adeb09c13de58336caa16243e192ea6ee88fb", - "sha256": "045nx37lnp9rncxgdarb6jn81pqrybggjf7ab6aknmh1imppqz0d" + "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", + "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" }, "stable": { "version": [ 2, - 16, + 17, 0 ], "deps": [ "dash" ], - "commit": "258c324d9840901db83b2cabef3fa75bba57c1ba", - "sha256": "150k48llqz2mb66vbznpyj47r6g16amfl7hbg8q46djq8mp7zc2v" + "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd", + "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n" } }, { @@ -16262,26 +16394,26 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20191210, - 1041 + 20200225, + 745 ], "deps": [ "page-break-lines" ], - "commit": "87779af059b33559c88596793cc55504c418fd32", - "sha256": "15jpw52kjcl0zpzx3yancw6kyz3ddyzl9lah8qya2914sv5w01c7" + "commit": "b7857a361967a9f0f6370879b30854f1e2fd81ff", + "sha256": "1l6n707v77gc4lgrg5livl2isigv7j6dsrkfppkcyjz2xyvl0n3y" }, "stable": { "version": [ 1, - 6, + 7, 0 ], "deps": [ "page-break-lines" ], - "commit": "5b66b65c4c7536f43e8e58b3f7055e5bd6381cda", - "sha256": "1g6g8vad1kdmv1zxp95a8sn70idl26isqjb3xk1r95pqnx1cn591" + "commit": "8dda82fcd4d0954f37a472ad68fb8df55195820e", + "sha256": "1qv4cqjy2s2d2bysbq10vq1axpbd8qc3jn1s1r81lxqkcja8zasa" } }, { @@ -16415,26 +16547,26 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20190404, - 1837 + 20200208, + 1629 ], "deps": [ "extmap" ], - "commit": "8c6d6fc991766e6bf9cefc4ea4b04eeae8116a84", - "sha256": "0c5y304pvns8jhy4fpz4jmbfxdgz8ms04hgrnsb0g168szc9g0s9" + "commit": "0ae7addb2c46133393f59011b2aecc08de49b8d1", + "sha256": "1df6c5wsn6nwqvfx11d7x3wkjazri3946fwy0m9i6mx18yac38h0" }, "stable": { "version": [ 0, 6, - 4 + 5 ], "deps": [ "extmap" ], - "commit": "8c6d6fc991766e6bf9cefc4ea4b04eeae8116a84", - "sha256": "0c5y304pvns8jhy4fpz4jmbfxdgz8ms04hgrnsb0g168szc9g0s9" + "commit": "4a480b66179f016100a582af170a76cda19c980a", + "sha256": "0j7k6157fvzl1395ybnrgcz697h6cjk9v445nnfi7q0l8vylbfvm" } }, { @@ -16537,15 +16669,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20191210, - 1919 + 20200301, + 237 ], "deps": [ "ccc", "cdb" ], - "commit": "51747f7afb5b66675bd9e1e812c93a8aba4d8249", - "sha256": "1kfx4w7bmw42x3g64zj3wpvg9cawgblrrywlp18zl0qygxj4jg5c" + "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b", + "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz" } }, { @@ -16587,16 +16719,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20191031, - 2214 + 20200202, + 1520 ], "deps": [ "dash", "s", "spinner" ], - "commit": "6ea9ad874827e7ba6c8f5e62a89a5a479cd20735", - "sha256": "0ngq8ysyfyrrb7mkh02i7wwqig29njad9ndam3bbsbqh07ihdywa" + "commit": "3ec95398d09719a9dbdc3a67d29d22ca224516cf", + "sha256": "0rxzm30md5s87s6j1aqgjxa9kb637v11b7q194l8zzhf457ky6la" }, "stable": { "version": [ @@ -17056,11 +17188,11 @@ "repo": "DamienCassou/desktop-environment", "unstable": { "version": [ - 20191114, - 441 + 20200225, + 1042 ], - "commit": "57de5e018baa1c7667230cae657c80ca765ae912", - "sha256": "195n99xvxyh4cfxjpfa1h1maalqrxf7nyi0bh3lqa1z6z5bdb6x2" + "commit": "dbcf3d9411d53908de09ab0d34932d19c8117144", + "sha256": "12lqwc3aqrly85ihdrh4k4vwglqypbi250fl0aasbbiwpbnraawa" }, "stable": { "version": [ @@ -17234,15 +17366,15 @@ "repo": "cqql/dictcc.el", "unstable": { "version": [ - 20190807, - 1504 + 20200209, + 1810 ], "deps": [ "cl-lib", "ivy" ], - "commit": "33df7c64ee5bb9faf77a4b80cd123d35a15ad706", - "sha256": "1dxn41p4bmi7l8lz6kp56qhb4v2qi7x8wijyicd3715amsagl2jc" + "commit": "e07ebfc577b904b3387705a91395ac873e42c727", + "sha256": "0wi3iz31qizd3xsys1pyfr2zfn03x27lrja5s8170s27zqkwm56j" }, "stable": { "version": [ @@ -17519,8 +17651,8 @@ 20160818, 949 ], - "commit": "79b81724b951fedffdd3113f473c18990af837a9", - "sha256": "1fclhpcrsi09z2np7q3dq3hhb3pqxsvv1l2dqis27afxnb1zshr3" + "commit": "5515f2e8657ef14adcc34aa5b05383a2684328ae", + "sha256": "044f337k5swz9bgfmisk6mqr5gjfv3y7zclqspdw846ka4kwpr2z" }, "stable": { "version": [ @@ -17610,11 +17742,11 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20191213, - 2008 + 20200301, + 43 ], - "commit": "f42411f8678e5745b6610ec24ab62bcb389a83ec", - "sha256": "00lq0zaslnhm51yymbprd9s93waszq6skjy6y6a6yr1pfsa6ibhv" + "commit": "b9a35a236314e9afe173287a5aaf5ac7307f6067", + "sha256": "1a8aagg6087l9pi4pjk91k1liikbsp6mxbnpx3mzzcvylh2kis5f" }, "stable": { "version": [ @@ -17872,6 +18004,27 @@ } }, { + "ename": "dired-git", + "commit": "640074b41e5b70e3b32484ea850a681e9026a9cf", + "sha256": "09qh6zjpyasqlsjnakal6a5i04pkhps51b064470rgg855jfh9li", + "fetcher": "github", + "repo": "conao3/dired-git.el", + "unstable": { + "version": [ + 20200130, + 743 + ], + "deps": [ + "all-the-icons", + "async", + "async-await", + "ppp" + ], + "commit": "11938721f7202aa784cc493027e3a0ec2c0d39b5", + "sha256": "1b5vc9hc26cs1dq7lmvm5gly4h6ahpp0dnlbxi8p4mza12yhnrwi" + } + }, + { "ename": "dired-hacks-utils", "commit": "568e524b7bdf91b31655bdbb30fe9481d7a0ffbf", "sha256": "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi", @@ -18163,15 +18316,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20200101, - 1207 + 20200225, + 1343 ], "deps": [ "dash", "s" ], - "commit": "698294cbd4b731abcb617f29aa133bc9c60b2651", - "sha256": "0q4w99cjp7ibbhjcgyzbwchk8k7qljp7w9p5dvszsfxiwfxgyg4w" + "commit": "276a313bd61096ad680769c8d419c1cf3d5981e9", + "sha256": "1s4cllfwyspp65f05f3jw449ijn6m96pbn3vjpil4b116hsxm1qb" }, "stable": { "version": [ @@ -18194,14 +18347,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20191024, - 116 + 20200226, + 333 ], "deps": [ "dired-subtree" ], - "commit": "21ccb6723bea69f2e2ca25998268d8a039f904cc", - "sha256": "0mck4qk6srbbf8xnn2sg11j822z4ybxvgavvy402d5sli515i8ca" + "commit": "5f88a4570eae9645be06ff22542f110aeb70dd7d", + "sha256": "0l1wr7g4lfqmvhw3vir6fmwxmid9sasxlf5pxxvh0z8kps53f0cn" }, "stable": { "version": [ @@ -18227,8 +18380,8 @@ 20180824, 312 ], - "commit": "b0ccca83df0542c5525c047ae283c0eadf500f5c", - "sha256": "14q8lp1x1b78ra9mk90n6dyrm1j9ny5pr7valgpkg8agqyqn7xmn" + "commit": "cfd463598175d89672a766a4f4a4a778836186e2", + "sha256": "0bpk4hqa9k702k0mcbg62wy29sx1n1dzrprkzp4x76ixgzfav3lj" }, "stable": { "version": [ @@ -18236,7 +18389,7 @@ 2, 0 ], - "commit": "c66c9969428d1cf3544a164d7e5347e8efb5dd5a", + "commit": "27120d6a079541e994105e3f969032d3ae7edaa4", "sha256": "14q8lp1x1b78ra9mk90n6dyrm1j9ny5pr7valgpkg8agqyqn7xmn" } }, @@ -18360,34 +18513,34 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20191016, - 1907 + 20200229, + 1525 ], "deps": [ "dash" ], - "commit": "fd0b6bbd5e3eaf6aa48bccd4a1ff3048bfb2c69b", - "sha256": "0py0if1wl61y6f55s4p8y11rjvrgx3yk2v5n1q2xl3gg7f4ra136" + "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576", + "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d" }, "stable": { "version": [ 2, - 0, + 1, 0 ], "deps": [ "dash" ], - "commit": "468f2fb20d825dd7134e4efbaff3666917cd4ec3", - "sha256": "005ibyzsx1fdyrl5iyhqpb1bg83mphzahq7zvw58x00syyqi2z49" + "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576", + "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d" } }, { "ename": "direx", - "commit": "a4b0903466d63b1c87abc002b0e064e36a8cddd3", - "sha256": "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm", + "commit": "7856a62fb86415c88aa72b574895328c93c10a09", + "sha256": "0qp3pidsa9gwz8vhcfg3l5vl6w8071gk04amba8cpc0w3a9pps95", "fetcher": "github", - "repo": "m2ym/direx-el", + "repo": "emacsorphanage/direx", "unstable": { "version": [ 20170422, @@ -18772,14 +18925,14 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20191115, - 824 + 20200108, + 1057 ], "deps": [ "cl-lib" ], - "commit": "da94351df5b185d5ad620bb7c3bbe7a6a5fa59fc", - "sha256": "1mk2nqiva6g7z8632qm5nbgbj9z3vf13hkjcaxz3jyw00lhyhsql" + "commit": "391832823f3f9835d957bc0224e122b376e5d825", + "sha256": "1h7wxi1nk6051arzx8671sf3m178ci9gs3a78h4hp8z0jrz364kz" }, "stable": { "version": [ @@ -18809,8 +18962,8 @@ "dix", "evil" ], - "commit": "da94351df5b185d5ad620bb7c3bbe7a6a5fa59fc", - "sha256": "1mk2nqiva6g7z8632qm5nbgbj9z3vf13hkjcaxz3jyw00lhyhsql" + "commit": "391832823f3f9835d957bc0224e122b376e5d825", + "sha256": "1h7wxi1nk6051arzx8671sf3m178ci9gs3a78h4hp8z0jrz364kz" }, "stable": { "version": [ @@ -19117,8 +19270,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20191222, - 939 + 20200218, + 1257 ], "deps": [ "dash", @@ -19128,8 +19281,8 @@ "tablist", "transient" ], - "commit": "baba7f72ea9e642536ca3664c2082722062b046e", - "sha256": "0vcmlw8v9rgpfyahfjx8fbdh524m2dkil23gp4gf5n4l696chk6z" + "commit": "a2092b3b170214587127b6c05f386504cae6981b", + "sha256": "1q3fgh3sjly62h86yvjqhr7j1yyrsfygk4rqkx0p7a052s2qvqi7" }, "stable": { "version": [ @@ -19281,6 +19434,21 @@ } }, { + "ename": "doct", + "commit": "f075d73b3269eec73dda992ce2bee67ccdfe4911", + "sha256": "0z4h2pmlmzaz2726pmd2y7g63k5ncw4fwd5jh5rv744f5pxxfs2m", + "fetcher": "github", + "repo": "progfolio/doct", + "unstable": { + "version": [ + 20200225, + 2305 + ], + "commit": "671ff27f9ee97b4ca79edcad8626a0356732d0cc", + "sha256": "0ajvys20w8fp661x8y7j7f72kmw5ylwvcdxrhiplk6h6xhacjwdc" + } + }, + { "ename": "dokuwiki", "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d", "sha256": "0d92il37z1m1hgcgb6c6zaifllznzk1na4yv4bfsfqg25l0mid75", @@ -19351,8 +19519,8 @@ 20181110, 1857 ], - "commit": "925845844035998a941faed57baea9142cb61a44", - "sha256": "0nbr9ncc73w6b138ccgnknlynn0lja2ap2h7131krz9p0n07hkll" + "commit": "da4fa915a2a659001eea04498d790cdd8cac1fce", + "sha256": "1xlh20vc43ywljjw13cp0aj4h9qackhqqzm0yi5g881lcyng2ca1" } }, { @@ -19392,21 +19560,21 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200106, - 622 + 20200301, + 657 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "4afe41ef3de2407f52c4954829240a3714256107", - "sha256": "041hdfp8ykiqm6apajriipbc6wgbysxak6ffaiwzw9zv909qywyh" + "commit": "0df558598451c36714c0793283fecc064adaf786", + "sha256": "1gi3qcqnv0qs8f1921s0bs6ppc3z44sbb035qdlzm1lii7s2v4ll" }, "stable": { "version": [ 2, - 8, + 9, 2 ], "deps": [ @@ -19414,8 +19582,8 @@ "dash", "shrink-path" ], - "commit": "a6f6f25877343a5fcf04eaffa410175411a4c1dd", - "sha256": "11srz1mr821axggs2jcmdhihxx09a2dniqv3n039wbdfaimfaidz" + "commit": "e6d690bae01cb68e7171857fe07ac914d7a19f4b", + "sha256": "0k5rppzpycl1aggg6cvwvgxylgvjbxksvdah8fkrrmx3dwcr2y3p" } }, { @@ -19426,14 +19594,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200106, - 100 + 20200225, + 1641 ], "deps": [ "cl-lib" ], - "commit": "2ec6df8905e22586f349290b6f39b320fc2e21be", - "sha256": "0wbxn41j2i6ca7y7gvdr3qmwhsw2bbazg9ckkbl9ycjmchjpxb20" + "commit": "756cf15a6bfb3146f2a28a861c1d9e4e86605cdf", + "sha256": "01w67r9vms19mrz8nc8mbyq0gkvgbixpcl14xbb51mrvnssaf3qb" }, "stable": { "version": [ @@ -19662,11 +19830,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20191227, - 1527 + 20200228, + 1008 ], - "commit": "a492387de86096bd274834bfc9e8f35ef708b958", - "sha256": "03wsj02mqb6czcx5205fzfg3bzxazy2hmkhjac4dr2qma09w59j5" + "commit": "f7cf1b23ae8f70aaf723552159213d143b92889a", + "sha256": "1lz24sbwc3d98ibjvqb160qb2jkknm53v0imdykw86bjqgplxvv7" }, "stable": { "version": [ @@ -19805,14 +19973,14 @@ "repo": "arnested/drupal-mode", "unstable": { "version": [ - 20171120, - 2309 + 20200210, + 2222 ], "deps": [ "php-mode" ], - "commit": "ee53f9e12bb3a80d65876a005b3a5a8ae6c7ab59", - "sha256": "1nrgx70gb1v84zn11a30ix24453g34v2zxw20d9w2xs9fv7vx55x" + "commit": "ee1a24c96a7487bb9df8dd15656be7d8330028f0", + "sha256": "1h0p1z0s02vn7b4p2kj6jr49y245wjf5grcv0n5riqds2s863q2v" }, "stable": { "version": [ @@ -19874,8 +20042,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20191215, - 2352 + 20200215, + 554 ], "deps": [ "cl-lib", @@ -19883,8 +20051,8 @@ "s", "seq" ], - "commit": "be7a8e148c022f73794e168dbba2ae821f400bf7", - "sha256": "1n6idkkmpbjrasacbyxdbfmxcy1v2kwxfwnbndmwn0pl9zqk4kbc" + "commit": "eb153de123af04fa7ce10ba4ce77f0cf764bc2de", + "sha256": "0prk6fl76dl5ay27ncfqr06spiv2fqr7hc8dad5dqw70w9d29vji" } }, { @@ -19992,8 +20160,8 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20191128, - 1910 + 20200222, + 2006 ], "deps": [ "dash", @@ -20001,8 +20169,8 @@ "popup", "s" ], - "commit": "738d40ceb7e2d6a3a26f7f27a31ba93924baaa2d", - "sha256": "0fpvzxvn6vhqsxqjhsxdf92x8vsiwyapgahbzl8c5bvq9rqdmlfi" + "commit": "a0ec2f139325bf3b39664e2a85be042a06f63af8", + "sha256": "12agvqxx50sg0klz3q6rcgfx5m2dw7idn65vwwamb019fpr4q94p" }, "stable": { "version": [ @@ -20046,17 +20214,17 @@ 20191016, 1241 ], - "commit": "78495a08c9b271b324d0b2485dda539599c0fbc9", - "sha256": "1765z4v30crrsivvhr3qqspj3n0rhpb72isxpvbabswyawh4900m" + "commit": "d90488a7e2c24ecc7136bbcb270bfb30d4f1ad4f", + "sha256": "0pqlwkz3j5kpghqgx29xns0s8a66mi48prarirgqq8knfd7vkvzs" }, "stable": { "version": [ 2, - 1, + 3, 1 ], - "commit": "4cba00ad7b228c46166404412dac92436c1f86de", - "sha256": "1lgpzf2mca3rh1mg46vn0d5jb7afm26p8n83iv5ngjarwd5064gk" + "commit": "4e9ca5de1bf9eb8cd3d2277634d418ba747be864", + "sha256": "124x7yh8mjmqrf3z962sdcakd1ka3js5kg2vx767ygw4q6w8cjdh" } }, { @@ -20506,28 +20674,28 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20191215, - 318 + 20200209, + 743 ], "deps": [ "popup", "request" ], - "commit": "9b3249872ed7b698909f580eb80b3d756acb94c2", - "sha256": "0i6smms1wck41d4gzkqx0q1ab5s1qszcfdb0gdncqq42qxwbqbvl" + "commit": "30145bb0bd5b04d9c413f5ace2fd0e52b2519663", + "sha256": "1i3wjkxksmq4d364sc56243p847rkyzzh10xj1j5a3zm69g3v53z" }, "stable": { "version": [ 3, - 8, + 9, 45 ], "deps": [ "popup", "request" ], - "commit": "9b3249872ed7b698909f580eb80b3d756acb94c2", - "sha256": "0i6smms1wck41d4gzkqx0q1ab5s1qszcfdb0gdncqq42qxwbqbvl" + "commit": "30145bb0bd5b04d9c413f5ace2fd0e52b2519663", + "sha256": "1i3wjkxksmq4d364sc56243p847rkyzzh10xj1j5a3zm69g3v53z" } }, { @@ -20538,26 +20706,26 @@ "repo": "masasam/emacs-easy-jekyll", "unstable": { "version": [ - 20191215, - 1016 + 20200209, + 651 ], "deps": [ "request" ], - "commit": "063f69505f4559b77fa4a5418df1a53849b29f19", - "sha256": "1z8997a9nvr0c04x5i7qrf5khy3l5w5llqshzgcxyb5jpmhl2hwz" + "commit": "3582ed543b3e9f5c32834f530abeba92ef0b4244", + "sha256": "0bqp6z1c1bf5gbj4rz717q47cj54ral2gagz8b6d7ihyn7398qq6" }, "stable": { "version": [ 2, - 3, + 4, 24 ], "deps": [ "request" ], - "commit": "063f69505f4559b77fa4a5418df1a53849b29f19", - "sha256": "1z8997a9nvr0c04x5i7qrf5khy3l5w5llqshzgcxyb5jpmhl2hwz" + "commit": "75f057caf54714b4e8a0934107f1ff8a05fc5349", + "sha256": "1753wf817z65sd23bkispsxyk67sd4r2yx9k6f1ncaywcl0z974k" } }, { @@ -20715,26 +20883,25 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20191207, - 844 + 20200229, + 741 ], "deps": [ "parsebib" ], - "commit": "99bd909f47f71e024ce324981109b73a50e82fba", - "sha256": "131vgl4d1j9s4055x88409w19q52x2m0x08b961hylp7yb5ljzgh" + "commit": "96dff9eacad70d2fbd3cc432c9235413569080f9", + "sha256": "044p78y48cgv9wyxpf6kd137ppbh96dmd5xyaykafk9jf75h47kz" }, "stable": { "version": [ 2, - 19, - 3 + 22 ], "deps": [ "parsebib" ], - "commit": "d69f59ae83ea92c17cc2f92040b76d9e47e12b81", - "sha256": "19hnrrvb0iwkmj095mqvm9qdpm0crr6f3268h5mh6l3qbm4zpj4l" + "commit": "f094f7741264ba5de14624b1b8da8a2ba678bfe7", + "sha256": "1hn11y09bpb10hxp0b7j72shivnnq1qyvw13lyjqlycr6rgvckb9" } }, { @@ -20745,11 +20912,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20200105, - 201 + 20200203, + 1122 ], - "commit": "9ca9dbd65112157b265dc040db2e8fa9504d5d21", - "sha256": "1frk27lba5g195a03mf0wyyhbghi614zkzkbmm2avkvqzq7649mv" + "commit": "2f1af38469966c788483cbce4ab70436f72cf30d", + "sha256": "15liiczqjf8p2jr9356zrj65ijp5gdrnb5i7m09armyhb8282rmg" } }, { @@ -21255,14 +21422,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20191127, - 529 + 20200212, + 739 ], "deps": [ "cl-lib" ], - "commit": "65f8244ffbeb9bf2720d922d4b5fc74849b9af82", - "sha256": "0ifz26mnv53mlk2vvyb2vrrid58y4dbw7wk1pfxxv0xbam9rihh4" + "commit": "19de0ec1bac67c5a76a4dd3d8ffe6c5411ace1af", + "sha256": "187vcflpbv4zpbzdsxw5i6c9j6dva7v3d3skh3b6wybjzh6ib4jf" }, "stable": { "version": [ @@ -21401,8 +21568,8 @@ "repo": "tjarvstrand/edts", "unstable": { "version": [ - 20191217, - 630 + 20200217, + 801 ], "deps": [ "auto-complete", @@ -21413,8 +21580,8 @@ "popup", "s" ], - "commit": "6e08bc97ce8a923a6ec4e0af442e861ad5010298", - "sha256": "085rrmcwpy0jdj84jiiz8wpscsnicp6flj96pc45g2f3arqccgj0" + "commit": "299e4553551a88dc5f26921125bccbc3efc662ef", + "sha256": "0fsgnh7g1fignsvl5i0kbkqb6f4ffc9k0202xm8p3b41vxgzdky5" }, "stable": { "version": [ @@ -21434,11 +21601,11 @@ "repo": "ajgrf/edwina", "unstable": { "version": [ - 20190821, - 1850 + 20200113, + 1714 ], - "commit": "8d6f7ce117c622e19576888fbff9145615683815", - "sha256": "12rvmr8r85k9hfgbz2qwp0ryvy4qdarr82hq16ilppq5vlkiar02" + "commit": "c5368716a504c93407fd8cb4ef925a8d8eb62698", + "sha256": "0rsi1v9rr76crbgb7f13g31rfq5bjk0hchqr356h97xlqr39168y" }, "stable": { "version": [ @@ -21562,17 +21729,17 @@ 20200107, 2333 ], - "commit": "84b42d0532561c902ed6dba40b134fa7f3cc1dcd", - "sha256": "132aj070k7yqzq01bwyipnvg6m5v9rggrlhc5rx0zzn9qy49x5fy" + "commit": "de8ccd81a8312634a3c8c7f06b6993105538d29f", + "sha256": "08wpwpyskx59k31bqakw3mzir0blqcqk8m7dmr5mvp9gji41mb2d" }, "stable": { "version": [ 3, 10, - 2 + 3 ], - "commit": "fa7adfd9abf5f7cf61fbbdac6a2add4f46d0c659", - "sha256": "15rf1mhzgaadp2kf5vrvnylc08fmq4ilpgsk55if8y337aafvy7i" + "commit": "79ab16f093aa3b2373422d0044f3119467755f5e", + "sha256": "0fisq0g3css641fh7y9vhagkfbsm2rfw9pnzyz434cr41wnjmjfz" } }, { @@ -21583,15 +21750,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200105, - 1332 + 20200113, + 1722 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "a4c83a65cf0054de1cfa0d74d7261a5177ebfb63", - "sha256": "0zwyc8mvxpdg661mkm2kv5b3sf4nixq0c3lg7liz1r2vdjm5pjqv" + "commit": "606e234ea867d057f201fde9a4de2a896f35782e", + "sha256": "0fjgy377vb3znzlb49xjf5a6k4ihmql1lbiaw2fla7282r5z5ja6" }, "stable": { "version": [ @@ -21614,28 +21781,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200102, - 1615 + 20200120, + 1457 ], "deps": [ "eglot", "julia-mode" ], - "commit": "38b7c0f1aa0f677ed1f966319e38535df4dad36a", - "sha256": "0d6232wlmyf58116h8z309h911z6gh4j5dma5y4znbk485q31ivm" + "commit": "94e84fe0d14585192dca53e1e962bec7596f095c", + "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "eglot", "julia-mode" ], - "commit": "38b7c0f1aa0f677ed1f966319e38535df4dad36a", - "sha256": "0d6232wlmyf58116h8z309h911z6gh4j5dma5y4znbk485q31ivm" + "commit": "94e84fe0d14585192dca53e1e962bec7596f095c", + "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb" } }, { @@ -21708,29 +21875,26 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200104, - 1609 + 20200301, + 802 ], "deps": [ - "auto-complete", + "anaphora", "dash", "deferred", - "markdown-mode", "polymode", "request", - "s", - "skewer-mode", "websocket" ], - "commit": "41d8e61df6f18f5accc341e7ae42e03069501870", - "sha256": "0qws01ba15rmc1bv3qzwzzcxl764iyr1xdzs7zsfay7s91px9cr0" + "commit": "10d7f10179f05eec243de3e55addd533bc46ce31", + "sha256": "0w2vlsr6s79mdlis4vsad9svs4ywbrkbyg5wygpd89m10sclkqcy" }, "stable": { "version": [ 0, 16, 2, - 2 + 3 ], "deps": [ "auto-complete", @@ -21743,8 +21907,8 @@ "skewer-mode", "websocket" ], - "commit": "4399f92b6b5d23240e8f447b36521b8db2a650a3", - "sha256": "12zq35ab84j6rhwnq6flp3ljm17ild95nv73mxgig9vsrvx1y57v" + "commit": "42f8efc54bfb915248972490a4b438b8d5bda381", + "sha256": "0jnqi8pq83s8q0dy2y1518yz8lsc0graqrqf8frss21fcj7ny22g" } }, { @@ -21797,8 +21961,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20191201, - 1636 + 20200212, + 1038 ], "deps": [ "auto-complete", @@ -21807,8 +21971,8 @@ "direx", "spinner" ], - "commit": "c151fdfceaa9cb9009878c30134cc45dd6386441", - "sha256": "1rvbnpxzg0qd47rw1w431mdjw3qf8lf6d5a2152ii6aa46jg9a3l" + "commit": "af7a59dba2ee2e906cbe6d1686d639b65f8838b2", + "sha256": "1pvhb1i4xhic89hn9l27afinxrgs50s0lpln8daa6dci3z0i8xx8" }, "stable": { "version": [ @@ -21891,8 +22055,8 @@ 20181006, 225 ], - "commit": "8f60d6249a2f7a5518d1a95a6d6a06f1f45cc6ad", - "sha256": "1rnvs3xrcl9fk5ryp0zdx6gcp4y8nnq34wy38zbhf1h87zd40px2" + "commit": "456fea0866ee71cb5a68eb65e9464565674081bf", + "sha256": "1hcjf88xjgkgp5wv7ccnfifnmpdj33csx6xm7rrdal3cy0f3ydj8" }, "stable": { "version": [ @@ -22234,11 +22398,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20191218, - 1744 + 20200224, + 1509 ], - "commit": "88bc8f6f6b92a9d3095d55e4ddc3601ea13d4447", - "sha256": "0vsfnlrp3s64iv34mdzjp3shm63sasfmiddi7ig70d0a9ylcnvly" + "commit": "61cd3834f8650a13d34d845138e40c5aaab75cb7", + "sha256": "0l3hv190xkzyalfnxsb0x7npmwdgf9bpc0qdi7p7issbf0vrjp4n" } }, { @@ -22275,6 +22439,30 @@ } }, { + "ename": "eldev", + "commit": "dd7ae513905a4e4cc23078239ecf2d5f346f1226", + "sha256": "11vxhssii5h5c3qm8iwg8d5zrxas3nzl391h9dl83v9h1pg98kg1", + "fetcher": "github", + "repo": "doublep/eldev", + "unstable": { + "version": [ + 20200221, + 2047 + ], + "commit": "a533ea3add577bb50a96ba24cee26f7e3e79a13f", + "sha256": "0wfpy5ib0f54lj394jmd45835iks8mvzxhnn0ii3qcsyjfs1jdnj" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "commit": "77e1e90efa6622c6784ef10f26e6f845aca5ee3e", + "sha256": "0ip9dnyh53m2yd92bp0jddm3db4fbcpm9zniqij9anvzhjdfqx1b" + } + }, + { "ename": "eldoc-box", "commit": "aac2e64f9e0d06b95bdf0dece214263f75470ea8", "sha256": "11720hi2gvjwc4x2yrxnrhh76wf3sj3yd0vaa3sc22xa5g1wi40r", @@ -22344,15 +22532,15 @@ "repo": "stardiviner/eldoc-overlay", "unstable": { "version": [ - 20190223, - 543 + 20200216, + 546 ], "deps": [ "inline-docs", "quick-peek" ], - "commit": "cfec077d9a699c88265af2e9480d5e76a3b3f833", - "sha256": "0c16i6y7675rzif5gj9s6rz3nc59339yp4fn27a56sly42qfnh9f" + "commit": "4dcd6644c7aee2565dd32c1f65e2d1fa4432ceb8", + "sha256": "0xnp937xpjvypz2cv0xsdc47g484qr7kbdjccdflgv2yn244dc37" } }, { @@ -22363,26 +22551,26 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20191106, - 131 + 20200221, + 2025 ], "deps": [ "stan-mode" ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" }, "stable": { "version": [ 10, - 0, + 1, 0 ], "deps": [ "stan-mode" ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" } }, { @@ -22439,11 +22627,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20161209, - 1957 + 20200223, + 838 ], - "commit": "9d0f8a213133f2619a4e9dfbba3b00d4348c07b0", - "sha256": "1wzf8q2k2iwnm9b5kj16bwif7g0qc7ll3cjs20gbmcnq5xmhwx9f" + "commit": "83568a7f2f0e2f0983e348b6e4adc0fc75b98adf", + "sha256": "03710cr8jvr22c9j3c266460aln26j7y9vqj6qm3mmzhsr3v7q2c" } }, { @@ -22493,11 +22681,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20191227, - 426 + 20200209, + 1942 ], - "commit": "fb7de7b6d299bb4190fed3cab541dbf5a5a1bbcd", - "sha256": "1wx55myyj15mii4zgczm1qpx2fa864ri87c1jr6fbl8vwcg4k0xq" + "commit": "d0405e63863e54a01200740a6717ac875eceabc1", + "sha256": "1pbcs4i9d1v8pmgrsxnacnbdrcswifpbnrb613z18caj1a17nl02" }, "stable": { "version": [ @@ -22562,28 +22750,28 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20200106, - 1038 + 20200301, + 236 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "2baf0b8bdda34911cd58b119f4f649603dd21500", - "sha256": "1m2fw4kxaj5apjk8hi8hbgsxs56ra2irqmg4mghqvkssjyjm1bfl" + "commit": "8f5cdb32c7d9f53427086fd8309c6c72d0bd9e79", + "sha256": "0brc185y8gb34xci5cv3g5i9s0gzrglkkbyxck5zk36icbh6wm3k" }, "stable": { "version": [ 0, - 6, - 1 + 7, + 3 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "2baf0b8bdda34911cd58b119f4f649603dd21500", - "sha256": "1m2fw4kxaj5apjk8hi8hbgsxs56ra2irqmg4mghqvkssjyjm1bfl" + "commit": "7048b8e3f55d6c8a9508d34b86f7a3434cda8e30", + "sha256": "0rg2nczzzbljmm3kkh5cnvj3ji0shrhwxw46lg3h93dp1nja9lzz" } }, { @@ -22594,26 +22782,28 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20200104, - 2247 + 20200222, + 7 ], "deps": [ + "cl-lib", "elfeed" ], - "commit": "7c76684ceccb0623f3320c16ea22c04b5ca4433a", - "sha256": "1qzmgryk9dg3jmz2v6mrrjbmkzik4isxlh02zmh1ajmcr93hkn3v" + "commit": "f14c0526676dd90be62b6aa086462047f7ac2da0", + "sha256": "099ch2jlj0fxn3d2v6z9rymkqbkrm3xp0bz4zkqbm54qcvdwib79" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ + "cl-lib", "elfeed" ], - "commit": "b1419ac54e5dfaa4b88352a3919e7fdedc61bb17", - "sha256": "0pkvq0f7linwxm9vv389wjhw60v3jcgw71q5ic4nrvayizx6ld5h" + "commit": "f14c0526676dd90be62b6aa086462047f7ac2da0", + "sha256": "099ch2jlj0fxn3d2v6z9rymkqbkrm3xp0bz4zkqbm54qcvdwib79" } }, { @@ -22631,8 +22821,8 @@ "elfeed", "simple-httpd" ], - "commit": "fb7de7b6d299bb4190fed3cab541dbf5a5a1bbcd", - "sha256": "1wx55myyj15mii4zgczm1qpx2fa864ri87c1jr6fbl8vwcg4k0xq" + "commit": "d0405e63863e54a01200740a6717ac875eceabc1", + "sha256": "1pbcs4i9d1v8pmgrsxnacnbdrcswifpbnrb613z18caj1a17nl02" }, "stable": { "version": [ @@ -22662,8 +22852,8 @@ "deps": [ "async" ], - "commit": "4a139c820c9dfe00dcd403818051fc78fca87782", - "sha256": "0g70d1a2677ga3f8lp0f4k8vr7j4fjdxn790fah9zcmc23nl8g6m" + "commit": "c475cee98bc607746901318ef9da463c96d5e04e", + "sha256": "02jfpi8bvjxw5jnjjpzq87xf1xjly745k8s74jc9lpginip3kj95" }, "stable": { "version": [ @@ -22734,20 +22924,20 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20200101, - 1259 + 20200219, + 2102 ], - "commit": "d61fd603f115214c582436fc7f4798a711b69de4", - "sha256": "148mqad8mk50zbjaacdjngb44i7maqxx8i71kwbaw27pgbcbfpbl" + "commit": "1d3b349f90dc6572a90d49ee247c43a4ba64252e", + "sha256": "0jvphz7ql4wbcj88w9igcgid4mjn7qysqgp8jmp7aqaf9zfpl2bd" }, "stable": { "version": [ 2020, - 1, - 1 + 2, + 19 ], - "commit": "966517c818c8fa0440c10a66008a2c209af8cf26", - "sha256": "02axxz3xin5n6kr8cmn19qqv96agcy8ml2apwwgrmbxrvqdhm1ia" + "commit": "7cc5ae4eac5bd8f38ade9ba1c28ad6faaba82160", + "sha256": "0mckgaz92v3y2vlkggx9kd51fd1mahylw39c42l51dyv8wscm7sc" } }, { @@ -22803,11 +22993,15 @@ "repo": "gonewest818/elisp-lint", "unstable": { "version": [ - 20200102, - 1550 + 20200217, + 38 ], - "commit": "f8316b84513261b17817006f5fcc25599d8e12b2", - "sha256": "0xv5n2qlk5i1jx441m5nhp1w7smyx5szv0jy7iayz4a3kn8lkvis" + "deps": [ + "dash", + "package-lint" + ], + "commit": "7a3866326631ba1ba8f4cd7a6cfd03c467c32aae", + "sha256": "1ldyv0c21dvl362kj566q8gd84gqq8g558slxyl73cf651q0nr84" }, "stable": { "version": [ @@ -22875,14 +23069,14 @@ "repo": "purcell/elisp-slime-nav", "unstable": { "version": [ - 20160128, - 1909 + 20200129, + 2057 ], "deps": [ "cl-lib" ], - "commit": "be36d66b4781eab7218bff419f3ec79573bbd15c", - "sha256": "0q0nisc0k4dl67n8c1068g32z8a642dawmq1h9licad71c42s95p" + "commit": "fea3bedf6383fea8370a9484a5610759c25055f9", + "sha256": "1mxs519gqax1fnaf5lirg69jrv4hj5a39hf7lzai7hyhcf9slzc1" }, "stable": { "version": [ @@ -22904,14 +23098,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20191203, - 408 + 20200121, + 623 ], "deps": [ "pkg-info" ], - "commit": "5920edcf19f0526bbee97b01435c4b8bf3b59c36", - "sha256": "0ymxrc0qy4p1ryffj8a57f6jn3i4ll5z0ay56m5fh9l46xz6b3am" + "commit": "231291ecadc479295d83fee619049030940bfbe5", + "sha256": "0lzzgdd1fkswij0d9rh6gyyvhf6z5m0az1hhvyighi45al3mj78s" }, "stable": { "version": [ @@ -22964,15 +23158,15 @@ "repo": "walseb/ellocate", "unstable": { "version": [ - 20190920, - 1407 + 20200112, + 1931 ], "deps": [ "f", "s" ], - "commit": "55b49500090247728d5abcd3670527a394ba16e4", - "sha256": "0gilc9z2mb53mp5702izdrbyjbmvij20jn8zgji1z629ckjivwh7" + "commit": "81405082f68f0577c9f176d3d4f034a7142aba59", + "sha256": "0amzbazg53956h1h5ppxd9psr1d1fwvlpm27kpfvhw5ipqzp3ws4" } }, { @@ -22983,8 +23177,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20191228, - 2356 + 20200301, + 19 ], "deps": [ "dash", @@ -22992,22 +23186,23 @@ "reformatter", "s" ], - "commit": "de2521ec8f47e7ef1a5120d7ba0e0d7cba94498f", - "sha256": "0rzrizzbrmsyd6703fqkabx7k7fh5n2f4skrisgcwph2sqzn89wy" + "commit": "3f042ec430e7d915bfdca21d4f4d6201a882434b", + "sha256": "16b66kv49bslnnhya2a9q0zshcwx58017sy0ab451j5zsq42v2qh" }, "stable": { "version": [ 0, - 20, - 3 + 21, + 0 ], "deps": [ + "dash", "f", - "let-alist", + "reformatter", "s" ], - "commit": "29f50a940113d793a21998f3bb414fdd9b0c5daa", - "sha256": "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk" + "commit": "5df694e307cf8fa5a3555d800984aa4ebb40664f", + "sha256": "0iwk4fmw8hq3ry4ky1zc7lgl4cpbnrjyk74c2xzddfspi3ks41fd" } }, { @@ -23320,8 +23515,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20191229, - 2252 + 20200202, + 2031 ], "deps": [ "company", @@ -23330,8 +23525,8 @@ "s", "yasnippet" ], - "commit": "a698cfd03e35a7b821fa343e4e13d1c5a22902da", - "sha256": "0wxjwgrac2r3y9q83gjb95253r440db39npqpisj4r9zxkn5ss3m" + "commit": "b25ab8c195472cf152fed80c212750b33837025e", + "sha256": "1nidig1yxr1fbwkfhpgd5zyqkd4mi5bp5h9bg17azs79xqprkrfx" }, "stable": { "version": [ @@ -23395,8 +23590,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20191002, - 2030 + 20200225, + 1440 ], "deps": [ "cl-lib", @@ -23404,8 +23599,8 @@ "f", "trinary" ], - "commit": "b43236e5e183249726b93f13e09c56a081817804", - "sha256": "0j0qppbhmb43nh1j1hrsyg6m0710m25i12sc9k9s2drz9wva7jc3" + "commit": "5ac373088eca10581e848ad42f5e278aedcd85c0", + "sha256": "11q5bh1mxc3z8a2zxs157pf7aqld9vddcffibgawh4r8q661ys03" } }, { @@ -23438,15 +23633,15 @@ "repo": "jeffgran/elscreen-buffer-group", "unstable": { "version": [ - 20190621, - 225 + 20200109, + 2338 ], "deps": [ "cl-lib", "elscreen" ], - "commit": "c78fc19b8a80415997b191fc08bf6768449ea12e", - "sha256": "1g8dm3vqgws9grhl435s7f1n26vpgyp5kvfryv98idqa7aqj3wvq" + "commit": "b48e71d4782adfeb2958f227d78c04164d26e4bd", + "sha256": "13wfnkg42k1fk1dbf7zspxfp116xm1z4j6pc82wk8lz5k5xjlpzq" } }, { @@ -23810,14 +24005,14 @@ "repo": "cireu/emacsql-sqlite3", "unstable": { "version": [ - 20191211, - 1229 + 20200117, + 1922 ], "deps": [ "emacsql" ], - "commit": "998ba547bd14c7406ab5d59820ef140c1819784e", - "sha256": "026hkbf90sp3q71g2pds63dvnfpw2q1i66vglfy42502c08l8285" + "commit": "82b90d493dba404473b515ffd670e0dd0dba1248", + "sha256": "1azv9mllvyjzqjkjw9n5rmdj79fa8srbpmx61w6vm25bl9f62vpf" } }, { @@ -23918,14 +24113,14 @@ "repo": "madnificent/ember-mode", "unstable": { "version": [ - 20191123, - 958 + 20200208, + 1423 ], "deps": [ "cl-lib" ], - "commit": "34373dd9413986288b2709365b2725e9390ecf9e", - "sha256": "005c679f9gpjixdcidsb50vzkg4gsy5qcz4rdjr84nspxz6nvjjw" + "commit": "a587c423041b2fcb065fd5b6a03b2899b764e462", + "sha256": "0x5fnrflbgafwcqr6v0jj6522j2j086s7msh2mr6yysmrfjhx2zk" } }, { @@ -24062,14 +24257,14 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20191205, - 2229 + 20200212, + 1825 ], "deps": [ "cl-lib" ], - "commit": "eedd61d9639de043933293b662a148d57d2f8a2f", - "sha256": "1nx0xvl03g2626xszqv9mw6v6xa83xxsjm11522g0srfvibj2iwn" + "commit": "2767c660562d35f02f9b272252a697804d70dd14", + "sha256": "1jg5m9684kdxvgfqvf56x5c7fqnlqf0mmqqlrrvl5di3n79cfmsb" }, "stable": { "version": [ @@ -24275,26 +24470,26 @@ "repo": "syl20bnr/emacs-emoji-cheat-sheet-plus", "unstable": { "version": [ - 20150617, - 1331 + 20200202, + 1404 ], "deps": [ "helm" ], - "commit": "96a003127d646a2683d81ca906a17eace0a6413e", - "sha256": "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk" + "commit": "ffcc84d7060dfa000148e7f8be4fd6701593a74f", + "sha256": "1na7mn9pgnwf9a1fbpb5k36aczzc7506ld5xm7mqpqgwshdxk0hq" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "helm" ], - "commit": "96a003127d646a2683d81ca906a17eace0a6413e", - "sha256": "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk" + "commit": "ffcc84d7060dfa000148e7f8be4fd6701593a74f", + "sha256": "1na7mn9pgnwf9a1fbpb5k36aczzc7506ld5xm7mqpqgwshdxk0hq" } }, { @@ -24636,8 +24831,8 @@ "repo": "youngker/eopengrok.el", "unstable": { "version": [ - 20160904, - 659 + 20200205, + 624 ], "deps": [ "cl-lib", @@ -24645,8 +24840,8 @@ "magit", "s" ], - "commit": "78f734328aaf19c52720415c037708ece1944c4c", - "sha256": "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns" + "commit": "6fa16c4ccaaebaef64dca0d3d29904c45fd6597d", + "sha256": "1y6n5b9pk4c3badzhwm7qv1jw60p34z55ljwhaaqlnmv7nq1qnj3" }, "stable": { "version": [ @@ -24864,15 +25059,15 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20200101, - 630 + 20200214, + 1651 ], "deps": [ "dash", "tco" ], - "commit": "4568d865e3524a284808e2a79c7ac9703bd228dc", - "sha256": "1ng1d0nrj0nzp4w209jr0gcnfl7chrlx7m6bapbq11lkf9qwgg35" + "commit": "2039faac5f649f586d86d5ace10204d5a510fe0e", + "sha256": "1zg1bxwpqgzak5nvcwlcv9k8lkpa071kpnh11yv7s74ykvxa49l0" } }, { @@ -25317,20 +25512,21 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20191219, - 1238 + 20200220, + 2206 ], - "commit": "52412c598ad67786032d17762e8655ad3d6771b5", - "sha256": "19d3whdfi21a0mlvgls549s8j3ygcmrw2sk7m36vpqf17k6059fw" + "commit": "2839ecb8fc1ba424b863867b2086127fad839d28", + "sha256": "0r7cljx0f1c0mbzgvny7aka0zsyvmnryvzly9qfx0psgr06x8qfw" }, "stable": { "version": [ - 22, - 2, + 23, + 0, + -1, 1 ], - "commit": "4583b137e585e59a3fc7020b781911a6927187a2", - "sha256": "070l0c40jwaq2s19mklq7459a0gd9v81q29xga39rbkv6diqcdq0" + "commit": "2b823b90b7dbd56aae3a3fbdcb182f9fd5127a59", + "sha256": "00dsbnii0w56jmbzzn43j18rprmc4d2ckd8ad0kzc6cb856mxs9s" } }, { @@ -25820,15 +26016,15 @@ "repo": "xuchunyang/eshell-git-prompt", "unstable": { "version": [ - 20200103, - 1444 + 20200109, + 2250 ], "deps": [ "cl-lib", "dash" ], - "commit": "5a73993f351e89255538f60ae546511362a49c91", - "sha256": "1ja2nfq266mnr1iqyl8g7180xmpi563fjh17xc4fhizhfvp650ai" + "commit": "48ee35774c9b8d0e2d96110e3ae84bac60f43dfd", + "sha256": "1w0drk4sfljshcnlvvn028v4lzqznglfx8ly0mfridsm85xws3pw" }, "stable": { "version": [ @@ -26089,8 +26285,8 @@ "deps": [ "pcsv" ], - "commit": "bc4047e09b8f6c34802db86095cd465935670dce", - "sha256": "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn" + "commit": "08a779a821f8d32c1a1985d8d9eb6cf21646ce2e", + "sha256": "18dvg2yagk9qyn3xfnhgfv192vyqzahzfy8xgc1fnm7a1l0gcg2x" } }, { @@ -26108,8 +26304,8 @@ "esqlite", "helm" ], - "commit": "bc4047e09b8f6c34802db86095cd465935670dce", - "sha256": "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn" + "commit": "08a779a821f8d32c1a1985d8d9eb6cf21646ce2e", + "sha256": "18dvg2yagk9qyn3xfnhgfv192vyqzahzfy8xgc1fnm7a1l0gcg2x" } }, { @@ -26120,14 +26316,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200103, - 915 + 20200226, + 2140 ], "deps": [ "julia-mode" ], - "commit": "2812b85880807e5da35dbf2e69fc1b577f2ad7f4", - "sha256": "055chn6vln1hg9r5fkzddk92c7y2ha42symzkkn0smpwjr12niry" + "commit": "a2be8cb97c6fff13fc28170d6359f835b8b562a5", + "sha256": "1jj040lng03jmp8ddn5fi8cg2v6fwxxv9ikispx3n03va1mrzf7m" }, "stable": { "version": [ @@ -26262,25 +26458,26 @@ "repo": "jschaf/esup", "unstable": { "version": [ - 20180727, - 342 + 20200130, + 2034 ], "deps": [ "cl-lib" ], - "commit": "0877d7831d0bf60e33097df135a889da153243c8", - "sha256": "0c9g9nhszxzyab57y48vj95wqzdjj441vvm2pnx1dyij7g0abqpl" + "commit": "4e5bf7d265c3b1484017fc0fd0ad50d2403c2bbe", + "sha256": "1jdsy5bqnmbai7kylidyfd0nla26apqvfl2f6vdvjs02hlr1w2s7" }, "stable": { "version": [ 0, - 6 + 7, + 1 ], "deps": [ "cl-lib" ], - "commit": "53355b13dc9f1636ba681ffff830162ebbd3b223", - "sha256": "1a4b8390azimlrr5ayxvaks1w7009vfbm56q11ybx00xxrd26v43" + "commit": "49e05d4f96adfbf71e608a78d23bbf148a8a7fc0", + "sha256": "020svy3r1m7xs38vcinad8kjd4622wvh4scfmjpklbln8r99n178" } }, { @@ -26575,30 +26772,30 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200103, - 1756 + 20200224, + 914 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "d14a349fcf7acf429ab9aa5e0faf43c816559fe7", - "sha256": "0vpd3x5hwi3g8qi5r961cxffvg1r2q62f4dd8svzx0dlxvfpbr3i" + "commit": "7c42ba4de086dc8f5b2d277c8d2806adc6b84279", + "sha256": "1pzznnibgk0x33m04064w2r0ksk26liynswa785nld4king70iq2" }, "stable": { "version": [ 1, 12, - 16 + 17 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "210316cbf9615ade96834e30352366985752f11e", - "sha256": "1nszhnl7j3pkdjxpzljqkaqr0c0xqpy97rwpbv6zb96qllallsmi" + "commit": "5b690258fcfc47ca1fed25f17e04356edc713925", + "sha256": "001ywnhjl0dmywc8vg8brsisx432kcfdgv6xksawbg1czw6j0y02" } }, { @@ -26689,14 +26886,14 @@ "repo": "YourFin/evil-better-visual-line", "unstable": { "version": [ - 20181026, - 1028 + 20200123, + 2045 ], "deps": [ "evil" ], - "commit": "15f77e67fcc3c48db323ccd8c8c4bc249e2911b8", - "sha256": "05wzq663p3irrmd5b2yg001qf8m9wmaj3mnsc76fad184m03g81r" + "commit": "4373f930ab1a8d3a2a90e68540967702313b2ce9", + "sha256": "0dnh932ib3hhphprm1jjh1hdwnj96d6cnfc64rj2y4mgxji4y19l" } }, { @@ -26778,16 +26975,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200105, - 1846 + 20200219, + 1042 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "815c127d020f8c45a17fe7b23dbd82240aaee390", - "sha256": "0djrhqvj3x75hj278qfz9pa2ikl4752yc8h0aslhkdvdfvs2nazv" + "commit": "a478a95a8a3665e40bdae3bab2a0519db6c1f29c", + "sha256": "15ii5lw6hs4yyl22yyzfwzagdma2sman4rm5gq4m9773g4ava515" }, "stable": { "version": [ @@ -26993,15 +27190,15 @@ "repo": "Dewdrops/evil-exchange", "unstable": { "version": [ - 20191105, - 255 + 20200118, + 252 ], "deps": [ "cl-lib", "evil" ], - "commit": "35dd0f0662789f043bd89a9f9801ffaf4318123f", - "sha256": "1wx8wpdgwhfgf5vykkjw2skbf6xhxmzj40vsq8dj5vhmiq4njw5k" + "commit": "3030e21ee16a42dfce7f7cf86147b778b3f5d8c1", + "sha256": "0zchmnzkq7bz2c4hl95xwnz5w243ya4ryi6hgbdss7mc9rnyyarh" } }, { @@ -27312,15 +27509,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20200102, - 1856 + 20200226, + 1347 ], "deps": [ "evil", "magit" ], - "commit": "7223dca89c0b4bca9871c453a30a4d4edfdb444e", - "sha256": "1sp1l6p88dj6qpgcmh0caprq0vv6ps6kmqrakrm2kgdnirvzqign" + "commit": "ba0e59248f8d7f59de811ed2e1f2c565dd7da1ca", + "sha256": "1jy1nzjr8mxn4153qdcvk3s0cdy7xrim7jq2c6dzdqxjdprhj8nz" }, "stable": { "version": [ @@ -27404,15 +27601,15 @@ "repo": "gabesoft/evil-mc", "unstable": { "version": [ - 20191202, - 806 + 20200228, + 1535 ], "deps": [ "cl-lib", "evil" ], - "commit": "007d471e26b44e692250804f82f06ebbd27b6ec4", - "sha256": "1hkynxs42sh24dd842lskysrn0s37c22w2p6422miykczq6dgffi" + "commit": "4d4c0172e4c7f80acc1d0e73d5fb3e536929b262", + "sha256": "1a5glj1n5dyhdaas5b8m3v2p36s1w9qcpmj7gnfxyp75iy0rqlbs" }, "stable": { "version": [ @@ -27475,16 +27672,16 @@ "repo": "hlissner/evil-multiedit", "unstable": { "version": [ - 20200103, - 1006 + 20200229, + 528 ], "deps": [ "cl-lib", "evil", "iedit" ], - "commit": "c3d43b1a65c193755dae2c41ce5c072c4c01b35d", - "sha256": "0nk5cg3ammn3mlymb093la8wab4jdzh3qhc15s1235vw3s47g6ag" + "commit": "9f271e0e6048297692f80ed6c5ae8994ac523abc", + "sha256": "03imayy9afv084yl6g4kg6qis3mikllpbbizd2fya7njbsnpbpq1" }, "stable": { "version": [ @@ -27509,20 +27706,20 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20191231, - 938 + 20200222, + 901 ], - "commit": "a5555ff02a43ddc4b54ba38e19c5a233c3a0b304", - "sha256": "0rpgjmybkk47p0n4j02sipx16xvam6hhiich8y3n7qsznbq97pbi" + "commit": "fa40dab8d2f010db17e1e62dfd245c1504d0542f", + "sha256": "0dn712k54qsxy82jqbqip77k5i3zv8m7afj2yi39zqx28iqvic0z" }, "stable": { "version": [ 3, - 4, - 0 + 5, + 1 ], - "commit": "a5555ff02a43ddc4b54ba38e19c5a233c3a0b304", - "sha256": "0rpgjmybkk47p0n4j02sipx16xvam6hhiich8y3n7qsznbq97pbi" + "commit": "fa40dab8d2f010db17e1e62dfd245c1504d0542f", + "sha256": "0dn712k54qsxy82jqbqip77k5i3zv8m7afj2yi39zqx28iqvic0z" } }, { @@ -27633,14 +27830,14 @@ "repo": "mamapanda/evil-owl", "unstable": { "version": [ - 20190828, - 435 + 20200113, + 405 ], "deps": [ "evil" ], - "commit": "93913d4e9b3a34973756d0c18803dde0ae52cb64", - "sha256": "1qn10lhy05ib9g8yc7cx18ca1hka94ni36fd98ixln6zqlwl6n78" + "commit": "ed5a98644a9cf321de213b50df6473de9f3a71ed", + "sha256": "03afn47fgz3bxifmpwlmckpkl9nc237lc0khmaks0jfpmzcbkagc" }, "stable": { "version": [ @@ -28106,26 +28303,26 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20191218, - 852 + 20200129, + 815 ], "deps": [ "evil" ], - "commit": "d14a349fcf7acf429ab9aa5e0faf43c816559fe7", - "sha256": "0vpd3x5hwi3g8qi5r961cxffvg1r2q62f4dd8svzx0dlxvfpbr3i" + "commit": "7c42ba4de086dc8f5b2d277c8d2806adc6b84279", + "sha256": "1pzznnibgk0x33m04064w2r0ksk26liynswa785nld4king70iq2" }, "stable": { "version": [ 1, 12, - 16 + 17 ], "deps": [ "evil" ], - "commit": "210316cbf9615ade96834e30352366985752f11e", - "sha256": "1nszhnl7j3pkdjxpzljqkaqr0c0xqpy97rwpbv6zb96qllallsmi" + "commit": "5b690258fcfc47ca1fed25f17e04356edc713925", + "sha256": "001ywnhjl0dmywc8vg8brsisx432kcfdgv6xksawbg1czw6j0y02" } }, { @@ -28278,8 +28475,8 @@ "deps": [ "evil" ], - "commit": "257c66bd7a9162caef3b04137af0dc9360fe3d53", - "sha256": "1saf7kpmz09j1q8nzriqmllxg4l3chqgy9x0j8qz91wflf15xbbs" + "commit": "bc25cae9fa5ab0ba1507827f0944f52ce0ca7462", + "sha256": "0xz2yjgz6h2d6h7gfhnvrylh8gj0s7vf45bvqa450j5579gz5sqz" } }, { @@ -28338,15 +28535,15 @@ "repo": "alexmurray/evil-vimish-fold", "unstable": { "version": [ - 20171030, - 1151 + 20200122, + 117 ], "deps": [ "evil", "vimish-fold" ], - "commit": "c617fecb91303f8c63f85a6101a503fdc88aae84", - "sha256": "05zm0gngdamfs5cqnjq4lh7253hdj0lggdgfphl56ynblhf8qf36" + "commit": "b6e0e6b91b8cd047e80debef1a536d9d49eef31a", + "sha256": "14qhfhk3d4c7v4jhr909dbxy8222flpqwk73bwg0pqwpkcifyv7n" } }, { @@ -28481,19 +28678,20 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190911, - 1319 + 20200301, + 823 ], - "commit": "17d5fda0b912813eb754f23547ad019e55a679da", - "sha256": "1p7y91hdd4qn0w09k8p1xna9c9lhqxsl4vlgmm214ybbvacrgm1n" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" }, "stable": { "version": [ 0, - 2 + 2, + 1 ], - "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", - "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" } }, { @@ -28510,19 +28708,20 @@ "deps": [ "ewal" ], - "commit": "17d5fda0b912813eb754f23547ad019e55a679da", - "sha256": "1p7y91hdd4qn0w09k8p1xna9c9lhqxsl4vlgmm214ybbvacrgm1n" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" }, "stable": { "version": [ 0, - 2 + 2, + 1 ], "deps": [ "ewal" ], - "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", - "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" } }, { @@ -28540,20 +28739,21 @@ "ewal", "spacemacs-theme" ], - "commit": "17d5fda0b912813eb754f23547ad019e55a679da", - "sha256": "1p7y91hdd4qn0w09k8p1xna9c9lhqxsl4vlgmm214ybbvacrgm1n" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" }, "stable": { "version": [ 0, - 2 + 2, + 1 ], "deps": [ "ewal", "spacemacs-theme" ], - "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", - "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" } }, { @@ -28644,8 +28844,8 @@ 20191229, 112 ], - "commit": "76fbdf5d01bace97dbabf5a4b56b6d9414a7aea3", - "sha256": "0vmdwdn60cq12bh2pinqzpdvd0yqizjrq77zbqszzscblb31cg0d" + "commit": "d17c4e0b73fc5ffeb2bc28156785c6bdda058654", + "sha256": "0nxrdfr9y37ws647qbb0c25l2vwapkqp3qhxwds20jwkskpqa7vm" }, "stable": { "version": [ @@ -28747,11 +28947,11 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20200106, - 2058 + 20200224, + 1501 ], - "commit": "0fa7c2d349e40c0e1de0965acf0f0b77b7070451", - "sha256": "1rqkrf021lmm761caskn0npp9aph7xjkr6v8973cgj9v09yk5mn1" + "commit": "1603d01fbfbef0d73ac940f7847c7e0b9b978093", + "sha256": "0apwvqbv04pgl682ja96l6cchfflr83s2h4p7vzpjc05h8pc0znr" }, "stable": { "version": [ @@ -28831,11 +29031,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20190917, - 1031 + 20200213, + 1249 ], - "commit": "848ad0084f27b92d1cf98dabffbad29f959a642d", - "sha256": "00wr025php7nl33x541s9rjm99hj0jbdcmnw9ljx5hqpm04aqm7c" + "commit": "d73c1af831584311d8ad8b45b2ec14cac6eb6edb", + "sha256": "1wm4qavrf9b76309cmmw0jf5hg7j3cym5m5syjhv9lh2hlyl358q" } }, { @@ -28872,8 +29072,8 @@ 20181028, 1645 ], - "commit": "1139b57d8f4276fe56b8416fdaf4745f2cdfe7c3", - "sha256": "0jgyscjfparnby0whrmbgvsab2a7qkaqhysmh3s3jh635fndm253" + "commit": "187f621cb2d9413595cb47917641e5692e3b37cd", + "sha256": "1h9d7fgvy9xz9rw6kf5q606j2k54xqmvva028d929h8aibb6pch2" }, "stable": { "version": [ @@ -28911,11 +29111,11 @@ "repo": "agzam/exwm-edit", "unstable": { "version": [ - 20191017, - 107 + 20200126, + 27 ], - "commit": "80c1cbecafde96a59e620d8fa7e5510a5a7bbd3d", - "sha256": "14qnnz3sa8ldhp8lgmvn7xh43prf6ajir90xxij3qaw85km25yi9" + "commit": "bc25ba094b383be3c650ca0b7e1534efe2bb154f", + "sha256": "1z1ya9xgknka3dy3b3x8zzfkxdx5jqsi8q5aqkvxjxa6n7mmqdwv" } }, { @@ -28944,16 +29144,16 @@ "repo": "walseb/exwm-firefox-evil", "unstable": { "version": [ - 20190608, - 2230 + 20200206, + 2212 ], "deps": [ "evil", "exwm", "exwm-firefox-core" ], - "commit": "69e8eff0e5443183713213386c450ebfef3b4d0a", - "sha256": "1h8h7v1cwbqbdk168vqz8ndb4zgxlkx28dyy0b315vib226vkxq6" + "commit": "9407977034baf5f8b1e43c07ed8728f8f42d70d8", + "sha256": "1fha5fxjylgylmbr6fn5cz9py9csh4na9h7vljvapkrazwkpvbsy" } }, { @@ -29122,19 +29322,18 @@ "repo": "thblt/eziam-theme-emacs", "unstable": { "version": [ - 20200102, - 2210 + 20200124, + 1045 ], - "commit": "bfa61cf62f20bd35e74425fa8105e12f7790f044", - "sha256": "159k9mk57349w8xw79l8dzsaysn04xnbmnvxa537psmlrrh3jdch" + "commit": "9ae0fdb2ad751044b3bd60aee08523d460db2bd6", + "sha256": "0gvf7g5s7wrchwbh0bnr0ryx9zaw56mx09bd4f32793lpv9sxyi6" }, "stable": { "version": [ - 1, 3 ], - "commit": "bfa61cf62f20bd35e74425fa8105e12f7790f044", - "sha256": "159k9mk57349w8xw79l8dzsaysn04xnbmnvxa537psmlrrh3jdch" + "commit": "e0c0daa37c3d70880052b3d55fcda05b92d575a6", + "sha256": "0jv0l1hcb33cinqivckhp18a8fkxpg38pkdyva1zripgz1ldjvxc" } }, { @@ -29400,14 +29599,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20190921, - 1811 + 20200129, + 1933 ], "deps": [ "popup" ], - "commit": "2d9c55ce0ef20cd405c597bbac8b204cfaeee77a", - "sha256": "0ap13sxycvwg5dxvm65qkp11816hz4vvw3828q730y9j30fizn0r" + "commit": "158e1e54055cafe5da9122a59519e8b3ed1057cf", + "sha256": "06616lzvv6vdc2i37gy47zw3rb4yjml83vn5py2k30ck8gl4fhs2" } }, { @@ -29711,11 +29910,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20190927, - 4 + 20200206, + 2001 ], - "commit": "deea7b971edf238f9018053de4e02fe931064694", - "sha256": "0bkpys736r70l9q7r101ghhik6lv14j303xf6sd8xk55v23wh1b8" + "commit": "c02f4a9ed1b9c26f9cfc3237906c2844f5937622", + "sha256": "1bcdicgp3wlxpdzardx1ry9js192dy26q8af6pdlvrnxqvdl2asm" } }, { @@ -29734,6 +29933,38 @@ } }, { + "ename": "ffmpeg-player", + "commit": "c3b60e5e699e0731ba195e5ea0760c218b3df4e9", + "sha256": "03ni2m92rjsz1dclw3gl983aganv9s88mczxw06lpmflrc5w0ac6", + "fetcher": "github", + "repo": "jcs-elpa/ffmpeg-player", + "unstable": { + "version": [ + 20200224, + 554 + ], + "deps": [ + "f", + "s" + ], + "commit": "1f2199f653ebae152ab34ebd8ccd364ab96ae392", + "sha256": "1idpm3gbbvq4s0q5dk7gs3lycnfwi58nhg4vdss084kgckwfz62r" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "f", + "s" + ], + "commit": "214c08b362daa138d2e17883a6b4d096f22f5ebb", + "sha256": "0w2afgdd3pasrqi9apnmp0qqg4qvd0skizybrnyi9abnc0bp9v7x" + } + }, + { "ename": "fic-mode", "commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f", "sha256": "0yy1zw0b0s93qkzyq0n17gzn33ma5h56mh40ysz6adwsi68af84c", @@ -29945,26 +30176,26 @@ "repo": "technomancy/find-file-in-project", "unstable": { "version": [ - 20191223, - 2328 + 20200227, + 1204 ], "deps": [ "ivy" ], - "commit": "9aff62217a16c6261b25237eef1ce41130692b29", - "sha256": "1ygmr2scbaawi7gzsay6rrapvxc2rb2260xf3riikb4w43dbzi79" + "commit": "acedab403f69f242fa41012c20078500d46aa9e8", + "sha256": "0p21vm6xz6093nic2wwgly18a85xki3wp0a2vy4hgy0dl7qici86" }, "stable": { "version": [ 5, 7, - 8 + 10 ], "deps": [ "ivy" ], - "commit": "4540416d5aaf7f6adcdcea3ac5b80a08bb695e44", - "sha256": "0ak7i76m3b6gi5favcd6rvmh2flr11995jlx5d52as5lrbx01x7m" + "commit": "e5bd59c52ddf3cd59bbaa4247770d7b2957a6ea3", + "sha256": "156sfd5xs831sdlkf7p5m20hzznv1zlf9nm3pfm8n8ixp13fnzj0" } }, { @@ -29998,11 +30229,11 @@ "repo": "thisirs/find-temp-file", "unstable": { "version": [ - 20170107, - 1339 + 20200117, + 2254 ], - "commit": "513005d19d72d71f34481ee00158dd57bd93206f", - "sha256": "129jnn16vxmp6r9gx8k4rvv6spag5q0if52b5fhsybicnsl35mrz" + "commit": "2bfcdba0d6a8a0e6faa080cb04ff0f7ed06491ba", + "sha256": "1fr48mkrwxmpjk5lrznrr6nhnj8h6d3v984261nm44c0rzziq7vj" } }, { @@ -30161,11 +30392,11 @@ "repo": "wasamasa/firestarter", "unstable": { "version": [ - 20161219, - 1323 + 20200116, + 2023 ], - "commit": "f2fd47d9be0c53d63bae5c248d23874fab7e2d6d", - "sha256": "14cb46jsvp5s7g6dmhadm9dmi2sqrk215bsq8bwsh6f81fnkvy87" + "commit": "eecd8f97a09bbfbc03113b71fa3c8b92766e3956", + "sha256": "1a7cp4rfa9r707pg7g9xhhs7nj79gva8fnmbq6ck0hxyllcabwa7" }, "stable": { "version": [ @@ -30223,11 +30454,11 @@ "repo": "wwwjfy/emacs-fish", "unstable": { "version": [ - 20190921, - 526 + 20200213, + 2137 ], - "commit": "688c82decad108029b0434e3bce6c3d129ede6f3", - "sha256": "1s961nhwxpb9xyc26rxpn6hvwn63sng452l03mm2ply32b247f9p" + "commit": "db257db81058b0b12f788c324c264cc59b9a5bf4", + "sha256": "1f6viga13k90ws8v18az3vh3rdc5vd28xkpx9vfv3542bx1np1im" }, "stable": { "version": [ @@ -30250,8 +30481,8 @@ 20190713, 1349 ], - "commit": "d4199bd1e2c4d4e1ff120fc683c526fda0877266", - "sha256": "18wbclnqwzgnab6jr32mfsldr1373ivf6v84f4xbj5j6k7n8b6q6" + "commit": "d3e17161d137fb75baf1449741ccaadb949e127a", + "sha256": "18yk3vs4v7n8zmxv80ss7bd94zmr14nring0d5bavax65b4wqk59" }, "stable": { "version": [ @@ -30300,8 +30531,8 @@ "deps": [ "cl-lib" ], - "commit": "53f8d77bfdb8087949a80a62e90a17ebefc9ce98", - "sha256": "1kwvjmp88yrbi2psnlv1kcg9gqxnx85qbhgnz8izpic0qnv76f1g" + "commit": "8d023f13710a90ae4da644d5485bf2be2646b6a1", + "sha256": "0pb5sd5cpz4173xi9kzgl9jx69169aymk94kdr6xgzhqda7iwy7p" }, "stable": { "version": [ @@ -30709,11 +30940,11 @@ "repo": "MetroWind/flucui-theme", "unstable": { "version": [ - 20190321, - 2313 + 20200204, + 1930 ], - "commit": "ec4b20dd5471ee20d5dd6d2e140225ad607550dc", - "sha256": "0bazkkdv3gyyxv3ci9wgwnm3mn9yzb1l8h2mjap5xzy4hm6zj627" + "commit": "01a3df3530474da7b4303e4eea2ed1fae00d1776", + "sha256": "1bfnpligs32mpizrz9fb1pyp1zxq2rmympcg9pqrgpkdlxvs6xrf" } }, { @@ -30724,11 +30955,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20191210, - 550 + 20200226, + 640 ], - "commit": "01473aeec61a19e9638a6c032228c054a578aba5", - "sha256": "1frlfc6wgg4pyhzvk6pa96lqn2dkz1h5c7nzw5rxvg9xm6vp8s86" + "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d", + "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy" } }, { @@ -30739,15 +30970,15 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20190729, - 401 + 20200221, + 1415 ], "deps": [ "flutter", "flycheck" ], - "commit": "01473aeec61a19e9638a6c032228c054a578aba5", - "sha256": "1frlfc6wgg4pyhzvk6pa96lqn2dkz1h5c7nzw5rxvg9xm6vp8s86" + "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d", + "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy" } }, { @@ -30857,8 +31088,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20191126, - 2142 + 20200224, + 2057 ], "deps": [ "dash", @@ -30866,8 +31097,8 @@ "pkg-info", "seq" ], - "commit": "269237f6529a4ad7db5bbbc5a40c1f038accf3cd", - "sha256": "11gjfnrk5s6pr3ggalcxxv9x0grhyliyyz3px2pf5jgc1n115pmk" + "commit": "08345d38e2872a3dcb14228edff796195809266f", + "sha256": "183s05gm7zkgwphrwq0bq9fv2sldhrxjik8skz7rvbz448syh0c5" }, "stable": { "version": [ @@ -31100,8 +31331,8 @@ "deps": [ "flycheck" ], - "commit": "2f89698ab0d78818875d5ef08d0b470a9ffc402f", - "sha256": "1l4jla3vlyx37nz9hjaihy9pi3ywbrg3512k2zp9cdis7130mvrb" + "commit": "2ae5542960785604a2974548f89e10407e2ccfc1", + "sha256": "0gpvavwmb4zp5c5b8z60jcsza0zsb29hsg4sapp9d35hk3ranbx5" }, "stable": { "version": [ @@ -31512,6 +31743,25 @@ } }, { + "ename": "flycheck-drstring", + "commit": "2070680f0d883ea61def1b7a9487c4524886a579", + "sha256": "08hyh39wyphh2lr879y2havw0wfgppq0v763j0sa5hpvaf0y46h7", + "fetcher": "github", + "repo": "danielmartin/flycheck-drstring", + "unstable": { + "version": [ + 20200210, + 1903 + ], + "deps": [ + "flycheck", + "swift-mode" + ], + "commit": "d8d5a560e792a6657ef5ac69934c74f1ed51372d", + "sha256": "0vcp3zbpi5vb8cs01fzb4268gj9ijq9qndqarwnls8w9wky4548w" + } + }, + { "ename": "flycheck-dtrace", "commit": "cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe", "sha256": "14sg7zkq9f5zbcfn8app8m9mdc8cnwcxh7h4glsz32yaqc1dj7h8", @@ -31575,14 +31825,14 @@ "repo": "emacs-elsa/flycheck-elsa", "unstable": { "version": [ - 20200104, - 1523 + 20200203, + 1758 ], "deps": [ "seq" ], - "commit": "4796cdae375f51e8364660518c2948b8a90bcd40", - "sha256": "1nmf51jrw0xixrb0nawl6shfw68nw4zs1w12plhghaiwr4430rjp" + "commit": "6274e6d5391bcdca46164b3238b045ca21c353a2", + "sha256": "0dr52dqxsgswswbkdbv0dax57k41j58n5wf3gny6yz52626kv8n8" } }, { @@ -31737,6 +31987,40 @@ } }, { + "ename": "flycheck-grammarly", + "commit": "5fdf51167be86e0871125d5548bddc0c926b79dd", + "sha256": "0rdgb9ig3gda33xwl8p9c11gf274v02zibzd660ncp0cipapvqp7", + "fetcher": "github", + "repo": "jcs-elpa/flycheck-grammarly", + "unstable": { + "version": [ + 20200203, + 446 + ], + "deps": [ + "cl-lib", + "flycheck", + "grammarly" + ], + "commit": "72425743364f4fd9516f94546a7432457e1e7df0", + "sha256": "17dl0g9f58gc9rkk87kg1bqy6qqz225ng7ymdg2ikhd8i2pd2zkw" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "deps": [ + "cl-lib", + "flycheck", + "grammarly" + ], + "commit": "1bcb11c3c7878c1b0d73318399e572e9a15587b1", + "sha256": "1daw5mmif1nzg4yr5zm42bzzfg1n4qxps3pkcisga11mbp9g553r" + } + }, + { "ename": "flycheck-haskell", "commit": "6ca601613788ae830655e148a222625035195f55", "sha256": "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7", @@ -31744,8 +32028,8 @@ "repo": "flycheck/flycheck-haskell", "unstable": { "version": [ - 20190907, - 2035 + 20200218, + 753 ], "deps": [ "dash", @@ -31754,8 +32038,8 @@ "let-alist", "seq" ], - "commit": "4b585264826a9f0f35d121dd52aa0e381f336d69", - "sha256": "1cz8yxb06acm77jlr0mk9kx79v6pnhb97p2601pik9rndr824c2a" + "commit": "23cfb9387faf6f70b421bb4c11b6847f0db38dfc", + "sha256": "0s36fcqvmi3kmvhmmb0vrbgjkxjpx9wkj343f0rjjz1rh4b3n7qv" }, "stable": { "version": [ @@ -31811,15 +32095,28 @@ "repo": "conao3/indent-lint.el", "unstable": { "version": [ - 20191228, - 235 + 20200129, + 2046 + ], + "deps": [ + "flycheck", + "indent-lint" + ], + "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797", + "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], "deps": [ "flycheck", "indent-lint" ], - "commit": "e76b127241635677a4cb2d457d5c4c74ca93ee92", - "sha256": "1bmik58ygg9r9p7cnvxhss49hkcqy3zgcwrhwq59baqixclfwrd1" + "commit": "5601a716d4daeb444642736ddef420cbc1047968", + "sha256": "0ndpdqdcg2rlrw5z86gyj46qsmsilh3a4snyyybi87kk5ajk2k64" } }, { @@ -32119,15 +32416,15 @@ "repo": "tomekowal/flycheck-mix", "unstable": { "version": [ - 20190714, - 958 + 20200211, + 1414 ], "deps": [ "elixir-mode", "flycheck" ], - "commit": "04681608e52ac660f74989a045579da75bc489f2", - "sha256": "0lszvz83xkzna349vmks7p63v5r7039lmk22m796gd7ynhw7k7qy" + "commit": "d3c075f61ace6695919e90239cee6567cce09638", + "sha256": "19bvnryfxz4idw1dgp90mpjbp3512423m3xqgczskv4csns4hw1q" }, "stable": { "version": [ @@ -32157,8 +32454,8 @@ "deps": [ "flycheck" ], - "commit": "c796a2f18884bfc2afeec1fb2060da0f4044ddee", - "sha256": "09q676m4izyr50c49rsk8dsq7bys227d782x9r2kdld0fr7c7hpd" + "commit": "f8fdd59ccb9ddc7d81efbf3dde096dc66e3f9fa1", + "sha256": "08rwmvddla2h0wjiljl8qab87chsyc42hzap2mqih2n7finvzj4f" }, "stable": { "version": [ @@ -32181,14 +32478,14 @@ "repo": "lbolla/emacs-flycheck-mypy", "unstable": { "version": [ - 20180907, - 1016 + 20200113, + 1336 ], "deps": [ "flycheck" ], - "commit": "6f99166f5229c7b4298cff1818b7eaece1c9c8bd", - "sha256": "06rdwjljhficbdf74qzlxsy02xhd8msp79fx75nwbxbd84q6dr5w" + "commit": "12a77ee8ee3f6e774365f63be3cd5aede6462dd5", + "sha256": "187v8877wh247j26d5h2qcnc8i3fmqgyzfvjjjlw9sswqgrln6m7" } }, { @@ -32312,27 +32609,27 @@ "repo": "purcell/flycheck-package", "unstable": { "version": [ - 20191007, - 51 + 20200222, + 512 ], "deps": [ "flycheck", "package-lint" ], - "commit": "d76e04009f2548581fc9e9a84f79f1a3112f1096", - "sha256": "1jndjq5mnhxmjvhaay4f07p5dbz4zsqv1zhyr98v8zc5dv7qkkfk" + "commit": "e867b83dc84f1f8870eea069a71fa2a24cbcd5c9", + "sha256": "1b7javiqbcfzh1xkrjld9f5xrmld69gvnjz72mqpqmzbilfvmdpq" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "flycheck", "package-lint" ], - "commit": "afe8a49343d90d08ee72ac6f993d424dcc39cc38", - "sha256": "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa" + "commit": "e867b83dc84f1f8870eea069a71fa2a24cbcd5c9", + "sha256": "1b7javiqbcfzh1xkrjld9f5xrmld69gvnjz72mqpqmzbilfvmdpq" } }, { @@ -32380,28 +32677,28 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20190626, - 1902 + 20200122, + 1256 ], "deps": [ "flycheck", "phpstan" ], - "commit": "81bcfa59d1e5708239d8c32d99cd84405449fb64", - "sha256": "1m4vk7v3aafj64qqs0aa9m1w8fbjziq0l6c9k4n10yr8dnm5j9aw" + "commit": "6744215d82ce9e82416d83e5b27fb9bac9e8d461", + "sha256": "0hbm881w84nm4g67085xzikz422vkb08y98hfk2n3kqmznvp8i51" }, "stable": { "version": [ 0, 3, - 2 + 3 ], "deps": [ "flycheck", "phpstan" ], - "commit": "de74ebfcbce53a08daf95d324d7447dede094222", - "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6" + "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a", + "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk" } }, { @@ -32581,25 +32878,25 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20191025, - 2137 + 20200206, + 2158 ], "deps": [ "flycheck" ], - "commit": "da328975c5554a879d6cd198e3ebb4f8427f0c36", - "sha256": "16n41bjmx6nk6gz70d1xv6rvhfw7sxmjs9y14ikp9fyg5j2kdy39" + "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74", + "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5" }, "stable": { "version": [ 0, - 13 + 14 ], "deps": [ "flycheck" ], - "commit": "680ed9bc1bfb6dc043294b705f5b6d87ca5a1700", - "sha256": "1d2caskc87kdclj6gsymnf8bxhyn4n9r9816z76hx88pn16xxqh5" + "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74", + "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5" } }, { @@ -32640,6 +32937,37 @@ } }, { + "ename": "flycheck-relint", + "commit": "e20128460e942a78a88bd9e6389a8fcbb14343ad", + "sha256": "1q443078jf6cxzwxz6mc4m9drzfcd86q0lcw5vszmfyzn35nwyzb", + "fetcher": "github", + "repo": "purcell/flycheck-relint", + "unstable": { + "version": [ + 20200226, + 508 + ], + "deps": [ + "flycheck", + "relint" + ], + "commit": "6dbd319a49d334653a3e4f9bff229f482bbb7ba4", + "sha256": "0rmnq0llmc96hmvhim451fknzafj80pjkd6qdb0x1bdr7iww1ilc" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "flycheck", + "relint" + ], + "commit": "6dbd319a49d334653a3e4f9bff229f482bbb7ba4", + "sha256": "0rmnq0llmc96hmvhim451fknzafj80pjkd6qdb0x1bdr7iww1ilc" + } + }, + { "ename": "flycheck-rtags", "commit": "3dea16daf0d72188c8b4043534f0833fe9b04e07", "sha256": "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4", @@ -32654,20 +32982,20 @@ "flycheck", "rtags" ], - "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", - "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" + "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", + "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" }, "stable": { "version": [ 2, - 37 + 38 ], "deps": [ "flycheck", "rtags" ], - "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", - "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" + "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", + "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" } }, { @@ -32732,28 +33060,28 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20191107, - 320 + 20200221, + 2025 ], "deps": [ "flycheck", "stan-mode" ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" }, "stable": { "version": [ 10, - 0, + 1, 0 ], "deps": [ "flycheck", "stan-mode" ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" } }, { @@ -33508,6 +33836,24 @@ } }, { + "ename": "flymake-joker", + "commit": "1b40ad24abac91b6beb550e743cdcece8c3ab849", + "sha256": "1wflpdqdczjsvkqnlr6p4qv1s7865lr4gpm9aq7gcfqwb0fm7pbw", + "fetcher": "github", + "repo": "beetleman/flymake-joker", + "unstable": { + "version": [ + 20200118, + 1937 + ], + "deps": [ + "flymake-quickdef" + ], + "commit": "c4350eb9198fb6fe1ebfb356e3c9c37dd6b0f171", + "sha256": "0c25nzainwcy5wxh2q1r98fvbnvgylyp6s41sh4zdpzid34rf1vz" + } + }, + { "ename": "flymake-jshint", "commit": "144511ce3378b468751b1ee627b77a2d22fe8dfc", "sha256": "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j", @@ -34033,11 +34379,11 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20191230, - 630 + 20200215, + 1408 ], - "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", - "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" + "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", + "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" }, "stable": { "version": [ @@ -34057,15 +34403,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20191230, - 630 + 20200215, + 1337 ], "deps": [ "avy-menu", "flyspell-correct" ], - "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", - "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" + "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", + "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" }, "stable": { "version": [ @@ -34089,15 +34435,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20191230, - 630 + 20200215, + 1337 ], "deps": [ "flyspell-correct", "helm" ], - "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", - "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" + "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", + "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" }, "stable": { "version": [ @@ -34121,15 +34467,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20191230, - 630 + 20200215, + 1503 ], "deps": [ "flyspell-correct", "ivy" ], - "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", - "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" + "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", + "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" }, "stable": { "version": [ @@ -34153,15 +34499,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20191230, - 630 + 20200204, + 521 ], "deps": [ "flyspell-correct", "popup" ], - "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", - "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" + "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", + "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" }, "stable": { "version": [ @@ -34634,8 +34980,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20200102, - 2204 + 20200228, + 1527 ], "deps": [ "closql", @@ -34647,8 +34993,8 @@ "markdown-mode", "transient" ], - "commit": "269effb4954071f590954c0e5b4faba3f27d03d0", - "sha256": "0d6l1rllzznc9qvim1zn5w3plqcdpk9lwc7m4jsx8jkhxzyajw68" + "commit": "0ade907a469d7159d9f5b3290e2aebec4397c58a", + "sha256": "12pvnasc4nr3n4k91ch90zsvyc1rv1ghga8lx7xp78fc6b3y959r" }, "stable": { "version": [ @@ -34703,26 +35049,28 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20200107, - 1608 + 20200219, + 1628 ], "deps": [ - "cl-lib" + "cl-lib", + "language-id" ], - "commit": "f0ff413f09b5982b39df6ebe0d566aa221da7327", - "sha256": "0bzss41dg25sn7cgf21v5v8hl0qb47l5cr5ngqc9yzd8lgg3x56y" + "commit": "8c8c47a863a397d947999fff4358caf20bafca0a", + "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss" }, "stable": { "version": [ 0, - 1, + 3, 0 ], "deps": [ - "cl-lib" + "cl-lib", + "language-id" ], - "commit": "09119a61855efe084e77f14544d5432b94cfa82c", - "sha256": "1890i4h18rciyl0vngxchdc01hw3wciq7s8qzgnikdz2pcqfwf2m" + "commit": "8c8c47a863a397d947999fff4358caf20bafca0a", + "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss" } }, { @@ -34846,20 +35194,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20191217, - 914 + 20200218, + 1249 + ], + "deps": [ + "seq" ], - "commit": "4805d4149366e69cdce2e4206540fcf064eac91b", - "sha256": "1xavb8yp24y2pvvmh68m0mfdslfifgni22dv7p20lnqz7dp3x3n6" + "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4", + "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d" }, "stable": { "version": [ - 2, - 8, - 1 + 3, + 0, + 3 ], - "commit": "cd58c7e8d8fde05ef521fbcd066a290b005e6d40", - "sha256": "063bdfr0rnnr4k1js9vjcwhdliw374iw433a5hwj3cqj1jwz133q" + "deps": [ + "seq" + ], + "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4", + "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d" } }, { @@ -35165,16 +35519,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20190810, - 1749 + 20200114, + 1826 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "2d7b342785ae27d45f5d252272df6eb773c78e20", - "sha256": "1z00by8hiss1r2lwmzrl8pnz6jykia2849dqqm4l3z5rf6lwvc0f" + "commit": "1eb289c9b2a4bbebb3065076750f54216ac9c718", + "sha256": "0qlwjk3a13gb3glib9irgpyx94j933kflky7pbnrl17a53pnryrw" } }, { @@ -35216,8 +35570,8 @@ "eglot", "s" ], - "commit": "0415c45489fa7d83e9a7c94530aa1943682aabf9", - "sha256": "1cwyj9xw9d2hyvibvyr046bhgmxpf55nmgb33la7564wfgkmr37f" + "commit": "8c86e38b93aac55f57d5baf3a9575b45b54cd16a", + "sha256": "08c8v5wnb7fi4pbi5ivkhi3l4nf8mhn9b9829nkpz1l5q9lmz263" }, "stable": { "version": [ @@ -35241,8 +35595,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20190815, - 1357 + 20200131, + 1622 ], "deps": [ "company", @@ -35252,8 +35606,8 @@ "quick-peek", "yasnippet" ], - "commit": "5af6fea23d1631f3f6653f804f17cd1b7358ca6b", - "sha256": "1wpr8hsvf923k7fwadl6j47k50vvfhzvpgrpj91j8208g8br87l8" + "commit": "336b41ecd7ecb64fac869ec61e683e20a14d79d2", + "sha256": "1122m5l16sw3mi9xvsmkrxxsvx6895g0agd55w8wk5968323n01y" }, "stable": { "version": [ @@ -35283,8 +35637,8 @@ "deps": [ "cl-lib" ], - "commit": "ca1612cc57239c37c7646544d40a6a10adb80476", - "sha256": "1nnim6q1ab2din657qdnlzn5fy1a9wdvkw7gjlb2n9xd27ln00gy" + "commit": "573e4ed198584f17126549f708bd8426e93058be", + "sha256": "0baqikbbgxb2a0jyqz8s9ibivh9q14bq2g2kngd89pssd74fv04k" }, "stable": { "version": [ @@ -35437,14 +35791,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20200107, - 2336 + 20200123, + 931 ], "deps": [ "cl-lib" ], - "commit": "c0899e431e5819575231a7e637d6c77f51e384f5", - "sha256": "0xayw1jwxfln67k8fwkdvc784zrv5sf0jajngxhcx0ljwaqj97q3" + "commit": "ca22b1e5fe46125b968c3da46e0bc9780b32e346", + "sha256": "1zkqlacxmiwprx8xbnp6phf3gh3faxghxv0j90019k0g3dq9l3ws" } }, { @@ -35636,19 +35990,19 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20181112, - 601 + 20200131, + 1335 ], - "commit": "210bd355dd2075bde3fd76c880aa489a25a54cb5", - "sha256": "1xvga0hjwcjvz9vpdn2pxq84wp6f3hrq8g55hhpr4gqxx7yg1bwj" + "commit": "bb4e8a223c8aac5ec9268d1cfcf1a9ea9b3d8a49", + "sha256": "084xjxj03d0ghh1lgrgwlkzf78y3szh47m3qva4r344yg0051yz3" }, "stable": { "version": [ 6, - 5 + 6 ], - "commit": "3022e9f8411628e6a210fb5843d858b15a7513f5", - "sha256": "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504" + "commit": "bb4e8a223c8aac5ec9268d1cfcf1a9ea9b3d8a49", + "sha256": "084xjxj03d0ghh1lgrgwlkzf78y3szh47m3qva4r344yg0051yz3" } }, { @@ -35713,11 +36067,11 @@ "repo": "koral/gcmh", "unstable": { "version": [ - 20190807, - 2023 + 20200213, + 944 ], - "commit": "f542908b9ae4405d70fa70f42bd62618c5de4b95", - "sha256": "0mpi6x06kg5a7dr13q69irv58j3rda62fbscm5b7d1b9vlp4vcqi" + "commit": "8867533a736f2098917904c26fd833feca2310a5", + "sha256": "0fwbxh0ywy6prjvgl91xdxfmcca4cnnn2cy2zndj5mdl0zx5k3a2" } }, { @@ -35820,19 +36174,20 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200103, - 1329 + 20200225, + 1423 ], - "commit": "645e4775420c59bb10ef0693ed2631a8df8c0e29", - "sha256": "035rf5i37zwl4glnpvvgn25sp1lf3c212ycsah5xpyh0ddzw5v4v" + "commit": "5fcd56b2d560c04a173ae7d8b21540471322afa4", + "sha256": "00zvll0glzx9lp4s9l1ix1grdqa9cj24kszil1akaa8rqniiafn1" }, "stable": { "version": [ 0, - 10 + 11, + 2 ], - "commit": "775d1d734a677274fbbf4af780592bb3768d3f9b", - "sha256": "086qlii1w7sqxwnxwxvc4d6d71p829jabhgwvi0l0bjkxn7bx8pq" + "commit": "51252bcb35d6afe006487b73c1e2276210b4ed83", + "sha256": "1khi1bghsjx6cs5acizmlbw9z19s4qycnji9krdbn42cbpv0rysv" } }, { @@ -35921,8 +36276,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20200107, - 2305 + 20200226, + 2137 ], "deps": [ "dash", @@ -35930,8 +36285,8 @@ "magit", "s" ], - "commit": "a88e2ca8a6b3ccab44ed8f4f7653e6235c96353b", - "sha256": "0mm7naq50wwjljky1yzcxh1mzi5x74dc4yzqaxl5wrqkc80calhz" + "commit": "36870fd34ad681f907a57a2d82b2002735878614", + "sha256": "0h9v4ajp50wpg3zz0p7klyi705ynfy2mka0hpzz81kgpq8q8f46z" } }, { @@ -36219,30 +36574,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20200102, - 2204 + 20200228, + 4 ], "deps": [ "let-alist", "treepy" ], - "commit": "a9c5ac44bc7691752e6bfea87ac75c7459ce88f3", - "sha256": "07wanc8l1k9dk1r7ykgpiq1yfp5dwhvwlfaay1y86xblpd9jaagi" + "commit": "b0faadaf079542f81ac06a15a1bd225e2a7af1ec", + "sha256": "1fasnipic9mkhkm7km56f43s19cyzrrs1cd8nr81b9kxmp95ik3r" }, "stable": { "version": [ 3, - 2, + 3, 0 ], "deps": [ - "dash", - "graphql", "let-alist", "treepy" ], - "commit": "b04c7d9a3318316ef67a5d360582d990dc9f6098", - "sha256": "0lp52qygyavddl1lrgsyb6mq7hcf9h89dy2pzya3mb2va49f0vvl" + "commit": "eec071aa9e2810c8ce2f2522e6be8d78f579069d", + "sha256": "1229g0d9f4ywwjndx32x4z5jdr0kzyi44hjxmy0sifwfmg9nn251" } }, { @@ -36284,11 +36637,19 @@ "repo": "Ambrevar/emacs-gif-screencast", "unstable": { "version": [ - 20191212, - 147 + 20200207, + 1358 + ], + "commit": "dce0f3bb71ab8761a689c7382864a20198874b8e", + "sha256": "0yf665w06ijjxvzfbg8naa95f5ga3z2kcaq9baq7md222r52xd7q" + }, + "stable": { + "version": [ + 1, + 1 ], - "commit": "2ed2ebe710690f041c074cc59816ecd3e0f8e980", - "sha256": "1nyysz7bcx4lm2jp08c50xqrz14piwpvr83yk77rrdjg837iasg4" + "commit": "9522f7e41d07b59afe21e28abbf186f78be3eab6", + "sha256": "1g1by8lvf8c9vzm4wwsi5kp285kaj0ahsl54048ympin4pi0njw9" } }, { @@ -36443,20 +36804,20 @@ "repo": "ryuslash/git-auto-commit-mode", "unstable": { "version": [ - 20191214, - 1021 + 20200217, + 2348 ], - "commit": "6f7b58f866a72709c213f4c1f7c957beb474bd6c", - "sha256": "0lfyksjl4wlb0vlw99ng4wi0q6q9dh6skia2ji836h0hbqnfyp3l" + "commit": "ae69e61233417a7f14efba35e42bd842b707aeb0", + "sha256": "0nrx3wnn2jii4yiv9c1cbbll4bgll5j73ypp1fi82kk99n0d8372" }, "stable": { "version": [ 4, - 5, + 6, 0 ], - "commit": "3db70af7d3659d1fe0ed2edf34cae23708a6d511", - "sha256": "1w3v9pmlmdxl4pglsb6j0igp13lbzg5bhbr1rv2vll93m6zxmyma" + "commit": "ae69e61233417a7f14efba35e42bd842b707aeb0", + "sha256": "0nrx3wnn2jii4yiv9c1cbbll4bgll5j73ypp1fi82kk99n0d8372" } }, { @@ -36564,16 +36925,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200102, - 2204 + 20200207, + 1819 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "2191261223078077bf35eb12187e35ff0228174a", - "sha256": "1fn1ygaw71qq5b6dqk4bj05rfjqb4qz2hv0vc3m3zvpckxar6v5g" + "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6", + "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv" }, "stable": { "version": [ @@ -36771,20 +37132,21 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20191006, - 443 + 20200124, + 1856 ], "deps": [ "dash", "f", "hydra" ], - "commit": "747ea7c2694754719261c2845cdd9f5f8b3aae20", - "sha256": "1hg2na6djk2ca4hdsnk3n04yk8q6cdjf6zm63142wgkmzd31qplx" + "commit": "8471e6f8ef6c502dc999e513b552d6b23974d40d", + "sha256": "1w4dnrc0dq0brdq0dpk5lj7ji50v5b7q32f1ghkvx50i7a3dslvq" }, "stable": { "version": [ 0, + 1, 1 ], "deps": [ @@ -36792,8 +37154,8 @@ "f", "hydra" ], - "commit": "fcfcb054c08b9a391add639123faf7f700b57af4", - "sha256": "1lyz4cwlskwfgh6jgvpbyc9c119znc651gwl4bchbqr97bgq2nqm" + "commit": "d5b8dcfc9f93aecfcd9c6fb212742c165d48173f", + "sha256": "1dblc0vlnkm1b16pgi40yr21wh45larb7818l9q8p9nbpxcjinh2" } }, { @@ -36915,11 +37277,11 @@ "repo": "10sr/git-ps1-mode-el", "unstable": { "version": [ - 20181115, - 349 + 20200113, + 704 ], - "commit": "b9188e26a64fa6f8678da6cbf5e3e865065f4f04", - "sha256": "0l9y6x53li7fqfrwb4037psn92xciylanj0fmmy8jy6n51dlzxyn" + "commit": "6762a309bd593d26258dfbf43e7bc21254a70fbf", + "sha256": "1xrp9c7ih5xvq9mhd4h2vwn47khmiycdinzhn4kmp69xy1a93b2c" }, "stable": { "version": [ @@ -37177,16 +37539,16 @@ "repo": "10sr/github-elpa", "unstable": { "version": [ - 20180831, - 811 + 20200129, + 417 ], "deps": [ "commander", "git", "package-build" ], - "commit": "279b6c352859cfd519ea8726eafed84d6875c418", - "sha256": "0qhsi6qayjxg15wyjbj4sjhq4y6nhb9vd8nhc8qx26qlmvmnd0mg" + "commit": "04a55c723ffcd84dd35e5438e7e2b9f1cce08d42", + "sha256": "19jidx1v3awga0d95shdcz5vgwfw4svpgs5l43d4l340lz84c4dk" }, "stable": { "version": [ @@ -37299,16 +37661,16 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20190830, - 1639 + 20200123, + 523 ], "deps": [ "dash", "ghub", "s" ], - "commit": "4f7f927f57d39beac231cadcd1fea42c77103073", - "sha256": "1wcmkz47ylid9p5fvy9a6yzylv457vrcpc64msmfsnai6qbqx8k3" + "commit": "1de2d6d148e3604899270be36eb6b0385b837aac", + "sha256": "1g1j6c93aw9n9v7r20dzlnylkn4292vwi59l8hai49i1944hr00h" } }, { @@ -37408,11 +37770,19 @@ "repo": "xuchunyang/gitignore-templates.el", "unstable": { "version": [ - 20180327, - 1326 + 20200228, + 1419 + ], + "commit": "b147d1930645dda76dbd48fb6f4f7f790353de26", + "sha256": "17g66y8swy8pjkrv0in9bb1qbaq04ixn5wp6h7r54nfvjlnl1rza" + }, + "stable": { + "version": [ + 1, + 0 ], - "commit": "b0705b8de4cbdd631c64c4e0024d62ba4ad68052", - "sha256": "1f0lcyw7yrdfmv0h8b87kz0pdrzhy28fzv688z4aaw964qn8jz0k" + "commit": "b147d1930645dda76dbd48fb6f4f7f790353de26", + "sha256": "17g66y8swy8pjkrv0in9bb1qbaq04ixn5wp6h7r54nfvjlnl1rza" } }, { @@ -37767,11 +38137,11 @@ "repo": "juergenhoetzel/emacs-gnome-screencast", "unstable": { "version": [ - 20191217, - 2007 + 20200115, + 2230 ], - "commit": "cff1c312224b4943df6fb6559492fd94caa82f86", - "sha256": "0cwdmlq3aibai1g4jbxvwms9wvqxscak7bvlxv52i9qxyr7gjlnv" + "commit": "8c5e787230b2b8a51520ab970d5b505cbbc8f32f", + "sha256": "1zalx97b92vxjczm798arxyxhl29hla9c9j4da9ykpyspf3wry4d" }, "stable": { "version": [ @@ -37833,11 +38203,11 @@ "repo": "lokedhs/gnu-apl-mode", "unstable": { "version": [ - 20181217, - 854 + 20200108, + 1633 ], - "commit": "3b5b13abeb424e8ed399379fdefc168422664def", - "sha256": "0nhbfzfwl44ffvhzrnkjxaxz2nfrp1a7zcy6fg6cm13c2z40jslp" + "commit": "7f84eb307e9765fadcd1e0a9201ae562724ef1c9", + "sha256": "0aqlgsl19p2vlagdvahxxhqdcvmr8g7wlziwjvm2pina3lqfw4wc" } }, { @@ -37990,6 +38360,15 @@ ], "commit": "3968667bfded60fbbf33f2fba3170e2b6501ec43", "sha256": "0rxaxc7b0dkhsd5547hngq24bdvnxig5a7xp9jir59fp2k8xd4aw" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "3968667bfded60fbbf33f2fba3170e2b6501ec43", + "sha256": "0rxaxc7b0dkhsd5547hngq24bdvnxig5a7xp9jir59fp2k8xd4aw" } }, { @@ -38104,11 +38483,11 @@ "url": "https://git.sr.ht/~zge/go-capf", "unstable": { "version": [ - 20200102, - 1957 + 20200216, + 936 ], - "commit": "d391dd08cc33be958d9ff21daeb88b79e5ab68e4", - "sha256": "0snwaj702xjy3qrknjjywqsgr8553rk6kr1qdcbpln9nj9hyksb4" + "commit": "9e66ce4ef4307e9f0e73e65f6bb2f287ed2c940b", + "sha256": "1sgsxd511xw1g707c0d58j3xzxfbay7k5b7hyamd2fnh30pw2hb3" }, "stable": { "version": [ @@ -38327,8 +38706,8 @@ "cl-lib", "go-mode" ], - "commit": "e10d6775f486ef09ed993567b0bd2c69f35deb45", - "sha256": "0z41kbyl8g0nb00sx8y5lhnx8w99rawnpkm7avn93f8kd5fan8im" + "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064", + "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc" }, "stable": { "version": [ @@ -38420,11 +38799,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20200107, - 546 + 20200112, + 2140 ], - "commit": "e10d6775f486ef09ed993567b0bd2c69f35deb45", - "sha256": "0z41kbyl8g0nb00sx8y5lhnx8w99rawnpkm7avn93f8kd5fan8im" + "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064", + "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc" }, "stable": { "version": [ @@ -38528,8 +38907,8 @@ "deps": [ "go-mode" ], - "commit": "e10d6775f486ef09ed993567b0bd2c69f35deb45", - "sha256": "0z41kbyl8g0nb00sx8y5lhnx8w99rawnpkm7avn93f8kd5fan8im" + "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064", + "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc" }, "stable": { "version": [ @@ -38776,8 +39155,8 @@ 20180221, 2015 ], - "commit": "fdd1cda4f05fd1fd86124f0ef9ce31a0b72c8448", - "sha256": "0a23pc90fqar8sm1b480sls15ss20rqk13yrf63b6rnyd2c6z0x2" + "commit": "910be7a94367618fd0fd25eaabbee4fdc0ac7092", + "sha256": "08gskshgfwxhmm9i4vgd4q7kqd5i7yihqh33v6r07br6kqd0g995" } }, { @@ -38821,8 +39200,8 @@ 20180130, 1736 ], - "commit": "f704c352f4f0597d2bd8b85d089b093946ff75d7", - "sha256": "0kki38izdw7wl6x8cvcwidmrrw1cgx18a64gffwl05ka59yw375g" + "commit": "305ac8725a166ed42e3f5dd3f80d6de2cf840ef1", + "sha256": "05znbhy98pyc6r7dii8drw4p8vy6f5b3zk0hmlw8w73vcwia59ay" } }, { @@ -39213,14 +39592,14 @@ "magit-popup", "s" ], - "commit": "deff37c279fe783a0ea565cd572565d37bbedafd", - "sha256": "0zamng9677kj13wp6gmadmrb4r9bngf74pmd6xvvnwdwn5s0gvrz" + "commit": "5d909f3e947adbce0482a0a00ede8654499cd28b", + "sha256": "122r7clj081gwxgw03d162garrjw604ynfpyzhawix0wh8hwmg9z" }, "stable": { "version": [ 0, - 21, - 0 + 22, + 2 ], "deps": [ "dash", @@ -39228,8 +39607,8 @@ "magit-popup", "s" ], - "commit": "a0fef816799db3e430bb7a5ac951e7835fe4d56b", - "sha256": "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130" + "commit": "e7df0c1118c15c0b35fe08f183ca084269ea6542", + "sha256": "0lm1jaw5bpz7z4gibbbhswjr7qdhxkgbawr5bnykprsmp663i3nm" } }, { @@ -39440,8 +39819,8 @@ "repo": "jcs-elpa/grammarly", "unstable": { "version": [ - 20200105, - 125 + 20200126, + 420 ], "deps": [ "cl-lib", @@ -39449,8 +39828,8 @@ "s", "websocket" ], - "commit": "87b46bb1c906e86fe9ea16b54d3699deb33d7221", - "sha256": "1jkb2g1xiwgwdyhgk1v9lr8s2h1hw1drq3d1kiba0djiicchy46y" + "commit": "ffff850b77ebbab827538f6ebee872b2638586bc", + "sha256": "1kxcnivlbv7dl09y09j72368sycqs96hk5nf7vsnqlfrrbc0337a" }, "stable": { "version": [ @@ -39612,20 +39991,20 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20191126, - 2016 + 20200203, + 1919 ], - "commit": "158644714e8f35d8d2b9e5e4fbd00dbd8075a7bb", - "sha256": "0ymz88244dccbrysaq1yik6nzrqmaw37jh6h1sqqla0nbbidgvr1" + "commit": "0a4197d1c2b440db37f3e77cba01fb2c00a1a88d", + "sha256": "0a2p4vnchb63275j0w9fhkq1x4dkyyvaxqpyhx41zlg2zfzvcpwh" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "1574c504d9810f34a85e2ff49b6f7648c2be5f27", - "sha256": "03l6zkkxhbcxj5i13hzjv6ypmzaw70zqqagh7ix1kdn33kpp37jj" + "commit": "80b9c5e7f464c70cfa423e5ee3237581bc69d643", + "sha256": "1v1p85wk73nfsvv66qf90flgf9dqhmv15z1r7q4zmc4ifklqn08m" } }, { @@ -39875,20 +40254,20 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20191114, - 1754 + 20200217, + 1151 ], - "commit": "d1ee2d170b50ccd6f32d875db527581e6ee959fd", - "sha256": "15892kak2ag4hc3vi01yp5qsn9yzjqqhfxyfxf4lv0xh02gnbh5j" + "commit": "061f78d0f1699288e7abc7eaa0dd13749524464a", + "sha256": "0dg4aq4x2wn7mwv04nydkz773ip3n3ps7j1kw4mcrvv65m62ks9y" }, "stable": { "version": [ 2, - 1, - 3 + 2, + 0 ], - "commit": "923ebc91e37e6489e02c11c5cd6c490f7aa5efb5", - "sha256": "0jhk8agn0y56gf6hcd15yn1lbfzdc7522j9xqly90pd3jjcllpbp" + "commit": "25650c9412df8b57c6546ffecfa5a9f6c0c362c8", + "sha256": "06xjr34srrmbbxaml45y3f6cq1n1q6a0rfjd54zq30fwanplklqk" } }, { @@ -39987,11 +40366,11 @@ "repo": "rexim/gruber-darker-theme", "unstable": { "version": [ - 20180529, - 712 + 20200227, + 2238 ], - "commit": "c7687ec0511941db1371dcd70b31061d74aa5668", - "sha256": "1dn4vb07wrnc6w94563isx8jfv6vbpp04kh0jfqjmc7nbmyzpaf2" + "commit": "7f95ce96079eb22b9214435ed25c5af98f60b482", + "sha256": "1zdqbjhcb8b1f4szzjmkzhpxcg17dqfp91882h95f1x9c2an5gdw" }, "stable": { "version": [ @@ -40042,14 +40421,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20190720, - 337 + 20200216, + 2257 ], "deps": [ "autothemer" ], - "commit": "37548041b6c541b69ab6d18b53f7513781a1f2b3", - "sha256": "08cmwspkijrfr1k0p7ady44vxjv27yjp7kj3achp024j4g2jvybc" + "commit": "d5218aec3283d21566cb2c5619a19268743fc07e", + "sha256": "1cp7imprwk5vvgsfskpvjzxypq06xf5pqjhicvnyg4386ckznfib" }, "stable": { "version": [ @@ -40242,8 +40621,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20191121, - 1620 + 20200219, + 1821 ], "deps": [ "bui", @@ -40252,8 +40631,8 @@ "geiser", "magit-popup" ], - "commit": "c2796e68868c91253b6aca422a9ae07363aa03a9", - "sha256": "0i0bvv3wd3fd22mffa62076mi1cnzwyphibqiimll23kngg507b2" + "commit": "3b5990618e70494aa89ff18c58ff24f369005323", + "sha256": "1w5dhacl451cbi8s6y49dcgzkxyai9ggrkpkf16kpmgwf7j0rapk" }, "stable": { "version": [ @@ -40894,11 +41273,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20191229, - 2357 + 20200221, + 1959 ], - "commit": "c69ced59b6e2b452858a9469ce2c343a09aee871", - "sha256": "0lbbn5kh3c2yvh5xn8b2a2s5364yms3iga6x0ks442yzkfrbf78g" + "commit": "35363a98445e27dad532d134d3ce863f8d95dd91", + "sha256": "1m3mhvaj5b7vavv507x92mzhm7r4clqs1via8zsza4v3ccbsgjws" }, "stable": { "version": [ @@ -40992,8 +41371,8 @@ "deps": [ "avy-menu" ], - "commit": "e5eb3cb72a3e86be9a682169885194941ce8ef40", - "sha256": "0mhlp053s7j632pckzsj585wkda6akg1pq70r4wj78mwmcrbm6qh" + "commit": "4a0d1d9beb3be8ff4a1857eb920c916734dcc8e1", + "sha256": "1sp07lqvxxcl625qr9ka7idvci3j0p77ll90pwzykr5cs7r3lzl2" }, "stable": { "version": [ @@ -41023,8 +41402,8 @@ "f", "magit-popup" ], - "commit": "98bd4046a9fca6eb98a7466694871325d787ca57", - "sha256": "1jd69blrwafc3x3l663zwfck07nrvij1p8xsprzjvx3hzyci7bdb" + "commit": "9ef133ed831a95a2b9990a46a3c57f1918d0274f", + "sha256": "08h795hplyy7d0yqxvdfx3ylb7gkjplyriyq0w9dsv6ggvmc5hhl" }, "stable": { "version": [ @@ -41079,17 +41458,17 @@ }, { "ename": "haxe-mode", - "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db", - "sha256": "14grb7lcaw57rzqlyy4ja10068r59i2ifxk0q177p4yg8rm519cy", + "commit": "31ab3513c2d048ee6d8277916e29987f981b81ca", + "sha256": "1h5v0vza8pyqf76hmzwgavh2zzrzwfjl4xdcc469bb6c59gzvhmr", "fetcher": "github", - "repo": "jcs-elpa/haxe-mode", + "repo": "emacsorphanage/haxe-mode", "unstable": { "version": [ - 20190703, - 619 + 20200204, + 1015 ], - "commit": "ed99906a808ff4a00bf6b0e231c30c240a563954", - "sha256": "1lnx8qrqix2n3bvw8blqc7msghfy1w1dzyga9s8c9z5pawqrbm85" + "commit": "9449b2b8bc733faa130d3ab68b97ac1ae1db3bff", + "sha256": "1xpjwzd8vd41hs3i3yy4l1w0q0pk8s12bgky5q524n03pdq4n756" }, "stable": { "version": [ @@ -41160,17 +41539,17 @@ }, { "ename": "hcl-mode", - "commit": "66b441525dc300b364d9be0358ae1e0fa2a8b4fe", - "sha256": "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin", + "commit": "979fe43b4f9325a4fccad6998763af2b44431b30", + "sha256": "0kvyvjv19fag60vv9qv0j91jmj8nilamcwqd1mj70qcj35pwlp60", "fetcher": "github", - "repo": "syohex/emacs-hcl-mode", + "repo": "purcell/emacs-hcl-mode", "unstable": { "version": [ - 20170107, - 827 + 20200225, + 2130 ], - "commit": "0f2c5ec7e7bcf77c8548e8cac8721ea935ca1b5e", - "sha256": "0qggby20h8sir4cs5af9y6b2cibix3r067sadygsrvx9ml17indw" + "commit": "6599520a350e01354300a962463ecbf5564db622", + "sha256": "18vs2cwa1pyly2kh2lapm10n8akam5fvsx8rvgp41lcwrdxs2323" }, "stable": { "version": [ @@ -41228,16 +41607,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200107, - 1518 + 20200227, + 923 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "05d70ff116a696f5c18e5ad569573d8936ff01da", - "sha256": "0v7xgfilnzcyha7vyqgr5imjhppw9y8vxazdvkl5n4vdh7n0xb98" + "commit": "21e778bc8858b082ed45e3d0bb287ca9d13e101b", + "sha256": "14rcgdmb7vlxzkfprps2svzk8r9198fzzkkrls8cafw9zg4fimxg" }, "stable": { "version": [ @@ -42083,14 +42462,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200108, - 724 + 20200207, + 1836 ], "deps": [ "async" ], - "commit": "05d70ff116a696f5c18e5ad569573d8936ff01da", - "sha256": "0v7xgfilnzcyha7vyqgr5imjhppw9y8vxazdvkl5n4vdh7n0xb98" + "commit": "21e778bc8858b082ed45e3d0bb287ca9d13e101b", + "sha256": "14rcgdmb7vlxzkfprps2svzk8r9198fzzkkrls8cafw9zg4fimxg" }, "stable": { "version": [ @@ -43640,8 +44019,8 @@ "helm", "lean-mode" ], - "commit": "f26e40daad2c1bd090e440a2b931205ac3b9b613", - "sha256": "022i1v885pvzz42cwrz7wp5amx25k664pvap7c4487hlrrkp1bg9" + "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609", + "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf" } }, { @@ -43827,11 +44206,11 @@ "repo": "abo-abo/helm-make", "unstable": { "version": [ - 20190729, - 1221 + 20200228, + 1742 ], - "commit": "6f3d9a0feed47c1d6a9b82baef2e2663ac496514", - "sha256": "0xgx1qr3ypnqnv38850zxak7rga9mn3d428szz80r6438nl8hlb0" + "commit": "a52b3a34ade00e695a412bc0c5873d4f4d22c323", + "sha256": "1jqihwh24f190zsc3a2xc7ja6j6q3nl742a0m9d6fiw28aijg34f" }, "stable": { "version": [ @@ -44343,15 +44722,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20200103, - 644 + 20200118, + 2302 ], "deps": [ "helm", "posframe" ], - "commit": "f9b41d6ef3471506528fc7edfeb784c050d87db0", - "sha256": "1j65nabxin0czr0vq9wh9fvgc3fswqgbls3l6bncw64y1wzpfbng" + "commit": "7970f9397ba7d148e590e4ffb340bf6c7c0602fc", + "sha256": "0106fsdzp3911spylrixqkgpnjnfg491f0rmbqmn4hc1shnc2sbk" } }, { @@ -44823,20 +45202,20 @@ "helm", "rtags" ], - "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", - "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" + "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", + "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" }, "stable": { "version": [ 2, - 37 + 38 ], "deps": [ "helm", "rtags" ], - "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", - "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" + "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", + "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" } }, { @@ -45192,14 +45571,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20191225, - 959 + 20200121, + 1859 ], "deps": [ "helm" ], - "commit": "eab47a9991ec3e6d332b091af3cbc5ee7761b121", - "sha256": "1h749s3vx5p8lgpavpvj49a3zipq6ajdrjh8bxv0qxn6k3lc1nly" + "commit": "9324d8c196ab2a86fde7142f159e081b87a4d277", + "sha256": "1nznfrnzfbxa5qlwbddjma96k93f9hr7jv9sqx3krc0i1061nbg8" }, "stable": { "version": [ @@ -45623,8 +46002,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20200101, - 1346 + 20200111, + 2324 ], "deps": [ "dash", @@ -45633,8 +46012,8 @@ "f", "s" ], - "commit": "982dd49c9c7e63fa94b56824f50dea4186081f8e", - "sha256": "03fkk0dybzj6ckkvih7fxsw7kf3a26h7mlly44acxcpkyjxq0k1k" + "commit": "c54e9ddbd6a77858048c1a4c4b549de98af8f88e", + "sha256": "0x339wxhwma1i27j52wnbhc541633dxqmx1wyxg3yp78aciyrfhv" }, "stable": { "version": [ @@ -46418,11 +46797,11 @@ "repo": "PythonNut/historian.el", "unstable": { "version": [ - 20190111, - 313 + 20200203, + 1927 ], - "commit": "64f4ef8cd4e417dfa090138a2d4ea1e72fd4456a", - "sha256": "0py43kml7fcf1k28pali7n9nhsjp003j02cpynqcz6hmk8zr7b48" + "commit": "ac1bea7d99dd6965c72fabeb72d5fdc38c5380a4", + "sha256": "13pray3iapy6vbd1y1y7fqcnjpsvgfz2z7j1a1awzd8ifp12g9cp" } }, { @@ -46538,11 +46917,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20200106, - 448 + 20200118, + 310 ], - "commit": "646c8cb8938b22b34f7c75a8644680a3f75f6bf5", - "sha256": "1ydnf53fk6gbcmqijwpi5yqwbz4b86y2xjbmf264a7yavb7gqpjh" + "commit": "6a8f871d7aa5d0d58b7c6ede281f8f8965124c9e", + "sha256": "1jdqz3cfncka4rdqxa4qg7f8dhkwx2h9s16gd3xqjwh8xrpf9qnd" } }, { @@ -46614,8 +46993,8 @@ 20200103, 1239 ], - "commit": "5d2ea49f83a7e6953f9d71de94dee478d08f9543", - "sha256": "1v51mlq13wr890ijwcwf0ymmc768cipj7a1nvmbmwh7y4ymlrsgn" + "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9", + "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w" }, "stable": { "version": [ @@ -46804,28 +47183,28 @@ "repo": "dunn/homebrew-mode", "unstable": { "version": [ - 20160615, - 1320 + 20200205, + 224 ], "deps": [ "dash", "inf-ruby" ], - "commit": "d422307aee2f897d1a92e3b959c3214bc54cbe38", - "sha256": "1z4d0niz8q24f2z8rnfnc2rlmkffkf7qc57qn4695jbkzb7galfz" + "commit": "8c04b040656dc99719efd7663c10f26f74df4a47", + "sha256": "0hqpj9fqq0b4nj7ya93jgkagafixqkinyr7qj8dsy2j1q458ynzf" }, "stable": { "version": [ - 1, - 3, - 6 + 2, + 0, + 0 ], "deps": [ "dash", "inf-ruby" ], - "commit": "d422307aee2f897d1a92e3b959c3214bc54cbe38", - "sha256": "1z4d0niz8q24f2z8rnfnc2rlmkffkf7qc57qn4695jbkzb7galfz" + "commit": "8c04b040656dc99719efd7663c10f26f74df4a47", + "sha256": "0hqpj9fqq0b4nj7ya93jgkagafixqkinyr7qj8dsy2j1q458ynzf" } }, { @@ -46879,6 +47258,21 @@ } }, { + "ename": "horizon-theme", + "commit": "e2021dcf9db816a28cdc3fda226dc58431d7baca", + "sha256": "1532ab1blkxyfjcalr2vzp6yk9mkxnxh9yim2v9l0h7j17ddmw2v", + "fetcher": "github", + "repo": "aodhneine/horizon-theme.el", + "unstable": { + "version": [ + 20200129, + 1957 + ], + "commit": "5bed6dd5bb9faf7d113b19f61cbca98da6262a3e", + "sha256": "0nhx0j3ffd24v9hvwfwwrp3bhx1105g9vwz543hn6yagx63y4vxz" + } + }, + { "ename": "horoscope", "commit": "180248c19160940a208b32fa7a9660a838f68de5", "sha256": "1y2nzhdl7ghi5l3iyzb04xics7gr5981jmb5z5y8y1z04xhqpfs6", @@ -46901,15 +47295,15 @@ "repo": "ryoung786/hound.el", "unstable": { "version": [ - 20170627, - 1959 + 20200122, + 1700 ], "deps": [ "cl-lib", "request" ], - "commit": "0c5a250ef82870dca737a429b6e9b9db93874ed3", - "sha256": "0kf2nhp5k3gk82ad1k9qi4aysqhw36x4mcdhg6kjckmcakfjw3g6" + "commit": "35e2cdc81fcc904b450a7ef3ec00fd25df6a4431", + "sha256": "04pb5yhv4ysmm9ngpipxglbwd6msxr4d0jd64mixxq77g2yfmfm4" }, "stable": { "version": [ @@ -47004,14 +47398,14 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20190924, - 704 + 20200217, + 2331 ], "deps": [ "dash" ], - "commit": "66c5f9131242697fabaede5566d87ecda4c14b1f", - "sha256": "0mip7v2w89wjs2nw4c198y7rpf9i7wsrjibmcnnzwxhcm1sidjnh" + "commit": "fff8c43f0e03d5b98deb9f988522b839ce2ca253", + "sha256": "0v89jrz0igkj1w4jxi365nqny2vqr1wjmrvknzdlrm7g0islinwc" }, "stable": { "version": [ @@ -47301,6 +47695,21 @@ } }, { + "ename": "humanoid-themes", + "commit": "3f4a3e3f257a02c4d702ddc38f5aff5a9411e21e", + "sha256": "070y1xrfabpzc4rdj7qhxa6yl8fdv4p7imi8yivbv0cwx3rpx75s", + "fetcher": "github", + "repo": "humanoid-colors/emacs-humanoid-themes", + "unstable": { + "version": [ + 20200209, + 1402 + ], + "commit": "80eeceadc595899a7b87abccf33099c3d4a14d0a", + "sha256": "0ji1wxlfyjdrwkfphkn6yl3y57701a0ywqzxpjbb9k762i20qycr" + } + }, + { "ename": "hungarian-holidays", "commit": "0c2dc20ce4b878a32c540744016a40f6cc2a657a", "sha256": "1bdl0ynlni1i19hq4h48k8j9b2davv2kfgrpd2mrl2xqmjvhm1m2", @@ -47458,15 +47867,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20191125, - 955 + 20200228, + 1830 ], "deps": [ "cl-lib", "lv" ], - "commit": "9db28034d7d61bfeff89899633b958f22befc53d", - "sha256": "1vay297i270n0s0bs1a96h9mn73i03885nnrcs8723i3iv7b51mp" + "commit": "d2b921d067d7c7ea2f087b4d8edfdc37bcdf4af8", + "sha256": "1zsm7qhqj17wnx611rz6f917lvvj4ifz4vg4x144y8a5740pkihi" }, "stable": { "version": [ @@ -47604,20 +48013,19 @@ "repo": "muffinmad/emacs-ibuffer-project", "unstable": { "version": [ - 20191128, - 1938 + 20200210, + 2252 ], - "commit": "38d0d528f7ec008d2953fc9c6217b327c50088ec", - "sha256": "08ahkjs2rwdn93mmwsp2snvvparq76y3k788q5nj90xl396j5l4r" + "commit": "8cc8c96cb15874dd55cdbfce759f528de0046f9f", + "sha256": "0ysjyirw9gkrs8wivvvxfgdq8radpkl6nhh2a0ac3s42vrwbf9g1" }, "stable": { "version": [ - 1, 2, - 1 + 0 ], - "commit": "a83e74952244f46a759a8ccd5e55176c763c7309", - "sha256": "09pcd0xlijxmz2lh69m3rs53agzq4zr7i2wg652v25s4rhipl55r" + "commit": "8cc8c96cb15874dd55cdbfce759f528de0046f9f", + "sha256": "0ysjyirw9gkrs8wivvvxfgdq8radpkl6nhh2a0ac3s42vrwbf9g1" } }, { @@ -47972,16 +48380,16 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20191105, - 532 + 20200215, + 1841 ], "deps": [ "cl-lib", "memoize", - "s" + "seq" ], - "commit": "74861eabd0a2619be9efc4c91fe0c5e69db5f263", - "sha256": "04rykll588dkvmanskqnfvkb9pgsj4ymlzx1msahj1g144laijnc" + "commit": "46202cf953139332ea79b8904bc30166a9cc6148", + "sha256": "06h437hni3lh90qnxq2a489h6f312b11wfvrcj21jwbn2zxak1hb" }, "stable": { "version": [ @@ -48768,20 +49176,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20200104, - 1433 + 20200217, + 1302 ], - "commit": "fbfceeca10c745829a9a4e0c982f41458e477a5b", - "sha256": "0whrgv8g6ml5d45lymwn4qh1cqsj19hwjl0mrhmzgsxj7cx5gfxq" + "commit": "a0fd571723adcfc780fd31a3a4444e1d6edbb64d", + "sha256": "1xby0qsbv1maqs31lkaq6h8djm08cahsxkas8q0cvnlfvgxxim1d" }, "stable": { "version": [ 0, 3, - 3 + 10 ], - "commit": "fbfceeca10c745829a9a4e0c982f41458e477a5b", - "sha256": "0whrgv8g6ml5d45lymwn4qh1cqsj19hwjl0mrhmzgsxj7cx5gfxq" + "commit": "1a18584252a79553dbc3bbfd3b6612235661bad3", + "sha256": "1dvl52innx742pg4lls1dgx8avpg2k3kqll7x04alxkc9wk6ms73" } }, { @@ -48976,11 +49384,20 @@ "repo": "terlar/indent-info.el", "unstable": { "version": [ - 20180423, - 1912 + 20200128, + 1052 + ], + "commit": "2976e6d9679f3578196ed7c104b4054f4a713b7e", + "sha256": "0ggnlvarpy49cp98970jla34khknj7xlkkg4r74hrywa9kk7j0hk" + }, + "stable": { + "version": [ + 0, + 2, + 0 ], - "commit": "d218b4cb3726476caee91db6f6c920856ab992bc", - "sha256": "0z427rvvhw5raql5391sajm4rk1n2y8khsy2wqr7r66fdv5hg2mg" + "commit": "4713807101bff80b342d0f847da9006be001141b", + "sha256": "0sprs5qgrbvgxd6k8h8fyybxdxfd3izhvk1bh13vg238qbn09a26" } }, { @@ -48991,11 +49408,28 @@ "repo": "conao3/indent-lint.el", "unstable": { "version": [ - 20191229, - 846 + 20200129, + 2046 + ], + "deps": [ + "async", + "async-await" + ], + "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797", + "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], - "commit": "e76b127241635677a4cb2d457d5c4c74ca93ee92", - "sha256": "1bmik58ygg9r9p7cnvxhss49hkcqy3zgcwrhwq59baqixclfwrd1" + "deps": [ + "async", + "async-await" + ], + "commit": "5601a716d4daeb444642736ddef420cbc1047968", + "sha256": "0ndpdqdcg2rlrw5z86gyj46qsmsilh3a4snyyybi87kk5ajk2k64" } }, { @@ -49060,8 +49494,8 @@ "repo": "NicolasPetton/Indium", "unstable": { "version": [ - 20191128, - 1600 + 20200116, + 1247 ], "deps": [ "company", @@ -49070,8 +49504,8 @@ "json-process-client", "seq" ], - "commit": "036f237840dd47e2dc5d368ce4ee3ec18fd4839d", - "sha256": "1gxd6ka99j10nlwkv2bmql5yf4lgpa0gh5ys0snci7d5565rxbr9" + "commit": "59f12cb1bc73bb399e00b2c6c69d21bdcb9c0955", + "sha256": "06x20zapygdgh7i2nr3c8xk8znrpp69yl5vpz08kkix7vssr9sxx" }, "stable": { "version": [ @@ -49113,14 +49547,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20191008, - 843 + 20200118, + 1533 ], "deps": [ "clojure-mode" ], - "commit": "575538e27bf0109693c30afd1a0b5b5bd3eeba0c", - "sha256": "13rq2x9y5nadi6qplg56dmr8d0d4gy8zl4dw3vskj1hnj0yi9bv6" + "commit": "49390d9dfde1d6354629b7662edd0ee422477f4a", + "sha256": "1jhh4ablxmwy4diai6jhki5ifiw1d0fcza7l9gy8iqqnd1yc2m25" }, "stable": { "version": [ @@ -49188,11 +49622,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20190927, - 1649 + 20200228, + 2320 ], - "commit": "fd8d392fefd1d99eb58fc597d537d0d7df29c334", - "sha256": "0axnjqgamy762ky5al56aryx0mp2b2i9almw9gkjcvxm7nc6zlq9" + "commit": "fe1ea9925c6a6cfa7620fe13ea7769e264494749", + "sha256": "0zk4w3fwgashql8vx4ihn6zdfzn6206gklf74wn2b3k4awb9mj8b" }, "stable": { "version": [ @@ -49244,8 +49678,16 @@ 20180604, 2122 ], - "commit": "af443795af20481af91ac54a489b20f6a9d90b0a", - "sha256": "0r938pp10szrqiv37ryzfir4h5pg68farm56cpnh9hh8cnix6nrh" + "commit": "97db34d23cb05b23e50c15875ee84f5d3236e0db", + "sha256": "0z1cya3mhgh5ibj3dgwzii1fkbzsq7zjjzg6hfdv3pd4a7722qlx" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "f65e89ad0c2a7acdef1dc182947d59287f371783", + "sha256": "0vd8d3dgqgqhrkmmvvf90ac04hcng03q32niwd54c0xj63hcxg8l" } }, { @@ -49279,14 +49721,14 @@ "repo": "ubolonton/info-colors", "unstable": { "version": [ - 20180205, - 1150 + 20200125, + 1447 ], "deps": [ "cl-lib" ], - "commit": "a8ebb7b8efa314c08ea8110d8b1876afb562bb45", - "sha256": "0wvyf2w5s184kwacs6lbpjryx6hziayvdrl3crxir8gmg2kcv07m" + "commit": "47ee73cc19b1049eef32c9f3e264ea7ef2aaf8a5", + "sha256": "1zmiik1ba7xspbk2g8igr1rscxxzxpzjrzspxjcw9khw6z4iwr51" }, "stable": { "version": [ @@ -49584,11 +50026,11 @@ "url": "https://git.carcosa.net/jmcbray/emacs-instapaper.git", "unstable": { "version": [ - 20130104, - 1421 + 20110419, + 1355 ], - "commit": "8daa0058ede70025e9f020656abe0e0d01cd8f89", - "sha256": "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8" + "commit": "f21531bcb935e7e9b9e8df83dd0e0838adbf9b1b", + "sha256": "1ckkdkwhhyc8nwz293m18i526817gldd8br193px0hwfaxqlxadl" }, "stable": { "version": [ @@ -49697,16 +50139,16 @@ "repo": "commercialhaskell/intero", "unstable": { "version": [ - 20191103, - 1239 + 20200125, + 848 ], "deps": [ "company", "flycheck", "haskell-mode" ], - "commit": "30d8e7330c9b20c2905035bc417fa8645e7b4b85", - "sha256": "054ml379drc1gqykv2wlzaw8d8y2qmsk3rbxgry5nz9w7j66j5jp" + "commit": "fdb0550a2ddb5692d470336aa4a057717d572695", + "sha256": "0myjhj416cbvlfv2x9h624nygfis94jaw9gqf75sjv6y4inkzy73" }, "stable": { "version": [ @@ -49981,15 +50423,15 @@ "repo": "Sarcasm/irony-mode", "unstable": { "version": [ - 20191009, - 2139 + 20200130, + 849 ], "deps": [ "cl-lib", "json" ], - "commit": "8387098286132abd6472a8f49750e38ddb8096b6", - "sha256": "0vbv0h75vxwhjk0wxmdvnyb20ymjp4jyyify6ycaq9i2byl84b1v" + "commit": "5f75fc0c9274f4622470e2324e2f4457087aa643", + "sha256": "107ry1jxl7qiqa0ackn03whygndkabg20s7szl5xm1l87vx5xghc" }, "stable": { "version": [ @@ -50222,8 +50664,8 @@ 20190113, 1424 ], - "commit": "fc1fcea5379bc7728a25dd81546886213e3db6fa", - "sha256": "1gvm5gfgmcw4mibi8899x9ry1zqm3ij6yl0dnmdqmv9dbv1zlqp2" + "commit": "698ffb93954817be0064ca6739f295d846707439", + "sha256": "10v6il7811w2907d8w2c28lnn29nlhdinlwwb7wy7rzl2vfinbm9" }, "stable": { "version": [ @@ -50298,11 +50740,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200105, - 1946 + 20200229, + 2136 ], - "commit": "3c6e5daccbc8678ee881b435ac956778de82a076", - "sha256": "184cdd41da1xizhbdymq9g3a8ryscdr6fq15vswdfv5gx8dx2fz6" + "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612", + "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq" }, "stable": { "version": [ @@ -50357,6 +50799,27 @@ } }, { + "ename": "ivy-clipmenu", + "commit": "17561e8af89bcb4da3d29a1acc04b8ff508af65b", + "sha256": "1zn5ccbsr1vniyznj597k98dy752g2ilfp8sznh4w2sljwxd74gi", + "fetcher": "github", + "repo": "wpcarro/ivy-clipmenu.el", + "unstable": { + "version": [ + 20200217, + 1656 + ], + "deps": [ + "dash", + "f", + "ivy", + "s" + ], + "commit": "305ff456e700621e96b552f8e4857a7edc664518", + "sha256": "06pi64375bmmdal3pdhsv9j35jfizxciks9zwbvwc90k9wbgvxrf" + } + }, + { "ename": "ivy-clojuredocs", "commit": "ef20e3b6fa8d4586d6f17a4e9a6746390dbb2b50", "sha256": "1p3fnj6zz2cxirn2dv54hnwabflxsj04vxjf0f7fbs931c7hrshx", @@ -50432,7 +50895,7 @@ "version": [ 0, 3, - 1 + 2 ], "deps": [ "async", @@ -50440,8 +50903,8 @@ "erlang", "ivy" ], - "commit": "62e2b14ff25b0c143c882cb38d029b216acc3dd6", - "sha256": "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568" + "commit": "7d60ed111dbfd34ab6ec1b07c06e2d16a5380b9a", + "sha256": "0z34ljmwr0hmkaq5z85p87vljywpv3nnsvhp1zc8cw4hvqarcjqg" } }, { @@ -50475,30 +50938,6 @@ } }, { - "ename": "ivy-feedwrangler", - "commit": "cf1c112939545f6d157111eabcb573738b09ef7c", - "sha256": "1mxm37biix8c0s32gfv4pidffvlgdz5i9325zk71fhgfzqwkf5vx", - "fetcher": "github", - "repo": "asimpson/ivy-feedwrangler", - "unstable": { - "version": [ - 20180618, - 1522 - ], - "commit": "051eac49cae32b16fab2e06ff0115cd8fb5dc499", - "sha256": "1irp76kbg8d7wmgvfjbb4c3wmd29bdrl503jkq4w52fl57g94cvj" - }, - "stable": { - "version": [ - 0, - 4, - 2 - ], - "commit": "051eac49cae32b16fab2e06ff0115cd8fb5dc499", - "sha256": "1irp76kbg8d7wmgvfjbb4c3wmd29bdrl503jkq4w52fl57g94cvj" - } - }, - { "ename": "ivy-fuz", "commit": "578c150cb8f61058f8003554d372944a990d7a7d", "sha256": "1z7r4fw1kl4vnfd5n6d628xwqhlr1768yfpj55gg28bq5lfx725h", @@ -50582,8 +51021,8 @@ "historian", "ivy" ], - "commit": "64f4ef8cd4e417dfa090138a2d4ea1e72fd4456a", - "sha256": "0py43kml7fcf1k28pali7n9nhsjp003j02cpynqcz6hmk8zr7b48" + "commit": "ac1bea7d99dd6965c72fabeb72d5fdc38c5380a4", + "sha256": "13pray3iapy6vbd1y1y7fqcnjpsvgfz2z7j1a1awzd8ifp12g9cp" } }, { @@ -50601,8 +51040,8 @@ "hydra", "ivy" ], - "commit": "3c6e5daccbc8678ee881b435ac956778de82a076", - "sha256": "184cdd41da1xizhbdymq9g3a8ryscdr6fq15vswdfv5gx8dx2fz6" + "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612", + "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq" }, "stable": { "version": [ @@ -50679,15 +51118,15 @@ "repo": "akirak/ivy-omni-org", "unstable": { "version": [ - 20191207, - 528 + 20200125, + 807 ], "deps": [ "dash", "ivy" ], - "commit": "5460a9fc061a4a5ae8372dc8df966ced94abab58", - "sha256": "1np1f51hc3phkl5w02a9a79gl38ra2d535i784fn4pqaasvm0rq8" + "commit": "113477ae46ec857c5794fc0a031c1e579615f0a9", + "sha256": "1j9gwl3azh6y24yiy2s9p9yh6vhs2rmydv2496ivwxqnq9md5b49" } }, { @@ -50847,26 +51286,26 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20191209, - 1200 + 20200214, + 504 ], "deps": [ "ivy" ], - "commit": "efcacd869ab8f214d95e4c0445da771ba21d62a6", - "sha256": "01whwckj0zlnck7b281r1z4c0kvjdmksjjajb6g2f62vdpjpd48r" + "commit": "af43abad5c87b44a46ce74d57e54cad5112c22eb", + "sha256": "0qa6kj88dh4vrxiyxrd7jg231hkmw7mfk96jvxqyldvsagp5ybcc" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ "ivy" ], - "commit": "25e36b10eff7fd299fcc03f15288b4fff33974e4", - "sha256": "070y28ldp5dvh12b7qv27mqdgxiq2dll7fx432hb2i6mk8lz5hpp" + "commit": "d2e64aee221228e27e670f6b1c051052cea33ea6", + "sha256": "1g45pk1w5vcrrlv7d7yz4qdk26v31a8ik2zkzk323bqwzc2safhi" } }, { @@ -50884,20 +51323,20 @@ "ivy", "rtags" ], - "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", - "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" + "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", + "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" }, "stable": { "version": [ 2, - 37 + 38 ], "deps": [ "ivy", "rtags" ], - "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", - "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" + "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", + "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" } }, { @@ -51670,15 +52109,15 @@ "repo": "rmuslimov/jenkins.el", "unstable": { "version": [ - 20190521, - 400 + 20200115, + 2133 ], "deps": [ "dash", "json" ], - "commit": "9c7b9d4cb39eff7d6ac4d0cbd5ebc103dc86cac2", - "sha256": "1s49xmpc975q1ffb5c7cjrcwpa4a7kcakri26f5vqy3hn1h0c2v7" + "commit": "29e27a685ec971b518251ce0e66a0b67d78ea395", + "sha256": "0ms9i4dww801q09n4wzjpaqd6k89xdkn5vx3i565p748kp9lqhz6" } }, { @@ -51704,8 +52143,8 @@ "repo": "emiller88/emacs-jest", "unstable": { "version": [ - 20181216, - 459 + 20200223, + 28 ], "deps": [ "cl-lib", @@ -51716,8 +52155,8 @@ "projectile", "s" ], - "commit": "4c3b718b6a6fd4bf1d6209be1beffa33f6156b90", - "sha256": "18hqsk81f846nrx5wcbm4c0v8a500aag9ki435ls4axsv0ka7n2b" + "commit": "777cca00f8fdb93226225b16b48eb955493243c5", + "sha256": "0292bhkc98pbj6lchfkx9i6zyllab2h60cly07ck71glq96kfx3c" } }, { @@ -52050,20 +52489,20 @@ "repo": "redguardtoo/js-comint", "unstable": { "version": [ - 20190606, - 6 + 20200117, + 615 ], - "commit": "ab8953bdf0176b1fadd7a3bb621f848ec5dc1f0c", - "sha256": "0li5za8zamwpr6cdz4b171wa0njana0ddmclrkbw1imkarb4yhp5" + "commit": "0dedaf4753fbe8cdbab14aa85f05d7673cbee8b6", + "sha256": "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], - "commit": "83e932e4a83d1a69098ee87e0ab911d299368e60", - "sha256": "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x" + "commit": "0dedaf4753fbe8cdbab14aa85f05d7673cbee8b6", + "sha256": "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka" } }, { @@ -52205,14 +52644,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20190815, - 1327 + 20200211, + 2057 ], "deps": [ "cl-lib" ], - "commit": "b3841a7a304d9d1328fdb0868fbbecf0c2f9831f", - "sha256": "0rl9vz194c29ljiwgk7xfcgc047hi2ybda7mlj3r1plhk80768n6" + "commit": "fe53814dc2a0db2e95ac06083362e43923bf83fc", + "sha256": "0b30c5valf58md5h5zm45nkx9xdszwi4kz12qfzh27fyn46gdwjq" }, "stable": { "version": [ @@ -52528,11 +52967,11 @@ "repo": "mgyucht/jsonnet-mode", "unstable": { "version": [ - 20181211, - 1853 + 20200218, + 2217 ], - "commit": "2b90b4e12a11c42df0f1e5db327a50555b6ff023", - "sha256": "0j1dggxq1rm47cbi7khask40sj1wrcd0jki4m7j15qaxw7ryihhm" + "commit": "d8b486c8376a4785a7f2dc8a16fe1f2d82c6bfae", + "sha256": "0xpy699jh6ia46brd7i2qrfi0zrcdrhj3dc8d275va9w8a78paks" }, "stable": { "version": [ @@ -53056,10 +53495,10 @@ }, { "ename": "kanban", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1j4qv3xcg0gk07yx3b4kayiy1n3w8yq1r78h07613iljx2ny91fz", - "fetcher": "bitbucket", - "repo": "ArneBab/kanban.el", + "commit": "c5c918900ad97075d788b3de658cddbb0c94f5d0", + "sha256": "04sy524zz5y99pb1nvlvqf9qyk57mrlmjqbjy44crl34ypi8gik6", + "fetcher": "hg", + "url": "https://hg.sr.ht/~arnebab/kanban.el", "unstable": { "version": [ 20170418, @@ -53126,15 +53565,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20200107, - 1719 + 20200210, + 237 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "f5fcb5b375ff559214be0fce2a0930cfbe6be3e4", - "sha256": "0r73k6lgkar4sdigczpiw2i1f4l3f9dlvmdl5jsx0pd8kb4nyzxp" + "commit": "0afcaff33ceff03420635feca835d760915e4c08", + "sha256": "0rw7dgd4dv8gk4n5xjl6mlvgyxm29vnzk8zlk7b07k264kxqr7c7" }, "stable": { "version": [ @@ -53245,6 +53684,30 @@ } }, { + "ename": "keepass-mode", + "commit": "350528855b482abee717d9d0515279e41ea9265e", + "sha256": "0vgkx8iz7vzavdkpgfxpnn6pcsnrfhf0vgx2m17rqv3g8ryb38hs", + "fetcher": "github", + "repo": "ifosch/keepass-mode", + "unstable": { + "version": [ + 20200216, + 723 + ], + "commit": "09dcc1da15808b5b6c22bc5d0cb4e2ba5d425ef8", + "sha256": "0r3aczydp6435alirl9c2gbb1a92c9mv6ibk9h57ds30z9ia31jr" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "commit": "ad073eaab4f96ca033df023736d195dc3b611897", + "sha256": "0kyzcws47ch3pkw9ijb4gjr7l933c3mrxc9bsy16ddkc8dvl7yng" + } + }, + { "ename": "kerl", "commit": "166afdc776689b0da93576dbeaa71ff6dfb627db", "sha256": "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss", @@ -53343,11 +53806,11 @@ "repo": "federicotdn/key-quiz", "unstable": { "version": [ - 20190721, - 1357 + 20200226, + 2129 ], - "commit": "f4a27da3c09dbee62d63dd756bc44652f6319692", - "sha256": "1bw3ywjv49bmkxkcjfr8pnshy2kxklfx253cd1qaplw1g28d0plb" + "commit": "1ee67f3f8977d95785e021f7896685de1979137e", + "sha256": "0cv0naq2g8z52vgf1p4mb55ww30bp2kpj1jp5cjnql1hxsvbx0mm" } }, { @@ -53465,8 +53928,8 @@ "deps": [ "cl-lib" ], - "commit": "9c665c8c219d18866403897936427bb408e3d6b9", - "sha256": "1dhdk4f6q340n0r9n8jld2n2fykp7m40x23n7sw4wpm8g151gxin" + "commit": "e5fe9d585ce882f1ba9afa5d894eaa82c79be4f4", + "sha256": "12m1jy8m8i39b809qbxx9g3r066jxhqwfyf5mqbd1lzlaw63b1i7" }, "stable": { "version": [ @@ -53696,8 +54159,8 @@ "deps": [ "cl-lib" ], - "commit": "fec16e7e5bf603c6971230f344882ce7a0d04e90", - "sha256": "0p1zd1kyw48xf40zvbssmkf8cj6gb0lln4xdnx3v2hh1m2mr3xs5" + "commit": "e77fcf46284afa1fd13499db695745112f41c8cd", + "sha256": "0c65qnsibcppyrf3bqp4blv2bfamisfwgxqy90z0gkbxzw9q4lxw" }, "stable": { "version": [ @@ -53808,8 +54271,8 @@ 20180702, 2029 ], - "commit": "52d12ebf33e410c9f4798674a93cbd0db8038bf1", - "sha256": "0hgfqy5yysfg3z04bj6xw53icixadigf3yxnskrnrs76sj4pd1qi" + "commit": "9398c8d5d260c9f4d5dd0aadc7de5001bddaf984", + "sha256": "1hps804r3pwnkndwr797ayg002i857ck3lvknvzz7j04xvs7g5s3" }, "stable": { "version": [ @@ -53831,15 +54294,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20191016, - 951 + 20200301, + 307 ], "deps": [ "cl-lib", "request" ], - "commit": "1fdcfcc6c080b5232cf588460283e16180a81dc9", - "sha256": "0088bnizccf372yivkw07x541ispmak8yy6ri2kqa15pkmszjfjh" + "commit": "f11e8fb9955b89a14db7092e48baa0b69667834e", + "sha256": "1ipkgnlvbdmgxh92hsrvqmyg8hxv4165kr0305hz2cr88wp8zsm1" }, "stable": { "version": [ @@ -54065,6 +54528,30 @@ } }, { + "ename": "kubectx-mode", + "commit": "e1a9badd46f8900a1d6355cb2c703788ed66e8fb", + "sha256": "0g73yf3kl1f1c40p1na29hli4q0ligy0dh0lxc21k9mj57dbnzyg", + "fetcher": "github", + "repo": "terjesannum/emacs-kubectx-mode", + "unstable": { + "version": [ + 20200116, + 1918 + ], + "commit": "f08687ae5403eb18bbeffc6dafdfde469bdb9a36", + "sha256": "1yml417gj8ds3fiy0vvrv9vxnjyis157hcmhyn491hb67bd6xl5j" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "commit": "f08687ae5403eb18bbeffc6dafdfde469bdb9a36", + "sha256": "1yml417gj8ds3fiy0vvrv9vxnjyis157hcmhyn491hb67bd6xl5j" + } + }, + { "ename": "kubel", "commit": "6fe35f90b858d0b6710b4bae8a2b80f97f1b8228", "sha256": "17xsy0kj2dskmr8mmrlvhkrylzgbfd0jqay9qa9avzlh24v85jcm", @@ -54072,14 +54559,25 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20191219, - 1646 + 20200211, + 1819 + ], + "deps": [ + "transient" + ], + "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857", + "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m" + }, + "stable": { + "version": [ + 1, + 0 ], "deps": [ "transient" ], - "commit": "12d8434fe435b81a3874911c7852aac8976fdb2f", - "sha256": "0gfacv3c79pih61dpwy6xq58wk233f4kxxrgf3q58x8kns3iymzc" + "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857", + "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m" } }, { @@ -54097,8 +54595,20 @@ "evil", "kubel" ], - "commit": "12d8434fe435b81a3874911c7852aac8976fdb2f", - "sha256": "0gfacv3c79pih61dpwy6xq58wk233f4kxxrgf3q58x8kns3iymzc" + "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857", + "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "evil", + "kubel" + ], + "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857", + "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m" } }, { @@ -54109,16 +54619,16 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20200106, - 848 + 20200114, + 436 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "239f4a1b40bfc76464ecf900eb16c3b078cd7d64", - "sha256": "1b41r8yhf14ki56638y0qk006idmvx1bs354b6cyq9z2k1h9x05v" + "commit": "cc33d8c7bb114c34809ee86020b9e635eff0017b", + "sha256": "11bi1z28rf2ldx20mqgq6yfkpc1af9kgvjzrz3w3dcf074jp89lb" }, "stable": { "version": [ @@ -54150,8 +54660,8 @@ "evil", "kubernetes" ], - "commit": "239f4a1b40bfc76464ecf900eb16c3b078cd7d64", - "sha256": "1b41r8yhf14ki56638y0qk006idmvx1bs354b6cyq9z2k1h9x05v" + "commit": "cc33d8c7bb114c34809ee86020b9e635eff0017b", + "sha256": "11bi1z28rf2ldx20mqgq6yfkpc1af9kgvjzrz3w3dcf074jp89lb" }, "stable": { "version": [ @@ -54211,14 +54721,14 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20191218, - 148 + 20200113, + 2027 ], "deps": [ "s" ], - "commit": "f8a51febc4cd2576887d477c88d881a865a62d07", - "sha256": "141r35z6sq0ainvja83plypf2bnn6hbwn8xfi5bsqpk27mpd2709" + "commit": "3fc84840cbbd75e646cafa2fd3a00004b55e37ec", + "sha256": "0y8wj8f2wzhg5vl4kjrqny3333616s4lcil085190yyb7mjakvn5" }, "stable": { "version": [ @@ -54271,11 +54781,11 @@ "repo": "MetroWind/lab-theme", "unstable": { "version": [ - 20190320, - 1827 + 20200204, + 1931 ], - "commit": "a4d1806793ab7a651c5380ebb2d1b53c8fbf7944", - "sha256": "06mw3x40wl4hfqwps41z2sps3vamgj89b7ks0ri7z9f90x645v4q" + "commit": "2cd61072d2b4c563d961f80918fc6b1dc45f7ba4", + "sha256": "0jwslzxjyclr4iw8ir0glcj5iasgx2z9i16qn7705sdmdmbzkdwz" } }, { @@ -54286,11 +54796,11 @@ "repo": "ksjogo/labburn-theme", "unstable": { "version": [ - 20170502, - 907 + 20200206, + 1213 ], - "commit": "e95334acd8a73fbe8e156f70e047014a87e92e66", - "sha256": "0ai8gr4an4d44lgin7kdzydn2d0a98jb8mv0n9b93bq160lbmkwj" + "commit": "ae3dafe552ab6f9d5b0760ace44555317e6c90c6", + "sha256": "1lx7ci0j5havhsymjr4mb4nnh71ajmviysmanjbbm6wsg470ig7r" }, "stable": { "version": [ @@ -54373,14 +54883,14 @@ "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20200104, - 18 + 20200117, + 441 ], "deps": [ "cl-lib" ], - "commit": "37e1e007e80fc01b040b7da21be5a628fbddfb1a", - "sha256": "0zlinwq5hzwws8frwdaw22q43xba3a4764qk6rhlpg6p6imf6s6m" + "commit": "a71ed02ce06920ae3cafd6708de1c21811ce14c3", + "sha256": "1ars70nx8gxb8szlp6jyqjll9gr7j9z5cd9ip1izqv00si6p1fvn" }, "stable": { "version": [ @@ -54421,25 +54931,25 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20191208, - 1933 + 20200214, + 2254 ], "deps": [ "cl-lib" ], - "commit": "57f3094cb576d6d1a10467953e0ea161c43e4cfa", - "sha256": "0dq81m245nbj1d6jry0jdf55h90p99z8n77r1ycsfcqmhk2x8ndi" + "commit": "dc18099dd74a954601ab425ef6cfd3ed32003023", + "sha256": "1mwkv4cyz8n8vm9jf7nw980j0ig487ch37ayx356nvvznnrfnm5s" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "57f3094cb576d6d1a10467953e0ea161c43e4cfa", - "sha256": "0dq81m245nbj1d6jry0jdf55h90p99z8n77r1ycsfcqmhk2x8ndi" + "commit": "dc18099dd74a954601ab425ef6cfd3ed32003023", + "sha256": "1mwkv4cyz8n8vm9jf7nw980j0ig487ch37ayx356nvvznnrfnm5s" } }, { @@ -54450,8 +54960,8 @@ "repo": "mihaiolteanu/lastfm.el", "unstable": { "version": [ - 20191117, - 1908 + 20200207, + 1316 ], "deps": [ "anaphora", @@ -54460,8 +54970,8 @@ "request", "s" ], - "commit": "c2b39d2fa4fb7f56e4aacb0a50ed2aa509ab992c", - "sha256": "09k8p5bpl7f4dgkvvx4gf91pgyc5ikm6kynkjhdwrsnpnnl2cc9b" + "commit": "cff7699343467b36ff3dad90061b567025ff9b23", + "sha256": "1jk400xh07pnwzab23xwsiyv9j0f4b8fl0v6w712vsn2n1ab88gm" }, "stable": { "version": [ @@ -54683,6 +55193,35 @@ } }, { + "ename": "lavenderless-theme", + "commit": "f21ef334dd997fb96e0306cd56538279644765f8", + "sha256": "1lbk654d4y5fg4j71kqmfq3xx8dr9rib2zcv9njaip77zjzbbxid", + "fetcher": "git", + "url": "https://git.sr.ht/~lthms/colorless-themes.el", + "unstable": { + "version": [ + 20200213, + 2057 + ], + "deps": [ + "colorless-themes" + ], + "commit": "a7b7c0a32b174988f40378996cd8997f73524f19", + "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "colorless-themes" + ], + "commit": "8e539097185704444a5dd5545924de92c11ba767", + "sha256": "1p16vxai8dj1vy4ahflwij1ldx00jzrjcinpgpc7wgh6ka748v11" + } + }, + { "ename": "lcb-mode", "commit": "fd1380a9ba363f62f297e3ab2995341258b51fd1", "sha256": "184vd5ll0ms2lspzv8zz2zbairsr8i9p3gs28hrnnwm6mrpx4n18", @@ -54743,20 +55282,20 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20191117, - 339 + 20200225, + 1023 ], - "commit": "57b99052f949f34471265f8b010549ee4725c320", - "sha256": "1vxcwdp7kgmv4pxjr33yfy2ba3x3zs6qacblyrah57f92xg85jg7" + "commit": "0179836fcc8ef613d6f9d7fa509a79a8fbf8db22", + "sha256": "0r5crz2n0q8xrh840gp3m8gy647i0khvwzj9pc3w5y9xkw7ca7vh" }, "stable": { "version": [ 3, - 5, + 6, 0 ], - "commit": "c8ca1ecc892229dc16019fe3a7eb98a7307e746f", - "sha256": "1rgd59146wad92yc64las0qgx67k2ifgsw1vwhp40xvkd7kb0r6d" + "commit": "c0a0fca2f9c83909c49729af75664411b4affab8", + "sha256": "18vrk19273xlg2nhkf7fvvhspnsfgk4dxa42x2q5599p9z7aph00" } }, { @@ -54767,14 +55306,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20191123, - 1814 + 20200214, + 1749 ], "deps": [ "leaf" ], - "commit": "c3223e54eddf82a9b264ef81d958a017049141da", - "sha256": "1qwcir8d16gqr1xbl5bi9k51qfc5yvzaqvp03sji55bfqnx7zjwv" + "commit": "138af8613feded5eaeda84ffaff2621e62c2e0fe", + "sha256": "03jvjmr6ki28ngdc0j7sjj14qyzd730jxp8gdcajjln76ni5cayy" }, "stable": { "version": [ @@ -54794,8 +55333,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20191229, - 1613 + 20200211, + 2010 ], "deps": [ "dash", @@ -54804,8 +55343,8 @@ "flycheck", "s" ], - "commit": "f26e40daad2c1bd090e440a2b931205ac3b9b613", - "sha256": "022i1v885pvzz42cwrz7wp5amx25k664pvap7c4487hlrrkp1bg9" + "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609", + "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf" } }, { @@ -54849,6 +55388,21 @@ } }, { + "ename": "learn-ocaml", + "commit": "6110b273c4f3bb8eddf1b79dbfa82f9c01600182", + "sha256": "17fah2109s9dzavmbsw5bgpjb4m9r2j9rgpf38av3bd89qba416z", + "fetcher": "github", + "repo": "pfitaxel/learn-ocaml.el", + "unstable": { + "version": [ + 20200224, + 2229 + ], + "commit": "e3424b3ae3f7d85ef020d030c2fa58df86ed8955", + "sha256": "0a8x2c0lxa0xihpbc9i1dvn1l00nsmawl1nv3i06r6iq5486pqdn" + } + }, + { "ename": "ledger-import", "commit": "4a1e2a9546b8b40f5f880197cb8166a6a715451f", "sha256": "1lcibmjk2d49vsa89wri7bbf695mjq2ikddz3nlzb6ljywsnqzm4", @@ -54886,11 +55440,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20191226, - 2018 + 20200229, + 1453 ], - "commit": "6b78e483dde4276a11d6946d081e41c7e3b894e8", - "sha256": "0xi5pwyzv81iqxj10sr1fl9csa6k5z1nisxwnpg9i3i1nj7ad3p6" + "commit": "6286366e6074e048d2a997d971d4d1c350f6bc63", + "sha256": "1bkfmvq7a6bq3b94495cfzzlxdxdiwyjar5rn5z2hsw1dljc7380" }, "stable": { "version": [ @@ -54936,6 +55490,21 @@ ], "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04", "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5" + }, + "stable": { + "version": [ + 0, + 1, + 10 + ], + "deps": [ + "aio", + "dash", + "graphql", + "spinner" + ], + "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04", + "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5" } }, { @@ -54946,11 +55515,11 @@ "repo": "jorgenschaefer/legalese", "unstable": { "version": [ - 20150820, - 1724 + 20200119, + 2248 ], - "commit": "ec23e69d18329456beed9546a1d6c72f96db91cf", - "sha256": "05zpc8b2pyjz76fvmgr7zkl56g6nf6hi4nmxdg6gkw8fx6p8i19f" + "commit": "e465471d2d5a62d35073d93e0f8d40387a82e302", + "sha256": "0xg4pyyyzd637i7shhq1frbva5rmy2j7y9cnf7zmms6a5qq4k1af" } }, { @@ -55109,11 +55678,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200102, - 2003 + 20200122, + 1934 ], - "commit": "ee89b5d8b08c94eb78c0398720381c44342e2f44", - "sha256": "1g6bhfd39jbz8awxh2d4syvqblw3yniind76fzsvsapis1za8yfg" + "commit": "dccd751682a0954165c7f2c08414bea0168a9a9f", + "sha256": "12njc6pmbadwn71h811alr4rpsmw1b48b3jjmxpy3s51ja44vcc4" } }, { @@ -55237,11 +55806,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20191217, - 1254 + 20200223, + 1431 ], - "commit": "65fde63a0bde9b4cef74204db5d9ac0a740d6b4d", - "sha256": "0q7jyrgq67449i524dskiqfvf3znb048ksb9v6ja1x9xhpfw27d2" + "commit": "6c3b89276a149b2d009882f756a9edf866671f05", + "sha256": "1r59bw0dggjf6ry2vbl0vddd5hxxh1mshr5h2bk9z74gy04cfi4y" } }, { @@ -55362,8 +55931,8 @@ 20180219, 1024 ], - "commit": "5136c339864ca961629e6eb48c3ff9d0228aaf52", - "sha256": "14mzwnnsqjmzp8jb9jac43ga7vxzmrl2mch7kqdm244d605k0xlz" + "commit": "8eacaf88ee7ef9445c767a032177a90711cb3ff7", + "sha256": "1334d09qsc5clcmkh1qi6mlph158ggf1p5kpsyl48vl1knj4ia9s" }, "stable": { "version": [ @@ -55467,15 +56036,15 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20200101, - 1633 + 20200205, + 2244 ], "deps": [ "avy", "cl-lib" ], - "commit": "8d8f9505f87dc8a3b3baee7cb516f091072893a7", - "sha256": "1bmb3x8i2ak72k2m3niczjqv2xg9lhvflxxfjj67j9ki7994vzx4" + "commit": "0d9cabcdb783ddc834ede6dcb1bed627c3acd303", + "sha256": "1ybzxc421wyy34w71lgbdfx7vgy9j6va9jjv1mkxa0zxqpdar974" } }, { @@ -55631,8 +56200,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20200105, - 1844 + 20200227, + 1354 ], "deps": [ "ace-window", @@ -55641,8 +56210,8 @@ "iedit", "zoutline" ], - "commit": "ba59a11e122170620e7d151df4b609490ee416f6", - "sha256": "0qynzadzklb7wnldcs7sj9v003v6xffvq0y85x8knj04cbl09bwy" + "commit": "c1286a2b41fa1f21c4f2ecdd5ba191805e04e268", + "sha256": "05vq28ziqamc0sysaa4zrljac4r0nq7j6a23m2vsf7nf8ymzff1c" }, "stable": { "version": [ @@ -55693,16 +56262,16 @@ "repo": "noctuid/lispyville", "unstable": { "version": [ - 20190719, - 141 + 20200129, + 243 ], "deps": [ "cl-lib", "evil", "lispy" ], - "commit": "56198f1c4488a52a0d0512c717dff36e8b9fbfd0", - "sha256": "1zrhn5pgjvwprwnsr85zs4rhs7mijyq3wbd5s0ff96m9n1dbj6vp" + "commit": "25a70126ea807653e0a8c512d4128c90ed673d7a", + "sha256": "0h4zz3k5chipswpp7abmd9agwacrss1dd5981x70wblpabdxm39m" } }, { @@ -55836,14 +56405,14 @@ "repo": "Fuco1/litable", "unstable": { "version": [ - 20160922, - 1559 + 20200130, + 1329 ], "deps": [ "dash" ], - "commit": "b0278f3f8dcff424bfbdfdefb545b1fbff33206f", - "sha256": "0bny40hv9a024n01clxns351cs4j4ifhgcc7m4743xncqf612p7g" + "commit": "02247ca284cbc79f3afb783d62ed092bfc5b8d83", + "sha256": "0c84fvc33ddicfi8blkcd6dv1lagjnlk9bwjj88zcvg48fnykqvr" } }, { @@ -55854,15 +56423,15 @@ "repo": "zzkt/litanizer", "unstable": { "version": [ - 20200108, - 607 + 20200211, + 621 ], "deps": [ "enlive", "s" ], - "commit": "ce74f10540d6b335c4d0966cbabcf5099531280e", - "sha256": "1gzpvl7pgawikkhprja6p94ymsjbsbklqjgdvhzca835mx1g4aw4" + "commit": "ba73259e35b4649884ba56542d3a55f43bd3b80b", + "sha256": "0147dqzhphnhxrcjxnbjk258j7g7y0rpbw6q3xrd340j9fk1q60k" }, "stable": { "version": [ @@ -56052,20 +56621,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200108, - 546 + 20200221, + 611 ], - "commit": "96a72eb3d2d03ea9910f1712ab55990705275343", - "sha256": "1g6f2rxy93x2mpphmnvvqx848638s7pzxbgnsipvzmx5hx2g1pm8" + "commit": "0048b6c4b4f948f08786f3fb06935aa3ce227368", + "sha256": "0mfqxjn0hhrm0w8wf7hf85g1i8b9ihnavkw870rmyfj8y8nnp8qb" }, "stable": { "version": [ - 3, + 4, 0, - 3 + 1 ], - "commit": "96a72eb3d2d03ea9910f1712ab55990705275343", - "sha256": "1g6f2rxy93x2mpphmnvvqx848638s7pzxbgnsipvzmx5hx2g1pm8" + "commit": "0cc8f0a31ef815e26eb7da314a516e908ba25838", + "sha256": "13wbsapnq5p75c27smzsgmmgzjbx7x2vbj7b7707bm6cakqjwdzv" } }, { @@ -56448,27 +57017,27 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20181027, - 1757 + 20200125, + 1808 ], "deps": [ "datetime", "extmap" ], - "commit": "72566479cbd8d90dfe2fec5984ebb4484994525c", - "sha256": "1ldqkbdl4vyqg6kibp1z8d5cam4r8za1pb851k886bqwag0zaj3b" + "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb", + "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "datetime", "extmap" ], - "commit": "bd662d467dbd7c93cfe1e3058e4f11c49314fd6a", - "sha256": "03s4q5xdz84cjn4qkfhsc3l9y3v5avrl2i5dby4bgsg2zj7n7f73" + "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb", + "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc" } }, { @@ -56684,8 +57253,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20200105, - 1046 + 20200114, + 2313 ], "deps": [ "dash", @@ -56697,8 +57266,8 @@ "request", "treemacs" ], - "commit": "a3ebf619a2b12b8dbbb24c39c4f78b1ba9c29e6a", - "sha256": "1x6il7pnyc7ylayiw35kn6jk8dphzwsas7dk129p6q0wjfdvif9d" + "commit": "dbeeee9c74db25db217059011935b882f7ec1257", + "sha256": "1ra16rm61xwhp583ib1ran6bv0z353qs4aag75l809kyvq9szlyg" }, "stable": { "version": [ @@ -56777,8 +57346,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200107, - 1910 + 20200229, + 1850 ], "deps": [ "dash", @@ -56789,8 +57358,8 @@ "markdown-mode", "spinner" ], - "commit": "752674a9efba4860ec85ea159fc4f9679a44819c", - "sha256": "0wi05v6a536y54kk9dc1a1id1arv8v6r5jpy49g9q2kglkhkaji8" + "commit": "db3f7f022b6d8c509b5f5d84ff437840dc0fdaa1", + "sha256": "0p0fkby3i87zjjilv7pzbi1bkvr1gnrqpc4rrly2nn9pcrg5l16w" }, "stable": { "version": [ @@ -56907,28 +57476,28 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20200106, - 1738 + 20200223, + 2136 ], "deps": [ "cl-lib", "lsp-mode" ], - "commit": "9780be701545064847456eff8ae30fadcdf63b0d", - "sha256": "021nmpabad3vgq10bs3qsgg3m5vd4vzlsbyi2jgk1si9kgw898j1" + "commit": "5d0c799099aa5810858174f390e28fff3894bc06", + "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "cl-lib", "lsp-mode" ], - "commit": "d8fa9d9eea03a457eaf9944c6188107ff2ed342c", - "sha256": "09v5i2sdayxa69csmfyr8x8lkqmz9578vw9vrm7ayys0sc1g2zh2" + "commit": "5d0c799099aa5810858174f390e28fff3894bc06", + "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp" } }, { @@ -56976,8 +57545,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20191229, - 1039 + 20200220, + 534 ], "deps": [ "dash", @@ -56987,8 +57556,8 @@ "lsp-mode", "treemacs" ], - "commit": "4faf0e3fa14fff712d9cd325a2bf17ba452fa2c1", - "sha256": "1bqmv64skm6w0m3wxg914jzqs34cd5axwj2c6wjli4sja162h8ab" + "commit": "2e3606eebfa8bd909b45b88e59d8eecc6afea4a2", + "sha256": "08xpf677jj1cnfkbpb148h3wld8lvlarp2yq89539nfcmajx53ch" } }, { @@ -56999,8 +57568,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20200106, - 1152 + 20200224, + 743 ], "deps": [ "dash", @@ -57008,13 +57577,13 @@ "lsp-mode", "markdown-mode" ], - "commit": "01f89e40f473032376f70a90e33831356832f084", - "sha256": "0avi8hfyh61gjrv0c8aj28y8nx8qw1vvsb3l15v9xzblvdrx7v5x" + "commit": "bf3966e87c91c5d825c483ce0883f30dd2272b62", + "sha256": "0wapq3472cjdr1m47isv0lg61byanpb67k7cn9iyrlqp11y2xcjp" }, "stable": { "version": [ 6, - 0 + 2 ], "deps": [ "dash", @@ -57022,8 +57591,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "a8c50a93952afae3cd8948fecf4c1a3dc7f3e094", - "sha256": "1r4327fd8cvjxfwkddp5c4bdskyncbs4sx9m3z2w4d773y2jrakc" + "commit": "207bc8d61abff7c3024f8a484f63bc60bc4ad58b", + "sha256": "024753bi0p1jyjhw7wk8k6s16kbwab5ar4cfasvbn8g08acf293b" } }, { @@ -57077,8 +57646,8 @@ 20180816, 2200 ], - "commit": "7cfc993709d712f75c51b505078608c9e1c11466", - "sha256": "0v17srm3l8p556d4j5im2bn7brxv7v0g2crlm4gb8x1cwjrbajzf" + "commit": "645e1959143532df8f7ef90e1184e9556df18af7", + "sha256": "0j9gbr3chaxc16yysyaaa1n2cvlrdc1y063l1kxj0mf435d1l7py" } }, { @@ -57089,11 +57658,14 @@ "repo": "sjbach/lusty-emacs", "unstable": { "version": [ - 20191203, - 1635 + 20200115, + 1413 ], - "commit": "1fbd5cfbdbb8ed744b5a141648febf620bbf5a84", - "sha256": "140af29angfnf9kakx65bpl233bn0xgr1lsb2na9qmbsarhva1kw" + "deps": [ + "s" + ], + "commit": "3f4be19e0c466399c680a355c402b09792123e4d", + "sha256": "1915w43dwvqkklxdh1scy4yxzmalyyrx76iy9wl024svwjq3i0np" }, "stable": { "version": [ @@ -57113,11 +57685,11 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20191214, - 1357 + 20200227, + 1301 ], - "commit": "9db28034d7d61bfeff89899633b958f22befc53d", - "sha256": "1vay297i270n0s0bs1a96h9mn73i03885nnrcs8723i3iv7b51mp" + "commit": "d2b921d067d7c7ea2f087b4d8edfdc37bcdf4af8", + "sha256": "1zsm7qhqj17wnx611rz6f917lvvj4ifz4vg4x144y8a5740pkihi" }, "stable": { "version": [ @@ -57247,25 +57819,25 @@ "repo": "DarwinAwardWinner/mac-pseudo-daemon", "unstable": { "version": [ - 20170728, - 1940 + 20200215, + 513 ], "deps": [ "cl-lib" ], - "commit": "d235680a72677f11925b912428ad1a57b664e3e8", - "sha256": "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40" + "commit": "703ee41303dc251b7672b7cba5aeb6aa54a76c90", + "sha256": "0cplbz7mc2zrxfk8g349ahb7gzli2hn5kda9155nbk8dw74xmj7d" }, "stable": { "version": [ 2, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "4d10e327cd8ee5bb7f006d68744be21c7097c1fc", - "sha256": "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2" + "commit": "564b006835facc4a8df247d8a47ab1030d7e7beb", + "sha256": "1ilqxl1851rg9v6ixi924xhzykc3c34f4nq1x0vyyq5b9m2fpb27" } }, { @@ -57428,32 +58000,32 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20191227, - 929 + 20200217, + 1213 ], - "commit": "f42fd8080781983ba593c9df39f2f5efc45bcf1f", - "sha256": "11vm25wkil9n2m9s330xy9c111qa85dffkig8x7m1qc9xka25wi7" + "commit": "c42d7c084c1b928815cd665d1e42ea29b280853e", + "sha256": "0kgpynkqny8rj9ly6q72fgpv07sry92dda2v6wqhwd9nr84p1nkk" }, "stable": { "version": [ 0, 0, - 1 + 3 ], - "commit": "11ea02254f2bdfaecc12a75545c558fd37b98954", - "sha256": "0msgpi4g8k6zyjshfaf5jb00idc5j5mrzl2kc5p2k1kg19bh3178" + "commit": "d280836c77fd263ee404273d7c21f47395a657f9", + "sha256": "0ibasyhqc6zgvzvkfyfvx7g6f18z4n7hy2lqjvyckh40cqpzpwj0" } }, { "ename": "magit", - "commit": "9f963950d69a944443d9b6a1658799f7860d0f93", - "sha256": "13fipghvlzbx2d4dwxmm1hhnnd28davdp8rjqhq8g4g0lcn3h8b1", + "commit": "15a5916ec8e9062e41b1dd7d4f5535a86c2170a3", + "sha256": "1bcv0yv5l51j3xyli9rq3zqjkf0b9w7yd0kykfmy1dp1hx39qf8r", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20200108, - 532 + 20200228, + 1207 ], "deps": [ "async", @@ -57462,8 +58034,8 @@ "transient", "with-editor" ], - "commit": "2191261223078077bf35eb12187e35ff0228174a", - "sha256": "1fn1ygaw71qq5b6dqk4bj05rfjqb4qz2hv0vc3m3zvpckxar6v5g" + "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6", + "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv" }, "stable": { "version": [ @@ -57491,15 +58063,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20190421, - 241 + 20200224, + 1 ], "deps": [ "cl-lib", "magit" ], - "commit": "d5d819c609256a3b7b11ccaf6664be61aa3597b6", - "sha256": "0bwbvwbnyp01vvp76fvn6capk17692c6ippw3z6pknlfiqcz3z0y" + "commit": "9ffebd50a18adba70a9cfc2710012dfd650c5376", + "sha256": "0sihrmk9snazdj1dana7q89a5qd7xjclhmfqh15gvxchs4a8jwqg" }, "stable": { "version": [ @@ -57727,8 +58299,8 @@ "deps": [ "magit" ], - "commit": "a7357ab87c89187234fe333bb869727c417638d1", - "sha256": "1s5ysmzyvlhnb9yzxwsrs0rj50ib0wzb2wrmisghxi10pk3j9sk9" + "commit": "3b588991d30a69d2209dbcbb041777ae8af62bd0", + "sha256": "19fyrann61k8viak05y0f5v9xr2p531ysrcq05d8pq8qf3vna1y1" }, "stable": { "version": [ @@ -57790,8 +58362,8 @@ "libgit", "magit" ], - "commit": "2191261223078077bf35eb12187e35ff0228174a", - "sha256": "1fn1ygaw71qq5b6dqk4bj05rfjqb4qz2hv0vc3m3zvpckxar6v5g" + "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6", + "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv" } }, { @@ -57846,6 +58418,24 @@ } }, { + "ename": "magit-patch-changelog", + "commit": "caf023c2af4c09c04de7bc0338fc1d07da895ddd", + "sha256": "1lkgrnhiis0rwx14pcvhi5r775mgysb04srnvqfsihdn31bqjh6g", + "fetcher": "github", + "repo": "dickmao/magit-patch-changelog", + "unstable": { + "version": [ + 20200217, + 1202 + ], + "deps": [ + "magit" + ], + "commit": "876c780bdb676b6ece64861704e199b94f33cf71", + "sha256": "0wkjh9s67vs90lysdx3gjyrax9mlbzfvs563pzr6ab3l4p5pgnsw" + } + }, + { "ename": "magit-popup", "commit": "0263ca6aea7bf6eae26a637454affbda6bd106df", "sha256": "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv", @@ -57914,6 +58504,33 @@ } }, { + "ename": "magit-section", + "commit": "92cab05cc5ba4153be97648d6fcd95417871e9c7", + "sha256": "1v9g8y9r0lmp54hgaxgjqr3x86l7cz4wvrrjbpij7aai40ddqdp3", + "fetcher": "github", + "repo": "magit/magit", + "unstable": { + "version": [ + 20200226, + 1251 + ], + "deps": [ + "dash" + ], + "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6", + "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv" + }, + "stable": { + "version": [ + 2, + 90, + 1 + ], + "commit": "791901b2f1d26fa0a383147fe77948a9abc753da", + "sha256": "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4" + } + }, + { "ename": "magit-stgit", "commit": "72a38bbc5bba53dfb971f17213287caf0d190db0", "sha256": "1spli6yq258zwx95y16s27hr7hlc2h0kc9mjnvjjl13y2l6shm0i", @@ -57981,8 +58598,8 @@ "deps": [ "magit" ], - "commit": "2b08d93c5ead14f34f9cc3c3140ecf25b1531151", - "sha256": "1h5lnns6adpyah2i1k8fznbq4qf43sf64a4vp8s5h67q2ajlf52j" + "commit": "0162390581c1165a0c4c68081d8fc5ffae4cf1a9", + "sha256": "0blwbgr4by0rawzw2hdpc5jcckmj96p0dxvgcml61rg3andsqyyl" }, "stable": { "version": [ @@ -58005,8 +58622,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20200102, - 7 + 20200204, + 823 ], "deps": [ "async", @@ -58017,13 +58634,13 @@ "pcre2el", "s" ], - "commit": "40d268f9b487ad7e3b7aff2da2bc44e596bc8052", - "sha256": "1xgwz13nmk2apbgq00ac9qrcf2hip558x0qcn8rg9n9shnbixsqq" + "commit": "ad5663aa26fad147f1afbd878cbe21a064ba5745", + "sha256": "1naqyl9qy15nkjz41l8pzqy79bkm7cp5ih63ji8ycq416400pia1" }, "stable": { "version": [ 1, - 4, + 5, 1 ], "deps": [ @@ -58035,8 +58652,8 @@ "pcre2el", "s" ], - "commit": "8557cf36260743674e7c3ecdb3038dca5106416b", - "sha256": "1rcl6j53yabxqk3jzgaxvm3wqq7rayf1hdib2v2fapw5b0layym6" + "commit": "ad5663aa26fad147f1afbd878cbe21a064ba5745", + "sha256": "1naqyl9qy15nkjz41l8pzqy79bkm7cp5ih63ji8ycq416400pia1" } }, { @@ -58233,15 +58850,16 @@ "repo": "stardiviner/major-mode-icons", "unstable": { "version": [ - 20170301, - 714 + 20200127, + 512 ], "deps": [ "all-the-icons", - "powerline" + "powerline", + "xpm" ], - "commit": "e6117a236b2ad52e948576550b183053321dfc91", - "sha256": "0gpp9x23qz7ll8d7hlbvynv891hw907k38i7v0b08s8zh1ilvnwa" + "commit": "b36eae2e976bad3c431b082c64b1a724a2ba1fe6", + "sha256": "1jjmma9lx5g4qprmy71izgdp564lbdb0wsiysl1f6d8wipml78ys" } }, { @@ -58461,11 +59079,19 @@ "repo": "emacsorphanage/manage-minor-mode", "unstable": { "version": [ - 20140310, - 1600 + 20200123, + 1406 + ], + "commit": "0dfab46a728a21c91658ffcb14101b182cf1b403", + "sha256": "1c17r1vz6181plbhb5nh36q6r2rwkrxhy45xmk7rjghmdd765f2r" + }, + "stable": { + "version": [ + 1, + 1 ], - "commit": "1bed33b0752380b548b822fe72e6858c5fe70c8e", - "sha256": "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07" + "commit": "d07d269586233787b4bea4c40df43d6357a40f58", + "sha256": "074bm7kfvslfl06zjrp7h0plbx6aqagzppczgnpslqa41373b8jx" } }, { @@ -58687,26 +59313,26 @@ "repo": "plandes/markdown-changelog", "unstable": { "version": [ - 20191231, - 1825 + 20200120, + 2253 ], "deps": [ "dash" ], - "commit": "251c675d38aadb314184a7477f8a2f53399843be", - "sha256": "17nb57q9dmrrrn68zvm6bmrkp5yz18aivgmcz46y4a269srdsc28" + "commit": "1a2c3a4c3e4196f2b5dbb145b01b4bc435a93a96", + "sha256": "0dw9bz1iq8v816n0z4v9zc6nsrx4qzl99q2pj04f37s7x9vgmc4x" }, "stable": { "version": [ 0, 0, - 1 + 2 ], "deps": [ "dash" ], - "commit": "83feaf9635a244bd26cb1959196be7efa143267b", - "sha256": "157imgdpwzmi5k02kqnpj2spyxkq663bka5gwxcf194h781icb61" + "commit": "1a2c3a4c3e4196f2b5dbb145b01b4bc435a93a96", + "sha256": "0dw9bz1iq8v816n0z4v9zc6nsrx4qzl99q2pj04f37s7x9vgmc4x" } }, { @@ -59084,20 +59710,19 @@ "repo": "vspinu/math-symbol-lists", "unstable": { "version": [ - 20190605, - 2058 + 20200131, + 2333 ], - "commit": "dc7531cff0c845d5470a50c24d5d7309b2ced7eb", - "sha256": "094m21i9rns6m59cmhxcivxxafbg52w8f8na4y3v47aq67zmhhqm" + "commit": "1cf7e2885f3352f55852ee9eba26c7cb5a7cd74b", + "sha256": "0c2fs87vsxx00svzx09x90p8sc1zm4mj24ab0bvqf7ghpl5qgwa8" }, "stable": { "version": [ 1, - 2, - 1 + 3 ], - "commit": "499986959356f7a905fd4f2a1609c17d7ff067c3", - "sha256": "1h6fwj2w77gm4wafqll5bd6r8xafh6f4a0piqmgjvcwxy2sxrk0q" + "commit": "590d9f09f8ad9aab747b97f077396a2035dcf50f", + "sha256": "1r2i600356k8g0l53s4b5xc24flpka664i8f23zbj4h7gk1g2787" } }, { @@ -59120,17 +59745,17 @@ }, { "ename": "matlab-mode", - "commit": "6f78cff288077e04f8c9e4c2e5be9f3c33d8ff49", - "sha256": "1q3sdmahf915ix4lrv65cxsfh6hrs91c8pmyixbqmbhifqi33d0q", + "commit": "08b700ce0068646b51cd856df98ca583e21da8a1", + "sha256": "1qxbcklmhwn4478chnf9n8hwc4qznjb7y8cj78a179hhws70l97j", "fetcher": "git", "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20200106, - 2217 + 20200213, + 930 ], - "commit": "b3057e8ca6a8703bf59ba365521cf37ad25c700b", - "sha256": "1ydls6g9fnsapvd5cnxba2b6g936q3ym4mlms7rvlazj3g1lma1n" + "commit": "e14d97df706049ea2e2d6e5b515fdbd08cd94dd3", + "sha256": "0zi873fpskv18k0xs9rgb2yfj49sga3yyq1b6xxc4ik0r45wi9cz" } }, { @@ -59283,11 +59908,11 @@ "repo": "dimitri/mbsync-el", "unstable": { "version": [ - 20191002, - 751 + 20200128, + 1053 ], - "commit": "b62491c0e0d89eb9c66261a16d7ac81231c9c453", - "sha256": "1zlih37mkqjn2czl12zn7lgxxljvrwhqqpbksj9c91zn0f0rm3mz" + "commit": "d3c81da81ce5b154c0d048047a47277338721a70", + "sha256": "10xxgvzjb7bl3lzgjkdsnnkd9wphkc2pm621agyjlayzcjnldz5p" } }, { @@ -59600,8 +60225,8 @@ 20191025, 851 ], - "commit": "28fc61128198f023d88c104e98451e17c896afd9", - "sha256": "0lc2y6lb4h0l0jlmsyf4n6nf87z6nfixnsipyg5cbkj7xzji0xys" + "commit": "077385b3f9f3050678963d47c56e18aecc9f8b28", + "sha256": "1p926jsajhn10679gbsj0lgmfvz8q5mxx0w326qni7y9mmrxvsni" }, "stable": { "version": [ @@ -59650,14 +60275,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20191206, - 443 + 20200221, + 1938 ], "deps": [ "f" ], - "commit": "83eb6627d793db39a147c7b499f65637db1341b2", - "sha256": "110im31z8fvl34h80y0kq6070id9p6cr7d6ssfkbmipl3w26x71d" + "commit": "833abce1fb232b7dbeac0ee568afe8c468077029", + "sha256": "0znc9sv5xv0bqq4szcaz6nlxypijqm5lmi0igkcpibry6bwfipgj" } }, { @@ -59668,19 +60293,19 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20181115, - 2125 + 20200216, + 2254 ], - "commit": "b507a87455af906e6c49aa4af70eba5b1d1af9ef", - "sha256": "046kf04vqq1wf9ncxq40fcjcgl18hk4vii5wl3m08rpvdwbnmfwr" + "commit": "bc6c09136c7f7de6f4b6ce9294e9b998e24b93c7", + "sha256": "113vj7z8zk80653ldq4sfxkk3pja8yjscywb0cwpkaq0088n5jf7" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "212d9f38a08074f1cb6e914e12b60bc52dcb8bee", - "sha256": "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v" + "commit": "d80ef159242402609a52c29949bd550c8442db53", + "sha256": "1720b3hpfqd989zrgcns51jbjrv4vzl9di9mccl55vkmkbqzfin0" } }, { @@ -59778,17 +60403,17 @@ 20191018, 242 ], - "commit": "58398120907504ff200adfd9b817f297142c9680", - "sha256": "0c8r9k803fc57ny56ny81s276r3m3y4cd7mxvwjmpz7ycivvg0v5" + "commit": "4fa095ff8416d1759ffd9cbd01d667cff386bbb5", + "sha256": "171fsvzk0msvz1052034g60prf40w6qdkglg560v73iika8x2k4s" }, "stable": { "version": [ 1, 1, - 1 + 5 ], - "commit": "3cad357cd5c0f7f949fc6c7aa42d76155d036e78", - "sha256": "136l0lm8lv7fgpzply241fngxfl3ck11raamqwislyv0nnjwdfdi" + "commit": "2e28cf362b7e4a8b6a5bbaf60983a72e19798c8b", + "sha256": "0lal6d4a4pbni1xl3g1gb3rnmyz2kym9r1mhb2n14awqqxxg7l3q" } }, { @@ -59799,14 +60424,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20200105, - 1555 + 20200126, + 1851 ], "deps": [ "seq" ], - "commit": "e8b2d96114ae52060e757d21003a5f242e744fe1", - "sha256": "1c6l7a9rl69vkvfidz2vc8agk4fzdlkjcn4dw01zq607m036jwzi" + "commit": "4da64b60091c3d7b23c7c5fd3dba981122b0e1f7", + "sha256": "1jy07b1am1g4hwiwywmi9iyidv3yp933j2y4f9nmfhpb4yjs193y" } }, { @@ -59817,11 +60442,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20200106, - 143 + 20200130, + 145 ], - "commit": "9cd86a81ee71268f007f949184a5d386cf737d77", - "sha256": "0zmdjxkp2mw9s2s7bryif5gjrqx29gjh47xkq05l8vvgf36r98rg" + "commit": "bdafb13aadeae6af73dadd9f6b383ea6903da32f", + "sha256": "09k9bkwf6hz8jnklsm30w79v3vkwsf5nd97cxfmi44j7wlb6kkr1" }, "stable": { "version": [ @@ -59858,8 +60483,8 @@ 20200104, 108 ], - "commit": "f07387225bfcb0b67850546ace4b74dfefb35ab3", - "sha256": "02pk90zrbrf8vwg0i83z48xvgaziwaar89rghnd5lggrj429kahv" + "commit": "3bce96bbd509ad5ffb35ead52128dec5c1a67abf", + "sha256": "01wx7cvk3bvdvkpldhbj7wvqyrra7ajqjkgnj4knjg8m2wrhilhj" }, "stable": { "version": [ @@ -60062,25 +60687,25 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20191006, - 1733 + 20200131, + 312 ], "deps": [ "dash" ], - "commit": "01608829d895d3a6f4160e3b33175e1a5bde628f", - "sha256": "19qdzn8jd8k85aalkl4751fyfw5lcrk0vvwrrvp2qmj5s3rr16jm" + "commit": "8762d2ec5de2994f05a2a11f505d0963eb28e59e", + "sha256": "0dc9frairj081g326b64mddr3knpxhwvmn19w7m1ckmxbv7lg0in" }, "stable": { "version": [ - 20191006, - 1733 + 20200131, + 312 ], "deps": [ "dash" ], - "commit": "fe7b723b5e609a721a15800faa9bd8b34fddd3e3", - "sha256": "047v8x9i8j6vcn3ba2kzy2lzdxwcm867bby0a5l297jp6mqfw92h" + "commit": "8762d2ec5de2994f05a2a11f505d0963eb28e59e", + "sha256": "0dc9frairj081g326b64mddr3knpxhwvmn19w7m1ckmxbv7lg0in" } }, { @@ -60216,14 +60841,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20200103, - 1239 + 20200204, + 1950 ], "deps": [ "dash" ], - "commit": "c331c1516111b9d2136e632a218c1d7707215356", - "sha256": "095yx8zg61nka6f7biyj1binbp8g872vq275ycwgmd2ix462zyf4" + "commit": "bc1edab09d3fc1b248c17775ae2eb7d35b96be40", + "sha256": "09z5wynw3xaxx2jr55ymlnhczryp5c5zgb1g9nr99k2rksq2j980" }, "stable": { "version": [ @@ -60246,14 +60871,14 @@ "repo": "arthurnn/minitest-emacs", "unstable": { "version": [ - 20191229, - 1711 + 20200224, + 1823 ], "deps": [ "dash" ], - "commit": "6d9f6233b7ce63c63c96675514c228fd93a2b6a1", - "sha256": "01mfsyj0iq6rgh0q5b1acczdzr46n0nj5v94gb3iw9hs54vm4871" + "commit": "97d7d1760b24e117ffd163531b0f57fd4321677b", + "sha256": "0d8kg68yy5x1y3ivj43vzcakb3gii6bh8jm40g4sah5f53bbrs16" }, "stable": { "version": [ @@ -60455,8 +61080,8 @@ "deps": [ "cl-lib" ], - "commit": "753f6dc888acbd932c4fbd7c73ff750381058561", - "sha256": "0smamgvl6qlvzyc4119szxllx5ydw6pmix0g4zfjqf47lwxdd2yi" + "commit": "6d3eedf4fae3c88dee33691aa2856514122adc8c", + "sha256": "0fykf7svgsbcjfcsbp1r571mgjhxwkdvmmhhl2clyi5z3mwg0s1g" }, "stable": { "version": [ @@ -60622,8 +61247,8 @@ 20190713, 1335 ], - "commit": "0a641093f5edb1e0849b82f90a1464623bb14a2f", - "sha256": "0fv03frlcqfa4sfnvv5v6qg9k79jpnv4pbwifzdafqwgpd34jgy1" + "commit": "8f71e0a85c2f6039111663e65d9a13f3310f12ed", + "sha256": "0vz58nk044jm97wh77v02h24571nwg57j1vx2v4rx9wmwrnifwid" }, "stable": { "version": [ @@ -60759,11 +61384,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200106, - 1823 + 20200228, + 1019 ], - "commit": "3c287ae6bf05b3cdc29fb9841bdce990c77ed61b", - "sha256": "171qhi4xcgrkvx1gg5ayz95b6pjazqi2swigl10qf5gxj2b26ys1" + "commit": "e1b2d0a6235c26ce9e8ca7085393eeff20408378", + "sha256": "0cjbvqnw2xhvrzihzywbb5x568vrmxwmrq2rzdm1bw2596ycrnd3" }, "stable": { "version": [ @@ -60783,11 +61408,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200106, - 1823 + 20200228, + 1019 ], - "commit": "3c287ae6bf05b3cdc29fb9841bdce990c77ed61b", - "sha256": "171qhi4xcgrkvx1gg5ayz95b6pjazqi2swigl10qf5gxj2b26ys1" + "commit": "e1b2d0a6235c26ce9e8ca7085393eeff20408378", + "sha256": "0cjbvqnw2xhvrzihzywbb5x568vrmxwmrq2rzdm1bw2596ycrnd3" }, "stable": { "version": [ @@ -60807,11 +61432,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20180617, - 200 + 20200216, + 1927 ], - "commit": "6e086d855d6bb446bbd1090742815589a81a915f", - "sha256": "0xj4wfd7h4jqnr193pizm9frf6lmwjr0dsdv2l9mqh9k691z1dnc" + "commit": "01d00a8d75b19f641b639ba23793cdd507c61f05", + "sha256": "14higsv6h0pka90gr25a3yxh95xn65l6qxb39mmdzkfdlnzsg664" }, "stable": { "version": [ @@ -60855,10 +61480,10 @@ }, { "ename": "mongo", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0jb5m611m7w26wgfwijgy0dn65s7p1y6fdcfpfgpxa7j5vrcxasc", + "commit": "7856a62fb86415c88aa72b574895328c93c10a09", + "sha256": "1xkhn8h6z60jah7v5gvkp4pfwdnmc2wcka4rcjaky51yv50zymad", "fetcher": "github", - "repo": "m2ym/mongo-el", + "repo": "emacsorphanage/mongo", "unstable": { "version": [ 20150315, @@ -61085,20 +61710,20 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20200103, - 1238 + 20200113, + 2321 ], - "commit": "3616a6bd7c6b028753dc11feabd14597da694a63", - "sha256": "1fj66x2vgxqi36fvzh2q0b3p9bijq4a86sqv57zjs59yknib29h7" + "commit": "2751d36152abcc2ac1479225392182b53f1e02dd", + "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586" }, "stable": { "version": [ 0, 5, - 2 + 3 ], - "commit": "3616a6bd7c6b028753dc11feabd14597da694a63", - "sha256": "1fj66x2vgxqi36fvzh2q0b3p9bijq4a86sqv57zjs59yknib29h7" + "commit": "2751d36152abcc2ac1479225392182b53f1e02dd", + "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586" } }, { @@ -61144,6 +61769,31 @@ } }, { + "ename": "moonshot", + "commit": "a0d294051a792679d215dbb830a600fdf5090866", + "sha256": "12gj1df28s7c05vplsx88hcsxjr13hnh8sc7878pj11kabgihpf6", + "fetcher": "github", + "repo": "ageldama/moonshot", + "unstable": { + "version": [ + 20200210, + 2356 + ], + "deps": [ + "cl-lib", + "counsel", + "f", + "levenshtein", + "projectile", + "realgud", + "s", + "seq" + ], + "commit": "83a9933cd4af234ae15fdc3a39e660d646b0c246", + "sha256": "0rljyk4pkjwwh9mrpjdzywc4lyf163glzqhjs3nlvfy2yz9j0863" + } + }, + { "ename": "morganey-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "18cbmx8lnypgxkisxa3lrh88v8l9k0q8fnai5ps8ngvfgz42rlqp", @@ -61408,15 +62058,16 @@ "repo": "akirak/mozc-posframe", "unstable": { "version": [ - 20190817, - 2037 + 20200208, + 750 ], "deps": [ "mozc", - "posframe" + "posframe", + "s" ], - "commit": "20df08f0bf239bc2a686ff2c6d9390b5ea6d89fa", - "sha256": "0azcwdig6xp5vxr6yidmnbqbrfhgb7jwfmyk4cci5ca8sfm4ycvp" + "commit": "1d07d5055381008ccbb29b97315d140e09a7ee95", + "sha256": "1hwc66xj2js5srmshmba5q6adn638qgbslnxg9l15znfhq3qcy9w" } }, { @@ -61511,15 +62162,15 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20200102, - 1938 + 20200221, + 1316 ], "deps": [ "libmpdel", "navigel" ], - "commit": "706268d988a7f3560190694f5d21e27f5eeb58da", - "sha256": "1jsh6x844j33n27ny2rwc5c0psc89fzqy8g2ny09sywm3j4lg281" + "commit": "29e7c46f83bab7aedfa0136c58e776faba6ad4ed", + "sha256": "1lz3i3ygdihr7r9rnb08fkcxrdg905wkb0s55pid57yhh4iva7fg" }, "stable": { "version": [ @@ -61834,11 +62485,11 @@ "repo": "mkcms/mu4e-overview", "unstable": { "version": [ - 20191020, - 842 + 20200218, + 546 ], - "commit": "c34f45b3ab9cce892835e14c6701b531a4f54cce", - "sha256": "1jc291xwym2ddiqvn83s2b2jw6a08dd63x0f6526qv8g3yr1jl1s" + "commit": "151d5d9e0dd5e8e8c775035203d3e17538151f33", + "sha256": "1gvlh306pcn1g4b7j5pk5m2n2wa72bl9vscfsp0gqr4fwrfnm3r6" }, "stable": { "version": [ @@ -62009,11 +62660,11 @@ "repo": "manateelazycat/multi-term", "unstable": { "version": [ - 20191104, - 1156 + 20200112, + 533 ], - "commit": "8deb0f2252399cca2426eb3cc3e9646c5de726b3", - "sha256": "19qbhxhpdsi76jlf6cfacy7g5z6a0r27v2hcf159p4xc4w93yphy" + "commit": "7307ddd456db44045206253e5a905d3d8c143d5c", + "sha256": "0cqq6y7whx4zwwd8360vdmbvsmkrvmxnn7cvz6hafrh5mrcfqmvn" }, "stable": { "version": [ @@ -62116,14 +62767,26 @@ "repo": "zevlg/multitran.el", "unstable": { "version": [ - 20190714, - 1049 + 20200201, + 55 ], "deps": [ "cl-lib" ], - "commit": "eea1e4a57870dd6ee6c6f0a85e53cb66af8954de", - "sha256": "0gvijqs0n3n98fpx61qvzx0akpzfyxhik70dvxp15skr2rvnh17j" + "commit": "475e2a92795dbed1aa3b1c5eba2c6c779cac4508", + "sha256": "0nl4cm1nx7lmb2gd76jw8v0hqdfjjcwy0xskpi0brd8z6dp1m5n3" + }, + "stable": { + "version": [ + 0, + 4, + 10 + ], + "deps": [ + "cl-lib" + ], + "commit": "258b1232af6680396b6c0912597ed52e583326f4", + "sha256": "08b9a0pb38swgvg2v97pm4g2zda0xagdgq42znwhkmhzjiskh2g1" } }, { @@ -62876,11 +63539,11 @@ "repo": "naota/navi2ch", "unstable": { "version": [ - 20150330, - 216 + 20200130, + 36 ], - "commit": "f39d93c32acd5b9c3a7fb1a9fe14c5e1c4b5288e", - "sha256": "0i0icyaa2zzzl0cr9n1zv44pg2lric8gic58dkjxjv8yyk6y01cn" + "commit": "7811dba052f679bd920a1f648d621a6fecace10f", + "sha256": "0glr8cfxpp23j8sr0147x1ba7f6i8vzn2c15kgfs94y5h2d4jv3l" } }, { @@ -62891,14 +63554,14 @@ "repo": "DamienCassou/navigel", "unstable": { "version": [ - 20191229, - 1357 + 20200202, + 1214 ], "deps": [ "tablist" ], - "commit": "2695f1df2260398930319095cf6b6a49ba98d6a5", - "sha256": "0v9f7wb6yghds3hjj8x5di6gfa8n5kjwhav7la1ca2zwgs2c1a9p" + "commit": "0a2d624d6b49f8363badc5ba8699b7028ef85632", + "sha256": "1lf46qsa6xb9rpb0s96vcvwv6n9v08iqp332pyhli0937afij454" }, "stable": { "version": [ @@ -63027,8 +63690,8 @@ 20161029, 2023 ], - "commit": "f7ebf8f2cff477c3d9b8abdb6470e7b8d80f51ce", - "sha256": "0nfj072wvvyzbc6xfw2m9fmfx19rv65s4l3hy2faa4d4skw425zz" + "commit": "7c63573fe66897b089963e9831546e5de7787c5a", + "sha256": "15cwfma9cq8i9x8cpaanzjgszddgvxbkn9q5aci0nnvl6nggqzpn" }, "stable": { "version": [ @@ -63334,11 +63997,11 @@ "repo": "aaronjensen/night-owl-emacs", "unstable": { "version": [ - 20190825, - 1559 + 20200118, + 1513 ], - "commit": "44c1b98f7c0d8b7ad31d6e1b3382bcf0294e03f2", - "sha256": "1nv2s0rz8ihixqxhxj3qn3h0zxfphgjzvldv3y32cg50gxnrb85n" + "commit": "b52fbf83ffef1ca265c9ea273bf51827532cef67", + "sha256": "0blgf7wx8i7am943m1jc7q4ndkb7pdczfgigrdnqsaf861m0nhng" }, "stable": { "version": [ @@ -63412,11 +64075,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20191123, - 1238 + 20200203, + 1941 ], - "commit": "c3d2b591de0763df11dbf62101578ca385ebe7cf", - "sha256": "0jc4zp1b0fk4fc1d2byi2vrbifiy0k89b75kh4qr702vkk9vgl4g" + "commit": "32c5c88502aec1afb6700a798c215b7fc6ce6101", + "sha256": "1s0f7wgik5383ffkys27376s0gzhhz6m0rap7l8iqq67yz0k6hxw" } }, { @@ -63430,17 +64093,17 @@ 20181024, 1439 ], - "commit": "bab5626e57a8b07b6778cd6d41ff29155fefb2af", - "sha256": "1jvcn32986xk33i7ashpva035qaaxw1sjs3g587x2j7iqqhp0s74" + "commit": "2ca4c711f77d9cb95e3698de70d07823f4baa256", + "sha256": "1g53dfs7dycihh98lsril6b57v5mfkqhicy74d3jpkyny7zpshaz" }, "stable": { "version": [ 1, - 9, + 10, 0 ], - "commit": "b25c08bda4949192c69cea4cee057887341a2ffc", - "sha256": "1q0nld3g0d210zmdjyjzjz2xb2bw1s58gj6zsx7p8q30yh0wg610" + "commit": "ed7f67040b370189d989adbd60ff8ea29957231f", + "sha256": "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4" } }, { @@ -63481,11 +64144,11 @@ "repo": "akirak/nix-env-install", "unstable": { "version": [ - 20191223, - 1651 + 20200113, + 751 ], - "commit": "f362590216e8a86ff85b3f444695f8e1dd1b2bcc", - "sha256": "108lyrix9gh438df6y432qppagpq3m2vn3gqsgp9sv24bvkv3wkf" + "commit": "b343a7e885206e78544da7313b860442abbd7440", + "sha256": "06sq5biv15pgz8azp1kkbkj6ifi2xpa688gx8hj3xvkms9hy6b29" } }, { @@ -63684,8 +64347,8 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20200102, - 1857 + 20200225, + 1605 ], "deps": [ "anaphora", @@ -63693,8 +64356,8 @@ "dash-functional", "request" ], - "commit": "da85bf90989c1a4f4e50a40fa64c5b5e82e03043", - "sha256": "1p1jc8daflndbp19ya4h8719zc60xsvxn2l8z3rh291wm2azp2gf" + "commit": "2fbe9052d93fa7b8fca107aa0dfaebbdf734c95c", + "sha256": "0c09hdr79i701gjalav6vj9k7qp8w5ln4s3ji2hk6z03fqpf7g91" } }, { @@ -63720,8 +64383,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20191215, - 1438 + 20200225, + 1558 ], "deps": [ "anaphora", @@ -63730,8 +64393,8 @@ "request", "virtualenvwrapper" ], - "commit": "b5655519c1bf4c540f17bfd6e1af03241e3c1fc3", - "sha256": "0m4gfx87lyz5p8d3bwp3hw5y95vaijnwl8gg9cjy98riw309xpzf" + "commit": "13c6bc1db743f047a952d023be6c2b982a0e95bf", + "sha256": "13qzgvpngja3cd9fkarx7scsvna97fz79snai3ap4qfy5d9gqyqh" } }, { @@ -63757,14 +64420,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20191203, - 645 + 20200123, + 1753 ], "deps": [ "cl-lib" ], - "commit": "d1d6965c70fc6ce0cfb38a5115d0e112aefac1d7", - "sha256": "17is06l0w6glppabv2kaclrnqi3dqb6p6alpslpg7lrjd8vd45ir" + "commit": "14ed8ed2a2d8ae700ce1889d76bc4588d22549b1", + "sha256": "0gdnvvlrakyi1xpvlxr55k0rjnb6fprrc7pwjzpl79j87srrj9k0" }, "stable": { "version": [ @@ -63893,20 +64556,20 @@ "repo": "abicky/nodejs-repl.el", "unstable": { "version": [ - 20190616, - 1753 + 20200223, + 1449 ], - "commit": "d43b8b276a90ccf980150a7d6fbb1f4d2a7cbe20", - "sha256": "1kkj888k9x5n0i7xkia177gzsa84my3g8n0n7v65281cc4f1yhk5" + "commit": "ed2052522d1770cc951863000f96165e0c42ec7b", + "sha256": "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx" }, "stable": { "version": [ 0, 2, - 2 + 4 ], - "commit": "0deb44e6c800daf061d9f8c07760b1e381382766", - "sha256": "1kkj888k9x5n0i7xkia177gzsa84my3g8n0n7v65281cc4f1yhk5" + "commit": "f5ce3d5b7b4e0d06f6e9d4930d9ecc417633586b", + "sha256": "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx" } }, { @@ -64019,14 +64682,25 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20190802, - 725 + 20200213, + 2057 + ], + "deps": [ + "colorless-themes" + ], + "commit": "a7b7c0a32b174988f40378996cd8997f73524f19", + "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz" + }, + "stable": { + "version": [ + 0, + 2 ], "deps": [ "colorless-themes" ], - "commit": "12678144d17edf36d34e6bcdc5435593e191d96d", - "sha256": "0fld15h92193bnbmka3ikq27hggxvsikzlzq4pi2n3kknq9hyh56" + "commit": "8e539097185704444a5dd5545924de92c11ba767", + "sha256": "1p16vxai8dj1vy4ahflwij1ldx00jzrjcinpgpc7wgh6ka748v11" } }, { @@ -64067,11 +64741,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20191214, - 1128 + 20200109, + 114 ], - "commit": "cedc6db19d2bb37ce0c8f74be25cdf045b35caca", - "sha256": "19siq81y03ngj3idc3g892fpg0qvhf1y40spmy8ffnzzliqysvcj" + "commit": "018ad3703ba46ea603854f51f8ff5ae86183cca0", + "sha256": "0vr17rhc74cf8k1n1snnfb82rzpsfc9xxcb8y2ydi0pbwd2h87r6" }, "stable": { "version": [ @@ -64084,6 +64758,36 @@ } }, { + "ename": "notmuch-bookmarks", + "commit": "dda2f16bfd15bebae67b51f04c068ffd032a42fb", + "sha256": "0ckl2hspjmk8gr2szh6xg1kv9vsnc2s0jjqymqvckpsl2g4n82p9", + "fetcher": "github", + "repo": "publicimageltd/notmuch-bookmarks", + "unstable": { + "version": [ + 20200105, + 1041 + ], + "deps": [ + "notmuch", + "seq" + ], + "commit": "28a8e58521b50bfe0944f74eb2945521e03daad3", + "sha256": "0ma8rmxcq0xh1gskzyc8ay5681nidc340ghjryic3g30njidbiwd" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "seq" + ], + "commit": "c0071310f01dd5296600bdc4d6135667d38ef0de", + "sha256": "0zg53b77g4s05dj3a7n3vxdvfwya6pzc0v86kqk0443m2y96vfwc" + } + }, + { "ename": "notmuch-labeler", "commit": "2e9940e66bbf70ec868dbdaaeaa1fbd4f076a2e1", "sha256": "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0", @@ -64120,15 +64824,15 @@ "repo": "wasamasa/nov.el", "unstable": { "version": [ - 20190821, - 1920 + 20200220, + 939 ], "deps": [ "dash", "esxml" ], - "commit": "ecbdecc927a3b3f7e0927d225e6e6464c244c2ae", - "sha256": "0z6h3vgp0vawr96ni7814csdzkq7q710kya8raf9ii90fkzwhpi1" + "commit": "cd1b264b3f978a9285fa9297e40ad29d1434adf5", + "sha256": "02apbr5x9vdrx05mfs8qyp4ami1y30n8mmy4kpd4xw04nza9wxki" }, "stable": { "version": [ @@ -64152,11 +64856,11 @@ "repo": "muirmanders/emacs-nova-theme", "unstable": { "version": [ - 20191213, - 2202 + 20200213, + 102 ], - "commit": "ff566133747cd3508f4d576234a1c3fcd3f8cf09", - "sha256": "0lpjbrnpxw0dxl34hlkn6lb1ddmwazi1l5201rwpf1yg512x176q" + "commit": "4553fabbcd340f3f2fa59dbfb6f3f32ecb016e6f", + "sha256": "0y0f7f03hikd5j20fc40g0hrp7aiwzna9rfwpxzlj10n8ijmygq9" } }, { @@ -64314,8 +65018,8 @@ 20191210, 815 ], - "commit": "54b590303626fcd53b017f92454ffe97c97ca69e", - "sha256": "1n0kjnx5xgd7x9zqrkgy8klydkv4ihxmn0gvprzsscp268rkrfnh" + "commit": "484ef531f67df358923dd5fef015233095928f8a", + "sha256": "10imnf6fq8bxbkzpnz47b55wjpf4mcr24ibnjrpy0z8rkf4i8gq3" } }, { @@ -64659,8 +65363,8 @@ "deps": [ "axiom-environment" ], - "commit": "3e7885d694efef923e7b53827d277c28bfa09320", - "sha256": "048x8mj72c57f62ffsad43mcrc201d8ilh339gnpm2yi8midv0ih" + "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", + "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" } }, { @@ -64955,15 +65659,15 @@ "repo": "jdormit/ob-graphql", "unstable": { "version": [ - 20191223, - 1358 + 20200108, + 2228 ], "deps": [ "graphql-mode", "request" ], - "commit": "c62d6a2ea2c162772d5e255715cff7b35fe660d5", - "sha256": "1s4rgr6v7xxpjr219a44309jg50iip5isch6x90zk5vig735c30h" + "commit": "ced37c6761d69e1ff206ff0ebd633f0e4fd2ac54", + "sha256": "0575w89sr97dv4ccygbhj4k7rpk2934q9f0p3q0hxf8a5wikf493" } }, { @@ -65205,14 +65909,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20191119, - 924 + 20200109, + 730 ], "deps": [ "restclient" ], - "commit": "fa4ac671756c9d4e395bd481405239d06b202bae", - "sha256": "119rkz8dwrmxdsybkq3yhw6g4gral3xfqvdgbnl4i3w89j16wwcr" + "commit": "c5c22e603531dca48575d0a425fddff16dc0f391", + "sha256": "19fs6ms6rj75w4v7p7z0k2004gnb246nksv20mb8cqjnzkj0495s" } }, { @@ -65738,26 +66442,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20200107, - 851 + 20200124, + 1310 ], "deps": [ "org-re-reveal" ], - "commit": "0e603b25ffa7dd2ea7935e7d9a5ad4c1f19e9d7e", - "sha256": "0ga6ii780bqpc5vj67s2avpg8hf4hszn5nfyvma9ir1prkskn0g6" + "commit": "64235b073c47baf7f1d7909706875c42a7f6da3d", + "sha256": "124f98q8bcd832wsdkmzm3rjmmhpqyf8z5ddx841j6p68ds8066r" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 0 ], "deps": [ "org-re-reveal" ], - "commit": "0e603b25ffa7dd2ea7935e7d9a5ad4c1f19e9d7e", - "sha256": "0ga6ii780bqpc5vj67s2avpg8hf4hszn5nfyvma9ir1prkskn0g6" + "commit": "64235b073c47baf7f1d7909706875c42a7f6da3d", + "sha256": "124f98q8bcd832wsdkmzm3rjmmhpqyf8z5ddx841j6p68ds8066r" } }, { @@ -65820,20 +66524,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20191217, - 917 + 20200212, + 1439 ], - "commit": "6c7505f426c1bb55bb209e45ea69e9a3cd683be0", - "sha256": "0m65wc7jz3hvq8kspr3h9m0sf3klf8facf59q2k2xpjn33ab6dps" + "commit": "4b113151308c1214e8e70a7846558dad9c918859", + "sha256": "0cb06dy22897nx0wakar24frdhg5865icj25a2wb198br8r094ik" }, "stable": { "version": [ 1, - 8, - 1 + 9, + 2 ], - "commit": "c7784fe2dccf676310a9a602b6eedc2a7b667499", - "sha256": "1fbj9s49y5yx5i429awv9rybacfgvhwp7v5h0zw67bpgx4qs44pa" + "commit": "4b113151308c1214e8e70a7846558dad9c918859", + "sha256": "0cb06dy22897nx0wakar24frdhg5865icj25a2wb198br8r094ik" } }, { @@ -66289,8 +66993,8 @@ "request", "s" ], - "commit": "13499b7ae602c735e40c1c494bda6252a2f1c98f", - "sha256": "14vb47y5cq3j80aah8fjjf5aw343p9p7bhlxnpz5fr8r9a883dka" + "commit": "6819b6271960dcdc7c32981dadd48968a3640cef", + "sha256": "12frm9w6xh5rkfyvvvpwhdd55nlgsv8w4f52pch0sl437vidcsqg" }, "stable": { "version": [ @@ -66370,11 +67074,11 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20191112, - 1629 + 20200122, + 1511 ], - "commit": "6ecf211b56e4296898aa87eec8c6fed365a5d220", - "sha256": "15plspxxg18nch4q22ilc6pvmyrhnhfz18g7p6c9hmxkrlkvg43n" + "commit": "654f185861ed4fedfe1394db48a83639a0be57f6", + "sha256": "1dwps9zv1jnc7m75j5cdla14pnv2vnivm5bq0zcvqfsvilvd38ds" } }, { @@ -66675,15 +67379,15 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200104, - 2235 + 20200229, + 2229 ], "deps": [ "org", "org-ql" ], - "commit": "5cfacc842842132894f6d8f4f0cb4ade8a9d657f", - "sha256": "07csazgchji964ch5yccfx6prrpdqpzk4hdjisx4qc8d3hjvhw78" + "commit": "6b7fced8015387efd03f28e53be47c3ca8907d7f", + "sha256": "01s8cjgxfl5pplswy80qgxisiv7p1kmbq28g3xx1qn2w7pfiyfwa" } }, { @@ -66781,14 +67485,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20191201, - 1435 + 20200220, + 2016 ], "deps": [ "org" ], - "commit": "a40ad1e5cda5a80faca255a344c14280b841ebbd", - "sha256": "1sr035jld69sv4yx787ci7rsll8z59q1s3gsmmmdkiab6sah09v6" + "commit": "61686fd87892e60268fc43348282abbfd879e5c9", + "sha256": "0n493p9dqx9bb6jcrb34s1rk8afwpz1fdgwrm64g7a0y2mbfga74" } }, { @@ -66814,15 +67518,15 @@ "repo": "dfeich/org-clock-convenience", "unstable": { "version": [ - 20190130, - 1610 + 20200123, + 1029 ], "deps": [ "cl-lib", "org" ], - "commit": "7d14699a15ad6c5b9a63246a11188c77f8800e94", - "sha256": "05r6jgh8ys4ihpns7g64n4zbnvyy5fvndf9v7zinq2nk6grb393q" + "commit": "4e522706a90a504c75d377161005f9543575ea02", + "sha256": "08d0hv2shpbw01pjh8ks04avyl4zc0zcyqlmn4hbdhwjz7lzp8dv" } }, { @@ -66926,11 +67630,11 @@ "repo": "thisirs/org-context", "unstable": { "version": [ - 20170107, - 1337 + 20200217, + 1006 ], - "commit": "a3b4a4ce6d15e3c2d45eb5dcb78bea81913f3e21", - "sha256": "18swz38q8z1nga6l8f1l27b7ba3y5y3ikk0baplmich3hxav58xj" + "commit": "f354108ecd3d33cadee05a4aec95d2df4bc61ae9", + "sha256": "1zlqciqadhwkhmzlag7w0i83pn9gg0gikfcrv2qlr9nsn5rzzvj4" } }, { @@ -67049,14 +67753,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20191219, - 1227 + 20200211, + 1541 ], "deps": [ "async" ], - "commit": "a367669384859261bcb11bac4b782f231f972353", - "sha256": "0yh1pfr3k04f98pywq54pgajhl3l1hy5x3marg0waqzgrbchr7yi" + "commit": "3c4810279334d487c76fb5e23e6e6cd098ccd6ac", + "sha256": "1xc98xbkrj56gp3njmbqnkvkigbgqjqfyiacrnqf9fkznwvjhrrp" }, "stable": { "version": [ @@ -67107,16 +67811,30 @@ "repo": "phillord/org-drill", "unstable": { "version": [ - 20191219, - 2100 + 20200216, + 1336 + ], + "deps": [ + "org", + "persist", + "seq" + ], + "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4", + "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy" + }, + "stable": { + "version": [ + 2, + 7, + 0 ], "deps": [ "org", "persist", "seq" ], - "commit": "d2fe915d7a6602b337d4413eec10baa1c1a10dff", - "sha256": "1d87z3fwr5p657fbl6h8gf3xw1znjcc12090y0lk1n88nfmwbckf" + "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4", + "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy" } }, { @@ -67321,6 +68039,24 @@ } }, { + "ename": "org-fragtog", + "commit": "b1136eb881139e51588b6110b9f13544b469259a", + "sha256": "09zb72l6hsvwi5kgmrihjlagdqbcr6nwj9a4c32hp9xm14rpd75h", + "fetcher": "github", + "repo": "io12/org-fragtog", + "unstable": { + "version": [ + 20200215, + 2217 + ], + "deps": [ + "org" + ], + "commit": "8eca8084cc025c43ce2677b38ed4919218dd9ad9", + "sha256": "0irr4l40djgmgvg41gx7kqza6zwi2mz69drq7dyrr10pz5hd0ikp" + } + }, + { "ename": "org-gcal", "commit": "d97c701819ea8deaa8a9664db1f391200ee52c4f", "sha256": "014h67ba0cwi4i1llngypscyvyrm74ljh067i3iapx5a18q7xw5v", @@ -67516,11 +68252,11 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200103, - 1227 + 20200227, + 1830 ], - "commit": "11b8255d8839515895581450a090351d18770c99", - "sha256": "17mqbb3hddkinr9r7q5m4rp20hp97fbygp18rnx0j2vhc7jpc4g3" + "commit": "271b99f5ec4fa45fdf546713a9c3f55543e9cbb9", + "sha256": "1ayqxcfbs3mcygwjyx93lclpp1dhqaq35v7bl8739d59i0drsyhq" }, "stable": { "version": [ @@ -67555,30 +68291,30 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20191003, - 1455 + 20200126, + 1158 ], "deps": [ "dash", "org", "s" ], - "commit": "3007d636f0c7b69d767d7adcca4ab462708f9610", - "sha256": "0mqi85gfaq60dxvm5r7rn6mi479fk26dy0nmss7dnqxwm2s39414" + "commit": "4e352ca1a0b712fc92f656b4fe436a04c7033a20", + "sha256": "0smjn7jmg5w9nwjp0qadl0sx6r78ycaqm8y3a2wm6slmdad2p1jb" }, "stable": { "version": [ 0, 4, - 21 + 23 ], "deps": [ "dash", "org", "s" ], - "commit": "3007d636f0c7b69d767d7adcca4ab462708f9610", - "sha256": "0mqi85gfaq60dxvm5r7rn6mi479fk26dy0nmss7dnqxwm2s39414" + "commit": "93f8135f2b7ae2d5ed807cb92954640796bbe273", + "sha256": "1wxc4y5swldqv3jqdz9gj1gx30r4xzis8g2m572bbsrdfjf04c26" } }, { @@ -67601,24 +68337,6 @@ } }, { - "ename": "org-link-minor-mode", - "commit": "b1d2add7baf96c9a18671766d61c8aa028756796", - "sha256": "1akb670mzzhmldw2202x3k6b7vwfcn0rs55znpxsrc4iqihdgka3", - "fetcher": "github", - "repo": "seanohalpin/org-link-minor-mode", - "unstable": { - "version": [ - 20170805, - 1852 - ], - "deps": [ - "org" - ], - "commit": "7b92df60f3fee7f609d649d80ef243b45771ebea", - "sha256": "1lz7qj57s391ssawmccvhgxv1w99fj1m9rg3g4pymdl3sgdcz4g4" - } - }, - { "ename": "org-link-travis", "commit": "52c7f9539630e5ac7748fe36fd27c3486649ab74", "sha256": "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs", @@ -67649,38 +68367,6 @@ } }, { - "ename": "org-linkany", - "commit": "df82cf95e34775b22da0a8bb29750f603c58f259", - "sha256": "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c", - "fetcher": "github", - "repo": "aki2o/org-linkany", - "unstable": { - "version": [ - 20160207, - 411 - ], - "deps": [ - "log4e", - "yaxception" - ], - "commit": "8cfe2f1a46e6654a79f56505349d1396263cecb3", - "sha256": "0lqxzmjxs80z3z90f66f3zfrdajiamdcwpvfv5j2w40js9xz4x37" - }, - "stable": { - "version": [ - 0, - 0, - 2 - ], - "deps": [ - "log4e", - "yaxception" - ], - "commit": "ed4a6614b56c9baef31647ea728b3d5fae6ed3a2", - "sha256": "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p" - } - }, - { "ename": "org-listcruncher", "commit": "5bed5078a3e56a825be61d158ca8321763b92f7c", "sha256": "05vi7a03gj1waaqcjnkgpij4r45r2087xg7kgfs6ki8zhsyws23q", @@ -67725,30 +68411,29 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20200101, - 305 + 20200110, + 1804 ], "deps": [ "dash", "org", "s" ], - "commit": "f640826c8e66c83adb2b511f99f32525e9da94c0", - "sha256": "0n3gm2g2zyqnqnbizajmlvy3h3bhvazfjvw68vikdn6x9fcnvmdl" + "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1", + "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw" }, "stable": { "version": [ 0, - 3, - 1 + 4 ], "deps": [ "dash", "org", "s" ], - "commit": "e92fd443c998532ff786361ae72b6981dc1f2ff0", - "sha256": "03vgygni5f1qrmchwy0szks47hwhpl21qvk4wlwh2bd79rxnhc1f" + "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1", + "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw" } }, { @@ -67826,11 +68511,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20191121, - 840 + 20200128, + 1208 ], - "commit": "1ec07f8ce60b3eca281072e51f88065469450ab1", - "sha256": "1a2vp6bk5lgcgy95ynflql5hacr3ckmfh8nq36bkakqw97k7wih9" + "commit": "8f9f4f978a3c40adf2ff00eebb56bccfe4caf4e1", + "sha256": "0v0q3qzz6fwh0y9c9ci46284msr0x69jfki2ng89hpz8aab90bli" }, "stable": { "version": [ @@ -67850,14 +68535,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20191129, - 2329 + 20200221, + 25 ], "deps": [ "htmlize" ], - "commit": "a236211e4928610c56b5ee40ea401db60bc2845a", - "sha256": "04ngim6204pii0xpg6cfdzac1b4dfyy7lnp6zfb9mjajrf40fyr1" + "commit": "4278cf11735a2890e22acf6d34c632dd64a2e5a4", + "sha256": "1fyr5z441bncgnazwgbpfk5bd4k5p9nh525sfdxzw6w8s26i8pnw" } }, { @@ -68223,14 +68908,14 @@ "repo": "rlister/org-present", "unstable": { "version": [ - 20180303, - 2330 + 20200204, + 1647 ], "deps": [ "org" ], - "commit": "d13acd70eff6a1608bc991920232146a0de76b21", - "sha256": "0jz8xiny3rv9ql0p623byz32pip1b82j2c2nyfz2wd114kiabb6q" + "commit": "9709ca2d04a59959354222ac4d3f8b750785739a", + "sha256": "08f8gh2zg4gr4d5ajlcnlj2lsp8nywni4mhw4w4nfa4dwyq7mxgv" } }, { @@ -68260,20 +68945,20 @@ "repo": "marcowahl/org-pretty-tags", "unstable": { "version": [ - 20191120, - 1343 + 20200124, + 2002 ], - "commit": "549fa6969660dcf0cf9bca5b7341d0cb48ec3b77", - "sha256": "12s74if74vw8q5awgrk0d1244ysfgb9kw3dxhypsccsbf413jmii" + "commit": "f52744ab69a9077450c84b80475147d7c435f4bb", + "sha256": "1nycdawb065c8cakmlfpcqpkyij0kv1c940mi49ps2k58nz4554x" }, "stable": { "version": [ 0, 2, - 1 + 2 ], - "commit": "8249601b6c75ac26254f3f12e38f5cb51e22bfdd", - "sha256": "0ws9b473b0dh8sp4qaj8v8p1qvfi0xxmgwnv1biydjwm50mzlran" + "commit": "549fa6969660dcf0cf9bca5b7341d0cb48ec3b77", + "sha256": "12s74if74vw8q5awgrk0d1244ysfgb9kw3dxhypsccsbf413jmii" } }, { @@ -68396,32 +69081,35 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20200103, - 1257 + 20200228, + 203 ], "deps": [ "dash", "dash-functional", "f", + "map", "org", "org-super-agenda", "ov", "peg", "s", + "transient", "ts" ], - "commit": "21c7dc15878f90eddee6375faf6b138d7784579c", - "sha256": "0qv4hysrgk34mzkfzmmqy1w8mbar768hcwjwbnz4pr15jq016d6d" + "commit": "fc91bdd4836a026ae5b5df18ed133f85cf3ff138", + "sha256": "1li9x44zd63s4xvhhimvnq6nd995hyhdrzybcxhvyr1qbqgnga5i" }, "stable": { "version": [ 0, - 3, - 2 + 4, + 1 ], "deps": [ "dash", "dash-functional", + "f", "org", "org-super-agenda", "ov", @@ -68429,8 +69117,8 @@ "s", "ts" ], - "commit": "2274efce077c7cf8b2930a8bfb9980c251d8e737", - "sha256": "11bhpi2l28vp8mm9nx18jljbqdnh9vxpv9kp1dn9lpsgivcdbc34" + "commit": "32c68d7f249e1780a7e1a0b1155db3f36d535e1c", + "sha256": "0bw4568vx3swxc3khnnz28288h70z473pvw2m38ygjq7kyqnrq9b" } }, { @@ -68489,16 +69177,16 @@ "repo": "mwfogleman/org-randomnote", "unstable": { "version": [ - 20190403, - 1633 + 20200110, + 1407 ], "deps": [ "dash", "f", "org" ], - "commit": "f35a9d948751ad409aa057bfb68f1d008fdf9442", - "sha256": "01nf3h5sg74lph1hjj7q77pxn6xxv4zq9cjnd97a7bfbpilq86a0" + "commit": "ea8cf4385970637efffff8f79e14576ba6d7ad13", + "sha256": "0q6xfwf35dy13hif3qrkqyhlwpmpcfsaw3lfwgv0dhi0g7h5bpry" } }, { @@ -68509,28 +69197,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20200107, - 751 + 20200206, + 712 ], "deps": [ "htmlize", "org" ], - "commit": "29bc467201220dbf5091fe2d32a2b237c744ff10", - "sha256": "17rz5z1gbwav2ihszl509vqmhpavg3abs6ggjk41v5v11szckyf8" + "commit": "14df7542f2a675f65501962e344e03d798cf0d39", + "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf" }, "stable": { "version": [ 2, 12, - 0 + 1 ], "deps": [ "htmlize", "org" ], - "commit": "62f0868c4e9b098fb43b62b257bcd924779838c0", - "sha256": "0nbbynpgwmw85y90frbkna0s0sxxdhskpijnl41f9l6psll70mq4" + "commit": "14df7542f2a675f65501962e344e03d798cf0d39", + "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf" } }, { @@ -68560,8 +69248,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20190909, - 1618 + 20200228, + 215 ], "deps": [ "dash", @@ -68570,8 +69258,8 @@ "org", "s" ], - "commit": "6430700dbe2ba34d852b36d56b3a879d71dabc9a", - "sha256": "0rl7f2dnwv90l7dnhgzaqnpmff0li366dmkiprjydxchkh1n7mic" + "commit": "bb9c96bea63a0ce8c0d18e8b8b4b24085d4c9d89", + "sha256": "15fa794drfz9vh9jms4ivayys3kf50nry8x06i8v76kn716klv49" }, "stable": { "version": [ @@ -68628,8 +69316,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20200107, - 1307 + 20200225, + 246 ], "deps": [ "dash", @@ -68643,8 +69331,8 @@ "pdf-tools", "s" ], - "commit": "52cf11378b31b070111ed43fb59138146819f926", - "sha256": "0vcpy107znh1xvi121kd8rhqvhibwmspcqdyvy2h2xp0pd2xnhwx" + "commit": "caca18f8eeae213c2719e628949df70910f7d3c7", + "sha256": "0w31xjyyn2122c7n3s3rs64wgmhb82q49hqsy48m7ynkm9x9a0jq" }, "stable": { "version": [ @@ -68699,14 +69387,26 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20190914, - 102 + 20200224, + 548 + ], + "deps": [ + "dash" + ], + "commit": "800e1094892be1b62087317bd7dbd6c2cdca07f2", + "sha256": "1rb9gc99jb1sbzc7hlc6yndaci1dfravjvnlix9wk9bix27g3vca" + }, + "stable": { + "version": [ + 0, + 3, + 1 ], "deps": [ "dash" ], - "commit": "7668fb561320bf01e73d98795eb6ad69f1e933ac", - "sha256": "1vw4996dj9j10b72vf9cya61h031bl2a4dsrqdg52v2j45bhk4dy" + "commit": "6fad8d248acfd32c7b2347223c9326351f8cefd4", + "sha256": "08kwbc630ijmz7nzypzm6bcr3yzij47rhb3ih1hgq6z5pm5cla6v" } }, { @@ -68774,16 +69474,16 @@ "repo": "ianxm/emacs-scrum", "unstable": { "version": [ - 20200107, - 1048 + 20200131, + 1129 ], "deps": [ "cl-lib", "org", "seq" ], - "commit": "227de5157d9dea4fb52527d3a30a61969731a040", - "sha256": "1hh29gjj7d629g5mzcpvvh6jpsm7fz1vypiq8ppfmpi9jxflz631" + "commit": "8b5cd196bb37cebd1aa5b02ed189ad7dadd92078", + "sha256": "1bb9njb8wqw5vm1kl63jqql2q5fmms2v6rhvfywr75iiirakxqzz" } }, { @@ -68890,14 +69590,14 @@ "repo": "ndwarshuis/org-sql", "unstable": { "version": [ - 20190621, - 2111 + 20200217, + 2130 ], "deps": [ "dash" ], - "commit": "e1bcfd7d648ce60bc2dd24b6e2144199af03563a", - "sha256": "0a0g60bbi3lfzj9gg0l0a068p8c8lqln4qcsf1rk879i70g365fv" + "commit": "9543ad58bc471abf09705d2615c50c1ead90c660", + "sha256": "18i4zhk955q13qvascvr8ag6pv2i9s14xfwl2061zjqarx89sxa1" } }, { @@ -68972,11 +69672,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20191107, - 805 + 20200117, + 800 ], - "commit": "6381b933853878eb0eac9404d9596ea59c5b1a1e", - "sha256": "15xrginwc7lhykwllsz68n8ms8zfg6sx63lm87f3f7aqf8hrsnig" + "commit": "5c19300d7634e94ae813b1b66abc716fbb1e5fc9", + "sha256": "1m7vmibjc6yk2npfrnnqd3g2099300r0q8mr8cvyivmk5ailbfrh" }, "stable": { "version": [ @@ -69026,8 +69726,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20200107, - 1609 + 20200129, + 16 ], "deps": [ "dash", @@ -69036,8 +69736,8 @@ "s", "ts" ], - "commit": "bd6f821e6e812ffe84cdf8d92cef7502f62355d7", - "sha256": "0r3lzlh9xw0zm0ycq7qkap60y204715vd80hbypcc2fpdqn6kmf4" + "commit": "ab9c335f9738853c52aae9b946f50e8b6c46a1e0", + "sha256": "1l1k7jbn1n1qp5q5h174sdwpqhh8l5zbg9flk1pwaxzq88103gy5" }, "stable": { "version": [ @@ -69168,11 +69868,11 @@ "repo": "mtekman/org-tanglesync.el", "unstable": { "version": [ - 20200107, - 2134 + 20200127, + 1616 ], - "commit": "e17f64c6472ab2c90d1f32eae83b9fe0843fc028", - "sha256": "1sljzjgwgw654lijl20p82pr8pas8v64dmyjagm6cw9ss8p75vj1" + "commit": "af83a73ae542d5cb3c9d433cbf2ce1d4f4259117", + "sha256": "11rfn0byy0k0321w7fjgpa785ik1nrk1j6d0y4j0j4a8gys5hjr5" } }, { @@ -69397,11 +70097,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20190729, - 1550 + 20200114, + 2334 ], - "commit": "036a36eec1cf712d3db155572aed325daa372eb5", - "sha256": "1r8ncx25xmxicgciyv5przp68y8qgy40fm10ba55awvql4xcm0yk" + "commit": "7bf09a02bd2d8f1ccfcb5209bfb18fbe02d1f44e", + "sha256": "1pzgb1z5k8zsbdqiaa7l94xlrncji1l09zqxvq62fyc0slxcf4ix" }, "stable": { "version": [ @@ -69421,8 +70121,8 @@ "repo": "org-trello/org-trello", "unstable": { "version": [ - 20190304, - 900 + 20200130, + 1748 ], "deps": [ "dash", @@ -69431,8 +70131,8 @@ "request-deferred", "s" ], - "commit": "94539558343ff109030e20ebba6a282af41a5eb9", - "sha256": "10pdr3pgshnbk2g3srn2ja5a1z37fxvjr4xz5r1zni109m8x98mp" + "commit": "e8e88239b5130307368f554b96fbf05ff4c207b5", + "sha256": "0kzvyv8rs0fsfbqsvgdjxlfa0qyi7wsdnfjw7c0hbwi25al39zm7" }, "stable": { "version": [ @@ -69587,19 +70287,19 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20191117, - 1948 + 20200207, + 2036 ], - "commit": "ee4cec8bea3cc8fd8456108fc3c5e53a62b5553c", - "sha256": "0gcgs8flxy1dldj7hscvzs23gjnyvshj9p9mbdhlq7cggbxly26m" + "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5", + "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8" }, "stable": { "version": [ - 1, - 1 + 2, + 0 ], - "commit": "ee4cec8bea3cc8fd8456108fc3c5e53a62b5553c", - "sha256": "0gcgs8flxy1dldj7hscvzs23gjnyvshj9p9mbdhlq7cggbxly26m" + "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5", + "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8" } }, { @@ -69632,8 +70332,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20191102, - 28 + 20200301, + 501 ], "deps": [ "htmlize", @@ -69641,22 +70341,23 @@ "metaweblog", "xml-rpc" ], - "commit": "58398120907504ff200adfd9b817f297142c9680", - "sha256": "0c8r9k803fc57ny56ny81s276r3m3y4cd7mxvwjmpz7ycivvg0v5" + "commit": "4fa095ff8416d1759ffd9cbd01d667cff386bbb5", + "sha256": "171fsvzk0msvz1052034g60prf40w6qdkglg560v73iika8x2k4s" }, "stable": { "version": [ 1, 1, - 1 + 5 ], "deps": [ "htmlize", "hydra", + "metaweblog", "xml-rpc" ], - "commit": "3cad357cd5c0f7f949fc6c7aa42d76155d036e78", - "sha256": "136l0lm8lv7fgpzply241fngxfl3ck11raamqwislyv0nnjwdfdi" + "commit": "2e28cf362b7e4a8b6a5bbaf60983a72e19798c8b", + "sha256": "0lal6d4a4pbni1xl3g1gb3rnmyz2kym9r1mhb2n14awqqxxg7l3q" } }, { @@ -70078,14 +70779,14 @@ "repo": "vyorkin/ormolu.el", "unstable": { "version": [ - 20191201, - 1243 + 20200207, + 2111 ], "deps": [ "reformatter" ], - "commit": "aa2c561e0e71584c1d8dc354d2dd1c541f226f57", - "sha256": "0vrp0yl3v3cmli8ryq8d1zf0q4kv4fd311gij1w6kb5mjdahqfvb" + "commit": "f6f2ea12ae158a400525857a82eb05bf2b7e88f3", + "sha256": "0v3ci5wyydpj14r2lvw7fn9yp7ra8nhz8z2c68521dydhblbry7b" } }, { @@ -70226,6 +70927,30 @@ } }, { + "ename": "osx-plist", + "commit": "3f536906e3272e1b377d1a192accbc80927e788f", + "sha256": "02m8sam2wi4lfwf1hm5xwal7n50nqvb1bv8k0sikh90yq56zympv", + "fetcher": "github", + "repo": "gonewest818/osx-plist", + "unstable": { + "version": [ + 20200212, + 1724 + ], + "commit": "7e717532c78a97eb77b79e2985cea0b201117ff8", + "sha256": "129874d3g5c1dim6gmx1fllx22rfjg4zdvgdmfpm37l1n8hyzccn" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "bbed74d334e8a4141c8f6ed07c8e42ee7979c35c", + "sha256": "0d4qb7by8b069mk98wd9n9qn9ibbc6gqchxvws8r8y1sqjv1ssv8" + } + }, + { "ename": "osx-pseudo-daemon", "commit": "6104efc035bcf469d133ab9a2caf42c9d4482334", "sha256": "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z", @@ -70233,19 +70958,19 @@ "repo": "DarwinAwardWinner/mac-pseudo-daemon", "unstable": { "version": [ - 20170722, - 607 + 20200215, + 513 ], - "commit": "d235680a72677f11925b912428ad1a57b664e3e8", - "sha256": "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40" + "commit": "703ee41303dc251b7672b7cba5aeb6aa54a76c90", + "sha256": "0cplbz7mc2zrxfk8g349ahb7gzli2hn5kda9155nbk8dw74xmj7d" }, "stable": { "version": [ 2, - 1 + 2 ], - "commit": "4d10e327cd8ee5bb7f006d68744be21c7097c1fc", - "sha256": "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2" + "commit": "564b006835facc4a8df247d8a47ab1030d7e7beb", + "sha256": "1ilqxl1851rg9v6ixi924xhzykc3c34f4nq1x0vyyq5b9m2fpb27" } }, { @@ -70474,11 +71199,11 @@ "repo": "emacsorphanage/ov", "unstable": { "version": [ - 20191127, - 32 + 20200124, + 1842 ], - "commit": "d1ae4d2a488e8ed99ab395e567bc00d21dd6c478", - "sha256": "0d8px0j9drviw02mx7zqkl5sgb9qa42dsczkqg02ggcbvhy6cm9g" + "commit": "3b246691d5b728ef1f0164f0cefffe00c9554e64", + "sha256": "10synkwxz6kqldx97pc52falr7h7khq97gck5fqidijwzmvs7jb2" }, "stable": { "version": [ @@ -70711,25 +71436,25 @@ "url": "https://git.sr.ht/~jakob/ox-haunt", "unstable": { "version": [ - 20190720, - 2352 + 20200202, + 229 ], "deps": [ "org" ], - "commit": "9d25ec4fc66fccbae23489abd4b9e8933c5b7dbd", - "sha256": "10kpz2qns0q92qh3hdwv1s8c9n4yb9iz9s7zas0h61rjqx22cz9n" + "commit": "f3c8fda6fee78f45a259e5d218a519dfd11c00c7", + "sha256": "1rs1n228c2fmpvirc57bqgf2616ijpphkgf4w9ln5j46snmkam25" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "org" ], - "commit": "9d25ec4fc66fccbae23489abd4b9e8933c5b7dbd", - "sha256": "10kpz2qns0q92qh3hdwv1s8c9n4yb9iz9s7zas0h61rjqx22cz9n" + "commit": "f3c8fda6fee78f45a259e5d218a519dfd11c00c7", + "sha256": "1rs1n228c2fmpvirc57bqgf2616ijpphkgf4w9ln5j46snmkam25" } }, { @@ -70758,14 +71483,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20191217, - 1543 + 20200122, + 2049 ], "deps": [ "org" ], - "commit": "d2892b3b5ea19f85063f2fba4a5b7ffa1123a395", - "sha256": "1z0y07y9m1svxiypfgcadsajfd728aksa1bmka5a7y9fsag3l4zh" + "commit": "16f1b0c9a9e01bdc3582284f570be5fd70004e03", + "sha256": "0z6cz93kcr7h3yag36m58mmncp6klyalqprj4ifpk9wj3802yyyi" }, "stable": { "version": [ @@ -70854,14 +71579,14 @@ "repo": "stig/ox-jira.el", "unstable": { "version": [ - 20171001, - 916 + 20200218, + 2301 ], "deps": [ "org" ], - "commit": "db2ec528f46c9e611624ba28611c440a99bff255", - "sha256": "04zz6359xkn4w7jmmadxyvjd8pw21gw12mqwch1l9yxc4m9q474l" + "commit": "00767df8ba024eb1ef09fe16c3aed30d729d6add", + "sha256": "0fbic43vzp0dp8wbx12cq22ca192v2jl2w131xcqmbhbww6j5xv2" } }, { @@ -70904,11 +71629,11 @@ "repo": "linktohack/ox-latex-subfigure", "unstable": { "version": [ - 20191208, - 1616 + 20200113, + 1029 ], - "commit": "b9e3ee8abd3b9f29e03f8b0b9cd6b4df134ca159", - "sha256": "09nv9anqldqlxqk71g40by1hch9jw7siilxgkc59hn9dn2ibbbq9" + "commit": "18bcee0c89c19da847f38660946a5b9343607cfb", + "sha256": "1hpwsx3cba6kk2n954h144pb1ba5yy46gcni8ikvsbqm8j17ragm" }, "stable": { "version": [ @@ -71069,14 +71794,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20191127, - 319 + 20200216, + 1516 ], "deps": [ "org" ], - "commit": "a4c12432ec564187b8acd0814d5f66e45ea30e4d", - "sha256": "04rzrx9y4imnhg47rq16sqmhdwyl82w1fjylxm8s6p2s89ql1d7f" + "commit": "aafedfd8052d1ac4b0ddf946b3258a3b5ae5bbbe", + "sha256": "1hiidlagr7y3l22xwk4nd7m6c83j2vlhyijb0hmw89casfsdixbj" } }, { @@ -71123,15 +71848,15 @@ "repo": "titaniumbones/ox-slack", "unstable": { "version": [ - 20181119, - 1131 + 20200108, + 1546 ], "deps": [ "org", "ox-gfm" ], - "commit": "96d90914e6df1a0141657fc51f1dc5bb8f1da6bd", - "sha256": "1cda5c35wm7aqyj7yj80wkwb79dgzlzis1dlpysdxv30ahcf4w8p" + "commit": "89cedb9da6ea08b78bc1fe77d6a39aa078172c1e", + "sha256": "0a97la3hwkb792a26c6byavwzg8gca6s0ccajd7pi9p430ys1i9y" } }, { @@ -71457,25 +72182,25 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20191010, - 616 + 20200125, + 1707 ], "deps": [ "cl-lib" ], - "commit": "f761c2ffeed0daba9c17ac7571c7b979b6ceed64", - "sha256": "05snrl5slkwp8c1vzfndrp132xbjk61a63vbllm77nbm9acibq41" + "commit": "f0ded6bf6532f475fdf62a62ef432604d6dddbe3", + "sha256": "0wg5xsj6x101ng0fxdzqbkf307igxr9vcja4gnhgcbrvkzsn7ydc" }, "stable": { "version": [ 2, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "385cd427ce15ca1715f3dd758b6aa408bf0186b1", - "sha256": "1412pjghyvzkdlsrrs0ql30vw591bhyk1wlbf49f15dzjbspx3w0" + "commit": "bc06686806d676658b5e962497770e47025c17f1", + "sha256": "1lm5mgvjhpxqfw5gcv99h4mwbq728b6f2hj5vjh1j67kdwy7ws8k" } }, { @@ -71501,27 +72226,27 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20191220, - 419 + 20200226, + 2001 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "3b26941686700a7500ca4c68650e9235c823a410", - "sha256": "0qscdxa7jy32vdrkp1kmc5p5kgn27rqbpj68igw4q6581pk4mjil" + "commit": "78d0cdbe63d142801cbd046871353ae0455dad33", + "sha256": "0ghq8sg3jgidr1srdrl1cighsdvk314an3l2w56ak0ss99h6q28a" }, "stable": { "version": [ 0, - 11 + 12 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "197684c60df4902e632aac1fb0f99e2e967dcf12", - "sha256": "1sxl3zf733iyw6k5d6hh4isr6gp1qlvhbp2q8jpzcby8gmvy6l3r" + "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba", + "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw" } }, { @@ -71538,19 +72263,19 @@ "deps": [ "package-lint" ], - "commit": "3b26941686700a7500ca4c68650e9235c823a410", - "sha256": "0qscdxa7jy32vdrkp1kmc5p5kgn27rqbpj68igw4q6581pk4mjil" + "commit": "78d0cdbe63d142801cbd046871353ae0455dad33", + "sha256": "0ghq8sg3jgidr1srdrl1cighsdvk314an3l2w56ak0ss99h6q28a" }, "stable": { "version": [ 0, - 11 + 12 ], "deps": [ "package-lint" ], - "commit": "197684c60df4902e632aac1fb0f99e2e967dcf12", - "sha256": "1sxl3zf733iyw6k5d6hh4isr6gp1qlvhbp2q8jpzcby8gmvy6l3r" + "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba", + "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw" } }, { @@ -71705,11 +72430,11 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20190519, - 2238 + 20200121, + 837 ], - "commit": "2e1d274e11071bb8daea4d6f4c0369c84466de7a", - "sha256": "1w6ckbb8rmi65knwnapyjy9amzcikgw088c6d9h5gqzdknbfdrqc" + "commit": "6fb993a42059b58d1a0219006f2d61ebd3b2c9e6", + "sha256": "09crppxqc0d2bdr1pb7k24mhbax5ibdcgd1mw7ybvifakgvfwbkf" }, "stable": { "version": [ @@ -71761,11 +72486,11 @@ "repo": "danielsz/Palimpsest", "unstable": { "version": [ - 20170119, - 2032 + 20200211, + 641 ], - "commit": "e6d5944393c260ceb724462c84046cc62c9ae916", - "sha256": "0vw3lv02rf8f9vm379zff4l85psjwxsrvba4xcpdkqi1w4rbsnxr" + "commit": "389ec5b4c5067fa903c543b7fe1d804f30b6ced5", + "sha256": "1yki1sl2m7fj4m52gmb768h2qkv0j93lmd72jv21n20bnzvjp73v" } }, { @@ -71812,16 +72537,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20190827, - 1127 + 20200228, + 1902 ], "deps": [ "hydra", "lispy", "worf" ], - "commit": "3690a3691da7792ed2f2270d1006632640182ae0", - "sha256": "1kn0ckfpr3s5yfkll7rn9mqg35jmplai2vafhrvnifhilf94dp7f" + "commit": "21ceadbf95cc49202e2704ba9704a5784230efd8", + "sha256": "0n7ia4fpp3lgdmf7m0q1lqqnkbpw24bdk1apjvacwjlpy4gsqy2z" } }, { @@ -71894,15 +72619,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20191003, - 1221 + 20200219, + 2243 ], "deps": [ "dash", "hydra" ], - "commit": "f4f10a329acd354aa7dda52e7f7bc23ca28366d3", - "sha256": "1j4bawr7a4lfhy76nxsivxngs4w7l1xlifzx69hjn157qdhbqawn" + "commit": "7e417a670cff080650f2c1153dd9c50fc4ac8a48", + "sha256": "0jd2avxzidfac5nz9xk405jpb3rba9bq2cw6acdz7wj37lnxxnh7" }, "stable": { "version": [ @@ -72020,20 +72745,23 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20190703, - 1531 + 20200221, + 1702 ], - "commit": "30eedd346175072e013b7bcf6ae1795f022fee0b", - "sha256": "01yiz4zkbmb95whgpg6n0mmjsi2fvnakvpg1cnx68k1nmd8waiv2" + "deps": [ + "autothemer" + ], + "commit": "206dfc8e459971b0d5795ef5da4f1f737020eeab", + "sha256": "097vs3792054jczsk8jy6dhwqqlfvfgfshg3bhlzyiwzcd5x98dw" }, "stable": { "version": [ 0, - 2, - 2 + 3, + 0 ], - "commit": "7d48ae9b39c37eeef7ab5bf7ee049d2edf0411a6", - "sha256": "071k34i48dsmlgpi8mpdff1fgcnz29dj2ci52c1i3alp9yc7s67a" + "commit": "b4dabed7939f8cf052c858ba29e295eee3f0ca13", + "sha256": "0361621f0xg786dvcw6xrfm9qkjr19cs8dkxgj8b5nq9isxyknh5" } }, { @@ -72210,8 +72938,8 @@ 20191015, 2127 ], - "commit": "13757524f1c708b866f4aaab5a9fb3599a1c4f56", - "sha256": "02anyi6mhw457pwsna3ycn1yxsavsmp6p96ffpwg1s7qidc44a4s" + "commit": "29265d118267e524453aaa9121c4eae213a63164", + "sha256": "04mpwsn16i00rbjyd3959kjyw1qn9xw9d9as6syhsfq5mzhwksni" }, "stable": { "version": [ @@ -72278,11 +73006,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20181219, - 928 + 20190126, + 901 ], - "commit": "9a5f1730b8ef1fb6c29262a8ba79f8136e5548d4", - "sha256": "1d9x57njgl16yyjmscmai5ml9wrqfh35ilcz2s674s8fa4krqw72" + "commit": "1357cb0e5916dfe63477d92f16c863a4c5e67b0e", + "sha256": "09b24j074dwawfm3b379m948f9pv859qsnrmz8k9qx97ls4jjmbw" }, "stable": { "version": [ @@ -72855,8 +73583,8 @@ "deps": [ "eieio" ], - "commit": "1f8086077d770e524492e6fa59b07856e85a6fea", - "sha256": "09z5295f8051ag13ndq8rhxgg2m0gim45yfpjv4xkbmdcfkfinc2" + "commit": "1f31433ad0b37a2e68d60ee043a8188ef1ce3176", + "sha256": "1bk6rg9qaaasbng6m6mdkjbwdm68zkr7mfwj18l34ivlz0f05sxw" }, "stable": { "version": [ @@ -73056,15 +73784,15 @@ "repo": "politza/pdf-tools", "unstable": { "version": [ - 20191228, - 1005 + 20200214, + 536 ], "deps": [ "let-alist", "tablist" ], - "commit": "cc29d4c9c2d81fcb1255f7172fd5b9b7851d656c", - "sha256": "0833x6q048sym8jlc7fhi2ypsdc1vgiy5b6ijg4wgsnskg91nyva" + "commit": "0159cb1ab36f75879151e5ea24a6918ef58e50a3", + "sha256": "1ai8g6n3d40mcr2zx4h8ih3b1fxx6xzwbr0h3m8yh32vjj5qlwrp" }, "stable": { "version": [ @@ -73105,11 +73833,11 @@ "repo": "jeremy-compostella/pdfgrep", "unstable": { "version": [ - 20181007, - 1728 + 20200124, + 2236 ], - "commit": "e251cd5c88a4ba5cb69008ba412d329f4d59e1d2", - "sha256": "0fy6h8ys490kw63l9jigsa0cf1psybyd9gcljpddnjd3nhkdwikw" + "commit": "e250376d97fc5240e07d81108bbca9b5a9ab50f4", + "sha256": "17yqvvgkgxmcl8nc0mb9yaz884zcdnz7dwvfi4mxjzp1l05fvwjk" } }, { @@ -73213,14 +73941,14 @@ "repo": "sebasmonia/pepita", "unstable": { "version": [ - 20190907, - 409 + 20200228, + 2257 ], "deps": [ "csv" ], - "commit": "489ddc2675906f9dd27bd4ec69ef140e52194952", - "sha256": "1k77c7zz73j2vais62qbymk246fyc6nw4jd1abdx2c9jjp3sn94k" + "commit": "263d6d940d7e4203bbecda46dbaa89b7af1db54f", + "sha256": "1jw27asnfd48mx3mi9qiihvj2hgzpmk53xdq87ajq9nsx8m6x110" } }, { @@ -73403,20 +74131,20 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20190511, - 1402 + 20200222, + 1106 ], - "commit": "e330e6240bbb82589077f30472b05b95d1ff430d", - "sha256": "0gy0h9mrgig0d2gjs2z949ld1ccgfhmp0dfd8g33g2kxgzp7wnv2" + "commit": "391a7dc248c9c04b7ad424c696bdff578e14dd2c", + "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g" }, "stable": { "version": [ 2, 9, - 6 + 8 ], - "commit": "1dfea0de788f6d25ee47b5c62ddbeaf9e8e92f06", - "sha256": "11ww8hg9p8qlmr8zpir0m5xzzbvd1faiqjx6vn4b05d4ll03rnhm" + "commit": "391a7dc248c9c04b7ad424c696bdff578e14dd2c", + "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g" } }, { @@ -73481,14 +74209,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20191211, - 401 + 20200224, + 2013 ], "deps": [ "cl-lib" ], - "commit": "f5d0424440656834540534d4074cca2f607bc8ae", - "sha256": "10bhq654ripqhnankxscgjrc0ihrw6xfifxv5yqrxb1wdjyzjb4k" + "commit": "d415c154fa59f1a85c4f2812d21ba29bb39677b8", + "sha256": "07ncr5jmn5lrmxdc0c6dw92cqkasc8yivjn9q4ri0wy08zfh298i" }, "stable": { "version": [ @@ -73536,19 +74264,19 @@ "repo": "Alexander-Miller/pfuture", "unstable": { "version": [ - 20190505, - 1006 + 20200113, + 620 ], - "commit": "368254ee30692c709400db413c347e18e76a8a55", - "sha256": "096raqpjx84njws85r7pqq1wi9w9bjwkr0ga1mbbhlna1mfn3mg4" + "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d", + "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy" }, "stable": { "version": [ 1, - 7 + 8 ], - "commit": "263227534e8bb98aedce18698c34db9fd4d6500b", - "sha256": "13r1f741rk5k35s413iyh1kng20zmp29qr4bzlxg8wjl7d8q6da2" + "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d", + "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy" } }, { @@ -73950,11 +74678,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20200104, - 21 + 20200301, + 1404 ], - "commit": "167b35749dbf700543d4a540d098c015af58df2b", - "sha256": "1zmk5qrw5af6bv19914xifcbkiqd3vdifzimhmy84rgl9gw78fi2" + "commit": "547a31d71991e7bb1d9e5d1ce45b6be6e5740058", + "sha256": "1iwbh8cc3a5ayq1r6lv8jkx5hfa4yfz1rgzmvb2s08si9q3y5wna" }, "stable": { "version": [ @@ -74042,8 +74770,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20191207, - 2030 + 20200121, + 1218 ], "deps": [ "async", @@ -74052,8 +74780,8 @@ "f", "php-runtime" ], - "commit": "b69f2d9b2490c26c782d327344a54c19b5142cb3", - "sha256": "0pkby33g4ih6mssndcv2d59b1xkisw64p14fn131d6cqfwqvcwjn" + "commit": "5ccf65d59e6bbc9cd958dd5988e8fd2143b0d57f", + "sha256": "0k4dzn4a5y4kq7yz3ifvzziv90rp5si380c5ypgxr5iwb1b8a0l3" }, "stable": { "version": [ @@ -74107,20 +74835,20 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20190929, - 612 + 20200122, + 1256 ], - "commit": "81bcfa59d1e5708239d8c32d99cd84405449fb64", - "sha256": "1m4vk7v3aafj64qqs0aa9m1w8fbjziq0l6c9k4n10yr8dnm5j9aw" + "commit": "6744215d82ce9e82416d83e5b27fb9bac9e8d461", + "sha256": "0hbm881w84nm4g67085xzikz422vkb08y98hfk2n3kqmznvp8i51" }, "stable": { "version": [ 0, 3, - 2 + 3 ], - "commit": "de74ebfcbce53a08daf95d324d7447dede094222", - "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6" + "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a", + "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk" } }, { @@ -74328,8 +75056,8 @@ "deps": [ "cl-lib" ], - "commit": "e14dd43cf74f254a898ae1c698a97d58734fc1a8", - "sha256": "0ljxvp9yppnmy1lnnipqqbk09bmay523haa8h0gnfnrl02jwgs91" + "commit": "9351a2320f1e75896f56032959c7bcbf9d9aa560", + "sha256": "080fzpr7is05cb8fj0rzhfc8pmb1rwfmkqnydj36d56da1ndrfmw" }, "stable": { "version": [ @@ -74565,21 +75293,6 @@ } }, { - "ename": "pivotal-tracker", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0yiyz11sd25ybgr2qmg62qqmcz96va1pq3q866cqmpl38xn7znpj", - "fetcher": "github", - "repo": "jxa/pivotal-tracker", - "unstable": { - "version": [ - 20170720, - 1516 - ], - "commit": "0311d117037c74512149a4a78b269c2e46d7dfba", - "sha256": "0g3xzh8jr9lbg6h2hk81cdyxkxx3l79qhxrp4g34rc0dml79rzf9" - } - }, - { "ename": "pixie-mode", "commit": "a57300bfdae57c9996db0411d56a5fc7b35778c3", "sha256": "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8", @@ -75277,15 +75990,15 @@ "repo": "galaunay/poetry.el", "unstable": { "version": [ - 20191022, - 938 + 20200112, + 2309 ], "deps": [ "pyvenv", "transient" ], - "commit": "3f9ac720b423f087797b9e345b575275f2dcd740", - "sha256": "0gs8jpihqckijbm5w300mdm5jl4f9j754fkv5mj1ghj78q6bjmmp" + "commit": "01da45f478c8ace3dea5088746873ac2d7c23dbb", + "sha256": "08x1q54pnb3hh4a2wbmghffl5cnq99sf280qdbgc65vqhdkj8r1z" }, "stable": { "version": [ @@ -75369,8 +76082,8 @@ "deps": [ "cl-lib" ], - "commit": "9673c72c5f38ab1196f17e694ed48b4ceb1b13be", - "sha256": "0mfz1x80zsjhq1870h7q4s2cncvh6jllci022fb9bllw4mrzh9a5" + "commit": "d0a33591498013886c2c4676e204cd684954e82a", + "sha256": "0lg65hzdjwbc3dav79f3jm7251yyq8ghcbccvkb32vwz281xhjnh" } }, { @@ -75994,39 +76707,39 @@ "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20191231, - 1631 + 20200201, + 1913 ], "deps": [ "cl-lib", "popup" ], - "commit": "e66769ea72f1fd38c2ba3cff505da334e2b26b45", - "sha256": "0b2w12cqpd7ms47x788x8qd1h5mkp73v62dxiz4kyzz70pk65szb" + "commit": "e275ec35de3b9cdedf0d6b2a4a78e91c605381be", + "sha256": "1zm6zk7c2i7gmn5am2d7090j1a71vbis8lbrzrbxdx53q6sklgi7" } }, { "ename": "popwin", - "commit": "2b3d6a8b734e0820fd904c215a83fe5519496dc3", - "sha256": "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf", + "commit": "7856a62fb86415c88aa72b574895328c93c10a09", + "sha256": "0zkaaj80ymssscj8iknndc3p6ydg1l32s2l63kqiy9kc46r2r5fz", "fetcher": "github", - "repo": "m2ym/popwin-el", + "repo": "emacsorphanage/popwin", "unstable": { "version": [ - 20150315, - 1300 + 20200122, + 1440 ], - "commit": "95dea14c60019d6cccf9a3b33e0dec4e1f22c304", - "sha256": "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp" + "commit": "d69dca5c9ec4b08f5268ff2d6b5097618d4082d7", + "sha256": "1w2dmzmy8k4drdhjzkryk6nbkl56aizvyawwn3dyc2gr0vg8lbb4" }, "stable": { "version": [ 1, 0, - 0 + 1 ], - "commit": "95dea14c60019d6cccf9a3b33e0dec4e1f22c304", - "sha256": "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp" + "commit": "4052b6e51bc6cc80cfc86007d2cadbbc4bbd55b5", + "sha256": "0kdlpjrf1xqyqyzfdymbin34jgs06l465p2ggpj4bb4zaypw2hr5" } }, { @@ -76114,20 +76827,35 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20191219, - 57 + 20200226, + 241 ], - "commit": "913b90dee7de5b6cb7e0791ca2b1dddeec5da38d", - "sha256": "1mbpwih6l2ixllv82i5gwzihc7lllqwlfiii4cwvr72ryyvy01ld" + "commit": "8a9af547e6fc63e9a1c4741349fabdf625f703c4", + "sha256": "03n5sbyh0acrmpwc69d834lrxxfybxgjn0lg7iphwfdv11xkf3g4" }, "stable": { "version": [ 0, - 5, + 6, 0 ], - "commit": "fc90a1a558200e5c3688c65add9afdea695a2c10", - "sha256": "1fhjxj7gi2pj5rdnmf0gddiwd8iifgjgjp01c01npz1gwwixyqh3" + "commit": "9638b9d9cf8b9727a13c86f70b5d33bf938497a5", + "sha256": "12r1as9lqqc6anckq455dqv8dbqahnbdzj437i11053wv33cv5vd" + } + }, + { + "ename": "posix-manual", + "commit": "5322048b88381fa4ec49fcd14bb749144d29585c", + "sha256": "1bmjy3gxr4k6yy18rj7pc8b7ziw2ynfily7siqcb59r9rygx6m9l", + "fetcher": "github", + "repo": "lassik/emacs-posix-manual", + "unstable": { + "version": [ + 20200301, + 1103 + ], + "commit": "ebaacd7266ae7a66605317f57b9f42e9cfb2ce1e", + "sha256": "0kdcpd59jd1gasqk5gx4ggbyp492b53dy6n3nkv9j2rj8618yzs6" } }, { @@ -76309,11 +77037,11 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200102, - 929 + 20200224, + 1320 ], - "commit": "345cc3c2b4e6166cc67231aee0962bca89e227d7", - "sha256": "0g6c5s82babc2khsvf2p5ljp4spx0zifnnyj4b8f3mqr1mahzqj2" + "commit": "a4eaec44216b189108164b42381abf35d0031200", + "sha256": "1gvzgx9nq6gqdgb5m6pdp14w96fd6j7b9bgc0pric0aw04i2bzp6" }, "stable": { "version": [ @@ -76559,14 +77287,25 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20190908, - 1820 + 20200301, + 1139 + ], + "deps": [ + "dash" + ], + "commit": "5782653a7e58fa2ba26feb3c1ea34a81761da7b0", + "sha256": "0cdqgnrqmwk4wm8xc3kppm8zvccv2qalckfi4k1w847s91q60zv5" + }, + "stable": { + "version": [ + 0, + 1 ], "deps": [ "dash" ], - "commit": "49c8b97b286c7403bf239645964416200ea82dd5", - "sha256": "0dcy032g4jc027mwq8dfadsc05bsi1k6yiab3rpdxwc17c9pg9x8" + "commit": "682034ff5f3fd62bd24eee1873a2c68498e8b7d3", + "sha256": "1bzqqvyraj5h4flzmhxbjgaw98wgqd21hmjq1jg4j3yxwg8cbrw9" } }, { @@ -76961,26 +77700,26 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20191216, - 2105 + 20200206, + 1749 ], "deps": [ "pkg-info" ], - "commit": "1e7b37f0ae07a6b4ac1b1a5f0e5422cfcb8e1c55", - "sha256": "16shvynx98r34wanbmphlw090iiydjnhgiqcz5xn8zhl0giljmza" + "commit": "341150c0e77c63075f53e346dae87a4c60ea3b5b", + "sha256": "1kywmyckgf8swjbnzc2vcbpsqhrdnxcqaxwwwxwdkapy640nnslv" }, "stable": { "version": [ 2, - 0, + 1, 0 ], "deps": [ "pkg-info" ], - "commit": "823c0aa9ffd1e8e03b20efe97c16cfb66e2c56c5", - "sha256": "16y0zcqydfag4igwcbljqymkwjgjxdh97ii616wgdsyjgk9xxd4h" + "commit": "34b2665023f9a29ebd2a415bfb8091db3c804d46", + "sha256": "16p79m8mkrlczx4b5v28nnlcd1ny49861lax28r7cb9ps9jhdz7d" } }, { @@ -77082,8 +77821,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20191226, - 2100 + 20200203, + 1226 ], "deps": [ "f", @@ -77092,14 +77831,14 @@ "projectile", "rake" ], - "commit": "411f8a4ab54f58a27b8f1f0cbd2f68f3fb4ee216", - "sha256": "0194lp2fdw2dik9gvbdvsllqg32fwdhwmcrdwv0q09b2x2hwfqkn" + "commit": "0398d940a201128946f619de842b0d1f9f0fffbd", + "sha256": "0cfrm56bxdwb96xqpdih6hqh61gvc1wal4yp7d7c414j8h0s7d02" }, "stable": { "version": [ 0, - 19, - 1 + 20, + 0 ], "deps": [ "f", @@ -77108,8 +77847,8 @@ "projectile", "rake" ], - "commit": "85c5bfef22a0ba95ffc65320b53462077531be49", - "sha256": "1kzb1mr19zsn87rjbfxsvxp5ss9q7z97jk8nzysb13yrpb4f3d7l" + "commit": "228f6316f2da229bc82fbbcf52323da951a17871", + "sha256": "1l9l0hza6p1l750i7lvys6gnrdy2j0dmlg6nbb6zr2cq6jbf1lkd" } }, { @@ -77333,14 +78072,19 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20200106, - 619 + 20200209, + 616 ], - "deps": [ - "async" + "commit": "c45b4e09d796385823cfb42ab15a4e67feb01b77", + "sha256": "1crhny97p6yz3z2lb1m43334vsprdiz3sb79jp7czyxskkwqn86r" + }, + "stable": { + "version": [ + 1, + 1 ], - "commit": "4e764a50e0c3bb87193ea7bbd7f5c67f10e80d54", - "sha256": "01fbs2d7dkhamb690jnx6vw1c7qzgiibxzxsbyzpqcflaaga0wn8" + "commit": "53e1dfe9a8bd613fdfa31944e5259dcdd3a29e12", + "sha256": "1xb34zdbwjvahfhycjphdkm925kgd22dr298c57hwxza4ljc2hxj" } }, { @@ -77386,6 +78130,21 @@ } }, { + "ename": "pronto", + "commit": "b0de92782a7305aee5a803607f9db0fe8b8e988e", + "sha256": "0vkas9h45i029wx04wsvm72dlhhq46vdx9y20c2rkq4n9ny94hr3", + "fetcher": "github", + "repo": "julianrubisch/pronto.el", + "unstable": { + "version": [ + 20200218, + 1633 + ], + "commit": "c2a2ec718c08de1fd2e681970456786cf4eac8fe", + "sha256": "1xgkl263iyrdin6mdlmvswr411qyciskasa2jbqi84ffiw83313m" + } + }, + { "ename": "proof-general", "commit": "135c8f2a04739145b500b8742a697907e398d270", "sha256": "10zif9ax4d3m8sa9y2xqz7g24xa2r3m2x5l0zqa06wm4afq29p87", @@ -77393,11 +78152,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20191209, - 2031 + 20200206, + 1448 ], - "commit": "cf904b955056f16e46d1541b3ffb1ca1533c936d", - "sha256": "0yfpnihhfvkwdza98szwa4m5nlgn907q3v22x8pim2c0nrc0z9xp" + "commit": "2a17093f6a7b168fedabc623602edec35aef8d8a", + "sha256": "0pm7hv3c88mpmbi3xsmlqqffxvphnh2cslm2rpqbgffk5kp98ach" }, "stable": { "version": [ @@ -77464,11 +78223,11 @@ "repo": "ksjogo/proportional", "unstable": { "version": [ - 20190806, - 1901 + 20200206, + 1211 ], - "commit": "f600b7ed2ab19a3072adad3f47048a5bbdb82703", - "sha256": "03vyyi5n5rq2hcd5yz7yirsnrgs6cin2y8xhly5skqsv60zs15p1" + "commit": "4c20c876b93b9b5d82931dabb42396d5ff471f50", + "sha256": "1sck0kjzlr5rcbclj9whrwz7lxik7is9av7ai720hzrlv0yvqgmq" } }, { @@ -77500,17 +78259,17 @@ 20170526, 1650 ], - "commit": "3214d0b0b20f98a2e3172ceab2d2c55a8ffd344c", - "sha256": "19sr6p9a86lcsqpjxz75k6l9qc5c4iwcbdzpi2ci57l0jdsw0l3n" + "commit": "4ff0fb841cfb8c6850613094d55bf51448dfd16b", + "sha256": "15wlrzz93wfpk7fkpl3n1vqvrlj8swxg9zjflja4dgn7sgy9f5bv" }, "stable": { "version": [ 3, 11, - 2 + 4 ], - "commit": "fe1790ca0df67173702f70d5646b82f48f412b99", - "sha256": "0j456a42k27khpa4g8mm0xh3zymhhypqdy4gdiqrw6wv3z2r66s5" + "commit": "d0bfd5221182da1a7cc280f3337b5e41a89539cf", + "sha256": "00g61f1yd8z5l0z0svmr3hms38ph35lcx2y7hivw6fahslw0l8yw" } }, { @@ -77550,11 +78309,11 @@ "repo": "stardiviner/proxy-mode", "unstable": { "version": [ - 20190130, - 8 + 20200131, + 816 ], - "commit": "a6c55e97dbe4ec4df9dc21d234cabe806dce3a29", - "sha256": "13xa19k0xyqq03ypih0lrkm97l2c5zha8mwl264h9vamn81i8vm2" + "commit": "e9b2a4bb032aaf13b006b74eec309a9bf2249cf0", + "sha256": "1wmj3ahjj1g7sx36fda6fhicvmxkm8qm64zqdk3qqj808jik1pry" } }, { @@ -77712,8 +78471,8 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20191219, - 2321 + 20200221, + 1013 ], "deps": [ "deferred", @@ -77721,14 +78480,14 @@ "s", "unidecode" ], - "commit": "9ab55cfd8bf243cb43cd4d68dd157bcb846940f6", - "sha256": "0x0sy2bkgs1gwl6rgrxp6jwhmk6jybz0irxh10zjzlx3wqzyzm84" + "commit": "de005c16750dfd925cd528b265fea133bb1cf342", + "sha256": "00fbks0f8kcmsazncrpkmi7w0ygd9ph1js6z1dwbdkjzwb161xv7" }, "stable": { "version": [ 0, 3, - 1 + 3 ], "deps": [ "deferred", @@ -77736,8 +78495,8 @@ "s", "unidecode" ], - "commit": "a220f446e9b075a4f1b2ab4fc532e850b27083a4", - "sha256": "1qs3n7d47sn00406r4f2z1jfwnmyrzf53wa93jp6xq1c3hg220fd" + "commit": "de005c16750dfd925cd528b265fea133bb1cf342", + "sha256": "00fbks0f8kcmsazncrpkmi7w0ygd9ph1js6z1dwbdkjzwb161xv7" } }, { @@ -78324,8 +79083,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20200103, - 558 + 20200228, + 645 ], "deps": [ "async", @@ -78333,8 +79092,8 @@ "pyim-basedict", "xr" ], - "commit": "03b06703a42fe1feb3e1ef8f024db3625c8c125f", - "sha256": "01mn59cc81wbx45savskxx369j6amh6rl2fyn3ppp7zdsyf8sxqx" + "commit": "99e04546a5cc05b17866f83a7dd26163e3d7ee59", + "sha256": "0hx7qph91jxzip9n0xqfx2zc2f9mwmgkgp8jrj943dindcrbrfy0" }, "stable": { "version": [ @@ -78479,8 +79238,8 @@ 20170402, 1255 ], - "commit": "b3d52631ea19328ab3ff5b2a12c280bc4e63ccaa", - "sha256": "06zy9k8zd48x0shcp8mb2274n1nigxwwapw5yrjkkh5mp21fbpv4" + "commit": "fb38afb55a6f27f17c113589c406b527dfa5c332", + "sha256": "04n9qyi1gnr6wfk6k2q8q6f0zz02lg9v9bbwrvr6jj976vaz4mfa" } }, { @@ -78533,8 +79292,20 @@ "pythonic", "tablist" ], - "commit": "05697e881a8b57c4f183344c42ae36662b180663", - "sha256": "148dhzpjv5ykakxdyp0fcxjbqjvf4r6sv8jq9jlyqk2q1nxz45fr" + "commit": "f0687b8aee3e685b55e2c66b16211e02ac5f9d94", + "sha256": "18kqqdk7yifcjmn11jgsqxvzr6izcgify1d8gm504sxw2qqc3q0i" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "pythonic", + "tablist" + ], + "commit": "59d7ec03dcb1968160ac1dfe3c979cc83fe0fe4b", + "sha256": "132l0sf08hwq5wa6yffm8n60a51303zf4ivnfz57vyja70qdbp8b" } }, { @@ -78709,11 +79480,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20191220, - 1543 + 20200224, + 1148 ], - "commit": "a79b5d111b18a83b1d0eb6ae01a5178f47938c93", - "sha256": "1rcqwxw5k4y5752hrp0pa2sqaq07k3s68rx34wbggz9l9r6c0jhr" + "commit": "5bf2c0dafb086684124c3997a618d40ac8db0fb0", + "sha256": "1hz9j8k4bybvi3kgq51rqi0rwy3d7c5wqvx2kkljh6734m9x8xp2" }, "stable": { "version": [ @@ -78996,6 +79767,21 @@ } }, { + "ename": "qtcreator-theme", + "commit": "bf0caf3c60f4b8c6ed1c126a5feb91c99eea1f60", + "sha256": "0ic7a9zas8ndrp15xbw4j2987ajfjjq003fcmqhibp0sc66rldfx", + "fetcher": "github", + "repo": "lesleylai/emacs-qtcreator-theme", + "unstable": { + "version": [ + 20200203, + 1436 + ], + "commit": "c56d792d5ab01743e1350e0a7a8a89bb3d2e0c4f", + "sha256": "1h7l094h5ccn24c8qp7aqcc4yn1gx8hlkgvsamh1zn8qpsx9bipy" + } + }, + { "ename": "quack", "commit": "aa58bf19d4b65ec785677a36709794ae5aebded4", "sha256": "18f3py9vr08589g9kvbcn2nvpd074rx45ni9k66cwl3hjb3hdkg5", @@ -79041,11 +79827,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20191223, - 1925 + 20200129, + 743 ], - "commit": "667fce0d43eb2b112b1eaefbeb3ec5bc186cdf4e", - "sha256": "1g9g1m7a1qxhw278y6b5f66j1k97fp2l3k20rl6x69ljxn8icj02" + "commit": "e7283c5e79197288ff4b875315816d49df6404e5", + "sha256": "0g1r03iaw0i803wlh3adicxb7p8lkl1hv1x7afp5fv7chmp0fp4i" } }, { @@ -79090,11 +79876,11 @@ "repo": "cpitclaudel/quick-peek", "unstable": { "version": [ - 20190208, - 1515 + 20200130, + 2059 ], - "commit": "fd8a6c81422932539d221f39f18c90f2811f2dd9", - "sha256": "18jr3syd7jd809qq1j61zwaaclmqn24qyb0mv0q8sj6ac4vzl1c3" + "commit": "03a276086795faad46a142454fc3e28cab058b70", + "sha256": "1kzsphzc9n80v6vf00dr2id9qkm78wqa6sb2ncnasgga6qj358ql" } }, { @@ -79178,11 +79964,11 @@ "repo": "zzkt/quiet", "unstable": { "version": [ - 20191230, - 714 + 20200211, + 721 ], - "commit": "aa3a6e039dbc9437e7dd178a6596d43cf19293eb", - "sha256": "0rl3l7wwdfn8bm1a1lajqsxp62xdqn9xihglv8a1ggq3wi40fw61" + "commit": "f8a4ef0be086f97e7fb631df7060f29cc4025b98", + "sha256": "01nbxgi1v6kqmcnzfdxxc0cqsswi8h12l98ngdiq6b62mv7cfcrs" }, "stable": { "version": [ @@ -79316,14 +80102,14 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20191204, - 205 + 20200218, + 1623 ], "deps": [ "faceup" ], - "commit": "09eba92e846733db1acc8b9e58ff2b5f52c79b23", - "sha256": "1q610znwy4wi26ka6ri6lzx2kl1pwi4sc4cbajk3d5i2c1d00rv3" + "commit": "7a1414f83981aa174feba28f3d83e95574c7f075", + "sha256": "1bszd21fwaqfqkksqpqiq5058hm7wr500qj75zx1xa2j6r67w7sa" } }, { @@ -79545,11 +80331,11 @@ "repo": "ralesi/ranger.el", "unstable": { "version": [ - 20190412, - 624 + 20200218, + 203 ], - "commit": "c3f349e52f5c50926dc0f285c97676934f50bc18", - "sha256": "1yc5g631xrvfkdgxzzy9rzvnacnl87r504yr1mpggsw1inklhzkk" + "commit": "ae9b3816a6da927cca5beb62c45400103797a2da", + "sha256": "07fiyw0gw51dxc7r92pj75lbxppg0gixjv9317qx9c3v1lcxaqiv" }, "stable": { "version": [ @@ -79811,19 +80597,19 @@ "repo": "simenheg/rdf-prefix", "unstable": { "version": [ - 20190511, - 1212 + 20200216, + 914 ], - "commit": "6daf675d96aa4a0bc78adc93560b791a77651b22", - "sha256": "0mxzpbmaw8qz6ykyhdhq0jvxsnbgsb98psjy0w99jpxkg09fas17" + "commit": "825af2c584fbad9e67c2c08e29040776fa647fe0", + "sha256": "0ky81w36dn6c69x4v4b46j8ixqqws9dc8adi4q19149xkiijx1kl" }, "stable": { "version": [ 1, - 11 + 12 ], - "commit": "6daf675d96aa4a0bc78adc93560b791a77651b22", - "sha256": "0mxzpbmaw8qz6ykyhdhq0jvxsnbgsb98psjy0w99jpxkg09fas17" + "commit": "825af2c584fbad9e67c2c08e29040776fa647fe0", + "sha256": "0ky81w36dn6c69x4v4b46j8ixqqws9dc8adi4q19149xkiijx1kl" } }, { @@ -79901,25 +80687,6 @@ } }, { - "ename": "readability", - "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", - "sha256": "06kykmf1yrk4jiazahk7qqf1ds34ppg9zbj9my5l52j3gjr7v9zq", - "fetcher": "github", - "repo": "emacsorphanage/readability", - "unstable": { - "version": [ - 20140716, - 27 - ], - "deps": [ - "oauth", - "ov" - ], - "commit": "6c220ab8e0ca63946574ed892add5c8fd14002ce", - "sha256": "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g" - } - }, - { "ename": "readline-complete", "commit": "0cf3b56dae7669b34df9d2abe2d78164cbf064c9", "sha256": "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277", @@ -80222,11 +80989,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20200105, - 2137 + 20200120, + 2006 ], - "commit": "ba9b8b5eba06d97d81fc391dc3a9f0c6105b96ad", - "sha256": "1mmxqrzy1dyw3gq2w7j25limw46v9yzp9dkhsdsckmv7y912gan5" + "commit": "6602e74d6190d2e8dd61358bebb513c3ae8b89fb", + "sha256": "1pywz6xm3wjkbcj5zr7w5xh5wfggvivnw94mmsm6lybnv2zgjg1d" }, "stable": { "version": [ @@ -80362,14 +81129,14 @@ "repo": "10sr/recently-el", "unstable": { "version": [ - 20190317, - 1234 + 20200120, + 1432 ], "deps": [ "cl-lib" ], - "commit": "7b5d1128becb387d759a3a95f6afb9ef54be792a", - "sha256": "0wghawh47jd2j5s77h1b69fg5njff1yccx1xpvwmlj6ssh3p38xp" + "commit": "fa8b52fe891a0adaabe0456f6f5a56a2600a831f", + "sha256": "0y0msmfwsrbsd59jhj9dh3vz49f2g0ykyp34c2i8l8vz5vkac3lp" }, "stable": { "version": [ @@ -80619,8 +81386,8 @@ 20181121, 21 ], - "commit": "0904065857c4388c18d1eacca89769e566d36a9f", - "sha256": "0yvn3c8hx0xj911n197xp5islx0hnbzzn2wx869scysn7wfh4kd7" + "commit": "50689559ff970e33013b8cf8a3bbc8be18ec4e09", + "sha256": "0v1xc27hfa223bganb7gksv6cc2v95bdfms7riv75sf30v3vh59s" } }, { @@ -80905,6 +81672,26 @@ } }, { + "ename": "remind-bindings", + "commit": "b55af46fa0ca3b32bcafcb8601ce1a3e660502ba", + "sha256": "0s6pqg9pgi1qjss90ip2ryn4604lij3z4acpg6pqhf99y4yjrchv", + "fetcher": "github", + "repo": "mtekman/remind-bindings.el", + "unstable": { + "version": [ + 20200224, + 1037 + ], + "deps": [ + "map", + "omni-quotes", + "popwin" + ], + "commit": "be4c34a52711d9f942994ec3fc0ee27e4aaa7c3f", + "sha256": "03gz7ca4486j58mrjr16akwwy9d9190fl3cv82hx849h48rabavf" + } + }, + { "ename": "renpy", "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", "sha256": "173391mcv56ljrkhl6hb9fhkl2vic9wj2xmd21hq88m3awpjmill", @@ -81141,11 +81928,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20191211, - 2051 + 20200219, + 2257 ], - "commit": "b207ebb298dbf181583ebf56c3e18a52fcbaa165", - "sha256": "0pmifizgj8y99rzp97cn0qmxr544hfb0x7l97f8s160c09fs3lsi" + "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6", + "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2" }, "stable": { "version": [ @@ -81172,8 +81959,8 @@ "deferred", "request" ], - "commit": "b207ebb298dbf181583ebf56c3e18a52fcbaa165", - "sha256": "0pmifizgj8y99rzp97cn0qmxr544hfb0x7l97f8s160c09fs3lsi" + "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6", + "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2" }, "stable": { "version": [ @@ -81418,11 +82205,11 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20191113, - 1509 + 20200219, + 1137 ], - "commit": "a04ce1236dd6bfaa0c520162e6c5a1017c099030", - "sha256": "14cq2162gcasv8112jdmb1cx6fidszqlcf2kalgq2ikj5bqs03av" + "commit": "45a55810ce3e07d4e42d9fb666100d7242004b4e", + "sha256": "1669fksymr24fz2lhxv419fm7csm94bkpycz20l2qy55ppn03his" } }, { @@ -81456,11 +82243,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20191227, - 1255 + 20200131, + 122 ], - "commit": "09b41ca47d99e7f1baddcbec6408ca2f60aafff4", - "sha256": "1rlk9wxqyac3dz1vzy157wc59gf67avwgiahjyj81y13kmz88nxc" + "commit": "09e2df58398b392f19642a12c8cb78eae726dbd2", + "sha256": "13cy7wy2jv1cjncfnayp28w1ka4s0jim2sarcw0dn2iiniqlkbwf" } }, { @@ -81486,26 +82273,26 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20190525, - 1910 + 20200215, + 1357 ], "deps": [ "helm" ], - "commit": "e7d9e2f4cb9ff302231efe57af6fdc201e5b48f0", - "sha256": "0hx3754ids3i40hl7cb3s5xi5gy676856h9y6aj50f4g8il16jq1" + "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553", + "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], "deps": [ "helm" ], - "commit": "5cdf7172e307c0e23bb5342c61263d4439292ede", - "sha256": "091yqk257z19rs9mcy6b52ll87s85s7fbsd235kzqmacfcqyjsmi" + "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553", + "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3" } }, { @@ -81525,8 +82312,8 @@ "transient", "wgrep" ], - "commit": "2b01b8bb77e687f3f9243a8649b289ca9823edb4", - "sha256": "1lsq9h842gg722mm2xbpcjldby2rgsj07rmcf167ghba0rwn3kf4" + "commit": "ed638db439e5010d1968a6ce904b7c21383506e8", + "sha256": "1qm26d6ra5d30rk62rik56gsndi35xi01pmjdkm2afbs1n1707ix" }, "stable": { "version": [ @@ -81810,14 +82597,14 @@ "repo": "felipeochoa/rjsx-mode", "unstable": { "version": [ - 20190614, - 2215 + 20200120, + 1446 ], "deps": [ "js2-mode" ], - "commit": "0e7fa6b4facdec4f85a7a8865bdf59dfd57217b5", - "sha256": "0s0871sx3ch09kgvbcp9na4zdrfrda62xjq8m9knbq5vnj8q8qpi" + "commit": "0061587a06cdc2579a8d0e90863498d96bf982d8", + "sha256": "08b4hdgq4hc1yfd9pvyir2j3cqqdqa3j5svgaba97x5fzhsz7y8i" }, "stable": { "version": [ @@ -81942,8 +82729,8 @@ 20191215, 1240 ], - "commit": "879af5c8cfbe284fa37695840784f1d74d730837", - "sha256": "1673b1xcmjg7058q44v190a940kgla6vxr1z5imx4hbjn5b76var" + "commit": "d1246557e2c9c685b0ee4ec0e58237431b846096", + "sha256": "11yd10b6pxg92ybn4lv3n7h7b7xa4xsvsmpz42hbqdarm50hxsdn" }, "stable": { "version": [ @@ -81963,11 +82750,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20191109, - 1939 + 20200109, + 1940 ], - "commit": "46ce6b5c16d24ebd80da39cf48f207cf12f1a5d0", - "sha256": "10h2hy1inrk6ph4gi3bd8l89mf4lbf0cizfwlymmarkjfmlrsz2w" + "commit": "0babdd3bbc038ee7436db0cc869df35752456268", + "sha256": "1f0bxbm1rgvf68q6qbsf63mzr44541aapk4237rs7pkxk81nnrrl" } }, { @@ -82064,15 +82851,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20191206, - 1559 + 20200228, + 2348 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "c4353a1bff164bccf6c55fda16aa7b9c9ab36685", - "sha256": "1xfxm54nyyspfly4f4wszb2v1r8f4q04bd8g9mhc57bjfrpqvzpy" + "commit": "9a2a9d2935ae17b8570485bdea7c347533b464f6", + "sha256": "0plr71dbghzcnbrl9l4g52g59yvlcx1dh41fwcnp0b12x13vslay" }, "stable": { "version": [ @@ -82095,19 +82882,19 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20191227, - 958 + 20200221, + 36 ], - "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", - "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" + "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", + "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" }, "stable": { "version": [ 2, - 37 + 38 ], - "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", - "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" + "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", + "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" } }, { @@ -82118,22 +82905,25 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20191222, - 920 + 20200130, + 1624 ], "deps": [ "rtags" ], - "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", - "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" + "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", + "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" }, "stable": { "version": [ 2, - 37 + 38 ], - "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", - "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" + "deps": [ + "rtags" + ], + "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", + "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" } }, { @@ -82278,8 +83068,8 @@ 20191217, 1214 ], - "commit": "0e6c1f1022ac84db6a03d60e7a0f9f1fd42ecc99", - "sha256": "1l3zz62d04m3kwj3swffsbkpvkayp9r651cpl07palghx9b34h3m" + "commit": "ea9571ce3af546fdb1234274c8b1a147109b4869", + "sha256": "16g1764igf9y717sg2rg4b2ysxxlnyjyzk2s6w9jx9dnr2lqih39" }, "stable": { "version": [ @@ -82593,11 +83383,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20191208, - 1654 + 20200229, + 1547 ], - "commit": "d0f3f45cc4fe1c5b72466253f051294d275a4b64", - "sha256": "0q6gq4qrcjz7hgjfqs4h2qh0v7z4zf5q8fvnpv7jn7agrzhrfwnm" + "commit": "86650056717be0661feae32e294ff991c087ed4d", + "sha256": "0m7cribk9xfmgil103491mwi0z9ykg19pn3qifdg4i80bs0h8xhj" }, "stable": { "version": [ @@ -82617,11 +83407,11 @@ "repo": "grafov/rust-playground", "unstable": { "version": [ - 20180807, - 1158 + 20200116, + 1043 ], - "commit": "092c8b11d62dea23953a004744833092bac85fe1", - "sha256": "0n2c1pjbvy46ic0k84jd3ffwwb5hibjqc1wv7knzkldi5agigfsh" + "commit": "5a117781dcb66065bea7830dd73618008fc34949", + "sha256": "1vmas5mg32lsyiki753a7hy597f54k1rx9sjiahw63jpgg785zys" }, "stable": { "version": [ @@ -82640,8 +83430,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20200107, - 1956 + 20200226, + 1915 ], "deps": [ "dash", @@ -82655,8 +83445,8 @@ "spinner", "xterm-color" ], - "commit": "3f1deff592ee5349d3618c080a0b26b5e30fbc63", - "sha256": "1w1yfiv80plbczw1y52vk8wkpddkbp57sj0jkxr0i3w14733cpjs" + "commit": "99396915c78556f4ad0da8caf9cb2a269582c39f", + "sha256": "0azr2kv77amr60ms64c2366sn9ak7959krz4whjl4wsdsd5rhqy4" } }, { @@ -82843,8 +83633,8 @@ 20171202, 1332 ], - "commit": "bb5ed0f0b0cd72f2eb1af065b7587ec81866b089", - "sha256": "1b53mdqgcmjay3i3fnxnycv8crqi20yvyv57ybgs2ikfl3v282h2" + "commit": "65c6b04abadd2cdeb4cc2dc2a8b96b06e0f27ed8", + "sha256": "18c6l36sdc3any2fccm49wiyrda97pnd07jdir22wfl5wba7xnj8" } }, { @@ -82873,29 +83663,29 @@ "repo": "glynnforrest/salt-mode", "unstable": { "version": [ - 20181225, - 1157 + 20200210, + 1200 ], "deps": [ "mmm-jinja2", "mmm-mode", "yaml-mode" ], - "commit": "5ed02dabe0c5c58f51959a48b559f7fc5425ea2c", - "sha256": "13xz5kfq4kgs94bx6ygl1b26j66l4bjhkvrcv40cvi5mpik2lp98" + "commit": "c46b24e7fdf4a46df5507dc9c533bbc0064a46fa", + "sha256": "07qnn8svgd0ishajx5dr91mk4nx9fm9phxsv00cjapvpd4f26xn6" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "mmm-jinja2", "mmm-mode", "yaml-mode" ], - "commit": "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81", - "sha256": "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x" + "commit": "6a1fedb4da7181b00f1bebfc88c87dd2f0c58766", + "sha256": "1vygzx7i3cxghji4517sa2v9w5yl84mjpfixf000mf897xpk7288" } }, { @@ -82990,11 +83780,11 @@ "repo": "nflath/save-visited-files", "unstable": { "version": [ - 20190927, - 2153 + 20200212, + 414 ], - "commit": "0b61c9bd16947bd99ccd61208bd481325e8c5cba", - "sha256": "04rrl0nn4mk8h7qyzh3lljagldm5hqhxv8ps6hkh0zz4il7ds018" + "commit": "8203a05a322324ec17b14437c8dfb38efdb53241", + "sha256": "1zc7f5l7i60fpi8vw41xhpnhz5jpiqkk7fdkd2k6lnmv7jnnilfc" } }, { @@ -83100,8 +83890,8 @@ 20190413, 1246 ], - "commit": "552643c03e90ff47ae905c06f1d1afbbdb808966", - "sha256": "0gqazmv279b45ycvmkf403cxi3imd0vn97k1ldnnbwxjp3993cp7" + "commit": "5696d0703583d3d53b34683bbc59d3b1cb284a78", + "sha256": "1kkcqdnphvmiwvcvr2balqpszcf87bjy9la682w9b846g53pgmin" } }, { @@ -83133,8 +83923,8 @@ 20190929, 1522 ], - "commit": "44772cbf1e1ade52bc5066555ff0aed68569aaec", - "sha256": "0xnsyrsardsmjyj563dkl03f5d6g2syng1x721i0w36qkiqwcqr7" + "commit": "46bb948345f165ebffe6ff3116e36a3b8a3f219d", + "sha256": "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv" }, "stable": { "version": [ @@ -83794,20 +84584,20 @@ "repo": "rbanffy/selectric-mode", "unstable": { "version": [ - 20170216, - 1111 + 20200209, + 2107 ], - "commit": "aed70015b29074b52a5d0c49b88b7a501d276dda", - "sha256": "0v2wfmi5y7jkg8wpc5fmhy1zpdckzlkvnwlz14ymylwpq62nl216" + "commit": "bb9e66678f34e9bc23624ff6292cf5e7857e8e5f", + "sha256": "1kkxm8ysjcx0vs6lic0lcncr2kcmjmh2n5y8j9303lhzzhh73psg" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "a35cb3815caceaf273ad7d16ac3b2dd3c7a3003e", - "sha256": "04bj71080wqybznyx63dawhppq6x3p88x1j56gvl8kvxv2hwzgzf" + "commit": "bb9e66678f34e9bc23624ff6292cf5e7857e8e5f", + "sha256": "1kkxm8ysjcx0vs6lic0lcncr2kcmjmh2n5y8j9303lhzzhh73psg" } }, { @@ -83870,16 +84660,16 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20191123, - 1851 + 20200203, + 1858 ], "deps": [ "htmlize", "simple-httpd", "web-mode" ], - "commit": "1f8bda7e5a4a36212f968b462cfc31ce53c6db85", - "sha256": "1hc0rwlgapbqf9965n3nsyvd4chdga5av7ya82wjzxn1mx4bhifa" + "commit": "6e09efaa613f411b9cc8cd30f46ddab44154a1e2", + "sha256": "0f6x2w94y1clqzl65f3qgw9hm9d97p91jaak4k8k92qnd9s3471r" }, "stable": { "version": [ @@ -84196,11 +84986,11 @@ "repo": "voloyev/sexy-monochrome-theme", "unstable": { "version": [ - 20180526, - 808 + 20200115, + 2146 ], - "commit": "036bc238e48dd21aae1c34e6971d376582d8281b", - "sha256": "1nfij1wzzs23aqbc7k6cc5a714bkywmmid95c8cj4wh3lwz2bpnh" + "commit": "f3ad07d60c966ef34cb11026eaba053e114bb8f1", + "sha256": "1lq7csb5dgpy9hd6dw1ds5klmp88zqyk9x97hg1llzic6rkkfjrr" }, "stable": { "version": [ @@ -84212,6 +85002,21 @@ } }, { + "ename": "sfz-mode", + "commit": "6e61f77045deaf0dd6a344911b73cf5b1a779a52", + "sha256": "1x7873xvqwj1nwp18pj50bp2s9djqbqzp37fr2hjx2rygfvpxzmg", + "fetcher": "github", + "repo": "sfztools/emacs-sfz-mode", + "unstable": { + "version": [ + 20200105, + 316 + ], + "commit": "614506bac2795c531ab118840ba010ee378e96d4", + "sha256": "042ci8kbhlmhwyx3kiwf8gnr9f1f85faviinv0g7yn80g3shxyp1" + } + }, + { "ename": "shackle", "commit": "806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21", "sha256": "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6", @@ -84625,8 +85430,8 @@ 20190930, 730 ], - "commit": "550cd4250d7db1248ffc3b6d897925558d9ef604", - "sha256": "116c0x7wric1gqxm8jswv732aymwd5hpy7dwzw19cx22w2j0imzy" + "commit": "6eda3828bb8530ecd69a3823bd5569a5f779c239", + "sha256": "0ij85i0zy9wi1cgm0j8cvqpv9802kfy7g4ffx381l7k28m35lqh2" } }, { @@ -84849,23 +85654,37 @@ }, { "ename": "shroud", - "commit": "2e4334a47a173e9cfb1e803d5781317da27702d7", - "sha256": "0s7gap41y2ncnlbj2cc6b2l7q7qc8psxpbznkc71y53ch1mc9isg", - "fetcher": "github", - "repo": "o-nly/emacs-shroud", + "commit": "261a5b2c77288cf38bc309504215fb23c719f09b", + "sha256": "03226c2v76zdscxlbhq32wp5wgpg385phqnxcsibn1apk2rb4s4m", + "fetcher": "git", + "url": "https://git.savannah.nongnu.org/git/emacs-shroud.git", "unstable": { "version": [ - 20191219, - 1722 + 20200124, + 1833 ], - "commit": "f758d497f87afd847126d2e69b2f7ba10a5bbbfa", - "sha256": "0q2pb3w8s833fjhkzicciw2php4lsnismad1dnwgp2lcway757ra" + "deps": [ + "bui", + "dash", + "dash-functional", + "epg", + "s" + ], + "commit": "bf8a854ecd440c525b870f9439f6785700af80d3", + "sha256": "1rfmykbv2jipkb8by9jsx51gdh62spilffj3c49h3rfcllqnbv2g" }, "stable": { "version": [ 1, 105 ], + "deps": [ + "bui", + "dash", + "dash-functional", + "epg", + "s" + ], "commit": "f758d497f87afd847126d2e69b2f7ba10a5bbbfa", "sha256": "0q2pb3w8s833fjhkzicciw2php4lsnismad1dnwgp2lcway757ra" } @@ -84908,20 +85727,20 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20191027, - 2130 + 20200203, + 41 ], - "commit": "298f96e68068d6891d20e6188e918ab55ac56b30", - "sha256": "17j406lxsa9d905j5g4707lmbiqb6lrswrrbyivda07blrrxrdpb" + "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5", + "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr" }, "stable": { "version": [ 1, 3, - 0 + 1 ], - "commit": "298f96e68068d6891d20e6188e918ab55ac56b30", - "sha256": "17j406lxsa9d905j5g4707lmbiqb6lrswrrbyivda07blrrxrdpb" + "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5", + "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr" } }, { @@ -84950,8 +85769,8 @@ 20180823, 1222 ], - "commit": "33acfa10a058aa65b6b22084a5b86a82410d794e", - "sha256": "1l8isy8kicr4xa6iilxj0cf0f5rqmkidzr6pigql74204db56jhd" + "commit": "26bc593aeae01da34ad92363b5bbd6aedab66da2", + "sha256": "0qvgdrzdp92mskqfh0x5garq0zcr8r7n834jlx5ky8q00xvb1a06" } }, { @@ -85176,14 +85995,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20190603, - 1836 + 20200120, + 2036 ], "deps": [ "cl-lib" ], - "commit": "2d3304af173b657176a1284abecdad2861820119", - "sha256": "1ac03h5hmx6qhsscq5n1n75wc5s1nnvpghws3sij6j64ksixi3b6" + "commit": "2a4ba8f99f39abf17976db8118e32b80eff0798b", + "sha256": "0897i5ggdivi2knblcbkyv9lpnwgdlr8ql9brd09bkdsbzhsqb6y" } }, { @@ -85228,20 +86047,20 @@ "repo": "rolandwalker/simpleclip", "unstable": { "version": [ - 20181105, - 1636 + 20200210, + 1406 ], - "commit": "2468b08ad829aaf4a90246541978be3974c60ab8", - "sha256": "1pkv4mi0pmi3hwbl3yyzahin5xv4zkd0jw8xh1cdipymndga4iwq" + "commit": "970159c788d38877f55f6fe93fe590642d45fb47", + "sha256": "0divawrww9py1r3yd7v0574lhf186f1d227gsmmal5m9zzi7pk7k" }, "stable": { "version": [ 1, 0, - 8 + 10 ], - "commit": "63b1a5356e6ff839b1dbacdf22a5c7a275ec88e6", - "sha256": "0iic8r0q21gjhj0d1k5nin9abx3789j0a37n96a5sx6rb4ps4f2v" + "commit": "d327abe0522b9b9a26e005eae5ffa4c34ea2ba0a", + "sha256": "1xkv34ibp3zv1b4y2q0i8x7c6vqrqf8r5jzj30nzz4lm5ipvd98r" } }, { @@ -85488,8 +86307,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20191230, - 1016 + 20200221, + 417 ], "deps": [ "alert", @@ -85499,8 +86318,8 @@ "request", "websocket" ], - "commit": "4e536bb4ee7a743605c5bfe7b91fc72b5c77fdf0", - "sha256": "1paiy7fx7b8fi6b2dd18qmwwldr2sdilccmvhdm4s70xrg90yxkw" + "commit": "b7b9eada0bf62d40dfe764b00f55913a2d3d742e", + "sha256": "0cqr7jnfxzb0z2wy79pdwpv9cvmawjif1kin3zbp8q7zhwrq09v0" } }, { @@ -85561,15 +86380,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20191224, - 2328 + 20200228, + 1656 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "e1a640a92ee8e63cc2670ef0cc44673f0c0bad0a", - "sha256": "0bycp6zcqxhrzq8ihqhqkyws2y8623jwc399ln4gklybgsdm1ibf" + "commit": "cd8cc3c95c3391b1f1cffa9e100336250a4509a7", + "sha256": "11b9747y43cia8s8dlgxsx3l326pjgsr20qmv5rs9ziby38502mq" }, "stable": { "version": [ @@ -85786,11 +86605,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20200101, - 1514 + 20200228, + 1350 ], - "commit": "91e5a8e7401c9907825b4e72e0fde3498c10021e", - "sha256": "0jgpf4d3sik45l7y7igh3kgd3iqigmz4n3ic59mqcfi8lrhppscm" + "commit": "86a63df73360be51529806c7ed9b775b3f02284d", + "sha256": "0sx6fdckcfcld41db0695svvlvllnfaazwx513686gnykwfd209n" }, "stable": { "version": [ @@ -85809,14 +86628,15 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20191021, - 718 + 20200217, + 2332 ], "deps": [ + "popup", "sly" ], - "commit": "69123fcebe63bb4d6e40e3dcb187299622401b74", - "sha256": "0f5ycdh02w6b6jkzw6fhsq9brdld78277cjykpy291112fx0ppny" + "commit": "feb25636fb729a08c92e8ba801fae5382f2668e3", + "sha256": "1j73s7xhlys97mwcnm4dpgfhdg7pf5nv2xqiz67fdbpdxwd4s6wj" }, "stable": { "version": [ @@ -85839,14 +86659,14 @@ "repo": "joaotavora/sly-hello-world", "unstable": { "version": [ - 20191013, - 2137 + 20200225, + 1755 ], "deps": [ "sly" ], - "commit": "ae8fe0a0ebcce50425a1d411c027db06ddec39ce", - "sha256": "0gimlph6pbq0s313gqa85gzc2x2d9ba4yww91apikd6xl32707bg" + "commit": "d25acc1220a3ce066bd9908251c2f0f88b1781e9", + "sha256": "0par51rbspk2gqfqag24rynzdvv4npdifdy7bjz9n0b0p2ly39kc" } }, { @@ -85991,11 +86811,11 @@ "repo": "malsyned/smart-dash", "unstable": { "version": [ - 20110131, - 316 + 20200104, + 1620 ], - "commit": "f8f23121ecb1b4b153e3561065cd0846d6722638", - "sha256": "069jwi74qh9hy152k19c7avdgb89zym989v92kgghbaaiyinng22" + "commit": "cc540eea7452e15d4ef2b09d8809d88174f509c0", + "sha256": "10xp7nf42v9rz9as3gspjcm3rjy075xza3yqbcppdk1zm59xxljr" } }, { @@ -86295,15 +87115,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20200105, - 1259 + 20200229, + 1752 ], "deps": [ "cl-lib", "dash" ], - "commit": "9449ae08593180ba99e4517897e8e825d3c422a8", - "sha256": "1h08awp6jr6ab7kb79dld6aygjl2vjnml81q3h7hqm3p7v9jv2h2" + "commit": "1f8857c5febe8b82654ba44ae43e6d2f435f4832", + "sha256": "02b05rh474kyk3vmkgh54366k7fqshdf2x5zgrd5q4a8jcffb5nf" }, "stable": { "version": [ @@ -86521,6 +87341,24 @@ } }, { + "ename": "smog", + "commit": "cc829fc6353e5cd78222eb2c7194eb3b796d2cc9", + "sha256": "0qq7ib8gv006jddhzrdfm702bgwgsk3rdd64v67xi5a39csrsfpw", + "fetcher": "github", + "repo": "zzkt/smog", + "unstable": { + "version": [ + 20200211, + 528 + ], + "deps": [ + "org" + ], + "commit": "0a6374493363d10826a8151d37fc461b08cc9b9a", + "sha256": "0vfhcnlz0p4dsnn7ac0fjqbk6xklanaa6jk0zbqcrlf2ww926v29" + } + }, + { "ename": "smooth-scroll", "commit": "4ad6411f76281232848c870e8f4f5bb78e6cf328", "sha256": "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf", @@ -86620,28 +87458,28 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20190912, - 308 + 20200222, + 1710 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "239b0c812b6963877d64c7051128353f2b9bcb55", - "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c" + "commit": "701f970bfb48d2f7abb241b9f69127ff5b667c76", + "sha256": "0di8wqwj0l2vx29kkpy2h1yxrxgcq51y2lss5lmqp6kmw3avkvi2" }, "stable": { "version": [ 1, - 6, + 7, 0 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "239b0c812b6963877d64c7051128353f2b9bcb55", - "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c" + "commit": "701f970bfb48d2f7abb241b9f69127ff5b667c76", + "sha256": "0di8wqwj0l2vx29kkpy2h1yxrxgcq51y2lss5lmqp6kmw3avkvi2" } }, { @@ -86868,26 +87706,26 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20200106, - 57 + 20200120, + 455 ], "deps": [ "cl-lib" ], - "commit": "2bfb3efe5a646079389dad6ca60e5e7f2c986829", - "sha256": "04inv9iny0ndkm2lwr82gvyfv73v50bn0sjrdbdqhkzxqxf8yr2k" + "commit": "4ac324ccb0b751be80ce64449553462eafab4f32", + "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps" }, "stable": { "version": [ 1, - 0, - 9 + 1, + 2 ], "deps": [ "cl-lib" ], - "commit": "fffdcc46f3956f415496342de7e24488b6e751c5", - "sha256": "011m4r7s6i9lgjymh7jgq5jwwrpz4vmpvp3c8d4ix96v5hi04kzg" + "commit": "4ac324ccb0b751be80ce64449553462eafab4f32", + "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps" } }, { @@ -86898,27 +87736,27 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20191212, - 1808 + 20200113, + 37 ], "deps": [ "dash" ], - "commit": "fac531ce8890795850bc12bb3ca63526b5252a07", - "sha256": "0rfdhfyp0b60cfz7q9bdk5y8nyr0rp6jg0mrb34mvnxc54aardag" + "commit": "b51d4f43fa5b814fd2de1f9348888c733af89b1c", + "sha256": "1jh6x447br0zdglazy58a6j1gbngi3x7750v6cwzzrrfiz9cb4h6" }, "stable": { "version": [ 1, 3, - 0 + 1 ], "deps": [ "cl-lib", "dash" ], - "commit": "c42a932e5c467c1ce12c42276d35bfb8f666e96d", - "sha256": "1m6grd8ym4azxi09ya236vil9ylqalli99p9fafd5zmzq647l840" + "commit": "55cd77b61b6968048c61e13358ba487d217f24c0", + "sha256": "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g" } }, { @@ -86929,24 +87767,28 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20181117, - 1518 + 20200113, + 1721 ], "deps": [ "flycheck", "solidity-mode" ], - "commit": "20d769513f42d8f82a4de7a42db89f59fb1c8fa1", - "sha256": "00y7arkg16yp7p4pvhjq0gkgchvpq65ql8jq42hkamh3gvj8gssq" + "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", + "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" }, "stable": { "version": [ 0, 1, - 9 + 10 + ], + "deps": [ + "flycheck", + "solidity-mode" ], - "commit": "d0ff4dea49540f37301d869f2797fca2492f55d5", - "sha256": "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724" + "commit": "93412f211fad7dfc3b02aa226856fc52b6a15c22", + "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8" } }, { @@ -86957,20 +87799,20 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20191214, - 859 + 20200124, + 827 ], - "commit": "20d769513f42d8f82a4de7a42db89f59fb1c8fa1", - "sha256": "00y7arkg16yp7p4pvhjq0gkgchvpq65ql8jq42hkamh3gvj8gssq" + "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", + "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" }, "stable": { "version": [ 0, 1, - 9 + 10 ], - "commit": "d0ff4dea49540f37301d869f2797fca2492f55d5", - "sha256": "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724" + "commit": "93412f211fad7dfc3b02aa226856fc52b6a15c22", + "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8" } }, { @@ -87386,11 +88228,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20191227, - 1039 + 20200127, + 1656 ], - "commit": "06a41d03274902bf16888b89db5a6ab6a054b11e", - "sha256": "0iml1qisamwv9pf07h0k5a3sff5m7vlnk4780k5nyv324aih1r05" + "commit": "e088bff4f190495615c29de93079aaa823e2300c", + "sha256": "09p5pzy3ibrl8dxmg10v8j16wxdn1fkdqpbi8l9pgfib2azmnvnc" } }, { @@ -87518,11 +88360,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20190821, - 1129 + 20200122, + 2036 ], - "commit": "1d4086a64ba554bb8c7d648c8d0e6c176277f6f3", - "sha256": "06sz5yl12mn0mq43bbv3ln14pk176ij8rxs95wi25yxdblznhsg0" + "commit": "590278f2b37919d082f576e522cbb790167a7f8d", + "sha256": "0s2znn91jy342xrcsda6mbf78f19ixxf5lf401jls8l5gj9bnx7f" } }, { @@ -87782,15 +88624,15 @@ "repo": "benmaughan/spotlight.el", "unstable": { "version": [ - 20150929, - 755 + 20200109, + 2137 ], "deps": [ "counsel", "swiper" ], - "commit": "ab902900f22e7d1ea2dd8169441d2da7155aaa68", - "sha256": "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8" + "commit": "ea71f4fd380c51e50c47bb25855af4f40e4d8da0", + "sha256": "1dda4gwxyhnr73ckjr70yjah9dmddvyfcwlrbb6d6bidb70ib0dj" } }, { @@ -88095,11 +88937,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20191123, - 1753 + 20200205, + 1729 ], - "commit": "bbd9b9239fc1a05f1aa1b7e7810166b4aa463ccc", - "sha256": "0ikxqxm4bfnl6v6ykn0zzbkqn7bj12b66x4bcyz8cp3vqv5v8fkg" + "commit": "5ce86917ad50d64c460eea6b6fa16bdcf88cc8f5", + "sha256": "16317yy64qcx7mi194xp9kbxpisjfz976yf637s6zabmk6xmmpcl" }, "stable": { "version": [ @@ -88165,11 +89007,11 @@ "repo": "AdamNiederer/ssass-mode", "unstable": { "version": [ - 20190521, - 249 + 20200211, + 132 ], - "commit": "c2c610abd85fecd171466bf5a9a4943bd62ffda5", - "sha256": "0vbh0nqbc7j2xjksk0xdfsrqfxd64fcqyladgk2v3jw0qply6ydw" + "commit": "96f557887ad97a0066a60c54f92b7234b8407016", + "sha256": "0kfk1dp8mgirbsrcg3klxi005gryqrr3jn2ss9m6vsxldjg69svb" }, "stable": { "version": [ @@ -88191,8 +89033,8 @@ 20120904, 2042 ], - "commit": "c17cf5b43df8ac4662a0580f85898e1f078df0d1", - "sha256": "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd" + "commit": "812e27409d01c38d74906a1816640506d6e7e3ef", + "sha256": "1ffwfgi450f95y1j1zp3k9lfwb6h26jzy88ng2bk4x92n53mhpww" } }, { @@ -88308,20 +89150,20 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20191106, - 131 + 20200221, + 2025 ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" }, "stable": { "version": [ 10, - 0, + 1, 0 ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" } }, { @@ -88332,28 +89174,28 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20191104, - 1056 + 20200221, + 2025 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" }, "stable": { "version": [ 10, - 0, + 1, 0 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", - "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + "commit": "599a0440086c660e6823622b35058f6d2d6d9637", + "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" } }, { @@ -88511,8 +89353,8 @@ 20171130, 1559 ], - "commit": "f2086b33ab310b70a47453011318d0ed5d432239", - "sha256": "0rx5h0d54f9w232w7r654qzpk2937zcgv0s3r2sya0ansxkk79kx" + "commit": "b505a5f524c9c92cf9f055a7038d19bb168bdfa8", + "sha256": "161mxajfl8rqik3cpapblngwwh7hwl8b6rym3rydcbya8i38015a" }, "stable": { "version": [ @@ -88580,14 +89422,14 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20190902, - 812 + 20200228, + 542 ], "deps": [ "dash" ], - "commit": "c7455081fa78fd8ffa229dcf0c691f66bf2ece16", - "sha256": "19phvf5xcaiwlxx0s8p9ys6xrw6ljp9qxjik98v2ab6d8f2x123q" + "commit": "32ae436a4cad49fea5038cc3e8eb638a3a83dd6c", + "sha256": "0dmjvgkhd445azs6vrj8lzcfmnm3h4prajr0c416s2ircrzpgnd9" } }, { @@ -89473,14 +90315,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200105, - 1958 + 20200227, + 1405 ], "deps": [ "ivy" ], - "commit": "3c6e5daccbc8678ee881b435ac956778de82a076", - "sha256": "184cdd41da1xizhbdymq9g3a8ryscdr6fq15vswdfv5gx8dx2fz6" + "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612", + "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq" }, "stable": { "version": [ @@ -89535,11 +90377,11 @@ "repo": "10sr/switch-buffer-functions-el", "unstable": { "version": [ - 20171011, - 1704 + 20200127, + 409 ], - "commit": "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba", - "sha256": "17bspkj4fxn9albjmj5g3gd5hi6x4d5rmv76qvyv3mdqws9x52j6" + "commit": "95a846baa93bac4c3b3c028b9d53507f1042b23a", + "sha256": "0ykdggzgdlb3dcg1qm388290h612kf5l224kwiv5jvvp8wqzb47l" }, "stable": { "version": [ @@ -89714,8 +90556,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20191203, - 2038 + 20200225, + 1928 ], "deps": [ "cider", @@ -89732,13 +90574,13 @@ "slime", "smartparens" ], - "commit": "bf3c566868cfbc1d1a280a099918c8ce4802a0f1", - "sha256": "1jbjk0j13ya0s2mzzir45w07544mlhzr4wqsdj2ar9h3kmw4y97x" + "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c", + "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ @@ -89756,8 +90598,8 @@ "slime", "smartparens" ], - "commit": "bf3c566868cfbc1d1a280a099918c8ce4802a0f1", - "sha256": "1jbjk0j13ya0s2mzzir45w07544mlhzr4wqsdj2ar9h3kmw4y97x" + "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c", + "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd" } }, { @@ -90023,11 +90865,11 @@ "repo": "jabranham/system-packages", "unstable": { "version": [ - 20190614, - 1320 + 20200227, + 1741 ], - "commit": "3ad6d52072f0bd043dced40ba7bd422fd9c00a7b", - "sha256": "0pxkyys2lgn16rhf4mzqlh27vs9aw6g083z2vr2agr7bmbavd2fp" + "commit": "c6fa6650202300265fbeb82db7d2223ab98951bc", + "sha256": "1b8ksr15bfmmmcq4d1vhpwd6sljsh1hpal21140z4hvplll35n1y" }, "stable": { "version": [ @@ -90225,11 +91067,11 @@ "repo": "politza/tablist", "unstable": { "version": [ - 20191129, - 1850 + 20200227, + 1918 ], - "commit": "41a9612f51bad36d6689667c11f42f8143103bb2", - "sha256": "0j6y9jh3qynbsya5aag3pfjfdizmxdz4ldry0qnx4rd9nz0cs7mi" + "commit": "10a573dc0e66981110507ee8b8b6408be48ce891", + "sha256": "0yzzkn6k8jjjkq5awiyi0li6j4bhynv8ayqa7sp1cqbgg4hd8rd4" }, "stable": { "version": [ @@ -90382,11 +91224,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20191128, - 1140 + 20200225, + 1349 ], - "commit": "b3e844ae64b9a7cbbb1427a26fca2d01f8e74c6d", - "sha256": "0yj1mxy81pfz71drdyvz5gmam6ypw798m5wiff0zj93kjs5f2k4q" + "commit": "6ebb8b188a39decf22a5cd675aeaa9684e4ea4ef", + "sha256": "0j3cxakgf943wv7bf73bwa69gc3m0g2ksw78xanz5hc0r0bsxbac" }, "stable": { "version": [ @@ -90430,20 +91272,20 @@ "deps": [ "cider" ], - "commit": "079028b7547743a36384650981ea068849aac53e", - "sha256": "06sjr4fv8p8y56a35pzghn89r1nzr2h5h3m98h0296bgnz8jgyg2" + "commit": "6c2631e3fd68e70110aa0cc5b83b7511eab363e2", + "sha256": "1sgnzgy0b61hxkj2fzkgnlrrpgsc5v1prns9hv1za4mv60xs8f15" }, "stable": { "version": [ 2, 0, - 0 + 2 ], "deps": [ "cider" ], - "commit": "d13389f701fc96fdd98b73fd068c6838a1d8ed4e", - "sha256": "0gdbkvb6vk7vhchl29gqqg5paq2hrq9ijxgbbk8qbss7ipmfj4zz" + "commit": "d4ce3b51e97fd7e9f5a650796dee9ba4079f9df0", + "sha256": "1vday9jnmzspnfy3ppladj0z5by4yysfwp1dnqv7n3ayyza5r8w0" } }, { @@ -90582,26 +91424,26 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200101, - 2251 + 20200226, + 1557 ], "deps": [ "visual-fill-column" ], - "commit": "88623eeb1ca4b79667d1a860496f5ea636611514", - "sha256": "1w5krpqraxfiwyz8nr9fwa4gfrj0fzr698dhvxzbpyjibdsna5xx" + "commit": "ee6f2a278b5f198cc6bf3d08b74e5ad2fffd6f05", + "sha256": "0q8x007p4888j1ljvh92wf012vdkiayawlqd43vhxmakl3zbgaq4" }, "stable": { "version": [ 0, - 5, - 4 + 6, + 0 ], "deps": [ "visual-fill-column" ], - "commit": "9bfb637b2e71f5f293debd35abd627a064faf8ef", - "sha256": "06v8i3862n5kf2lnxii8vp9g8cq5ql51kr8yxh7l1wccsidri67a" + "commit": "ae09592498ce380e57fbb76725fd4c89ae248864", + "sha256": "0mv6i80958d9crzspzik5xh5g8326115bvg2frgv0dp9p6rm86m3" } }, { @@ -90686,16 +91528,16 @@ "repo": "kostafey/temporary-persistent", "unstable": { "version": [ - 20161210, - 1133 + 20200201, + 1719 ], "deps": [ "dash", "names", "s" ], - "commit": "ac66f3054fc701d53f11ada9d2d9ab18ea481dc0", - "sha256": "15mjcr9gwf1ijppvcxwddnxj84y9idwz7s3lcqr910xb4d3ai8nb" + "commit": "0080879b0257d350aeba1c4d6901613d7dc534de", + "sha256": "1np9xh6gqynp96rby2shh4w40r14vsvpvwaibq0c1wr1ydwggm9i" } }, { @@ -90918,11 +91760,11 @@ "repo": "10sr/term-run-el", "unstable": { "version": [ - 20190529, - 743 + 20200128, + 702 ], - "commit": "fe8bf58814b167f887aaef98a148b8d5d8a11d3f", - "sha256": "0jzk0b07rj5a7va6nc93sjd4zii228gg63v1q49wg0hz2x2yjmfl" + "commit": "0fd135d55fcf864598b1fb8dd880833a1a322910", + "sha256": "1x1qdm5ahd5bxb4xi2i7ha5zqcxa5n0yskiqcz2hdbwpsdiirmlc" }, "stable": { "version": [ @@ -91034,8 +91876,8 @@ "cl-lib", "json" ], - "commit": "0d19800db70a6348c627a69f444b91d21ad89629", - "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" + "commit": "a295a80a502771cc07dc061961e0eb85343c2925", + "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw" }, "stable": { "version": [ @@ -91067,8 +91909,8 @@ "cl-lib", "tern" ], - "commit": "0d19800db70a6348c627a69f444b91d21ad89629", - "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" + "commit": "a295a80a502771cc07dc061961e0eb85343c2925", + "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw" }, "stable": { "version": [ @@ -91506,10 +92348,10 @@ }, { "ename": "thingopt", - "commit": "1b82d4102fa2c7622e76dae1154aaa8340b7f4b8", - "sha256": "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y", + "commit": "7856a62fb86415c88aa72b574895328c93c10a09", + "sha256": "1a91rvpgbil0cvp90zhj7rv9dqi48j2xr10ycyn52ps3ixhlcyl3", "fetcher": "github", - "repo": "m2ym/thingopt-el", + "repo": "emacsorphanage/thingopt", "unstable": { "version": [ 20160520, @@ -91589,21 +92431,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20180905, - 1050 + 20200212, + 1903 ], - "commit": "71240fbb5fec6d0aef967f26cfe6f29d5fa0404c", - "sha256": "1m8ahhz02fii84arzn9zpy0i2y1z2rbc1743y9dhf2ajqc0znigm" + "commit": "9a0b5eebf6a21a1941b56d4b27c0c90f37626c8a", + "sha256": "0daj7c6bz286dc1gdgjh0zhb0qvzjxm4qsjscig447m61hjjjbzj" }, "stable": { "version": [ 2020, - 1, - 6, + 2, + 24, 0 ], - "commit": "1362aa1d2d0ccc8a3ce28957a1385c216e72bad7", - "sha256": "1axhy9rg75bmqckahriaxrwg9avn67vnna5d9m7cpzq2pj7spssc" + "commit": "e67ec8ea5cb8c5e6213b0c00b12a242ac31db8f9", + "sha256": "15if11riz19vq33jnsc497ya99fflpksshp2zrf5q24l8pq9lz3g" } }, { @@ -91659,20 +92501,20 @@ "deps": [ "haskell-mode" ], - "commit": "014560454f352997839ffd54dbca24b638a9d456", - "sha256": "1yvqfc0jfyzc1nkvafnk5jpnbrrfbmj4i28gd1dkq79h6hykl4li" + "commit": "b28951be9abee7dc234c318849169bb578db3c49", + "sha256": "0absv56yqrqf3mzgs064q88lh6k28a7knzqrgdmf4100gf32np4j" }, "stable": { "version": [ 1, 4, - 7 + 8 ], "deps": [ "haskell-mode" ], - "commit": "014560454f352997839ffd54dbca24b638a9d456", - "sha256": "1yvqfc0jfyzc1nkvafnk5jpnbrrfbmj4i28gd1dkq79h6hykl4li" + "commit": "b28951be9abee7dc234c318849169bb578db3c49", + "sha256": "0absv56yqrqf3mzgs064q88lh6k28a7knzqrgdmf4100gf32np4j" } }, { @@ -91683,8 +92525,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20200103, - 1159 + 20200111, + 1236 ], "deps": [ "cl-lib", @@ -91693,14 +92535,14 @@ "s", "typescript-mode" ], - "commit": "ac0f0a6f688c5abade71a0277ea5f1cef45a0b8b", - "sha256": "11igdklmsn5y6xx9ws2im2m5hn70kqv8l4n9c5abr4ibslxjaffa" + "commit": "fd79540360dc8cc96f4a9cfc92d1d51f96fd2b28", + "sha256": "0zjs30gi0sqgr6qlvmzq5xcwjd4prni8zn38bd2qxr79r62s1sw7" }, "stable": { "version": [ 3, - 2, - 3 + 7, + 4 ], "deps": [ "cl-lib", @@ -91709,8 +92551,8 @@ "s", "typescript-mode" ], - "commit": "2d17c051cccd248a980575caf5728f4d5c986b30", - "sha256": "19kjq4kr2j853p5qp1s79zxmrfprli82lsnphbrlp9vbnib28xyd" + "commit": "1878a097fc41ee81c40c155022c8feaaf8bfaa6d", + "sha256": "0ipri5jxx73vrra6dikbv0y2ws96wfi7bjh2v6pshiw3b1x2isav" } }, { @@ -92022,15 +92864,15 @@ "repo": "laishulu/emacs-tmux-pane", "unstable": { "version": [ - 20181210, - 1210 + 20200227, + 1230 ], "deps": [ "names", "s" ], - "commit": "5e83ec65a1d38af9b8a389bdf34a78d13437e63d", - "sha256": "1451d51ml36i1pgksjkd4x2y8zjf4in9q8m6gda3b25v57fnkg2i" + "commit": "be321093575c1b68946296edd57762c4323c253b", + "sha256": "14f1nvnp6qxgq64410kqwi59f29p2shr6v8qg1ck8g9fiarilx5w" } }, { @@ -92065,16 +92907,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20191014, - 2033 + 20200227, + 1510 ], "deps": [ "dash", "org", "transient" ], - "commit": "3b8f8b4fc6d5cfdfca149b142ff7cadba6ffae7a", - "sha256": "0w8d53njk81smdk7vm6mxdrrg1310cyxapjbylv2a51d442hrf5g" + "commit": "b1fba9f3600e6cfe129efae304b96a7f6dc66e1a", + "sha256": "0391m19ws4ajqfbbwd1q1z8p1l6ai94xzf2rqg5zdvlnmc06kl76" } }, { @@ -92100,11 +92942,11 @@ "repo": "avillafiorita/todotxt-mode", "unstable": { "version": [ - 20191017, - 1319 + 20200228, + 952 ], - "commit": "ec94ac719e2f879c474d29e21dc84353b20258d7", - "sha256": "0x5syh0gvkqn3d32baf1r8xnqrpyzy5ywa9vwdbcjrkqfnnap8zb" + "commit": "8b616ce1cf3e18a60757450a0acf22996abb9b79", + "sha256": "1frvksra8s004xknlizs5gz5rhy9xbis5r353pzsybmn1bxa40wk" } }, { @@ -92139,8 +92981,8 @@ "deps": [ "cl-lib" ], - "commit": "ce213afc026590871ca7d514e563720ef967c938", - "sha256": "0wq4c4dzpkrppic65ma7gfzr9mxsln87csmb1laz3b2g4b19cy6k" + "commit": "052881b101d8c2d11c89ae4f1befe7a999de987e", + "sha256": "0k9sjjsqxnrh0cq6m3cd9rk44n0rjbjgqcbfv6fg33a0gpybvryf" } }, { @@ -92448,8 +93290,8 @@ 20171210, 2102 ], - "commit": "0c79138fb2d37940654649787cb17cb619268748", - "sha256": "0b2zmqrnvg37hwiywnb43zaggi3c7jh6zfdwp7z90hf98il13jpk" + "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4", + "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw" }, "stable": { "version": [ @@ -92552,24 +93394,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20200107, - 2156 + 20200226, + 1612 ], - "commit": "95389b31ec45984e3ff0849f4216adbd183d946f", - "sha256": "06c47pcicjqcfs8w0jfs4ggb1x431zwz9frx52w6xahb0p37qirm" + "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca", + "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "deps": [ - "dash", - "lv" - ], - "commit": "33f538a0bb83c8d4abc8f4c2db0dfbb9b09c4f92", - "sha256": "1hrn4mgag6rkcqzpmn5ysa9rj79dsgmh8vrihjvaikrdyshf9zxc" + "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca", + "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr" } }, { @@ -92580,14 +93418,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20190211, - 246 + 20200215, + 1350 ], "deps": [ "let-alist" ], - "commit": "7293beeb8a49cf6822abd16a9f4b9e4bef0a9296", - "sha256": "0pbmxl5654l1y213pq2h65dyrr78jlkybbdwz1dq52km98mpnf3r" + "commit": "49d3d764819afabf7a66f9d887a6b16c53566317", + "sha256": "00hk1rgqilxhlaabi7pgz25k0ykfizwhpp65yzgs453q6kvhccfv" }, "stable": { "version": [ @@ -92715,8 +93553,8 @@ "repo": "cyberthal/treefactor", "unstable": { "version": [ - 20191223, - 1230 + 20200131, + 621 ], "deps": [ "avy", @@ -92724,14 +93562,14 @@ "f", "org" ], - "commit": "caa431c3a512426de8abade3300d7fd21b969f7a", - "sha256": "1ppiwxnjcma5w3r0jnzywnsl7jn2yhjwq7gbam22phyf0jmpqnvd" + "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", + "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" }, "stable": { "version": [ 3, - 0, - 2 + 2, + 1 ], "deps": [ "avy", @@ -92739,20 +93577,20 @@ "f", "org" ], - "commit": "caa431c3a512426de8abade3300d7fd21b969f7a", - "sha256": "1ppiwxnjcma5w3r0jnzywnsl7jn2yhjwq7gbam22phyf0jmpqnvd" + "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", + "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" } }, { "ename": "treemacs", - "commit": "37cca017cf529a0553ba73bcb824a945ec8b1137", - "sha256": "0is4waygw902vkha4jwav0i05298zhf4d559m91gmsfg1cfrlrr3", + "commit": "8fec46a8717fb5b0eedfba39b4b6001cce1c7145", + "sha256": "1vmqqq830ffqyp0jj9am60b88whvabzimpg12gp6wk86h41qpbqq", "fetcher": "github", "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200103, - 1907 + 20200301, + 1232 ], "deps": [ "ace-window", @@ -92764,8 +93602,8 @@ "pfuture", "s" ], - "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", - "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" + "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", + "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" }, "stable": { "version": [ @@ -92794,15 +93632,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20191223, - 1047 + 20200114, + 1715 ], "deps": [ "evil", "treemacs" ], - "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", - "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" + "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", + "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" }, "stable": { "version": [ @@ -92825,15 +93663,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200108, - 553 + 20200205, + 548 ], "deps": [ "cl-lib", "treemacs" ], - "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", - "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" + "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", + "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" }, "stable": { "version": [ @@ -92856,16 +93694,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20191223, - 1047 + 20200114, + 1715 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", - "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" + "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", + "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" }, "stable": { "version": [ @@ -92889,15 +93727,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200103, - 1832 + 20200301, + 1156 ], "deps": [ + "dash", "persp-mode", "treemacs" ], - "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", - "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" + "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", + "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" } }, { @@ -92908,15 +93747,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200107, - 1640 + 20200114, + 1715 ], "deps": [ "projectile", "treemacs" ], - "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", - "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" + "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", + "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" }, "stable": { "version": [ @@ -93176,10 +94015,10 @@ }, { "ename": "ttl-mode", - "commit": "d56140a50abeab0953825d3646122d6e6ed19a7c", - "sha256": "1nnn2y0n9rj3a8r85y2vp6qja5rm4drcbnj9q793zzqfjl9akqd4", + "commit": "f91dc8c20b7b8a06cc2ee25b6f376aac3a6ad2c8", + "sha256": "07jryy2dws2q0v3184fzijx68gz65rv83csfwr5llm9ic6xmw5ky", "error": "Not in archive", - "fetcher": "bitbucket", + "fetcher": "github", "repo": "nxg/ttl-mode" }, { @@ -93442,11 +94281,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20191209, - 1107 + 20200221, + 2312 ], - "commit": "761f3aec6e192ddf0a9f1cc3d5d2ee77d32cb06c", - "sha256": "0b9gcidsgrmnz7dca8wx9ky8cqprxfi4zghf0cbfb31n0x2dqq5n" + "commit": "a8b7e76e85c1f8b4e353498e3e2d52f1dbcfb6d9", + "sha256": "13s4jclbs5563vjxh44ynzxh5k5hq5h1l9icf33wxwwqwk8b93lj" }, "stable": { "version": [ @@ -93495,15 +94334,15 @@ "repo": "mrkkrp/typit", "unstable": { "version": [ - 20190713, - 1336 + 20200217, + 2059 ], "deps": [ "f", "mmt" ], - "commit": "2adb0e0df4689b5abaa89a71808ec7993ecfaf9b", - "sha256": "1b4n85dp65naswp6s960l8kvdkd9424f6r2w5n3lxijxb8a5jlbw" + "commit": "231cb7df43253b84323520b8ed70f128d37003af", + "sha256": "1savrxs7xl92ifyxpxkkzv2didr7lb405h0dwz1bs1wldr5fb53f" }, "stable": { "version": [ @@ -93527,11 +94366,11 @@ "repo": "jorgenschaefer/typoel", "unstable": { "version": [ - 20191202, - 1033 + 20200212, + 919 ], - "commit": "54a9dbcfb24a146fd14232e927109eec59b50171", - "sha256": "02ri51iyw99m1735j76qfd5spyyvxwg6mjzjd7g493h23pc6bvy6" + "commit": "505b4b1ead337b773863ea54066f867d07735f9e", + "sha256": "0n8xh6bp757fjqa68slphw04kb4g0489g66r6f4n4v8bpbbi3bbl" }, "stable": { "version": [ @@ -93670,14 +94509,14 @@ "repo": "ianxm/emacs-uml", "unstable": { "version": [ - 20191231, - 1145 + 20200129, + 1147 ], "deps": [ "seq" ], - "commit": "4ce7a07670832e3b22de2cef2130bc7867aadbf6", - "sha256": "0v2q2spk19n2mn7jfywnnik52kn7n30bgsznw6vs38z59z8z1nqn" + "commit": "4c37ac1c4424b2313cd8f16ba48a98a4cc214200", + "sha256": "145i4srnfvd1vyibri2a1l6p9mbjvkkwlrpi41134pbarqffcnka" } }, { @@ -93783,11 +94622,26 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200103, - 1445 + 20200229, + 2346 ], - "commit": "a0e111b955c6f654faaf8125f95558a804a7b37c", - "sha256": "18vz67ifmlwprf5x7bp3crbimmg086a80cv1pd0lar25nc2cs7v6" + "commit": "8b0b289bbd83fac489baee3f46be2225a868e0f4", + "sha256": "1d4chzmx248pyk8qaswxyw4gzyk8r844gzzxh08dnl48406zhcy2" + } + }, + { + "ename": "undo-fu-session", + "commit": "f39d9dc5e57554b42eca54ad5399a53947c2c25f", + "sha256": "0k9qxs3igzf7zcg1vd4v9npfiah512w9j2scnm333brmx4jfgvb7", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-undo-fu-session", + "unstable": { + "version": [ + 20200221, + 1152 + ], + "commit": "35d4cf3771d905d647a35df050abfd9015833aad", + "sha256": "0846whh01bzxhl98wlywd11ki6wk2iyzzxvc5gnlj85cdasjrz10" } }, { @@ -93798,29 +94652,41 @@ "repo": "jackkamm/undo-propose-el", "unstable": { "version": [ - 20191229, - 2229 + 20200204, + 1612 ], - "commit": "71002612480fe5cb2b139e73d18c87ddf1fd76b2", - "sha256": "0mlmck46cgm95hsdqskadd975fdq03mh6pq6lfgzl1ffd0nfqm0z" + "commit": "20409358ad321fb937152cf93a50a4a775e405d6", + "sha256": "0mc6qldsjh8671kayl6wxmmcb8q0wjcg09qr7ppmsmwzsd9ydn0n" } }, { "ename": "undohist", - "commit": "aebd16ca1ac51d9982eae5437c6084a2a3946b88", - "sha256": "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn", + "commit": "7856a62fb86415c88aa72b574895328c93c10a09", + "sha256": "0nsf4y5zbyhw965rdshky03n999pz71f4sy1nrp0y99ld1z2mk49", "fetcher": "github", - "repo": "m2ym/undohist-el", + "repo": "emacsorphanage/undohist", "unstable": { "version": [ - 20150315, - 1242 + 20200120, + 1328 ], "deps": [ "cl-lib" ], - "commit": "d2239a5f736724ceb9e3b6bcaa86f4064805cda0", - "sha256": "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx" + "commit": "6c905772e6aa9969fd9ca500d2fe93e114130fe6", + "sha256": "0hmx2b20nrxg2lb8vplgrzdh8chgxwlbmjvbq5scddggd302sd56" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "deps": [ + "cl-lib" + ], + "commit": "6c905772e6aa9969fd9ca500d2fe93e114130fe6", + "sha256": "0hmx2b20nrxg2lb8vplgrzdh8chgxwlbmjvbq5scddggd302sd56" } }, { @@ -94353,8 +95219,8 @@ "deps": [ "bind-key" ], - "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", - "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" + "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", + "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" }, "stable": { "version": [ @@ -94385,8 +95251,8 @@ "key-chord", "use-package" ], - "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", - "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" + "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", + "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" }, "stable": { "version": [ @@ -94447,8 +95313,8 @@ "system-packages", "use-package" ], - "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", - "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" + "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", + "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" }, "stable": { "version": [ @@ -94557,8 +95423,8 @@ 20190715, 1836 ], - "commit": "ba35712f1bd1c489a54088a4fd807f8484c1d98a", - "sha256": "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp" + "commit": "c719401992c255f30ed42c4a942651ce7982ce9d", + "sha256": "1dafg3549mpkkl4c698byghai7nlr9nfzl2l7bgqxqwh5qrwp15k" }, "stable": { "version": [ @@ -94593,11 +95459,19 @@ "repo": "kanru/uuidgen-el", "unstable": { "version": [ - 20140918, - 2301 + 20200223, + 509 ], - "commit": "7eb96415484c3854a3f383d1a3e10b87ae674e22", - "sha256": "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw" + "commit": "f096f35a6e1f27d2bc9e9093cd61dd97bc33f502", + "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "f096f35a6e1f27d2bc9e9093cd61dd97bc33f502", + "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01" } }, { @@ -94665,14 +95539,14 @@ "repo": "dougm/vagrant-tramp", "unstable": { "version": [ - 20190816, - 1846 + 20200118, + 2324 ], "deps": [ "dash" ], - "commit": "47c6fdc07722934eacce9f91c47bb1ee7d46b86f", - "sha256": "0a423h6klk0m3vjkds27a3h60xq8n72j15p1izrhgdzf1642w1g1" + "commit": "f67925928dd844b74e4002f433e6f0ebd3aae357", + "sha256": "1s022vcjzm78v1j7z29pda3lk9x93fvks4qw5v9kh2yzsrxdq4h8" } }, { @@ -94918,21 +95792,20 @@ "repo": "stepnem/vcsh-el", "unstable": { "version": [ - 20191007, - 1102 + 20200226, + 1339 ], - "commit": "cbb2b387ea035ee4f95455964144d699f573491d", - "sha256": "0apqrhdv0mrv52ws4yyd9q3fd5hrp084nvq5ji9gva8rs2qyki2v" + "commit": "7e376436b8f450a5571e19246136ccf77bbdd4f1", + "sha256": "183pffdiqb7qqmjq31wxl3fpv8qswqgg99gb716rddiyk15ysri7" }, "stable": { "version": [ 0, 4, - 2, - 1 + 4 ], - "commit": "cbb2b387ea035ee4f95455964144d699f573491d", - "sha256": "0apqrhdv0mrv52ws4yyd9q3fd5hrp084nvq5ji9gva8rs2qyki2v" + "commit": "7e376436b8f450a5571e19246136ccf77bbdd4f1", + "sha256": "183pffdiqb7qqmjq31wxl3fpv8qswqgg99gb716rddiyk15ysri7" } }, { @@ -94966,14 +95839,14 @@ "repo": "justbur/emacs-vdiff", "unstable": { "version": [ - 20190227, - 303 + 20200214, + 1845 ], "deps": [ "hydra" ], - "commit": "09e15fc932bfd2febe1d4a65780a532394562b07", - "sha256": "1gvqi5l4zs872nn4pmj603aza09d81qad2rgijzv268lif8z34db" + "commit": "c0541ae9c2cb878be9ab3935da058a72155a14fc", + "sha256": "0jqkr92y5xrwlj2aa8nm2s153nbzsy9xf04c2rixizg7xzz5jky8" }, "stable": { "version": [ @@ -95164,6 +96037,30 @@ } }, { + "ename": "verb", + "commit": "3802b91f39ef7800afd49589d398182cb191b756", + "sha256": "12hskj4d7w43a8mjqqa535p02w778hi7lsxm47mh1xjiimibad3p", + "fetcher": "github", + "repo": "federicotdn/verb", + "unstable": { + "version": [ + 20200225, + 2133 + ], + "commit": "01555842722ee5ee3abfca1bffc60a188dd5d5ac", + "sha256": "1wa9jvz3yph0cxpda4s8lvnlpnlj4vpmvbvg5kvz6pi8kv39ajws" + }, + "stable": { + "version": [ + 2, + 8, + 0 + ], + "commit": "f9199768e55849cbe5a879a530b33bce88ac4c2c", + "sha256": "1zpsvjsr5mvi0l0mgfwirxg5bkhkp305h85fbv5g3hr4g0vnr448" + } + }, + { "ename": "veri-kompass", "commit": "18c3a69bec780e3e7456b310db6f0eec2a35c753", "sha256": "103x4003qj0z9ki6xz4hymamyhipzfxz94x4gszk3k2qnvkjkxnj", @@ -95171,15 +96068,15 @@ "repo": "koral/veri-kompass", "unstable": { "version": [ - 20181110, - 933 + 20200213, + 934 ], "deps": [ "cl-lib", "org" ], - "commit": "8638eea5a14f9834c001c943e7c22d8d90abc455", - "sha256": "1iy1qdh7bf3g7j3ipnpw96qgw4f4y4x8l2rg2kz651lhail3dk8i" + "commit": "271903cdf92db05898ee7cffb65641f30fa08280", + "sha256": "0ag2975bwj6l6wzd03min8dj5cy1429fzm3z2p2807i4j7fd7bkr" } }, { @@ -95288,16 +96185,16 @@ "repo": "csantosb/vhdl-tools", "unstable": { "version": [ - 20191127, - 2102 + 20200128, + 957 ], "deps": [ "ggtags", "helm-rg", "outshine" ], - "commit": "e174a7077eb8b80cd76bb9688a4a5f08a747f212", - "sha256": "1c8wkfidvzpsv73d666n0n8marhavgm1yc6bv6ig5h4xsblhaigc" + "commit": "8584e73ab550841b3df7419dea32b874cdd64425", + "sha256": "0s0ljcn6lgcr6zqhw31llg4ri2drkxbz31kviir0xwgr8hn4p5dn" }, "stable": { "version": [ @@ -95404,6 +96301,30 @@ } }, { + "ename": "vimgolf", + "commit": "1de0a1cdc8fd33601ecca982fa9aa66f4400843b", + "sha256": "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f", + "fetcher": "github", + "repo": "timvisher/vimgolf.el", + "unstable": { + "version": [ + 20200205, + 1420 + ], + "commit": "f565447ed294898588a19438d56c116555d8c628", + "sha256": "0vyxqs575xfvk9vdwwx5vd9fmcjj1hl2139yw31902dd9lrf55ag" + }, + "stable": { + "version": [ + 0, + 10, + 3 + ], + "commit": "78e91f810a1b49d68ef19565e1c6513c84855e1e", + "sha256": "1picdbrkpd694aqmsjcs1v7fh6s6l8bb6j89bicss9gxn65p6bs8" + } + }, + { "ename": "vimish-fold", "commit": "b4862b0a3d43f073e645803cbbf11d973a4b51d5", "sha256": "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3", @@ -95411,15 +96332,15 @@ "repo": "mrkkrp/vimish-fold", "unstable": { "version": [ - 20190713, - 1333 + 20200223, + 1836 ], "deps": [ "cl-lib", "f" ], - "commit": "863bef039672693566cfcfe1d0ad236d3af48fea", - "sha256": "0kr4rzfmydqcxsgzg88c3b8g5323dliirx1v01gdbinf868hlkh7" + "commit": "d3248a41a79092ea270b07ac60bf7420befa2146", + "sha256": "164jx09m7sgmffixlarjdyn8zdrqcmm4ngwddpjyv3phi65pnpj0" }, "stable": { "version": [ @@ -95451,6 +96372,25 @@ } }, { + "ename": "virtual-auto-fill", + "commit": "a77a66240098fe2e6a4a8097ca9d0f85f3c2b9af", + "sha256": "14832wgn6kl122v3lddcnshgl6rk80cpm6xmmxcqcimhiybb9vcx", + "fetcher": "github", + "repo": "luisgerhorst/virtual-auto-fill", + "unstable": { + "version": [ + 20200217, + 2333 + ], + "deps": [ + "adaptive-wrap", + "visual-fill-column" + ], + "commit": "91fb699ead3f86663e56b48a10adeb5723ca7b84", + "sha256": "0rfrgjflgn0c9xj7f4fwdzyclp2p9fbfir19iwy77z7jnkjk78dv" + } + }, + { "ename": "virtualenv", "commit": "923e4fcf29423ad55b13132d53759bc436466ef9", "sha256": "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl", @@ -95546,8 +96486,8 @@ 20190422, 2154 ], - "commit": "772d4b25ba19f57409cd03524be0f5bfdc2e8da1", - "sha256": "1k4a7nqc2zxwxrcrryap2jk6bwc6ln3j6yzgkg5yyf2imsbil4br" + "commit": "9a3a2ef3c7c76666a0c9271a821256eec9daab2a", + "sha256": "1z535rddy8q4gxdmsf7p1z3hm2vav0zcjh9kpxnq3v49scq1nd5j" }, "stable": { "version": [ @@ -95723,6 +96663,52 @@ } }, { + "ename": "vs-dark-theme", + "commit": "60b9b00d18334f2d7b737e3cc6b3c733e1b163e4", + "sha256": "0didkb2zd9ac7h1ccwi9y1q5mcqpwxyws7nsk5g8rhrkygdf9lds", + "fetcher": "github", + "repo": "jcs-elpa/vs-dark-theme", + "unstable": { + "version": [ + 20191209, + 1600 + ], + "commit": "d1f954a3879ec3f93c8dea9177772bf4d5bd0ecb", + "sha256": "13kfwp129wrlbbpvl9n4h7ybnycph68x214dx5v6v7ap6gnv0lr6" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "c3c6b0be8bd525079b341490afc8875941b8af79", + "sha256": "0w4gygxdfbb7gp92f59p9qvw725l70sy2baf4h6rifrf92af55f2" + } + }, + { + "ename": "vs-light-theme", + "commit": "c997456be95ece85fdef87905e9e14fe308fd827", + "sha256": "02w5zyxf34r1lvk56s3xbkzpvinbwsyv1h685hg9vhn0yy0a23ns", + "fetcher": "github", + "repo": "jcs-elpa/vs-light-theme", + "unstable": { + "version": [ + 20191209, + 1600 + ], + "commit": "764f478f5866140b121b1e43857487b7a66afa72", + "sha256": "0s8fh7n8qhsfdk8l7r81ifscaazgmpls4n3pginaqb5cszdy4063" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "8b34cbe6294ad02676970bd72c9efbcc09981f3f", + "sha256": "0sw8k737ra2qhakxyf83lz41a5sv0dzw5xssnvyiyrarh73n5pp0" + } + }, + { "ename": "vscdark-theme", "commit": "8f3accf76fcd91e1507b9e8ac8577d3af5ae0b88", "sha256": "13d3g6bjnry7964pnphl0i205vn9gvl7glydzj5wv82s7yav752w", @@ -95760,11 +96746,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200107, - 1419 + 20200224, + 307 ], - "commit": "58b4cc40ee9872a08fc5cbfee78ad0e195a3306c", - "sha256": "1w5yfl8nq4k7xyldf0ivzv36vhz3dwdzk6q2vs3xwpx6ljy52px6" + "commit": "b9bccf38dfeb495bfd93d55618b3791ebad24588", + "sha256": "053x5zpfsj0n0a8gdzra7awg3y3py2a2nxv14vn4g8r7hrhdwac0" } }, { @@ -95775,14 +96761,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20191209, - 928 + 20200228, + 628 ], "deps": [ "vterm" ], - "commit": "88c823b532493b95a24d9cbd749278552a047860", - "sha256": "0ascpjc3c5q9pw2xbqfc60vxmsdhw7yakb2rvkgglha314p3fwkb" + "commit": "24d68a0ab920875d0834598688128e692fe9a5b2", + "sha256": "0bzxd5xzpajvg7mv7ggplcba7plchhlrl1m14dnx3nrx6q0936cr" } }, { @@ -95888,11 +96874,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20200105, - 2322 + 20200113, + 2320 ], - "commit": "550cd4250d7db1248ffc3b6d897925558d9ef604", - "sha256": "116c0x7wric1gqxm8jswv732aymwd5hpy7dwzw19cx22w2j0imzy" + "commit": "6eda3828bb8530ecd69a3823bd5569a5f779c239", + "sha256": "0ij85i0zy9wi1cgm0j8cvqpv9802kfy7g4ffx381l7k28m35lqh2" } }, { @@ -96007,6 +96993,25 @@ } }, { + "ename": "walkman", + "commit": "603a2bf865eb16505504cf20ab1ecfd619cce6dc", + "sha256": "1hr5c95pv30l18f0kv0sgn5h46x8989lg4n0kg7bd1kb7k6hc8n1", + "fetcher": "github", + "repo": "abrochard/walkman", + "unstable": { + "version": [ + 20200224, + 1501 + ], + "deps": [ + "org", + "transient" + ], + "commit": "bdc026b58dc023cf078ec5eafae3b334ac5c39ef", + "sha256": "13bhdmylg7k9r5y6wi158rv8rm4cndv8av35g65vc6qk0bgnnwpz" + } + }, + { "ename": "wand", "commit": "38be840bbb32094b753ec169b717a70817006655", "sha256": "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l", @@ -96014,15 +97019,15 @@ "repo": "cmpitg/wand", "unstable": { "version": [ - 20191122, - 1408 + 20200211, + 2238 ], "deps": [ "dash", "s" ], - "commit": "93a5a4ecab1973e5846b35f856391daf8068d12e", - "sha256": "067149rrl6rgfdq55fpx8d2y4b0kqi1ify53ajksrddz74fl6h0c" + "commit": "fe4bf7b35b61eda15437a212e96d08395d307f73", + "sha256": "1rfiyh2v28zpdv8sd6hjz5fgv3knyhgz1ymp9ycl9m4y93s78wbq" } }, { @@ -96151,19 +97156,19 @@ "repo": "bnbeckwith/wc-mode", "unstable": { "version": [ - 20170127, - 429 + 20200108, + 1841 ], - "commit": "f218f42709a651b34d6c1ddd98856f44648ef707", - "sha256": "0h79kf37pns92w4zsgazwhg087vkjvnhk9p1npll5ka87zbknndm" + "commit": "79107d1130e8be3e1db4619373b98045b4fd9033", + "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc" }, "stable": { "version": [ 1, - 3 + 4 ], - "commit": "122f90bd1d422a84cc50acabd350d44d39ddeb69", - "sha256": "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp" + "commit": "79107d1130e8be3e1db4619373b98045b4fd9033", + "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc" } }, { @@ -96206,6 +97211,29 @@ } }, { + "ename": "weak-ref", + "commit": "ef1a6048d197a4feebb8d4ebb6dbfd600bce100e", + "sha256": "08c887xkj18j9s92pqlik7x6984y2fi4q7xlqa6wrbmjgl27cl1z", + "fetcher": "github", + "repo": "skeeto/elisp-weak-ref", + "unstable": { + "version": [ + 20200217, + 2200 + ], + "commit": "24e8c37da6465e65ce9f866267bd3fa53c8899c6", + "sha256": "0jh3l64sagvm3jdhxk8wwfddckwgk66w1cfn7cchklz0wss82cs2" + }, + "stable": { + "version": [ + 2, + 0 + ], + "commit": "434e7d7cc84d0813bd06606a04c08fc96cd9eec8", + "sha256": "1rri4q600vs3fhvvyds6jshjranfvb1zzn6zwy44q5g914ghhnfw" + } + }, + { "ename": "weather-metno", "commit": "75beac314565b9becb701ddd9bc85660e268c3ae", "sha256": "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6", @@ -96309,11 +97337,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20191104, + 20200229, 1859 ], - "commit": "cd000fcfce97152f8b831b7eef4ea0d0b1eed11a", - "sha256": "0fm9gwgcg3qgx8q2l27lsn76mzdkdsxvrwgwfsq34gzwzm1yg2xb" + "commit": "f271e1b97989e7de8e33cb49a97a829ebec1911d", + "sha256": "192zkjlz3dm1p6lrivc0qqws7mfyv1nvbgcq71gfpm9x085rqyn4" }, "stable": { "version": [ @@ -96402,11 +97430,11 @@ "repo": "eschulte/emacs-web-server", "unstable": { "version": [ - 20190310, - 213 + 20200216, + 1126 ], - "commit": "cafa5b7582c57252a0884b2c33da9b18fb678713", - "sha256": "1c0lfqmbs5hvz3fh3c8wgp6ipwmxrwx9xj264bjpj3phixd5419y" + "commit": "33afdb46e1cd61251736816d965495525b36c9cd", + "sha256": "109gxdk7xznxm85fvlvccj01bznali98wzywypzy73l8zxs2yj74" } }, { @@ -96453,15 +97481,15 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20191214, - 649 + 20200227, + 912 ], "deps": [ "cl-lib", "request" ], - "commit": "8f9322fb1c6b8a80187f48ba2cb96cc107fad2b2", - "sha256": "135gz07zwizvp4iv9k3s20rx8f5rmzmqwas5rfkx9c2nffarnjii" + "commit": "ef33b0f298bf36cfb84b37af4870706fc376b0c3", + "sha256": "0v2yw3jbwlamkycgfmd5abxr764zyzcggyzn2ybzlkffxaxaz6dw" }, "stable": { "version": [ @@ -96609,20 +97637,20 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20181229, - 40 + 20200217, + 1030 ], - "commit": "379afd89ebd76f63842c8589127d66096a8bb595", - "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47" + "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", + "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" }, "stable": { "version": [ 2, 3, - 0 + 2 ], - "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767", - "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s" + "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", + "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" } }, { @@ -96633,26 +97661,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20141012, - 1011 + 20200128, + 109 ], "deps": [ "wgrep" ], - "commit": "379afd89ebd76f63842c8589127d66096a8bb595", - "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47" + "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", + "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" }, "stable": { "version": [ 2, 3, - 0 + 2 ], "deps": [ "wgrep" ], - "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767", - "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s" + "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", + "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" } }, { @@ -96663,26 +97691,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20181229, - 124 + 20200217, + 1028 ], "deps": [ "wgrep" ], - "commit": "379afd89ebd76f63842c8589127d66096a8bb595", - "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47" + "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", + "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" }, "stable": { "version": [ 2, 3, - 0 + 2 ], "deps": [ "wgrep" ], - "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767", - "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s" + "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", + "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" } }, { @@ -96693,26 +97721,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20190401, - 2156 + 20200128, + 109 ], "deps": [ "wgrep" ], - "commit": "379afd89ebd76f63842c8589127d66096a8bb595", - "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47" + "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", + "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" }, "stable": { "version": [ 2, 3, - 0 + 2 ], "deps": [ "wgrep" ], - "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767", - "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s" + "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", + "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" } }, { @@ -96723,26 +97751,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20140510, - 2231 + 20200128, + 109 ], "deps": [ "wgrep" ], - "commit": "379afd89ebd76f63842c8589127d66096a8bb595", - "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47" + "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", + "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" }, "stable": { "version": [ 2, 3, - 0 + 2 ], "deps": [ "wgrep" ], - "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767", - "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s" + "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", + "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" } }, { @@ -96768,20 +97796,20 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20191221, - 1857 + 20200216, + 1350 ], - "commit": "1e3640e48c31f8062f018b5fc84acad696a0ea2a", - "sha256": "1ahgb7dqdc75farkl0fg0a6hvx2067gdvjq99cd3z2dz56km0p05" + "commit": "8b49ae978cceca65967f3544c236f32964ddbed0", + "sha256": "15ydzqv23m1w6g27il57fmzs6pjcasdb7drml3msjpq2l8kr4ard" }, "stable": { "version": [ 3, - 3, - 1 + 4, + 0 ], - "commit": "2f5661646b771f6c5a00a8a9aaa3f183abd5f84d", - "sha256": "1dh6kr00wmql46whjkvnl953zngiv5j99ypvr1b3cb2174623afb" + "commit": "1e3640e48c31f8062f018b5fc84acad696a0ea2a", + "sha256": "1ahgb7dqdc75farkl0fg0a6hvx2067gdvjq99cd3z2dz56km0p05" } }, { @@ -96933,8 +97961,8 @@ 20190529, 1554 ], - "commit": "b4cdab4d25225c6e834727a7d85cdb0d493da152", - "sha256": "058wym1iwgz5n5yd508xdc05ncdyqbs53a5c9mq0s6gs06h5xfyw" + "commit": "c86c0ad9adc4787a422cca11b66229cc14a6d83a", + "sha256": "1abn5rzapbvk217h1s7lk166y48g7fvdvjmy2fsbz60rwq2zhpk6" }, "stable": { "version": [ @@ -97446,14 +98474,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20200102, - 2147 + 20200217, + 1015 ], "deps": [ "async" ], - "commit": "7e0bf753709f1775d2bbbb6edf4482fca7fd286a", - "sha256": "1y4zrgsfs0504ks30qb7hl32ygd3hb6yx5x8032b30j7rh5ks29d" + "commit": "4fe66d4d55c8eacebda53a13cc38e01d32bdaaa2", + "sha256": "1lyjrh1vddnf8v4i6g05bfx1kq8angbdhyh5v3j0d27gb66cshxp" }, "stable": { "version": [ @@ -97476,11 +98504,11 @@ "repo": "twlz0ne/with-emacs.el", "unstable": { "version": [ - 20191219, - 1521 + 20200210, + 1543 ], - "commit": "295e5d5b16fd96ed476ea55efa60819515daafef", - "sha256": "1fgqzwg1p9by1zqhhdvh8g25wdig6d9d4p5ish70qij46gvaf7a0" + "commit": "9f99bec56f87e53deb9f33b364eda77677a17eb9", + "sha256": "0ay860skpnbv6a8xid0hhz9vx33ks2vkdicvpm3a4qngp932jvnp" } }, { @@ -97518,6 +98546,24 @@ } }, { + "ename": "with-shell-interpreter", + "commit": "dc61e8f90dbae7184228b16de447ce1ede630a1c", + "sha256": "0qjr7j3jv20ja94ma0rk4rr0fx6vazqp25sgc806xl034ax669y9", + "fetcher": "github", + "repo": "p3r7/with-shell-interpreter", + "unstable": { + "version": [ + 20200217, + 1112 + ], + "deps": [ + "cl-lib" + ], + "commit": "62c3b0bd16c6fc4a0ee42f4d6a2dd7f66beab7cc", + "sha256": "1hp3i9njipzppdlwl7a3xhdrvvmc0ynmh85nmj0csxzpnahyp12d" + } + }, + { "ename": "with-simulated-input", "commit": "e4ddf16e19f5018106a423327ddc7e7499cf9248", "sha256": "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk", @@ -97525,15 +98571,11 @@ "repo": "DarwinAwardWinner/with-simulated-input", "unstable": { "version": [ - 20191127, - 2116 - ], - "deps": [ - "s", - "seq" + 20200215, + 1807 ], - "commit": "7b044003150ee39505234080b86f474c60ad3471", - "sha256": "1y544fff80cjdzx9js5fwqnicdc75k5kn6i0hl6ns0cr6779b3z2" + "commit": "29173588751eeb33d2392d380b26648b2e213438", + "sha256": "0qmcv1ks3cnvl7l6cmbl5a03irwp38zfc98rzp9hbd3xw7rh970b" }, "stable": { "version": [ @@ -97556,14 +98598,14 @@ "repo": "10sr/with-venv-el", "unstable": { "version": [ - 20190516, - 606 + 20200125, + 1620 ], "deps": [ "cl-lib" ], - "commit": "3728d3a60c600d7ac505ce281cd2579a8992c14d", - "sha256": "16gb7fcgz2akd78hxi8fy0h62957xfrgqb7flw8hkrixxi26jxyn" + "commit": "51ba19ac75a2796d494587b3b20ce51d4eb178a5", + "sha256": "1nbw88727spdgivrafjnlzbda81nnd1xprqdgmy6h2xfvki23zzb" }, "stable": { "version": [ @@ -97750,8 +98792,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20191116, - 1730 + 20200121, + 1629 ], "deps": [ "ace-link", @@ -97759,8 +98801,8 @@ "swiper", "zoutline" ], - "commit": "b1fb5771c4a3a47b628b8c349595c4ace347113b", - "sha256": "0s6c91r48cr306dh7pf3jlrkjvjbipxvv7936h8q8a8l97y3a5wv" + "commit": "bdc8240ff4188c7403a020eb58dc10eea104b7df", + "sha256": "1lkix09lwnjsycaacwdn7gyqnm0n2frcp1p0l3hfhayz3p18dy5p" }, "stable": { "version": [ @@ -97943,25 +98985,25 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20191208, - 2351 + 20200225, + 2011 ], "deps": [ "visual-fill-column" ], - "commit": "fa17eb651102502f60086d62784f1dae15c0630d", - "sha256": "1nrppnfqsaki6myp58w8jhmzb94rzskh5n98glcn4ghr8sqnafi8" + "commit": "c806c41f7c2ecb3f945aef7f0c25e3e223ededc0", + "sha256": "0wi8l1nz4g8ygxvffpa525lm80l0jwj92argsa5i11sh7w6hjksv" }, "stable": { "version": [ 3, - 9 + 10 ], "deps": [ "visual-fill-column" ], - "commit": "fa17eb651102502f60086d62784f1dae15c0630d", - "sha256": "1nrppnfqsaki6myp58w8jhmzb94rzskh5n98glcn4ghr8sqnafi8" + "commit": "6552c056b85fd26a3ac509100d9d5c5c3c19515a", + "sha256": "0la4q2dm123l4rdfh0ry03b99ihvh324y7iw12az909198bcx335" } }, { @@ -98049,20 +99091,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20191219, - 418 + 20200116, + 1447 ], - "commit": "95c417f49321071645214a5774209393f0db3dbd", - "sha256": "1scw0lzbix4ifh0mkh20wbb4a9h32n8ncpxnlxwdim8z4b469w11" + "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f", + "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij" }, "stable": { "version": [ 0, 0, - 6 + 7 ], - "commit": "dc56b11e0f5c4e4a121e6ac72523fa0e6cae4c02", - "sha256": "0mjvdj9j1l27i5nmam087fig6183awbn6xnib4wrrfbyc6q4qxlw" + "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f", + "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij" } }, { @@ -98218,11 +99260,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20191226, - 2348 + 20200215, + 124 ], - "commit": "b3702573524c8bde14a6eb32cf2da20cfa0a0bbf", - "sha256": "10rlpd8jxndv3pg2vafq3dgpfifzdid1377agmxr5m646n8a4ddf" + "commit": "064cb19b1d3d133ea0f123e570f0c6c3351af9c7", + "sha256": "0vsm7lbv0sw0zxiprgq756fcl1hz8aj5v1lczwzd7v7sxzkcslv6" } }, { @@ -98248,11 +99290,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20181225, - 1942 + 20200225, + 31 ], - "commit": "2cafbf3605a8f2ac4c56392c5b1f75adc3b11f24", - "sha256": "1xr2fp6dylv098g7m7x31j7jllr87545snab3qw5r32rzsa7fswz" + "commit": "5ddd01520ca49d459f67567901fc08c84aa553bd", + "sha256": "07fx4vypgim39rw022v5m7gfp68095s393j8s28k2j038jqgzdp5" } }, { @@ -98263,11 +99305,11 @@ "repo": "xahlee/xah-math-input", "unstable": { "version": [ - 20190206, - 1658 + 20200217, + 740 ], - "commit": "af787f87815b85d56c35bbe0f22e03a31c8e670d", - "sha256": "05fqjyzz6c0nclhqc7qxs3hg99d3yxb3qjzn1wc26m6jcmm2l6zd" + "commit": "c1e72c4578a134e9aa3ec9ef425038d8c16fba94", + "sha256": "0laq440vk8mnjbdjz0h4n18qh72n83hxqmwjm124ykzclzjcdknh" } }, { @@ -98491,11 +99533,11 @@ "repo": "ndw/xml-quotes", "unstable": { "version": [ - 20151230, - 2249 + 20200301, + 1222 ], - "commit": "26db170e80b9295861227cdf970721b12539ed44", - "sha256": "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd" + "commit": "8fc21e43b45f9a50b24642412f05afcc3a316a1f", + "sha256": "1czz6zgbnvwf3bn6k5iczs02rjx6frjnc0d78gcxhvsnbsvv60iw" } }, { @@ -98803,26 +99845,26 @@ }, { "ename": "yafolding", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl", + "commit": "aca84b24c4d95b330b233851af35e7c8a8e6615c", + "sha256": "0xlcxhmgm8nmv14yr2ffvmf5g7fs6rnq9yc1zpcar8x3d11s0ql2", "fetcher": "github", - "repo": "zenozeng/yafolding.el", + "repo": "emacsorphanage/yafolding", "unstable": { "version": [ - 20170305, - 317 + 20200119, + 1353 ], - "commit": "57c015ddd7c3454571c80825bc5391d7a10fa1d7", - "sha256": "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8" + "commit": "4c1888ae45f9241516519ae0ae3a899f2efa05ba", + "sha256": "1bb763lx5cs5z06irjllip8z9c61brjsamfcjajibi24wcajkprx" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "57c015ddd7c3454571c80825bc5391d7a10fa1d7", - "sha256": "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8" + "commit": "4c1888ae45f9241516519ae0ae3a899f2efa05ba", + "sha256": "1bb763lx5cs5z06irjllip8z9c61brjsamfcjajibi24wcajkprx" } }, { @@ -98866,8 +99908,8 @@ 20171022, 1412 ], - "commit": "f13ba9d613c0edaa23fac57721529cf41413353f", - "sha256": "1ijacfcz2b7cmgxfyx9b7yhs9nybv19388fb9y0527nhbnjls4v4" + "commit": "db84dbb30ed39079d34d5eba01cc67af6f7d92de", + "sha256": "1syxgm3a51i3kybbjgjlwlrrgr6rscr4iqam3aa7r55z0hlx8k2r" } }, { @@ -99004,11 +100046,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20191228, - 1345 + 20200108, + 1811 ], - "commit": "0230b1dd2477673ba45a7c07da6bac15414f10cd", - "sha256": "01007dz4lxv50qkcb3z4z5ibc0jkqw79hyxg7qfjdar8157ylb2s" + "commit": "dd97994a8bff58e4d98aa6cb90aa08c5ddde5c82", + "sha256": "114qnr8s5v2dr3v3jvy4aagyi1wbn3fw27mrb6zdg6faxvfpd8sk" }, "stable": { "version": [ @@ -99027,11 +100069,11 @@ "repo": "JorisE/yapfify", "unstable": { "version": [ - 20191103, - 2100 + 20200117, + 1245 ], - "commit": "530ca2b589070edfe9bd59034af55c924d03b83a", - "sha256": "14f2zfb4l3fd2sry7b3cjzk0bhdfsmwjqsc25zaf2y5dy0ryllds" + "commit": "0b4f20af0b00a86353ddc286df26eade89381269", + "sha256": "1k91fav3dvdjkg632zhkmgbjvichbixwqdir4x8lc332ma3wwi0h" }, "stable": { "version": [ @@ -99104,10 +100146,10 @@ "repo": "anachronic/yarn-mode", "unstable": { "version": [ - 20191208, - 2153 + 20200208, + 2332 ], - "commit": "218cdb3c53d740b4520c807cb0d8479bfecedaed", + "commit": "8239d4dc7d8a52fa1e3fa81bd32c904a359fcfc1", "sha256": "0pf98jkz8k4gyc650wwfhww6gli847hmxb8lrnmw50yb88dqa38f" }, "stable": { @@ -99121,28 +100163,32 @@ }, { "ename": "yascroll", - "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", - "sha256": "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f", + "commit": "7856a62fb86415c88aa72b574895328c93c10a09", + "sha256": "1hdh8xfmgj0w3vrl3nr3i6j8b9qf8ndnfa1bvwainzdbxpfwiz1v", "fetcher": "github", - "repo": "m2ym/yascroll-el", + "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20170315, - 1906 + 20200224, + 1117 ], "deps": [ "cl-lib" ], - "commit": "fe4494e5f4faf2832e665c7de0fed99cdbb39478", - "sha256": "09y8phmvqdwp1k9w84rf6p609jrg0mhgx6akwda8rsvxrrbsh6j4" + "commit": "b298a34ae872a45c3e83d29d33888abde59c185b", + "sha256": "1pnynyy3scrd15q4ag769af5njrxx6rw48svbsfx3xrz1n0x9snz" }, "stable": { "version": [ 0, - 1 + 1, + 7 ], - "commit": "0a8b531b3a3c8afe7235c8c212e08bfe2021a629", - "sha256": "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz" + "deps": [ + "cl-lib" + ], + "commit": "784ebb0ee5496b5e7762bfd4c8101166542cb90d", + "sha256": "1k9y319ny01yqkg1xsh4rh2xs3dpx5jgvhs17p4c4dvqm0g53mkm" } }, { @@ -99165,14 +100211,14 @@ "stable": { "version": [ 0, - 13, + 14, 0 ], "deps": [ "cl-lib" ], - "commit": "5a29fe67d70de3749e30ebb37206395b4d1a51a8", - "sha256": "0fkkplycrw8f8r30hjjxl1wm7p2irq2ipzzc1g7cc52abaal796p" + "commit": "3bf9a3b1af37174a004798b7195826af0123fa6a", + "sha256": "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv" } }, { @@ -99201,14 +100247,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20191230, - 1405 + 20200122, + 1140 ], "deps": [ "yasnippet" ], - "commit": "e813c1479a9fb2773d95ddba39c4aa0e7a1c33c5", - "sha256": "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx" + "commit": "612be838d2e50c3601c349d7842702d95e17682a", + "sha256": "1m7iyg7zw1jwv4sq788sv84269nydn7c6xbhvhip8hkddyn03pcl" }, "stable": { "version": [ @@ -99224,31 +100270,31 @@ }, { "ename": "yatemplate", - "commit": "8ba3cdb74f121cbf36b6d9d5a434c363905ce526", + "commit": "67a9079253ebd9ab3b34e16eea0443812fb1a8ee", "sha256": "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q", "fetcher": "github", "repo": "mineo/yatemplate", "unstable": { "version": [ - 20180617, - 952 + 20200108, + 2102 ], "deps": [ "yasnippet" ], - "commit": "4f4fca9f04f7088c98aa195cf33635a35a6055cb", - "sha256": "04nd9fcp0ff2sjhwrq4nqjicc50m7498vq1qzw2cn5c5gaqmzff8" + "commit": "bfee45cfc179d6b7fbc3ff06c9f79b76dc7fbf58", + "sha256": "0h2fc9vjwb94n3nklq35s3dy9i4ihrqffp2556cmsaq7gzlipb81" }, "stable": { "version": [ - 3, + 4, 0 ], "deps": [ "yasnippet" ], - "commit": "c1de31d2b16d98af197a4392b6481346ab4e8d57", - "sha256": "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx" + "commit": "bfee45cfc179d6b7fbc3ff06c9f79b76dc7fbf58", + "sha256": "0h2fc9vjwb94n3nklq35s3dy9i4ihrqffp2556cmsaq7gzlipb81" } }, { @@ -99259,11 +100305,11 @@ "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { "version": [ - 20191226, - 351 + 20200208, + 931 ], - "commit": "89a13c59674f57dc057594117f2dc929500e82a0", - "sha256": "1si880lg2idb088c7hywyyrkrm3by3f957kjgd28r4zv8d2z0k0p" + "commit": "f4c2dca86202c2da5b4f0f6ec97c49dd1cb01e6c", + "sha256": "1dh4i2dj2cfg693bvwdi4frmi2892h4q25xdacdm63c7fmn3ap6l" } }, { @@ -99380,14 +100426,25 @@ "repo": "alphapapa/yequake", "unstable": { "version": [ - 20191121, - 1726 + 20200219, + 2323 + ], + "deps": [ + "dash" + ], + "commit": "d18166e597414350117d0b82a29e509fc53c636d", + "sha256": "074wijjphnpch7bl3455apfkdv35b0iw4l4lzwj0jcxyfszviq9f" + }, + "stable": { + "version": [ + 0, + 1 ], "deps": [ "dash" ], - "commit": "16dd29c68f4b59ee2da7b7c13d17a687c9c79e16", - "sha256": "1mgnnbss3id8hnas69gc91v2ni3fjy93wn1fjmmw5qq1gl56bgqc" + "commit": "d18166e597414350117d0b82a29e509fc53c636d", + "sha256": "074wijjphnpch7bl3455apfkdv35b0iw4l4lzwj0jcxyfszviq9f" } }, { @@ -99598,11 +100655,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20200105, - 1010 + 20200227, + 751 ], - "commit": "eaaba83ce08e8afff5f4c8dd6be0921ef34f9cef", - "sha256": "1a02cpm0j9x59f864nkhbv4acr111kmrwdv4myd33m0yf31x9ilr" + "commit": "f42847d617d4314d4b8e272f2b58007e479b964d", + "sha256": "1ydfkynfclx7djji1hjfvm1pf6ndfjy43y0piqk3v14n6mxz78al" }, "stable": { "version": [ @@ -99694,26 +100751,26 @@ "url": "https://gitlab.emacsos.com/sylecn/zero-el", "unstable": { "version": [ - 20191110, - 910 + 20200220, + 1619 ], "deps": [ "s" ], - "commit": "cd075a5ff4a979f0ab850d0fc747b4db429298e4", - "sha256": "0p1ir4zk13n0hmxrx02an014bwd2rpypdxndik4p90b7yl25vw56" + "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab", + "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl" }, "stable": { "version": [ 2, - 0, - 7 + 6, + 0 ], "deps": [ "s" ], - "commit": "cd075a5ff4a979f0ab850d0fc747b4db429298e4", - "sha256": "0p1ir4zk13n0hmxrx02an014bwd2rpypdxndik4p90b7yl25vw56" + "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab", + "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl" } }, { @@ -99753,14 +100810,14 @@ "repo": "efls/zetteldeft", "unstable": { "version": [ - 20200105, - 1705 + 20200214, + 2052 ], "deps": [ "deft" ], - "commit": "fbd9c3f619548aab0bff088c2682e5c70b4c2fcd", - "sha256": "1q6j3aqrrfmv1jdsg51vx1vby5rjb06cx76a8jlvlcc8fgmb4s45" + "commit": "301adcf54205a3780aed2988c58420da3feaeb43", + "sha256": "1mhxnmbmxj40774hvazp7n2yhwh9ikhmss4phk3y85gls30lqbyx" } }, { @@ -99999,8 +101056,8 @@ 20200106, 1204 ], - "commit": "4d4b6d9feca600f9cc0f0dec2e8988c3a07f9189", - "sha256": "0fxks1508ah0c3i2j454cjapc2k5fq4akvhjzz9lj04wwhjxilgg" + "commit": "a54324344eca49cfb11626446e1ebe239cba6557", + "sha256": "01ycz8496ywb2d980hxpvlnzxw5012mrj8kh8d97vdclhdbkx0y1" }, "stable": { "version": [ @@ -100116,26 +101173,28 @@ "repo": "egh/zotxt-emacs", "unstable": { "version": [ - 20180518, - 147 + 20200120, + 1950 ], "deps": [ - "request-deferred" + "deferred", + "request" ], - "commit": "1578e7fd82cb09a7a4349fd8e4d59f16d0ed7074", - "sha256": "0ynaz90an0ar4r5yjmjy2nvv00gg0qslshnqg15n6j7gkq1zg1rd" + "commit": "2e7ce60fa4b0311c646a509c140fd1c94c08fa79", + "sha256": "0ww0bg3bbrynnfhkkr7vdsrjc3341ngkzf83nn934zl0aphg87wb" }, "stable": { "version": [ + 5, 0, - 1, - 34 + 5 ], "deps": [ - "request-deferred" + "deferred", + "request" ], - "commit": "43c0c6d23b31126bac6b14bb85608180fd9c866f", - "sha256": "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp" + "commit": "98323098c37a444de49cfef44f1506e9386e8c5f", + "sha256": "1zr67h0w49rsi84mgf6jdili28h8782q6vjl8za0iq1hcx9zqxyf" } }, { @@ -100284,8 +101343,8 @@ "avy", "cl-lib" ], - "commit": "3499777d74add95625b4592b5d675a82abc8f888", - "sha256": "0548skxh3gyriwscjkz2zf8l3gn16vwz5ardwab03gw7a7arsrc9" + "commit": "09613d53e1e6e7c58102fb8812bbef2121d57026", + "sha256": "1rfi7gp5z2lm71qrf9akkn8iiiv297i1mqkvwyv7vlhx5vk21r4s" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index 3c96ba911651..4faf1e28b1cc 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ne"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "vigna"; repo = pname; rev = version; - sha256 = "0h6d08cnwrk96ss83i9bragwwanph6x54sm3ak1z81146dsqsiif"; + sha256 = "01aglnsfljlvx0wvyvpjfn4y88jf450a06qnj9a8lgdqv1hdkq1a"; }; postPatch = '' diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix index 5d5843890e14..a5117f3a6786 100644 --- a/pkgs/applications/editors/texmacs/darwin.nix +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { "${ghostscript}/bin:" + (if aspell == null then "" else "${aspell}/bin:") + (if tex == null then "" else "${tex}/bin:") + - (if netpbm == null then "" else "${netpbm}/bin:") + + (if netpbm == null then "" else "${stdenv.lib.getBin netpbm}/bin:") + (if imagemagick == null then "" else "${imagemagick}/bin:"); enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index bdcf786f61d2..ace4bbe9cdc7 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -62,6 +62,8 @@ in else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) ++ [ libsecret libXScrnSaver ]; + runtimeDependencies = [ systemd.lib fontconfig.lib ]; + nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; dontBuild = true; @@ -94,9 +96,5 @@ in grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded ''; - preFixup = lib.optionalString (system == "i686-linux" || system == "x86_64-linux") '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ systemd fontconfig ]}) - ''; - inherit meta; } diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix new file mode 100644 index 000000000000..67fa5da398bc --- /dev/null +++ b/pkgs/applications/graphics/drawing/default.nix @@ -0,0 +1,69 @@ +{ lib +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, python3 +, gtk3 +, appstream-glib +, desktop-file-utils +, gobject-introspection +, wrapGAppsHook +, glib +, gdk-pixbuf +, pango +, gettext +}: + +python3.pkgs.buildPythonApplication rec { + pname = "drawing"; + version = "0.4.11"; + + format = "other"; + + src = fetchFromGitHub { + owner = "maoschanz"; + repo = pname; + rev = version; + sha256 = "00c1h6jns11rmsg35gy40fb6ahvik80wpbm2133bjcqxfwwnlal6"; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gobject-introspection + meson + ninja + pkgconfig + wrapGAppsHook + glib + gettext + ]; + + buildInputs = [ + glib + gtk3 + gdk-pixbuf + pango + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pycairo + pygobject3 + ]; + + postPatch = '' + chmod +x build-aux/meson/postinstall.py # patchShebangs requires executable file + patchShebangs build-aux/meson/postinstall.py + ''; + + strictDeps = false; + + meta = with lib; { + description = "A free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop"; + homepage = "https://maoschanz.github.io/drawing/"; + maintainers = with maintainers; [ mothsart ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 386916083bb6..3e17a045ecc1 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ideogram"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "cassidyjames"; repo = pname; rev = version; - sha256 = "08nl11gj3234nrqyigqkq3yiyrqf2hha24x5jkl78ypj2xhcnhw8"; + sha256 = "1zkr7x022khn5g3sq2dkxzy1hiiz66vl81s3i5sb9qr88znh79p1"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix new file mode 100644 index 000000000000..6402868b9221 --- /dev/null +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -0,0 +1,49 @@ +{ mkDerivation, fetchFromGitHub, lib +, pkgconfig, cmake +, exiv2, qtbase, qtimageformats, qtsvg +}: + +mkDerivation rec { + pname = "qimgv"; + version = "0.8.9"; + + src = fetchFromGitHub { + owner = "easymodo"; + repo = pname; + rev = "v${version}"; + sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6"; + }; + + cmakeFlags = [ + # Video support appears to be broken; the following gets printed upon + # attempting to view an mp4, webm, or mkv (and probably all video formats): + # + # [VideoPlayerInitProxy] Error - could not load player library + # "qimgv_player_mpv" + # + # GIFs are unaffected. If this ever gets addressed, all that is necessary is + # to add `mpv` to the arguments list and to `buildInputs`, and to remove + # `cmakeFlags`. + "-DVIDEO_SUPPORT=OFF" + ]; + + nativeBuildInputs = [ + pkgconfig + cmake + ]; + + buildInputs = [ + exiv2 + qtbase + qtimageformats + qtsvg + ]; + + meta = with lib; { + description = "Qt5 image viewer with optional video support"; + homepage = "https://github.com/easymodo/qimgv"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ cole-h ]; + }; +} diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 51d03831e32b..b4338d8f3cda 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -16,10 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1n5s7v2z13550gkqz7w6dw62jdy60wdi8w1lfa23609b4yhg4w94"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "173jfjvdag97f6jvfg366hjk9v3cz301cbzpcahy51rbf1cip1w1"; + cargoSha256 = "077cs9bf7f3h5aschcv7pbbnpaq1rg79j7f6pnyrzkmn7gxzicg3"; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 277bb5fe1f25..75f5b8302e6f 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -7,7 +7,7 @@ , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada -, enableNumpy ? false, makeWrapper +, makeWrapper , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL }: @@ -117,11 +117,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = optionalString enableNumpy - '' - wrapProgram $out/bin/blender \ - --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages} - ''; + blenderExecutable = + placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); + # --python-expr is used to workaround https://developer.blender.org/T74304 + postInstall = '' + wrapProgram $blenderExecutable \ + --add-flags '--python-expr "import sys; sys.path.append(\"${python3Packages.numpy}/${python.sitePackages}\")"' + ''; # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be # found. See the explanation in libglvnd. diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix new file mode 100644 index 000000000000..7b17d4847718 --- /dev/null +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, meson, ninja, cairo, pango, pkg-config, wayland-protocols +, glib, wayland, libxkbcommon, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "dmenu-wayland-unstable"; + version = "2020-02-28"; + + src = fetchFromGitHub { + owner = "nyyManni"; + repo = "dmenu-wayland"; + rev = "68e08e8bcde10a10ac3290431f173c6c7fce4238"; + sha256 = "10b1v2brgpgb6wkzn62haj56zmkf3aq6fs3p9rp6bxiw8bs2nvlm"; + }; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; + buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ]; + + postInstall = '' + wrapProgram $out/bin/dmenu-wl_run \ + --prefix PATH : $out/bin + ''; + + meta = with stdenv.lib; { + license = licenses.mit; + platforms = platforms.linux; + description = "dmenu for wayland-compositors"; + homepage = "https://github.com/nyyManni/dmenu-wayland"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index b32004d0cc77..5af7650982ab 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.65.3"; + version = "0.66.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1m0xhzm1w6y778x3fplzr9dif7lcqlkfvk4b7plywrisv3ic8yqs"; + sha256 = "177vqxzmldpkpaj7giqlbl39091fa2ga2pnshdj6gc393rw52f0a"; }; modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na"; diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix index d63576d5cbd0..cabe306defc8 100644 --- a/pkgs/applications/misc/iterm2/default.nix +++ b/pkgs/applications/misc/iterm2/default.nix @@ -1,31 +1,48 @@ { stdenv, fetchFromGitHub }: + /* + This derivation is impure: it relies on an Xcode toolchain being installed + and available in the expected place. The values of sandboxProfile + are copied pretty directly from the MacVim derivation, which + is also impure. In order to build you at least need the `sandbox` + option set to `relaxed` or `false`. + */ + stdenv.mkDerivation rec { pname = "iterm2"; - version = "3.0.14"; + version = "3.3.9"; src = fetchFromGitHub { owner = "gnachman"; repo = "iTerm2"; rev = "v${version}"; - sha256 = "03m0ja11w9910z96yi8fzq3436y8xl14q031rdb2w3sapjd54qrj"; + sha256 = "06mq3gfjgy8jw2f3fzdsi3pbfkdijfzzlhlw6ixa5bfb4hbcgn5j"; }; patches = [ ./disable_updates.patch ]; postPatch = '' sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj ''; + preConfigure = "LD=$CC"; - makeFlagsArray = ["Deployment"]; + makeFlagsArray = ["Nix"]; installPhase = '' - mkdir -p "$out/Applications" - mv "build/Deployment/iTerm2.app" "$out/Applications/iTerm.app" + mkdir -p $out/Applications + mv Build/Products/Deployment/iTerm2.app $out/Applications/iTerm.app + ''; + + sandboxProfile = '' + (allow file-read* file-write* process-exec mach-lookup) + ; block homebrew dependencies + (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) ''; - meta = { + meta = with stdenv.lib; { description = "A replacement for Terminal and the successor to iTerm"; homepage = https://www.iterm2.com/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.darwin; + license = licenses.gpl2; + maintainers = with maintainers; [ tricktron ]; + platforms = platforms.darwin; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 45b788a9489a..ad824b238f8e 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.9.8.1"; + version = "0.9.9"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "10x5aplkjyi2w0793whjjzi777ffh3m4d0sp06qzkpx8jqd46him"; + sha256 = "01b2zr2x5hnadkvj687lwi3l6dwq3kdn5y9k4qf1bv0sa4vw6hn9"; name = "${pname}-${version}.tar.xz"; }; @@ -20,7 +20,7 @@ mkDerivation rec { meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; - homepage = https://github.com/psifidotos/Latte-Dock; + homepage = "https://github.com/psifidotos/Latte-Dock"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.benley maintainers.ysndr ]; diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 4847f06ebb82..90b42ba72b7f 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pastel"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1fh0l64bvpbgm1725qmyq3042pglr8wz3w1azjv6lml9ivrm4b0k"; + sha256 = "1xrg25w175m2iz7q9v7c05a0p0v5rr71vd4m3v6p0lqvij3sih4s"; }; - cargoSha256 = "0q7p66r6hwqaalwm9fd2bshadlynhjf3pzd6rnamr07mknyfzh5s"; + cargoSha256 = "17rw9wp9mfv38h0azdjwl60bxdknb5q84ia0a2r1vi91gz6275cs"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index e283a5381e76..d2ee27ed1d1f 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1y33n0dmrssv35l0apfq1mchyh92cfbzjarh0m8zb2nxwhvk7paw"; + cargoSha256 = "08zqhj3b0v4fxj8vi323zrxg4xvbp9gndm2khzs6daacglbwbvhk"; postInstall = '' installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index a8b86e71cb13..1a21bb43868f 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command-line time tracker"; - homepage = https://taskwarrior.org/docs/timewarrior; + homepage = "https://timewarrior.net"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 289c60b44029..659b7099943d 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.0"; + version = "1.1"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "147yarm26nl0zc0a2rs7qi4jd7bz48vvyaygsif1qsv8fx0xiqqf"; + sha256 = "0rq6c8fv0h7xj3jw1i01r39dz0f31k7jgf7hpgl6mlsyn0ddc80z"; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 3dee9844c0c9..f12f96871c00 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "1g76hzlyi8s8dayd36cs4bhnwgrrr731ybflw3xk5pgkgcbs14sd"; + sha256 = "0j184s82bnnhrpm7vdsqg7i3xfm2wqz8jmwqxjkfw87ifgvaha5d"; }; - modSha256 = "186m7s20r59dyh5lpby4sd4vw3rvnkfzslylwin0c3r6150yrx8h"; + modSha256 = "14qbjv8rnidfqxzqhli7jyj4573s0swwypdj11mpykcrzk9by8xk"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 31e699161968..255b399ef3da 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg_utils, yasm, minizip, libwebp , libusb1, pciutils, nss, re2, zlib -, python2Packages, perl, pkgconfig +, python2Packages, perl, pkgconfig, clang-tools , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf @@ -104,6 +104,8 @@ let result else result; + llvm-clang-tools = clang-tools.override { inherit llvmPackages; }; + base = rec { name = "${packageName}-unwrapped-${version}"; inherit (upstream-info) channel version; @@ -214,6 +216,8 @@ let ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar + '' + optionalString (stdenv.lib.versionAtLeast version "82") '' + ln -s ${llvm-clang-tools}/bin/clang-format buildtools/linux64/clang-format ''; gnFlags = mkGnFlags ({ diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 20ecbebd6d8e..ea840694bd31 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.2.1"; + version = "6.3.0"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "182kzk68l6rr878aaaqx31c6npb65x77qzhbc5rbqlrrdrb69zsg"; + sha256 = "0h159szljvphs2hvagxwv6nncx46q0mvr4ylhl2nimap9jvss91n"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 9295e90794d2..52da70bc8b86 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,20 +1,44 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +let + # Argo can package a static server in the CLI using the `staticfiles` go module. + # We build the CLI without the static server for simplicity, but the tool is still required for + # compilation to succeed. + # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117 + staticfiles = buildGoPackage rec { + name = "staticfiles"; + src = fetchFromGitHub { + owner = "bouk"; + repo = "staticfiles"; + rev = "827d7f6389cd410d0aa3f3d472a4838557bf53dd"; + sha256 = "0xarhmsqypl8036w96ssdzjv3k098p2d4mkmw5f6hkp1m3j67j61"; + }; + + goPackagePath = "bou.ke/staticfiles"; + }; +in +buildGoModule rec { pname = "argo"; - version = "2.4.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "15726n5rrbzszq5dpmrxbw9cn7ahihn28jqk274270140gz5aak1"; + sha256 = "0hlvsi706jwlf43mdwic6j7iriii4daxjr82qgi80ac4h4x0z3h2"; }; - goDeps = ./deps.nix; - goPackagePath = "github.com/argoproj/argo"; + modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45"; + subPackages = [ "cmd/argo" ]; + preBuild = '' + mkdir -p ui/dist/app + echo "Built without static files" > ui/dist/app/index.html + + ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app + ''; + meta = with lib; { description = "Container native workflow engine for Kubernetes"; homepage = https://github.com/argoproj/argo; diff --git a/pkgs/applications/networking/cluster/argo/deps.nix b/pkgs/applications/networking/cluster/argo/deps.nix deleted file mode 100644 index b275cd21cf48..000000000000 --- a/pkgs/applications/networking/cluster/argo/deps.nix +++ /dev/null @@ -1,903 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "ceeb313ad77b789a7fa5287b36a1d127b69b7093"; - sha256 = "0z5z3qag9g4fc7g6di7ijxzz0s3c7al1rx0sxxkbqbpwlgk4iwf2"; - }; - } - { - goPackagePath = "contrib.go.opencensus.io/exporter/ocagent"; - fetch = { - type = "git"; - url = "https://github.com/census-ecosystem/opencensus-go-exporter-ocagent"; - rev = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e"; - sha256 = "09n7w31668f6f55qw6qkw85mp6mhkmxs2x5hk4vr0p5qiqap576h"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "880eb0e2aca291c40538ddef66e5914fb1cc1d7f"; - sha256 = "0v6d6la29n3kkgn7r3b63pf96cpj5kf88rddkm2x2vqb9x2gmi0p"; - }; - } - { - goPackagePath = "github.com/Knetic/govaluate"; - fetch = { - type = "git"; - url = "https://github.com/Knetic/govaluate"; - rev = "9aa49832a739dcd78a5542ff189fb82c3e423116"; - sha256 = "12klijhq4fckzbhv0cwygbazj6lvhmdqksha9y6jgfmwzv51kwv5"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "44968752391892e1b0d0b821ee79e9a85fa13049"; - sha256 = "0c525frsxmalrn55hzzsxy17ng8avkd40ga0wxfw9haxsdjgqdqy"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad457846296e2031421a34e2568e304e35"; - sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; - }; - } - { - goPackagePath = "github.com/argoproj/pkg"; - fetch = { - type = "git"; - url = "https://github.com/argoproj/pkg"; - rev = "5616f48963eebf7cca912632230032b263bb62bc"; - sha256 = "1m50mpmgdv4hjdpl994xdkdbjfwv7dagn6mhix17cb5mf61ixs6z"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "d57c8d96f72d9475194ccf18d2ba70ac294b0cb3"; - sha256 = "09bv2ay7vnv15vj83ysqs98v0hcjg0nziwnp7qjdr0iasrhl4r21"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "37c8de3658fcb183f997c4e13e8337516ab753e6"; - sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "d89fa54de508111353cb0b06403c00569be780d8"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - goPackagePath = "github.com/colinmarc/hdfs"; - fetch = { - type = "git"; - url = "https://github.com/colinmarc/hdfs"; - rev = "9746310a4d311e21ce43b2a645c5a1e64c5e8efa"; - sha256 = "0r5dyadjck22i7fyci67r00ajbcqgx52z13rhriy0sw68j510r1r"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/docker/spdystream"; - fetch = { - type = "git"; - url = "https://github.com/docker/spdystream"; - rev = "6480d4af844c189cf5dd913db24ddd339d3a4f85"; - sha256 = "19glzj20vvy19igsl5bji9xrxi9m0ixhk4zs98dg15mh8ah36zak"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "6ac3b8eb89d325e5c750d77f344a6870464d03c3"; - sha256 = "0dgjld5240xhz45rj929ffm452n931qfw3fx8x99vhlnii9qrwz2"; - }; - } - { - goPackagePath = "github.com/emirpasic/gods"; - fetch = { - type = "git"; - url = "https://github.com/emirpasic/gods"; - rev = "1615341f118ae12f353cc8a983f35b584342c9b3"; - sha256 = "0i5qqq7ajvw3mikr95zl9rsnfsjanzwpqqs6kzzplsfgsifybar1"; - }; - } - { - goPackagePath = "github.com/evanphx/json-patch"; - fetch = { - type = "git"; - url = "https://github.com/evanphx/json-patch"; - rev = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f"; - sha256 = "144mk2v9q37l1qjf8498nff4hhz96mlkl7ls7ihixbmrji4lmch4"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "a105a905c5e6ad147f08504784917f3e178e0ba5"; - sha256 = "1s3cqf4svrbygvvpvi7hf122szsgihas52vqh0bba3avf4w03g9n"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "2903bfd4bfbaf188694f1edf731f2725a8fa344f"; - sha256 = "0v933yvcwyzzlpdxwb9204ki7lls2rwfd96ww2i901ndvz37kdf8"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "bdfd7e07daecc404d77868a88b2364d0aed0ee5a"; - sha256 = "1r2my46qc85fp1j4lbddmd6c1n0am9bq1wyqsnw7x8raiznqxp5l"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "c3d0f7896d589f3babb99eea24bbc7de98108e72"; - sha256 = "1z34vqc5yz6rzvarrvlhkimxx33p74iaxb28l1mv716njvlsmjhg"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "72cd26f257d44c1114970e19afddcd812016007e"; - sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "0ca988a254f991240804bf9821f3450d87ccbb1b"; - sha256 = "0slfyrmbpdcppf0z3waar90bpszdhi2gv705ys1b0zx5x6ax8f1a"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "f140a6486e521aad38f5917de355cbf147cc0496"; - sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "ab0dd09aa10e2952b28e12ecd35681b20463ebab"; - sha256 = "1f4bs71hrqkwg8fdhsxh25s12xnkxly13cnmp6m4qj6vc6k6zr2n"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "c3e18be99d19e6b3e8f1559eea2c161a665c4b6b"; - sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/grpc-gateway"; - rev = "471f45a5a99a578de7a8638dc7ed29e245bde097"; - sha256 = "1jbr14p1dh6jpq3q6b4nq97ryh56h17ali0nckicpxhdrvxgi81c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; - sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d"; - sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "7c29201646fa3de8506f701213473dd407f19646"; - sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jbenet/go-context"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-context"; - rev = "d14ea06fba99483203c19d92cfcd13ebe73135f4"; - sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl"; - }; - } - { - goPackagePath = "github.com/jcmturner/gofork"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/gofork"; - rev = "dc7c13fece037a4a36e2b3c69db4991498d30692"; - sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "27518f6661eba504be5a7a9a9f6d9460d892ade3"; - sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz"; - }; - } - { - goPackagePath = "github.com/kevinburke/ssh_config"; - fetch = { - type = "git"; - url = "https://github.com/kevinburke/ssh_config"; - rev = "6cfae18c12b8934b1afba3ce8159476fdef666ba"; - sha256 = "05jvz5r58a057zxvic9dyr9v2wilha8l6366npwkqgxmnmk9sh5f"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "3427c32cb71afc948325f299f040e53c1dd78979"; - sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "b2ccc519800e761ac8000b95e5d57c80a897ff9e"; - sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/minio/minio-go"; - fetch = { - type = "git"; - url = "https://github.com/minio/minio-go"; - rev = "c6c2912aa5522e5f5a505e6cba30e95f0d8456fa"; - sha256 = "0f5av1da4xbcy34j6dfy7c90na4a1capmsyac9qswq4xzq2zky10"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-ps"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-ps"; - rev = "621e5597135b1d14a7d9c2bfc7bc312e7c58463c"; - sha256 = "0sjkz24kqz5nzgncnvdlzhlyba4jwmf6cxj8c4p8mb44679gkphh"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "31bed53e4047fd6c510e43a941f90cb31be0972a"; - sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "00ec24a6a2d86e7074629c8384715dbb05adccd8"; - sha256 = "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "1744e2970ca51c86172c8190fadad617561ed6e7"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "839c75faf7f98a33d445d181f3018b5c3409a45e"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "fe5e611709b0c57fa4a89136deaa8e1d4004d053"; - sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/src-d/gcfg"; - fetch = { - type = "git"; - url = "https://github.com/src-d/gcfg"; - rev = "1ac3a1ac202429a54835fe8408a92880156b489d"; - sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "221dbe5ed46703ee255b1da0dec05086f5035f62"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "github.com/tidwall/gjson"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/gjson"; - rev = "c5e72cdf74dff23857243dd662c465b810891c21"; - sha256 = "0cg23va26ga6d0gckp5i3ramc98cbz6ij9gn9dqqyc8igvcx9cb3"; - }; - } - { - goPackagePath = "github.com/tidwall/match"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/match"; - rev = "33827db735fff6510490d69a8622612558a557ed"; - sha256 = "1ip5nkjvmzzzsypyzdd9nsnzbhwssprlx8qs5llqh16fl7kcvi3n"; - }; - } - { - goPackagePath = "github.com/tidwall/pretty"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/pretty"; - rev = "1166b9ac2b65e46a43d8618d30d1554f4652d49b"; - sha256 = "1jwpj5903lh8hsj9apm2gwd70809zq0gjgmivkxaq4iq29wnv0n9"; - }; - } - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7"; - sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; - }; - } - { - goPackagePath = "github.com/valyala/fasttemplate"; - fetch = { - type = "git"; - url = "https://github.com/valyala/fasttemplate"; - rev = "8b5e4e491ab636663841c42ea3c5a9adebabaf36"; - sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; - }; - } - { - goPackagePath = "github.com/xanzy/ssh-agent"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/ssh-agent"; - rev = "6a3e2ff9e7c564f36873c2e36413f634534f1c44"; - sha256 = "1chjlnv5d6svpymxgsr62d992m2xi6jb5lybjc5zn1h3hv1m01av"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "aab39bd6a98b853ab66c8a564f5d6cfcad59ce8a"; - sha256 = "1x1ysvpyak1hcmfgvy0mk30g1ammbsmw19c9s0brz5h9wn7m4vva"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "9756ffdc24725223350eb3266ffb92590d28f278"; - sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ba9fcec4b297b415637633c5a6e8fa592e4a16c3"; - sha256 = "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; - sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c580c3556b8cee6403af37a4fc5f28c"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "9109b7679e13aa34a54834cfb4949cac4b96e576"; - sha256 = "169sg6fyjkykiylrgxr0pynv2zc3frkgssbsk5w2lqyl8mb319hl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef"; - sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "be0da057c5e3c2df569a2c25cd280149b7d7e7d0"; - sha256 = "19i9sjvbk79sgzyzjzrnmf575rnwj2bjsj4r1fmp7827dq97kqks"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "feb0267beb8644f5088a03be4d5ec3f8c7020152"; - sha256 = "1lzdzkd2i41v6amxs9jah1q44qbvf1yvm8906jpfjiq6c3ffhqss"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "5f2a59506353b8d5ba8cbbcd9f3c1f41f1eaf079"; - sha256 = "1gwcwh8w5b1l15pjm8pqs3bbymvjcak3wva37zi5z9ilzr8c5wnx"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "24fa4b261c55da65468f2abfdae2b024eef27dfb"; - sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "6eaf6f47437a6b4e2153a190160ef39a92c7eceb"; - sha256 = "1cn33r2gclmq2v1ndpf1n5bmhf2qs8mms7ii5cnl6f9ch4r2c4k3"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; - sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "d4cae42d398bc0095297fc3315669590d29166ea"; - sha256 = "1z7531wz62305hwg9y2f04d819am8x3ys96ssy6qndlzmw60yjsr"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/aescts.v1"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/aescts"; - rev = "f6abebb3171c4c1b1fea279cb7c7325020a26290"; - sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/dnsutils.v1"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/dnsutils"; - rev = "13eeb8d49ffb74d7a75784c35e4d900607a3943c"; - sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/gokrb5.v5"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/gokrb5"; - rev = "32ba44ca5b42f17a4a9f33ff4305e70665a1bc0f"; - sha256 = "0jynpkncifdd2ib2pc9qhh0r8q7ab7yw0ygzpzgisdzv8ars1diq"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/rpc.v0"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/rpc"; - rev = "4480c480c9cd343b54b0acb5b62261cbd33d7adf"; - sha256 = "0hivgq52gwxsqs5x1my2047k7nqh7wx3yi0llsj3lc3h2mjy4yhd"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-billy.v4"; - fetch = { - type = "git"; - url = "https://github.com/src-d/go-billy"; - rev = "780403cfc1bc95ff4d07e7b26db40a6186c5326e"; - sha256 = "0jcyi4ink2njgflp3f2mbl5b86p2w0rh945k5xplcl158i5wkrc6"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-git.v4"; - fetch = { - type = "git"; - url = "https://github.com/src-d/go-git"; - rev = "0d1a009cbb604db18be960db5f1525b99a55d727"; - sha256 = "0n4x7r69qrmpss51b3wd3vj4b9jmip4archz3fbqk6q1yyd1pxjb"; - }; - } - { - goPackagePath = "gopkg.in/warnings.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-warnings/warnings"; - rev = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b"; - sha256 = "1kzj50jn708cingn7a13c2wdlzs6qv89dr2h4zj8d09647vlnd81"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "e3a6b8045b0b303430f6d0c261fd9e35be50800e"; - sha256 = "1c1nrcy0j7aj93l2xgdw0asyvxa4h8pzz004drf7pvh9pvsg0vqq"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "8f6ac2502e5143406f4eaedc4ca4262854d877ce"; - sha256 = "0v8cb63nvry4b0ls1h185hb3llp6rk0b4n92f76jcjsv1b7sspbi"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "6d55c1b1f1ca8ad83d572bbc3ca55ba5526d9d71"; - sha256 = "1j8m0pqn9c6lwr7h5aq7zrpdd73bwbwnhy4mbc0654ylmc3lnq8q"; - }; - } - { - goPackagePath = "k8s.io/code-generator"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/code-generator"; - rev = "6c2a4329ac290d921e8616cad41635c87dbb1518"; - sha256 = "18kx2wcqb5cvivbl61q7vyic5rp0fica9n6xgrjfsxczjbihlq70"; - }; - } - { - goPackagePath = "k8s.io/gengo"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/gengo"; - rev = "a874a240740c2ae854082ec73d46c5efcedd2149"; - sha256 = "0z8gay4bj6l8cv7gzi55l2c3jx94caq28sk0x6p3s6wxqxmnqp92"; - }; - } - { - goPackagePath = "k8s.io/klog"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/klog"; - rev = "3ca30a56d8a775276f9cdae009ba326fdc05af7f"; - sha256 = "0a7kn145q4cbsd2cfpv7sz09prjrxl6aaqzdcgq7p7jxc23a7zps"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "5e22f3d471e6f24ca20becfdffdc6206c7cecac8"; - sha256 = "08drikf269fhlnrhc29v7rhxl1950d94rl5x8l11n0qf2v2ffwib"; - }; - } - { - goPackagePath = "k8s.io/utils"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/utils"; - rev = "3a4a5477acf81b48e20870a3b9dc743f63c66730"; - sha256 = "1f01ck7nvm9rmw1fkylbnr1cdd9byiagl9ni40j9p9gfy5v5nxk8"; - }; - } - { - goPackagePath = "sigs.k8s.io/yaml"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-sigs/yaml"; - rev = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480"; - sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; - }; - } - { - goPackagePath = "upper.io/db.v3"; - fetch = { - type = "git"; - url = "https://upper.io/db.v3"; - rev = "fad80cdab4f761cb26416675df120f5d8c3f0db7"; - sha256 = "1bddpi278bzp39470llrgnsnnfyqqmzym5hmd8dxmczmzhhkirfv"; - }; - } -] \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index dd5deff294a0..ef90c0cde321 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -13,10 +13,7 @@ buildRustPackage rec { sha256 = "18mpzvvww2g6y2d3m8wcfajzdshagihn59k03xvcknd5d8zxagl3"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0298x7wkr4j1l5flmv5vhl1ay8icvh4dlhsh4xi8fd3p8jl9jpqv"; + cargoSha256 = "1f9yn4pvp58laylngdrfdkwygisnzkhkm7pndf6l33k3aqxhz5mm"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 23c4f4bfa8b3..40a6bb11c7da 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { pname = "terraform-provider-libvirt"; - version = "0.5.1"; + version = "0.6.1"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "0shnj5byqj3qzyqniiy1dcygd8xw1h2bx9z6mgcydw8k64fkm4bw"; + sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz"; }; buildInputs = [ libvirt pkgconfig makeWrapper ]; diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 402017e129d6..d5dc287ecac7 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub, python, glibcLocales }: let - # errbot requires markdown<3, and is not compatible with it either. py = python.override { packageOverrides = self: super: { + # errbot requires markdown<3, and is not compatible with it either. markdown = super.markdown.overridePythonAttrs (oldAttrs: rec { version = "2.6.11"; src = super.fetchPypi { @@ -12,6 +12,28 @@ let sha256 = "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8"; }; }); + + # errbot requires slackclient 1.x, see https://github.com/errbotio/errbot/pull/1367 + # latest 1.x release would be 1.3.2, but it requires an older websocket_client than the one in nixpkgs + # so let's just vendor the known-working version until they've migrated to 2.x. + slackclient = super.slackclient.overridePythonAttrs (oldAttrs: rec { + version = "1.2.1"; + pname = "slackclient"; + src = fetchFromGitHub { + owner = "slackapi"; + repo = "python-slackclient"; + rev = version; + sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0"; + }; + + propagatedBuildInputs = with self; [ websocket_client requests six ]; + + checkInputs = with self; [ pytest codecov coverage mock pytestcov pytest-mock responses flake8 ]; + # test_server.py fails because it needs connection (I think); + checkPhase = '' + py.test --cov-report= --cov=slackclient tests --ignore=tests/test_server.py + ''; + }); }; }; @@ -48,6 +70,7 @@ py.pkgs.buildPythonApplication rec { homepage = http://errbot.io/; maintainers = with maintainers; [ fpletz globin ]; license = licenses.gpl3; - platforms = platforms.unix; + platforms = platforms.linux; + # flaky on darwin, "RuntimeError: can't start new thread" }; } diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index f567dabf5a66..27bf8e81b117 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0q0iqd8y9rph8pwild5i2kv00h217a166c88hxpmbrigq9w960lp"; + cargoSha256 = "0q7bira2adfmx0ghb1c5nqz200iajaxap9bq8j5wvvk9l2wywslp"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 4361679fc884..30665b240818 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.26"; + version = "3.1.30"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0bd8ccc9ae8e9fd9d5aa4f61a1a5d8b62ff30257fc0f5b2ec61b2f4b26275eee"; + sha256 = "453992c6bf8a7b0f83abeddd0e8f989dc10fd59e407e3803b886072cff2576a7"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 11e2cf5c7e45..3dc7c79b00b9 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.9", + "version": "1.5.10", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index bf0feda42780..f94d7ad165db 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.5.9"; + version = "1.5.10"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "13bskp8nj1h44y7x4dibnfa8sdnzl744x4xckcw5lxnlkccfr69m"; + sha256 = "0yr5f3i24qh9b8hjfalpqxwr0qhs7hax450g83vf06skap1l5i5j"; }; in mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 25e273bda51e..d47368a9cb25 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -2,8 +2,9 @@ , fetchFromGitHub # Dynamic libraries , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative -, qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg -, qttools, qtwayland, qtwebchannel, qtwebengine +, qtgraphicaleffects, qtimageformats, qtlocation, qtquickcontrols +, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel +, qtwebengine # Runtime , coreutils, libjpeg_turbo, pciutils, procps, utillinux , pulseaudioSupport ? true, libpulseaudio ? null @@ -14,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.5.359539.0224"; + version = "3.5.361976.0301"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1n6rcsl86150y2dzkcgy5rzdij0d6ib3nvg4dz4a4dkyhq5hbla2"; + sha256 = "12pqs4pk73d7y9b49vq6f4fryph27k45zm1rjrpijnbi6ln2w993"; }; }; @@ -39,9 +40,9 @@ in mkDerivation { nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ - dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo - qtbase qtdeclarative qtlocation qtquickcontrols qtquickcontrols2 qtscript - qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland + dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo qtbase + qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2 + qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland ]; runtimeDependencies = optional pulseaudioSupport libpulseaudio; diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 4fbbbfd140fb..abb296d64744 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -19,10 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1m57xsrc7lzkrm8k1wh3yx3in5bhd0qjzygxdwr8lvigpsiy5caa"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1vj6whnx8gd5r66zric9163ddlqc4al4azj0dvhv5sq0r33871kv"; + cargoSha256 = "1s93zxk85wa7zw8745ba1sgipal75w1y18nc9vca6sig4pzvvj41"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix new file mode 100644 index 000000000000..b1498d0a9ce7 --- /dev/null +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, meson, pkg-config, ninja +, pixman, libuv, libGL, libxkbcommon, wayland, neatvnc, libdrm, libX11 +}: + +stdenv.mkDerivation rec { + pname = "wayvnc"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "any1"; + repo = pname; + rev = "v${version}"; + sha256 = "17c30c33zzhhlqzc4a5dd1y74ch7c8gsm98wvcn4n1fv50fbmpbd"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ pixman libuv libGL libxkbcommon wayland neatvnc libdrm libX11 ]; + + meta = with stdenv.lib; { + description = "A VNC server for wlroots based Wayland compositors"; + longDescription = '' + This is a VNC server for wlroots based Wayland compositors. It attaches + to a running Wayland session, creates virtual input devices and exposes a + single display via the RFB protocol. The Wayland session may be a + headless one, so it is also possible to run wayvnc without a physical + display attached. + ''; + inherit (src.meta) homepage; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index d5a10f43c55a..1e1f686ab194 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "aesop"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1aa1kp1rndi2dj1d9sf8zhssn5dw183yx1fm2xccdy9zjf9wi4jk"; + sha256 = "1bqykr1mwanfm55w1v9ipqcqgzj8kbjvlm4d5b2swvhng77gnf3d"; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The simplest PDF viewer around"; - homepage = https://github.com/lainsce/aesop; + homepage = "https://github.com/lainsce/aesop"; license = licenses.gpl2Plus; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/radio/pyradio/default.nix b/pkgs/applications/radio/pyradio/default.nix new file mode 100644 index 000000000000..88ce23cd7096 --- /dev/null +++ b/pkgs/applications/radio/pyradio/default.nix @@ -0,0 +1,24 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "pyradio"; + version = "0.8.7.1"; + + src = fetchFromGitHub { + owner = "coderholic"; + repo = pname; + rev = version; + sha256 = "1f1dch5vrx2armrff19rh9gpqydspn3nvzc9p9j2jfi6gsxhppyb"; + }; + + checkPhase = '' + $out/bin/pyradio --help + ''; + + meta = with lib; { + homepage = "http://www.coderholic.com/pyradio/"; + description = "Curses based internet radio player"; + license = licenses.mit; + maintainers = with maintainers; [ contrun ]; + }; +} diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index bee43da6719d..e64c9d3493e9 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "truvari"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "spiralgenetics"; repo = "truvari"; rev = "v${version}"; - sha256 = "0wmjz8nzibvj0ixky1m0qi7iyd204prk7glbvig1cvaab33k19f1"; + sha256 = "1bph7v48s7pyfagz8a2fzl5fycjliqzn5lcbv3m2bp2ih1f1gd1v"; }; propagatedBuildInputs = with python3Packages; [ @@ -25,8 +25,9 @@ python3Packages.buildPythonApplication rec { prePatch = '' substituteInPlace ./setup.py \ - --replace '"progressbar2==3.41.0",' "" \ - --replace '"pysam==0.15.2",' "" + --replace '"progressbar2==3.41.0",' '"progressbar2==3.47.0",' \ + --replace '"pysam==0.15.2",' '"pysam==0.15.4",' \ + --replace '"pyfaidx==0.5.5.2",' '"pyfaidx==0.5.8",' ''; meta = with lib; { diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index b27af67c974f..2c155e4e848f 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.4.0"; + version = "20.6.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "12kygxq24in7hbp7shkx1baqig8rwmzvv0d3kc3ld9sj9hb0a2n1"; + sha256 = "1vd1hsj36wzghpn6xnppjmva35kdcin7h0xdj3xmi4w5l3qw7fl6"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index d37f8d17336e..a5abbe2d1de6 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "octopus"; - version = "9.1"; + version = "9.2"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "1l5fqgllk7rij16q7a3la7qq6isy8a5n37vk400qcscw1v32s90h"; + sha256 = "083z51sjv70asr04rv53wb9gf4396nblq1zl22qw7jdr28hji4is"; }; nativeBuildInputs = [ perl procps autoreconfHook ]; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index ea80e9fd5ca7..bd420519ce01 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "6.4.1"; + version = "6.5"; pname = "quantum-espresso"; src = fetchurl { url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; - sha256 = "027skhp2zzx0f4mh6azqjljdimchak5cdn13v4x7aj5q2zvfkmxh"; + sha256 = "00nnsq1vq579xsmkvwrgs6bdqdcbdlsmcp4yfynnvs40ca52m2r5"; }; passthru = { @@ -35,7 +35,7 @@ configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${g nanoscale. It is based on density-functional theory, plane waves, and pseudopotentials. ''; - homepage = https://www.quantum-espresso.org/; + homepage = "https://www.quantum-espresso.org/"; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index 4eb666ada7ce..f93fddba8cb5 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" "LEX=flex" - "RGBDEF=${netpbm}/share/netpbm/misc/rgb.txt" + "RGBDEF=${netpbm.out}/share/netpbm/misc/rgb.txt" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index d718dd01ed42..ae8b0ada8062 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1filkhyqcjglbavbkjra0nk3y7hw8993wyl7r87ikydb2bjishsc"; + sha256 = "0crcpzbz75mdyi1vi4mygw3mj4lx73vff58fkic1gfxlpwrwgi20"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automatic and interactive theorem prover"; - homepage = https://leanprover.github.io/; + homepage = "https://leanprover.github.io/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice gebner ]; diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index c0512b744884..ba0e787af721 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, gmp, jdk8, +{ stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8, # The JDK we use on Darwin currenly makes extensive use of rpaths which are # annoying and break the python library, so let's not bother for now includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }: @@ -20,9 +20,17 @@ let inherit rev sha256; }; + patches = [ + # Python 3.8 compatibility + (fetchpatch { + url = https://github.com/sambayless/monosat/commit/a5079711d0df0451f9840f3a41248e56dbb03967.patch; + sha256 = "1p2y0jw8hb9c90nbffhn86k1dxd6f6hk5v70dfmpzka3y6g1ksal"; + }) + ]; + core = stdenv.mkDerivation { name = "${pname}-${version}"; - inherit src; + inherit src patches; buildInputs = [ cmake zlib gmp jdk8 ]; cmakeFlags = [ @@ -48,20 +56,22 @@ let }; python = { buildPythonPackage, cython }: buildPythonPackage { - inherit pname version src; - - # The top-level "source" is what fetchFromGitHub gives us. The rest is inside the repo - sourceRoot = "source/src/monosat/api/python/"; + inherit pname version src patches; propagatedBuildInputs = [ core cython ]; # This tells setup.py to use cython, which should produce faster bindings MONOSAT_CYTHON = true; + # After patching src, move to where the actually relevant source is. This could just be made + # the sourceRoot if it weren't for the patch. + postPatch = '' + cd src/monosat/api/python + '' + # The relative paths here don't make sense for our Nix build # TODO: do we want to just reference the core monosat library rather than copying the # shared lib? The current setup.py copies the .dylib/.so... - postPatch = '' + '' substituteInPlace setup.py \ --replace 'library_dir = "../../../../"' 'library_dir = "${core}/lib/"' ''; diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/applications/system/glances/default.nix index 0a0864e52b6c..946cc1125863 100644 --- a/pkgs/development/python-modules/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,13 +1,12 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib -, psutil, setuptools, bottle, batinfo, pysnmp -, hddtemp, future +{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib +, future, psutil, setuptools # Optional dependencies: +, bottle, batinfo, pysnmp +, hddtemp , netifaces # IP module -# Tests: -, unittest2 }: -buildPythonPackage rec { +buildPythonApplication rec { pname = "glances"; version = "3.1.3"; disabled = isPyPy; @@ -44,13 +43,18 @@ buildPythonPackage rec { ]; doCheck = true; - checkInputs = [ unittest2 ]; preCheck = lib.optional stdenv.isDarwin '' export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks ''; - propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp future + propagatedBuildInputs = [ + batinfo + bottle + future netifaces + psutil + pysnmp + setuptools ] ++ lib.optional stdenv.isLinux hddtemp; preConfigure = '' @@ -58,10 +62,9 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://nicolargo.github.io/glances/; + homepage = "https://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; license = licenses.lgpl3; - maintainers = with maintainers; [ primeos koral ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ jonringer primeos koral ]; }; } diff --git a/pkgs/development/python-modules/glances/skip-failing-tests.patch b/pkgs/applications/system/glances/skip-failing-tests.patch index e3116af6a2c2..e3116af6a2c2 100644 --- a/pkgs/development/python-modules/glances/skip-failing-tests.patch +++ b/pkgs/applications/system/glances/skip-failing-tests.patch diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 594d2a3abae0..03c7bdc1b6ea 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "0.5.7"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "14j8210c1dndnhb8l2ifxcljzhajjhil86lvk9y7ndjkq09805q1"; + sha256 = "0wqc9c30iydwylw53idff1ny2v410jcbhn7hpiinc4x5m3dy7827"; }; - modSha256 = "1qwcl74sg5az9vaivnvn7f40p72ilmkms5rp52sp5imfrql81lxf"; + modSha256 = "191ds0dkllc0l2lbqnwlca26js90b2g9f70jsid0zhmz3z9f1zh9"; buildFlagsArray = [ "-ldflags=-X github.com/cli/cli/command.Version=${version}" diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 960d0826a847..e420fe405cf0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.13.1"; + version = "2.13.5"; src = fetchPypi { inherit pname version; - sha256 = "1qq94x4rqn8vl5h11bn5d4x5ybsbj769kgf4lnj56my7si7qy8qn"; + sha256 = "1ll5l1f3vcib9a8qsqm8bfzz4g4q1dnr389x7x26kl13n6a50wib"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix index 51ae994b43bb..d65e2cf6ebff 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-backup/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0h31j8clvk4gkw4mgva9p0ypf26zhf7f0y564fdmzyw6rsz9wzcj"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1vfyhfdy5ks9zs9sy61ck9459w86hn9v6jqcar7rib82bclzr1mx"; + cargoSha256 = "09nfvzvgpdl5glzjays4lm50iwvjzbz364y6agya1a94qqwkaj7f"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index e7e73d4c48a0..87c37f1c75f4 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.7.6", - "repo_hash": "092c6n2jg8himmcc23gh3gvmx0y272kwk00cj1s2k4b92dlzvm18", + "version": "12.8.1", + "repo_hash": "1h844a79scf3an5rv0wi332lrf7mv1zcv2mg6zllk82f7nf341gn", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.7.6-ee", + "rev": "v12.8.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.83.0", - "GITLAB_PAGES_VERSION": "1.12.0", + "GITALY_SERVER_VERSION": "12.8.1", + "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", - "GITLAB_WORKHORSE_VERSION": "8.20.0" + "GITLAB_WORKHORSE_VERSION": "8.21.0" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 81a8d9f69c89..1d7cf17161c9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.5', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' -gem 'activesupport', '~> 5.2.3' +gem 'activesupport', '6.0.2' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false @@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.5.0' +gem 'gitlab-labkit', '~> 0.9.1' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index c095ad39f516..e3f7865226a2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,24 +2,25 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) + actionpack (6.0.2) + actionview (= 6.0.2) + activesupport (= 6.0.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.3) - activesupport (= 5.2.3) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (6.0.2) + activesupport (= 6.0.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.2.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activesupport (6.0.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -27,7 +28,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) ast (2.4.0) binding_ninja (0.2.3) - builder (3.2.3) + builder (3.2.4) charlock_holmes (0.7.6) coderay (1.1.2) concord (0.1.5) @@ -36,11 +37,11 @@ GEM concurrent-ruby (1.1.5) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.5) + crass (1.0.6) diff-lcs (1.3) docile (1.3.2) equalizer (0.0.11) - erubi (1.8.0) + erubi (1.9.0) escape_utils (1.2.1) factory_bot (5.0.2) activesupport (>= 4.2.0) @@ -71,9 +72,9 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-labkit (0.5.2) - actionpack (~> 5) - activesupport (~> 5) + gitlab-labkit (0.9.1) + actionpack (>= 5.0.0, < 6.1.0) + activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) jaeger-client (~> 0.10) opentracing (~> 0.4) @@ -88,7 +89,7 @@ GEM google-protobuf (~> 3.8) googleapis-common-protos-types (~> 1.0) hashdiff (0.3.9) - i18n (1.6.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (0.10.0) @@ -110,7 +111,7 @@ GEM mime-types-data (3.2019.0331) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.0) msgpack (1.3.1) multipart-post (2.0.0) nokogiri (1.10.7) @@ -132,7 +133,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.3) - rack (2.0.7) + rack (2.1.2) rack-test (1.1.0) rack (>= 1.0, < 3) rails-dom-testing (2.0.3) @@ -146,8 +147,8 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (6.2.0) - redis (4.1.2) - rouge (3.11.0) + redis (4.1.3) + rouge (3.15.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -192,7 +193,7 @@ GEM thread_safe (0.3.6) thrift (0.11.0.0) timecop (0.9.1) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) unicode-display_width (1.6.0) unparser (0.4.5) @@ -208,19 +209,20 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff + zeitwerk (2.2.2) PLATFORMS ruby DEPENDENCIES - activesupport (~> 5.2.3) + activesupport (= 6.0.2) bundler (>= 1.17.3) factory_bot faraday (~> 0.12) github-linguist (~> 7.5) gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) - gitlab-labkit (~> 0.5.0) + gitlab-labkit (~> 0.9.1) gitlab-markup (~> 1.7.0) google-protobuf (~> 3.8.0) grpc (~> 1.24.0) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 831fdb398d6a..bac51cd278c2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchFromGitLab, buildGoPackage, ruby, bundlerEnv, pkgconfig, libgit2 }: +{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby, + bundlerEnv, pkgconfig, libgit2 }: let rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; + copyGemFiles = true; gemdir = ./.; gemset = let x = import (gemdir + "/gemset.nix"); @@ -16,15 +18,24 @@ let }; }; }; + libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec { + version = "0.27.8"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9"; + }; + }); in buildGoPackage rec { - version = "1.83.0"; + version = "12.8.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1vwa38mhnxyncrrvp45d8s6fg94xaq8c71d7qh9ip77db0ak45kh"; + sha256 = "0sjkh0j36dpakqmq7l5gd1ydmx1kxgij53bjvvn37r19liqdijnx"; }; # Fix a check which assumes that hook files are writeable by their @@ -38,7 +49,7 @@ in buildGoPackage rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2 ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ]; goDeps = ./deps.nix; preBuild = "rm -r go/src/gitlab.com/gitlab-org/labkit/vendor"; @@ -60,7 +71,7 @@ in buildGoPackage rec { homepage = https://gitlab.com/gitlab-org/gitaly; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux; - maintainers = with maintainers; [ roblabla globin fpletz ]; + maintainers = with maintainers; [ roblabla globin fpletz talyz ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index f710523103f6..83a2f0f5f748 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -1319,8 +1319,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + rev = "v1.1.4"; + sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; }; } { @@ -1670,8 +1670,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.5"; - sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 3b4e4e5faa6f..d91c84b1fa29 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; + sha256 = "0zg96vjjw1kbli6nk6cyk64zfh4lgpl7fqx38ncbgfacl4dq7y0b"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,21 +24,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; + sha256 = "1bfh9z3n98c76c6jdp6avh75wsckxyp74r59hmgnqdhfznbkppv4"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; + sha256 = "1brlp5pmawb2hqdybjb732zxxkamcmis6px3wyh09rjlc0gqnzzz"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -83,10 +83,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.4"; }; charlock_holmes = { source = { @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f"; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; diff-lcs = { source = { @@ -173,10 +173,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; + sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.0"; }; escape_utils = { source = { @@ -283,10 +283,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h"; + sha256 = "1s1cgnnzlnfglsh5r0iihgvyasa2zbqkyrrnbxshvnkddb10i94z"; type = "gem"; }; - version = "0.5.2"; + version = "0.9.1"; }; gitlab-markup = { groups = ["default"]; @@ -355,10 +355,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; + sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.2"; }; ice_nine = { source = { @@ -482,12 +482,14 @@ version = "2.4.0"; }; minitest = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; type = "gem"; }; - version = "5.11.3"; + version = "5.14.0"; }; msgpack = { groups = ["default"]; @@ -613,10 +615,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; + sha256 = "04qa0ry26hxfwkmvhi0fjlvbm8irzg66ahnpx2pp3bl6qbdc0i8w"; type = "gem"; }; - version = "2.0.7"; + version = "2.1.2"; }; rack-test = { dependencies = ["rack"]; @@ -683,20 +685,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3"; + sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb"; + sha256 = "1ipgdir89a6pp1zscl2fkb99pppa7c513pk4wvis157bn8p9hlrx"; type = "gem"; }; - version = "3.11.0"; + version = "3.15.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; @@ -881,12 +883,14 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.6"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -926,4 +930,14 @@ }; version = "3.4.2"; }; + zeitwerk = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + type = "gem"; + }; + version = "2.2.2"; + }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 38cb8767e785..7327f7e02a8f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, buildGoPackage, ruby }: buildGoPackage rec { - pname = "gitlab-shell-go"; + pname = "gitlab-shell"; version = "11.0.0"; src = fetchFromGitLab { owner = "gitlab-org"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 9506a9a86c30..937c3576fc33 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.20.0"; + version = "8.21.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0a64qrbyxvpqgf5ksczn3kisbhyx6fcw58g5nlag4jnjj6w5i0wr"; + sha256 = "04vhshm9lwnx77q9l7znxwkvvwm3gxgxw12y1xwahfilj352xr7q"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 04c9f9808a74..20c713e8c39d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '5.2.3' +gem 'rails', '6.0.2' gem 'bootsnap', '~> 1.4' @@ -26,14 +26,14 @@ gem 'marginalia', '~> 1.8.0' # Authentication libraries gem 'devise', '~> 4.6' -gem 'doorkeeper', '~> 4.3' -gem 'doorkeeper-openid_connect', '~> 1.5' +gem 'doorkeeper', '~> 5.0.2' +gem 'doorkeeper-openid_connect', '~> 1.6.3' gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '~> 1.3' +gem 'omniauth-github', '~> 1.4' gem 'omniauth-gitlab', '~> 1.0.2' gem 'omniauth-google-oauth2', '~> 0.6.0' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos @@ -67,7 +67,7 @@ gem 'u2f', '~> 0.2.1' gem 'validates_hostname', '~> 1.0.6' gem 'rubyzip', '~> 2.0.0', require: 'zip' # GitLab Pages letsencrypt support -gem 'acme-client', '~> 2.0.2' +gem 'acme-client', '~> 2.0.5' # Browser detection gem 'browser', '~> 2.5' @@ -84,10 +84,10 @@ gem 'net-ldap' # API gem 'grape', '~> 1.1.0' gem 'grape-entity', '~> 0.7.1' -gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' +gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' # GraphQL API -gem 'graphql', '~> 1.9.11' +gem 'graphql', '~> 1.9.12' # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771 # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: # https://gitlab.com/gitlab-org/gitlab/issues/31747 @@ -149,7 +149,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '0.0.10' -gem 'rouge', '~> 3.11.0' +gem 'rouge', '~> 3.15.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.5' @@ -301,11 +301,11 @@ gem 'sentry-raven', '~> 2.9' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.8.0' +gem 'gitlab-labkit', '0.9.1' # I18n gem 'ruby_parser', '~> 3.8', require: false -gem 'rails-i18n', '~> 5.1' +gem 'rails-i18n', '~> 6.0' gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development @@ -349,7 +349,7 @@ end group :development, :test do gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri - gem 'pry-rails', '~> 0.3.4' + gem 'pry-rails', '~> 0.3.9' gem 'awesome_print', require: false @@ -381,8 +381,6 @@ group :development, :test do gem 'knapsack', '~> 1.17' - gem 'stackprof', '~> 0.2.13', require: false - gem 'simple_po_parser', '~> 1.1.2', require: false gem 'timecop', '~> 0.8.0' @@ -427,6 +425,7 @@ gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' gem 'ruby-prof', '~> 1.0.0' +gem 'stackprof', '~> 0.2.15', require: false gem 'rbtrace', '~> 0.4', require: false gem 'memory_profiler', '~> 0.9', require: false gem 'benchmark-memory', '~> 0.1', require: false @@ -456,7 +455,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 1.81.0' +gem 'gitaly', '~> 1.86.0' gem 'grpc', '~> 1.24.0' @@ -486,3 +485,10 @@ gem 'liquid', '~> 4.0' # LRU cache gem 'lru_redux' + +gem 'erubi', '~> 1.9.0' + +# Locked as long as quoted-printable encoding issues are not resolved +# Monkey-patched in `config/initializers/mail_encoding_patch.rb` +# See https://gitlab.com/gitlab-org/gitlab/issues/197386 +gem 'mail', '= 2.7.1' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 0733d49c3de4..aa33bd4cd68a 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -4,52 +4,66 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - acme-client (2.0.2) + acme-client (2.0.5) faraday (~> 0.9, >= 0.9.1) - actioncable (5.2.3) - actionpack (= 5.2.3) + actioncable (6.0.2) + actionpack (= 6.0.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) + actionmailbox (6.0.2) + actionpack (= 6.0.2) + activejob (= 6.0.2) + activerecord (= 6.0.2) + activestorage (= 6.0.2) + activesupport (= 6.0.2) + mail (>= 2.7.1) + actionmailer (6.0.2) + actionpack (= 6.0.2) + actionview (= 6.0.2) + activejob (= 6.0.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) + actionpack (6.0.2) + actionview (= 6.0.2) + activesupport (= 6.0.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.3) - activesupport (= 5.2.3) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.2) + actionpack (= 6.0.2) + activerecord (= 6.0.2) + activestorage (= 6.0.2) + activesupport (= 6.0.2) + nokogiri (>= 1.8.5) + actionview (6.0.2) + activesupport (= 6.0.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.3) - activesupport (= 5.2.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.2) + activesupport (= 6.0.2) globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) - arel (>= 9.0) + activemodel (6.0.2) + activesupport (= 6.0.2) + activerecord (6.0.2) + activemodel (= 6.0.2) + activesupport (= 6.0.2) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) + activestorage (6.0.2) + actionpack (= 6.0.2) + activejob (= 6.0.2) + activerecord (= 6.0.2) marcel (~> 0.3.1) - activesupport (5.2.3) + activesupport (6.0.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2) acts-as-taggable-on (6.5.0) activerecord (>= 5.0, < 6.1) adamantium (0.2.0) @@ -62,7 +76,6 @@ GEM apollo_upload_server (2.0.0.beta.3) graphql (>= 1.8) rails (>= 4.2) - arel (9.0.0) asana (0.9.3) faraday (~> 0.9) faraday_middleware (~> 0.9) @@ -171,7 +184,7 @@ GEM unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.5) + crass (1.0.6) creole (0.5.0) css_parser (1.7.0) addressable @@ -198,13 +211,14 @@ GEM declarative-option (0.1.0) default_value_for (3.3.0) activerecord (>= 3.2.0, < 6.1) - derailed_benchmarks (1.3.5) + derailed_benchmarks (1.4.2) benchmark-ips (~> 2) get_process_mem (~> 0) heapy (~> 0) memory_profiler (~> 0) rack (>= 1) - rake (> 10, < 13) + rake (> 10, < 14) + ruby-statistics (>= 2.1) thor (~> 0.19) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) @@ -229,10 +243,10 @@ GEM docile (1.3.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.3.2) + doorkeeper (5.0.2) railties (>= 4.2) - doorkeeper-openid_connect (1.5.0) - doorkeeper (~> 4.3) + doorkeeper-openid_connect (1.6.3) + doorkeeper (>= 5.0, < 5.2) json-jwt (~> 1.6) ed25519 (1.2.4) elasticsearch (6.8.0) @@ -348,7 +362,8 @@ GEM gemoji (3.0.1) gemojione (3.3.0) json - get_process_mem (0.2.3) + get_process_mem (0.2.5) + ffi (~> 1.0) gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) @@ -360,12 +375,12 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (1.81.0) + gitaly (1.86.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-labkit (0.8.0) + gitlab-labkit (0.9.1) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) @@ -434,12 +449,13 @@ GEM activesupport grape (~> 1.0) rake (~> 12) - grape_logging (1.7.0) + grape_logging (1.8.3) grape + rack graphiql-rails (1.4.10) railties sprockets-rails - graphql (1.9.11) + graphql (1.9.12) graphql-docs (1.6.0) commonmarker (~> 0.16) escape_utils (~> 1.2) @@ -510,7 +526,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.7.1) + i18n (1.8.2) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -609,12 +625,12 @@ GEM memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - memory_profiler (0.9.13) + memory_profiler (0.9.14) method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) - mimemagic (0.3.2) + mimemagic (0.3.3) mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) @@ -672,7 +688,7 @@ GEM omniauth (~> 1.2) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.3.0) + omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-gitlab (1.0.3) @@ -739,7 +755,7 @@ GEM parslet (1.8.2) peek (1.1.0) railties (>= 4.0.0) - pg (1.1.4) + pg (1.2.2) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) @@ -762,7 +778,7 @@ GEM pry-byebug (3.5.1) byebug (~> 9.1) pry (~> 0.10) - pry-rails (0.3.6) + pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.3) pyu-ruby-sasl (0.0.3.3) @@ -787,18 +803,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.1) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) + rails (6.0.2) + actioncable (= 6.0.2) + actionmailbox (= 6.0.2) + actionmailer (= 6.0.2) + actionpack (= 6.0.2) + actiontext (= 6.0.2) + actionview (= 6.0.2) + activejob (= 6.0.2) + activemodel (= 6.0.2) + activerecord (= 6.0.2) + activestorage (= 6.0.2) + activesupport (= 6.0.2) bundler (>= 1.3.0) - railties (= 5.2.3) + railties (= 6.0.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -809,15 +827,15 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - rails-i18n (5.1.1) + rails-i18n (6.0.0) i18n (>= 0.7, < 2) - railties (>= 5.0, < 6) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) + railties (>= 6.0.0, < 7) + railties (6.0.2) + actionpack (= 6.0.2) + activesupport (= 6.0.2) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rainbow (3.0.0) raindrops (0.19.0) rake (12.3.3) @@ -871,7 +889,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.11.0) + rouge (3.15.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -937,6 +955,7 @@ GEM ruby-progressbar (1.10.1) ruby-saml (1.7.2) nokogiri (>= 1.5.10) + ruby-statistics (2.1.1) ruby_dep (1.5.0) ruby_parser (3.13.1) sexp_processor (~> 4.9) @@ -1018,7 +1037,7 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.3.13) sshkey (2.0.0) - stackprof (0.2.13) + stackprof (0.2.15) state_machines (0.5.0) state_machines-activemodel (0.7.1) activemodel (>= 4.1) @@ -1111,9 +1130,9 @@ GEM hashdiff webpack-rails (0.9.11) railties (>= 3.2.0) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) wikicloth (0.8.1) builder expression_parser @@ -1122,6 +1141,7 @@ GEM xml-simple (1.1.5) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.2.2) PLATFORMS ruby @@ -1129,7 +1149,7 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) - acme-client (~> 2.0.2) + acme-client (~> 2.0.5) activerecord-explain-analyze (~> 0.1) acts-as-taggable-on (~> 6.0) addressable (~> 2.7) @@ -1177,14 +1197,15 @@ DEPENDENCIES diff_match_patch (~> 0.1.0) diffy (~> 3.1.0) discordrb-webhooks-blackst0ne (~> 3.3) - doorkeeper (~> 4.3) - doorkeeper-openid_connect (~> 1.5) + doorkeeper (~> 5.0.2) + doorkeeper-openid_connect (~> 1.6.3) ed25519 (~> 1.2) elasticsearch-api (~> 6.8) elasticsearch-model (~> 6.1) elasticsearch-rails (~> 6.1) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) + erubi (~> 1.9.0) escape_utils (~> 1.1) factory_bot_rails (~> 5.1.0) faraday (~> 0.12) @@ -1209,10 +1230,10 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 1.81.0) + gitaly (~> 1.86.0) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-labkit (= 0.8.0) + gitlab-labkit (= 0.9.1) gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) gitlab-net-dns (~> 0.9.1) @@ -1231,7 +1252,7 @@ DEPENDENCIES grape-path-helpers (~> 1.2) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) - graphql (~> 1.9.11) + graphql (~> 1.9.12) graphql-docs (~> 1.6.0) grpc (~> 1.24.0) gssapi @@ -1262,6 +1283,7 @@ DEPENDENCIES lograge (~> 0.5) loofah (~> 2.2) lru_redux + mail (= 2.7.1) mail_room (~> 0.10.0) marginalia (~> 1.8.0) memory_profiler (~> 0.9) @@ -1282,7 +1304,7 @@ DEPENDENCIES omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) omniauth-facebook (~> 4.0.0) - omniauth-github (~> 1.3) + omniauth-github (~> 1.4) omniauth-gitlab (~> 1.0.2) omniauth-google-oauth2 (~> 0.6.0) omniauth-kerberos (~> 0.3.0) @@ -1302,16 +1324,16 @@ DEPENDENCIES premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.10.0) pry-byebug (~> 3.5.1) - pry-rails (~> 0.3.4) + pry-rails (~> 0.3.9) rack (~> 2.0.7) rack-attack (~> 6.2.0) - rack-cors (~> 1.0.0) + rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) rack-timeout - rails (= 5.2.3) + rails (= 6.0.2) rails-controller-testing - rails-i18n (~> 5.1) + rails-i18n (~> 6.0) rainbow (~> 3.0) raindrops (~> 0.18) rblineprof (~> 0.3.6) @@ -1325,7 +1347,7 @@ DEPENDENCIES request_store (~> 1.3) responders (~> 3.0) retriable (~> 3.1.2) - rouge (~> 3.11.0) + rouge (~> 3.15.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 4.0.0.beta3) @@ -1360,7 +1382,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) sshkey (~> 2.0) - stackprof (~> 0.2.13) + stackprof (~> 0.2.15) state_machines-activerecord (~> 0.6.0) sys-filesystem (~> 1.1.6) test-prof (~> 0.10.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index a1f2a95197c3..efba20ab0822 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -25,21 +25,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1552fkgaj6qfylwsckgmhck34shjqnfrzymj1ji1kq3r310qqrnp"; + sha256 = "1k9pddds2kfw0br2c153csly4248w9rppkvslx46gncadp9gdb4n"; type = "gem"; }; - version = "2.0.2"; + version = "2.0.5"; }; actioncable = { dependencies = ["actionpack" "nio4r" "websocket-driver"]; - groups = ["default" "development" "test"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dngxp5r9ww4xgryn458ngq2h3ylx7d6d258wcfqhibpyjr7qvpj"; + type = "gem"; + }; + version = "6.0.2"; + }; + actionmailbox = { + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; + sha256 = "11wpcjc806y82p1nn3ly9savcdqcf4b0qml5ri5bmd6r2g802s2z"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -47,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; + sha256 = "0ych434bbim8n65png7hg35xfgmpv0qxvkngpvrr3qgj7l1xgdi5"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -58,10 +69,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; + sha256 = "0zg96vjjw1kbli6nk6cyk64zfh4lgpl7fqx38ncbgfacl4dq7y0b"; + type = "gem"; + }; + version = "6.0.2"; + }; + actiontext = { + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1acw3yypd4w35ra87d0kzwwcwj3hps6j0g108rnxy7pscvzajw8q"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -69,10 +91,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; + sha256 = "1bfh9z3n98c76c6jdp6avh75wsckxyp74r59hmgnqdhfznbkppv4"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -80,32 +102,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; + sha256 = "0bhf4lxnrmz73zshl5rzvw65x3kd18yligf11lcg7ik9b2i9j6pi"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; activemodel = { dependencies = ["activesupport"]; - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; + sha256 = "09p7si419x0fb5cw8cbfmzplyk2bdrx0m5cy9pwja89rnhp8yhl0"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; activerecord = { - dependencies = ["activemodel" "activesupport" "arel"]; - groups = ["default" "development" "test"]; + dependencies = ["activemodel" "activesupport"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; + sha256 = "1w60vnkg88frbpsixfm9immh211pbqg9dwm0gqrr17kdjd00r5z4"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -119,26 +141,26 @@ version = "0.1.0"; }; activestorage = { - dependencies = ["actionpack" "activerecord" "marcel"]; - groups = ["default" "development" "test"]; + dependencies = ["actionpack" "activejob" "activerecord" "marcel"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; + sha256 = "0qsjhyrjcklqf7dqw6yjvmbfd8yhqyz0dy9apmpd0swiwxnn8kds"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; + sha256 = "1brlp5pmawb2hqdybjb732zxxkamcmis6px3wyh09rjlc0gqnzzz"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -204,16 +226,6 @@ }; version = "2.0.0.beta.3"; }; - arel = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; - type = "gem"; - }; - version = "9.0.0"; - }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; groups = ["default"]; @@ -814,10 +826,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f"; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; creole = { groups = ["default"]; @@ -938,15 +950,15 @@ version = "3.3.0"; }; derailed_benchmarks = { - dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"]; + dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "ruby-statistics" "thor"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c9djg1r2w461h97zmmdsdgnsrxqm4qfyp7gry9qxbav9skrplb8"; + sha256 = "1bsxrmrjhjvvxpl3sgq0c6yyzspazgmxcpdkfipqknd7p8r0hd53"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.2"; }; descendants_tracker = { dependencies = ["thread_safe"]; @@ -1059,10 +1071,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r03i830b2lvmr0xzlj6ivlvc1zr64hy4a4bsy3flv94da77rz"; + sha256 = "0488m6nwp31mxrhayj60gsb7jgyw1lzh73r2kldx00a9bw3634d4"; type = "gem"; }; - version = "4.3.2"; + version = "5.0.2"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; @@ -1070,10 +1082,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95"; + sha256 = "1qcl11dw9b0si45id7sqwv19g8am4i221sqkigimnvhc1cci2yfw"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.3"; }; ed25519 = { groups = ["ed25519"]; @@ -1597,14 +1609,15 @@ version = "3.3.0"; }; get_process_mem = { + dependencies = ["ffi"]; groups = ["default" "puma" "unicorn"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bvfjdign16r0zwm2rlfrq0sk1licvmlgbnlpnyckniv5r7i080g"; + sha256 = "1q7pivp9z9pdxc2ha32q7x9zgqy8m9jf87g6n5mvi5l6knxya8sh"; type = "gem"; }; - version = "0.2.3"; + version = "0.2.5"; }; gettext = { dependencies = ["locale" "text"]; @@ -1655,10 +1668,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "048s8p93srl3fvaj4l38qhrqzndzgiv32dvrr3s5k65pcxm0vb5i"; + sha256 = "14ihiw3xsr3r7pk4mbwarasakhq31vzg87bm8g4qaym9ihpf7y77"; type = "gem"; }; - version = "1.81.0"; + version = "1.86.0"; }; github-markup = { groups = ["default"]; @@ -1687,10 +1700,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q3qd8jriafyblivqd5fzb95x9mzm8hgizg5401m3m5i957957z9"; + sha256 = "1s1cgnnzlnfglsh5r0iihgvyasa2zbqkyrrnbxshvnkddb10i94z"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.1"; }; gitlab-license = { groups = ["default"]; @@ -1898,15 +1911,15 @@ version = "1.2.0"; }; grape_logging = { - dependencies = ["grape"]; + dependencies = ["grape" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza"; + sha256 = "0x6cmmj0wi1m689r8d4yhyhpl8dwj5skn8b29igm4xvw3swkg94x"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.3"; }; graphiql-rails = { dependencies = ["railties" "sprockets-rails"]; @@ -1924,10 +1937,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17gpvpv3zpmcbzgdx9skaaj5frxw12ja5hssk7xwzckna0v782vh"; + sha256 = "17p5c1432fxcqpj7yl70a1667n9774chmam6zswdm021vn8cfwmv"; type = "gem"; }; - version = "1.9.11"; + version = "1.9.12"; }; graphql-docs = { dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; @@ -2202,10 +2215,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ss256hnild52qg5kxisidf1fn0n6gm8hq65y9fnqnq0wq7daw9"; + sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.2"; }; i18n_data = { groups = ["default"]; @@ -2657,10 +2670,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xki7jrbzylsmk1brjibmhifb0x70skr55pdq4rvxcyrlnrrvyxz"; + sha256 = "04ivhv1bilwqm33jv28gar2vwzsichb5nipaq395d3axabv8qmfy"; type = "gem"; }; - version = "0.9.13"; + version = "0.9.14"; }; method_source = { groups = ["default" "development" "metrics" "test"]; @@ -2698,14 +2711,14 @@ version = "3.2019.0331"; }; mimemagic = { - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00ibc1mhvdfyfyl103xwb45621nwyqxf124cni5hyfhag0fn1c3q"; + sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw"; type = "gem"; }; - version = "0.3.2"; + version = "0.3.3"; }; mini_magick = { groups = ["default"]; @@ -3055,10 +3068,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yg7k4p95ybcsii17spqarl8rpfzkq0kb19ab6wl4lc922zgfbqc"; + sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; omniauth-gitlab = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -3329,14 +3342,14 @@ version = "1.1.0"; }; pg = { - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; + sha256 = "1r01bqqhnk272dsyhg3cqx6j0aiwbcdnrwp7vxzc969mb5dgnnrl"; type = "gem"; }; - version = "1.1.4"; + version = "1.2.2"; }; png_quantizator = { groups = ["development" "test"]; @@ -3448,10 +3461,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; + sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.9"; }; public_suffix = { groups = ["default" "development" "test"]; @@ -3581,15 +3594,15 @@ version = "0.5.1"; }; rails = { - dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; - groups = ["default" "development" "test"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; + sha256 = "02sxw1f3n2ydmhacakmgjjwv84vqplgr1888cv5dyflb11a3f8mm"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -3630,10 +3643,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rqij2ggqz5iq36lbibhnd7pl4qxrvv9kgw9s0c6594vzbbxmhs0"; + sha256 = "05mcgv748vppnm3fnml37wjy3dw61wj8vfw14ldaj1yx1bmkhb07"; type = "gem"; }; - version = "5.1.1"; + version = "6.0.0"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -3641,10 +3654,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; + sha256 = "0lpzw7bwvg42x6mwfv7d3bhcnyy8p7rcd8yy8cj5qq5mjznhawca"; type = "gem"; }; - version = "5.2.3"; + version = "6.0.2"; }; rainbow = { groups = ["default" "development" "test"]; @@ -3948,10 +3961,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb"; + sha256 = "1ipgdir89a6pp1zscl2fkb99pppa7c513pk4wvis157bn8p9hlrx"; type = "gem"; }; - version = "3.11.0"; + version = "3.15.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4202,6 +4215,16 @@ }; version = "1.7.2"; }; + ruby-statistics = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f5mpzb1way683klgggsj029a4kw7krj72i17ggmvlp83804s6a3"; + type = "gem"; + }; + version = "2.1.1"; + }; ruby_dep = { groups = ["default" "test"]; platforms = []; @@ -4584,14 +4607,14 @@ version = "2.0.0"; }; stackprof = { - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wck8lqmlndaic2c8z678ylxkkyqlip9ikms9x6lplk298rrdybl"; + sha256 = "1g2zzasjdr1qnwmpmn28ddv2z9jsnv4w5raiz26y9h1jh03sagqd"; type = "gem"; }; - version = "0.2.13"; + version = "0.2.15"; }; state_machines = { groups = ["default"]; @@ -5049,24 +5072,24 @@ }; websocket-driver = { dependencies = ["websocket-extensions"]; - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; + sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; websocket-extensions = { - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270"; + sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; @@ -5110,4 +5133,14 @@ }; version = "3.2.0"; }; + zeitwerk = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + type = "gem"; + }; + version = "2.2.2"; + }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 67b08d2c234f..0215a47756f9 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -106,11 +106,11 @@ }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz"; - sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d"; + 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"; }; } { @@ -594,11 +594,11 @@ }; } { - name = "_babel_standalone___standalone_7.5.5.tgz"; + name = "_babel_standalone___standalone_7.8.3.tgz"; path = fetchurl { - name = "_babel_standalone___standalone_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.5.5.tgz"; - sha1 = "9d3143f6078ff408db694a4254bd6f03c5c33962"; + name = "_babel_standalone___standalone_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.8.3.tgz"; + sha1 = "0674730a8c5fbb9352de5342bf0c0c040d658380"; }; } { @@ -618,11 +618,11 @@ }; } { - name = "_babel_types___types_7.6.1.tgz"; + name = "_babel_types___types_7.8.3.tgz"; path = fetchurl { - name = "_babel_types___types_7.6.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz"; - sha1 = "53abf3308add3ac2a2884d539151c57c4b3ac648"; + name = "_babel_types___types_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz"; + sha1 = "5a383dffa5416db1b73dedffd311ffd0788fb31c"; }; } { @@ -642,11 +642,19 @@ }; } { - name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz"; + name = "_gitlab_at.js___at.js_1.5.5.tgz"; path = fetchurl { - name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-2.0.0.tgz"; - sha1 = "e30dbf2b170a7a4ca003a321de9f4170a2512510"; + name = "_gitlab_at.js___at.js_1.5.5.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.5.tgz"; + sha1 = "5f6bfe6baaef360daa9b038fa78798d7a6a916b4"; + }; + } + { + name = "_gitlab_eslint_config___eslint_config_3.0.0.tgz"; + path = fetchurl { + name = "_gitlab_eslint_config___eslint_config_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-3.0.0.tgz"; + sha1 = "9a93662ffefb7792d5d0d96d876c316f2c393315"; }; } { @@ -658,27 +666,27 @@ }; } { - name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_1.2.0.tgz"; + name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_2.0.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-1.2.0.tgz"; - sha1 = "6dcd8bf6bdd7a31c1c4c2c4114762508af435836"; + name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-2.0.0.tgz"; + sha1 = "5a01912d9d5a7524539d678f09cac6fa57d6d838"; }; } { - name = "_gitlab_svgs___svgs_1.89.0.tgz"; + name = "_gitlab_svgs___svgs_1.96.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.89.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.89.0.tgz"; - sha1 = "5bdaff1b0af1cc07ed34e89c21c34c7c6a3e1caa"; + name = "_gitlab_svgs___svgs_1.96.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.96.0.tgz"; + sha1 = "1d32730389e94358dc245e8336912523446d1269"; }; } { - name = "_gitlab_ui___ui_8.17.0.tgz"; + name = "_gitlab_ui___ui_9.8.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_8.17.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-8.17.0.tgz"; - sha1 = "674baa9b5c05fa6ecb23b233c5b308ff82ba5660"; + name = "_gitlab_ui___ui_9.8.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-9.8.0.tgz"; + sha1 = "b1a0b5f1f6ac9fdb19b64d74f0f729e3ec182495"; }; } { @@ -794,11 +802,11 @@ }; } { - name = "_nuxt_opencollective___opencollective_0.2.2.tgz"; + name = "_nuxt_opencollective___opencollective_0.3.0.tgz"; path = fetchurl { - name = "_nuxt_opencollective___opencollective_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.2.2.tgz"; - sha1 = "17adc7d380457379cd14cbb64a435ea196cc4a6e"; + name = "_nuxt_opencollective___opencollective_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.0.tgz"; + sha1 = "11d8944dcf2d526e31660bb69570be03f8fb72b7"; }; } { @@ -850,11 +858,11 @@ }; } { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.18.tgz"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.30.tgz"; path = fetchurl { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.18.tgz"; - url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.18.tgz"; - sha1 = "814467cdbc94bbfee5768193acf89fdf404ca949"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.30.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.30.tgz"; + sha1 = "85f52eca0f8fd5efb1526a7ec6a09d261ab43bda"; }; } { @@ -1042,11 +1050,11 @@ }; } { - name = "_vue_component_compiler_utils___component_compiler_utils_3.0.0.tgz"; + name = "_vue_component_compiler_utils___component_compiler_utils_3.1.1.tgz"; path = fetchurl { - name = "_vue_component_compiler_utils___component_compiler_utils_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz"; - sha1 = "d16fa26b836c06df5baaeb45f3d80afc47e35634"; + name = "_vue_component_compiler_utils___component_compiler_utils_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz"; + sha1 = "d4ef8f80292674044ad6211e336a302e4d2a6575"; }; } { @@ -1274,11 +1282,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.0.1.tgz"; + name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz"; - sha1 = "32a064fd925429216a09b141102bfdd185fae40e"; + name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; + sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; }; } { @@ -1306,6 +1314,14 @@ }; } { + name = "acorn___acorn_7.1.0.tgz"; + path = fetchurl { + name = "acorn___acorn_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz"; + sha1 = "949d36f2c292535da602283586c2477c57eb2d6c"; + }; + } + { name = "after___after_0.8.2.tgz"; path = fetchurl { name = "after___after_0.8.2.tgz"; @@ -1314,6 +1330,14 @@ }; } { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; + sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; + }; + } + { name = "ajv_errors___ajv_errors_1.0.0.tgz"; path = fetchurl { name = "ajv_errors___ajv_errors_1.0.0.tgz"; @@ -1330,11 +1354,11 @@ }; } { - name = "ajv___ajv_6.10.2.tgz"; + name = "ajv___ajv_6.11.0.tgz"; path = fetchurl { - name = "ajv___ajv_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; - sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + name = "ajv___ajv_6.11.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; + sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; }; } { @@ -1370,6 +1394,14 @@ }; } { + name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz"; + sha1 = "a4ce2b33d6b214b7950d8595c212f12ac9cc569d"; + }; + } + { name = "ansi_html___ansi_html_0.0.7.tgz"; path = fetchurl { name = "ansi_html___ansi_html_0.0.7.tgz"; @@ -1634,6 +1666,14 @@ }; } { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; + sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + }; + } + { name = "arraybuffer.slice___arraybuffer.slice_0.0.7.tgz"; path = fetchurl { name = "arraybuffer.slice___arraybuffer.slice_0.0.7.tgz"; @@ -1746,14 +1786,6 @@ }; } { - name = "at.js___at.js_1.5.4.tgz"; - path = fetchurl { - name = "at.js___at.js_1.5.4.tgz"; - url = "https://registry.yarnpkg.com/at.js/-/at.js-1.5.4.tgz"; - sha1 = "8fc60cc80eadbe4874449b166a818e7ae1d784c1"; - }; - } - { name = "atob___atob_2.1.2.tgz"; path = fetchurl { name = "atob___atob_2.1.2.tgz"; @@ -1826,11 +1858,11 @@ }; } { - name = "babel_eslint___babel_eslint_10.0.1.tgz"; + name = "babel_eslint___babel_eslint_10.0.3.tgz"; path = fetchurl { - name = "babel_eslint___babel_eslint_10.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz"; - sha1 = "919681dc099614cd7d31d45c8908695092a1faed"; + name = "babel_eslint___babel_eslint_10.0.3.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz"; + sha1 = "81a2c669be0f205e19462fed2482d33e4687a88a"; }; } { @@ -1874,6 +1906,14 @@ }; } { + name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; + path = fetchurl { + name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz"; + sha1 = "4f6844358a1340baed182adbeffa8df9967bc196"; + }; + } + { name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz"; path = fetchurl { name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz"; @@ -2066,11 +2106,11 @@ }; } { - name = "bootstrap_vue___bootstrap_vue_2.0.0_rc.27.tgz"; + name = "bootstrap_vue___bootstrap_vue_2.1.0.tgz"; path = fetchurl { - name = "bootstrap_vue___bootstrap_vue_2.0.0_rc.27.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.27.tgz"; - sha1 = "884a46a71948d13c9729134cb564467f79a7b2b9"; + name = "bootstrap_vue___bootstrap_vue_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.1.0.tgz"; + sha1 = "41c0cd265a6cea14ffe29eeea71543ec396d1789"; }; } { @@ -2274,14 +2314,6 @@ }; } { - name = "cacache___cacache_11.3.3.tgz"; - path = fetchurl { - name = "cacache___cacache_11.3.3.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz"; - sha1 = "8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"; - }; - } - { name = "cacache___cacache_12.0.3.tgz"; path = fetchurl { name = "cacache___cacache_12.0.3.tgz"; @@ -2290,6 +2322,14 @@ }; } { + name = "cacache___cacache_13.0.1.tgz"; + path = fetchurl { + name = "cacache___cacache_13.0.1.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz"; + sha1 = "a8000c21697089082f85287a1aec6e382024a71c"; + }; + } + { name = "cache_base___cache_base_1.0.1.tgz"; path = fetchurl { name = "cache_base___cache_base_1.0.1.tgz"; @@ -2322,14 +2362,6 @@ }; } { - name = "caller_path___caller_path_0.1.0.tgz"; - path = fetchurl { - name = "caller_path___caller_path_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz"; - sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; - }; - } - { name = "caller_path___caller_path_2.0.0.tgz"; path = fetchurl { name = "caller_path___caller_path_2.0.0.tgz"; @@ -2346,14 +2378,6 @@ }; } { - name = "callsites___callsites_0.2.0.tgz"; - path = fetchurl { - name = "callsites___callsites_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz"; - sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; - }; - } - { name = "callsites___callsites_2.0.0.tgz"; path = fetchurl { name = "callsites___callsites_2.0.0.tgz"; @@ -2426,11 +2450,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30000985.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001025.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30000985.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000985.tgz"; - sha1 = "0eb40f6c8a8c219155cbe43c4975c0efb4a0f77f"; + name = "caniuse_lite___caniuse_lite_1.0.30001025.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001025.tgz"; + sha1 = "30336a8aca7f98618eb3cf38e35184e13d4e5fe6"; }; } { @@ -2522,11 +2546,11 @@ }; } { - name = "chardet___chardet_0.5.0.tgz"; + name = "chardet___chardet_0.7.0.tgz"; path = fetchurl { - name = "chardet___chardet_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/chardet/-/chardet-0.5.0.tgz"; - sha1 = "fe3ac73c00c3d865ffcc02a0682e2c20b6a06029"; + name = "chardet___chardet_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; + sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e"; }; } { @@ -2586,11 +2610,11 @@ }; } { - name = "chownr___chownr_1.1.1.tgz"; + name = "chownr___chownr_1.1.3.tgz"; path = fetchurl { - name = "chownr___chownr_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz"; - sha1 = "54726b8b8fff4df053c42187e801fb4412df1494"; + name = "chownr___chownr_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz"; + sha1 = "42d837d5239688d55f303003a508230fa6727142"; }; } { @@ -2626,14 +2650,6 @@ }; } { - name = "circular_json___circular_json_0.3.3.tgz"; - path = fetchurl { - name = "circular_json___circular_json_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz"; - sha1 = "815c99ea84f6809529d2f45791bdf82711352d66"; - }; - } - { name = "class_utils___class_utils_0.3.6.tgz"; path = fetchurl { name = "class_utils___class_utils_0.3.6.tgz"; @@ -2658,6 +2674,14 @@ }; } { + name = "clean_stack___clean_stack_2.2.0.tgz"; + path = fetchurl { + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + }; + } + { name = "cli_boxes___cli_boxes_1.0.0.tgz"; path = fetchurl { name = "cli_boxes___cli_boxes_1.0.0.tgz"; @@ -2666,19 +2690,19 @@ }; } { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; + name = "cli_cursor___cli_cursor_3.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_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; }; } { - name = "cli_width___cli_width_2.1.0.tgz"; + name = "cli_width___cli_width_2.2.0.tgz"; path = fetchurl { - name = "cli_width___cli_width_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz"; - sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a"; + name = "cli_width___cli_width_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; }; } { @@ -2890,11 +2914,11 @@ }; } { - name = "compression_webpack_plugin___compression_webpack_plugin_3.0.0.tgz"; + name = "compression_webpack_plugin___compression_webpack_plugin_3.0.1.tgz"; path = fetchurl { - name = "compression_webpack_plugin___compression_webpack_plugin_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.0.tgz"; - sha1 = "097d2e4d95c3a14cb5c8ed20899009ab5b9bbca0"; + name = "compression_webpack_plugin___compression_webpack_plugin_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.1.tgz"; + sha1 = "be7a343e6dfbccbd64a77c5fbe29627d140fc321"; }; } { @@ -2946,6 +2970,14 @@ }; } { + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; + path = fetchurl { + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz"; + sha1 = "72bc13b483c0276801681871d4898516f8f54fdd"; + }; + } + { name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; path = fetchurl { name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; @@ -2962,11 +2994,11 @@ }; } { - name = "consola___consola_2.9.0.tgz"; + name = "consola___consola_2.10.1.tgz"; path = fetchurl { - name = "consola___consola_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/consola/-/consola-2.9.0.tgz"; - sha1 = "57760e3a65a53ec27337f4add31505802d902278"; + name = "consola___consola_2.10.1.tgz"; + url = "https://registry.yarnpkg.com/consola/-/consola-2.10.1.tgz"; + sha1 = "4693edba714677c878d520e4c7e4f69306b4b927"; }; } { @@ -3074,19 +3106,19 @@ }; } { - name = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz"; + name = "copy_to_clipboard___copy_to_clipboard_3.2.0.tgz"; path = fetchurl { - name = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz"; - url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz"; - sha1 = "f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9"; + name = "copy_to_clipboard___copy_to_clipboard_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz"; + sha1 = "d2724a3ccbfed89706fac8a894872c979ac74467"; }; } { - name = "copy_webpack_plugin___copy_webpack_plugin_5.0.4.tgz"; + name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz"; path = fetchurl { - name = "copy_webpack_plugin___copy_webpack_plugin_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz"; - sha1 = "c78126f604e24f194c6ec2f43a64e232b5d43655"; + name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; + sha1 = "5481a03dea1123d88a988c6ff8b78247214f0b88"; }; } { @@ -3850,14 +3882,6 @@ }; } { - name = "del___del_2.2.2.tgz"; - path = fetchurl { - name = "del___del_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz"; - sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8"; - }; - } - { name = "del___del_4.1.1.tgz"; path = fetchurl { name = "del___del_4.1.1.tgz"; @@ -4034,11 +4058,11 @@ }; } { - name = "doctrine___doctrine_2.1.0.tgz"; + name = "doctrine___doctrine_3.0.0.tgz"; path = fetchurl { - name = "doctrine___doctrine_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; }; } { @@ -4170,11 +4194,11 @@ }; } { - name = "echarts___echarts_4.2.1.tgz"; + name = "echarts___echarts_4.6.0.tgz"; path = fetchurl { - name = "echarts___echarts_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/echarts/-/echarts-4.2.1.tgz"; - sha1 = "9a8ea3b03354f86f824d97625c334cf16965ef03"; + name = "echarts___echarts_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/echarts/-/echarts-4.6.0.tgz"; + sha1 = "b5a47a1046cec93ceeef954f9ee54751340558ec"; }; } { @@ -4346,11 +4370,11 @@ }; } { - name = "es_abstract___es_abstract_1.16.2.tgz"; + name = "es_abstract___es_abstract_1.17.4.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.16.2.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz"; - sha1 = "4e874331645e9925edef141e74fc4bd144669d34"; + name = "es_abstract___es_abstract_1.17.4.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz"; + sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184"; }; } { @@ -4402,27 +4426,27 @@ }; } { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz"; + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.0.0.tgz"; path = fetchurl { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz"; - sha1 = "b5a1b480b80dfad16433d6c4ad84e6605052c05c"; + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.0.0.tgz"; + sha1 = "8a7bcb9643d13c55df4dd7444f138bf4efa61e17"; }; } { - name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz"; + name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz"; path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz"; - sha1 = "41afc8d3b852e757f06274ed6c44ca16f939a57d"; + name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz"; + sha1 = "7b15e303bf9c956875c948f6b21500e48ded6a7f"; }; } { - name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.1.tgz"; + name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.2.tgz"; path = fetchurl { - name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.1.tgz"; - sha1 = "78c1934e3b5b77283326f036e089cc3b9fae6346"; + name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.2.tgz"; + sha1 = "8720fbe8b8498e95cb2bc6ef52b46b713aedaa59"; }; } { @@ -4434,19 +4458,27 @@ }; } { - name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.10.1.tgz"; + name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.12.1.tgz"; path = fetchurl { - name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.10.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.10.1.tgz"; - sha1 = "4cbceed2c0c43e488a74775c30861e58e00fb290"; + name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.12.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.1.tgz"; + sha1 = "771ae561e887ca4e53ee87605fbb36c5e290b0f5"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz"; - sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c"; + name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz"; + sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708"; + }; + } + { + name = "eslint_plugin_babel___eslint_plugin_babel_5.3.0.tgz"; + path = fetchurl { + name = "eslint_plugin_babel___eslint_plugin_babel_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.0.tgz"; + sha1 = "2e7f251ccc249326da760c1a4c948a91c32d0023"; }; } { @@ -4458,19 +4490,19 @@ }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz"; - sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz"; + sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3"; }; } { - name = "eslint_plugin_jasmine___eslint_plugin_jasmine_2.10.1.tgz"; + name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.0.tgz"; path = fetchurl { - name = "eslint_plugin_jasmine___eslint_plugin_jasmine_2.10.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.10.1.tgz"; - sha1 = "5733b709e751f4bc40e31e1c16989bd2cdfbec97"; + name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.1.0.tgz"; + sha1 = "4f6d41b1a8622348c97559cbcd29badffa74dbfa"; }; } { @@ -4482,43 +4514,35 @@ }; } { - name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz"; - path = fetchurl { - name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.0.tgz"; - sha1 = "fccdad84afa61baa4c0527dd6249cdcbfa0f74a8"; - }; - } - { - name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz"; + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.1.tgz"; path = fetchurl { - name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.1.1.tgz"; - sha1 = "1e08cb68b5b2cd8839f8d5864c796f56d82746db"; + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.1.tgz"; + sha1 = "1c364cb863a38cc1570c8020155b6004cca62178"; }; } { - name = "eslint_plugin_vue___eslint_plugin_vue_5.0.0.tgz"; + name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0.tgz"; - sha1 = "4a2cc1c0e71ea45e1bd9c1a60f925bfe68bb5710"; + name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz"; + sha1 = "845fd8b2260ad8f82564c1222fce44ad71d9418a"; }; } { - name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz"; + name = "eslint_plugin_vue___eslint_plugin_vue_6.1.2.tgz"; path = fetchurl { - name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz"; - sha1 = "35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"; + name = "eslint_plugin_vue___eslint_plugin_vue_6.1.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.1.2.tgz"; + sha1 = "4b05c28c83c0ec912669b64dbd998bb8bf692ef6"; }; } { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; + name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"; + sha1 = "79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"; }; } { @@ -4530,43 +4554,43 @@ }; } { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; + name = "eslint_scope___eslint_scope_5.0.0.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz"; - sha1 = "166a5180ef6ab7eb462f162fd0e6f2463d7309ab"; + name = "eslint_scope___eslint_scope_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz"; + sha1 = "e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"; }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; - sha1 = "3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; }; } { - name = "eslint___eslint_5.9.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; path = fetchurl { - name = "eslint___eslint_5.9.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-5.9.0.tgz"; - sha1 = "b234b6d15ef84b5849c6de2af43195a2d59d408e"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; }; } { - name = "espree___espree_4.1.0.tgz"; + name = "eslint___eslint_6.8.0.tgz"; path = fetchurl { - name = "espree___espree_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz"; - sha1 = "728d5451e0fd156c04384a7ad89ed51ff54eb25f"; + name = "eslint___eslint_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; + sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; }; } { - name = "espree___espree_5.0.1.tgz"; + name = "espree___espree_6.1.2.tgz"; path = fetchurl { - name = "espree___espree_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz"; - sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"; + name = "espree___espree_6.1.2.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; + sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; }; } { @@ -4778,11 +4802,11 @@ }; } { - name = "external_editor___external_editor_3.0.0.tgz"; + name = "external_editor___external_editor_3.1.0.tgz"; path = fetchurl { - name = "external_editor___external_editor_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.0.tgz"; - sha1 = "dc35c48c6f98a30ca27a20e9687d7f3c77704bb6"; + name = "external_editor___external_editor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; + sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; }; } { @@ -4818,11 +4842,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + 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"; }; } { @@ -4898,19 +4922,11 @@ }; } { - 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_entry_cache___file_entry_cache_2.0.0.tgz"; + name = "figures___figures_3.2.0.tgz"; path = fetchurl { - name = "file_entry_cache___file_entry_cache_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz"; - sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; + name = "figures___figures_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; + sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; }; } { @@ -5042,14 +5058,6 @@ }; } { - name = "flat_cache___flat_cache_1.2.2.tgz"; - path = fetchurl { - name = "flat_cache___flat_cache_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz"; - sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96"; - }; - } - { name = "flat_cache___flat_cache_2.0.1.tgz"; path = fetchurl { name = "flat_cache___flat_cache_2.0.1.tgz"; @@ -5170,6 +5178,14 @@ }; } { + name = "fs_minipass___fs_minipass_2.0.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz"; + sha1 = "a6415edab02fae4b9e9230bc87ee2e4472003cd1"; + }; + } + { name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; path = fetchurl { name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; @@ -5434,11 +5450,11 @@ }; } { - name = "globby___globby_5.0.0.tgz"; + name = "globals___globals_12.3.0.tgz"; path = fetchurl { - name = "globby___globby_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz"; - sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; + name = "globals___globals_12.3.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; + sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; }; } { @@ -5506,11 +5522,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.0.tgz"; + name = "graceful_fs___graceful_fs_4.2.3.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz"; - sha1 = "8d8fdc73977cb04104721cb53666c1ca64cd328b"; + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; }; } { @@ -5570,11 +5586,11 @@ }; } { - name = "handlebars___handlebars_4.1.2.tgz"; + name = "handlebars___handlebars_4.7.2.tgz"; path = fetchurl { - name = "handlebars___handlebars_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz"; - sha1 = "b6b37c1ced0306b221e094fc7aca3ec23b131b67"; + name = "handlebars___handlebars_4.7.2.tgz"; + url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.2.tgz"; + sha1 = "01127b3840156a0927058779482031afe0e730d7"; }; } { @@ -5970,6 +5986,14 @@ }; } { + 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 = "import_lazy___import_lazy_2.1.0.tgz"; path = fetchurl { name = "import_lazy___import_lazy_2.1.0.tgz"; @@ -6034,6 +6058,14 @@ }; } { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { name = "indexes_of___indexes_of_1.0.1.tgz"; path = fetchurl { name = "indexes_of___indexes_of_1.0.1.tgz"; @@ -6090,11 +6122,11 @@ }; } { - name = "inquirer___inquirer_6.2.0.tgz"; + name = "inquirer___inquirer_7.0.4.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz"; - sha1 = "51adcd776f661369dc1e894859c2560a224abdd8"; + name = "inquirer___inquirer_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz"; + sha1 = "99af5bde47153abca23f5c7fc30db247f39da703"; }; } { @@ -6250,11 +6282,11 @@ }; } { - name = "is_callable___is_callable_1.1.4.tgz"; + name = "is_callable___is_callable_1.1.5.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; - sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + name = "is_callable___is_callable_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; + sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; }; } { @@ -6458,14 +6490,6 @@ }; } { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; - path = fetchurl { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; - }; - } - { name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; path = fetchurl { name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; @@ -6474,14 +6498,6 @@ }; } { - name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz"; - path = fetchurl { - name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz"; - sha1 = "6477582b8214d602346094567003be8a9eac04dc"; - }; - } - { name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; path = fetchurl { name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; @@ -6538,11 +6554,11 @@ }; } { - name = "is_regex___is_regex_1.0.4.tgz"; + name = "is_regex___is_regex_1.0.5.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + name = "is_regex___is_regex_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; + sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; }; } { @@ -6562,14 +6578,6 @@ }; } { - name = "is_resolvable___is_resolvable_1.1.0.tgz"; - path = fetchurl { - name = "is_resolvable___is_resolvable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz"; - sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88"; - }; - } - { name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz"; path = fetchurl { name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz"; @@ -7106,11 +7114,11 @@ }; } { - name = "js_beautify___js_beautify_1.10.2.tgz"; + name = "js_beautify___js_beautify_1.10.3.tgz"; path = fetchurl { - name = "js_beautify___js_beautify_1.10.2.tgz"; - url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.2.tgz"; - sha1 = "88c9099cd6559402b124cfab18754936f8a7b178"; + name = "js_beautify___js_beautify_1.10.3.tgz"; + url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz"; + sha1 = "c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1"; }; } { @@ -8138,14 +8146,6 @@ }; } { - 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 = "mimic_fn___mimic_fn_2.1.0.tgz"; path = fetchurl { name = "mimic_fn___mimic_fn_2.1.0.tgz"; @@ -8218,6 +8218,30 @@ }; } { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; + path = fetchurl { + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz"; + sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; + }; + } + { name = "minipass___minipass_2.3.5.tgz"; path = fetchurl { name = "minipass___minipass_2.3.5.tgz"; @@ -8226,6 +8250,14 @@ }; } { + name = "minipass___minipass_3.1.1.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; + sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; + }; + } + { name = "minizlib___minizlib_1.2.1.tgz"; path = fetchurl { name = "minizlib___minizlib_1.2.1.tgz"; @@ -8338,11 +8370,11 @@ }; } { - name = "mute_stream___mute_stream_0.0.7.tgz"; + name = "mute_stream___mute_stream_0.0.8.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 = "mute_stream___mute_stream_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; + sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; }; } { @@ -8690,11 +8722,11 @@ }; } { - name = "object.entries___object.entries_1.0.4.tgz"; + name = "object.entries___object.entries_1.1.1.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz"; - sha1 = "1bf9a4dd2288f5b33f3a993d257661f05d161a5f"; + name = "object.entries___object.entries_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; + sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; }; } { @@ -8754,11 +8786,11 @@ }; } { - name = "onetime___onetime_2.0.1.tgz"; + name = "onetime___onetime_5.1.0.tgz"; path = fetchurl { - name = "onetime___onetime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + name = "onetime___onetime_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; + sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; }; } { @@ -8794,11 +8826,11 @@ }; } { - name = "optionator___optionator_0.8.2.tgz"; + name = "optionator___optionator_0.8.3.tgz"; path = fetchurl { - name = "optionator___optionator_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; }; } { @@ -8906,11 +8938,11 @@ }; } { - name = "p_limit___p_limit_2.2.0.tgz"; + name = "p_limit___p_limit_2.2.2.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz"; - sha1 = "417c9941e6027a9abcba5092dd2904e255b5fbc2"; + name = "p_limit___p_limit_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; + sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; }; } { @@ -8946,6 +8978,14 @@ }; } { + name = "p_map___p_map_3.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz"; + sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d"; + }; + } + { name = "p_reduce___p_reduce_1.0.0.tgz"; path = fetchurl { name = "p_reduce___p_reduce_1.0.0.tgz"; @@ -9010,6 +9050,14 @@ }; } { + 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_asn1___parse_asn1_5.1.0.tgz"; path = fetchurl { name = "parse_asn1___parse_asn1_5.1.0.tgz"; @@ -9330,14 +9378,6 @@ }; } { - name = "pluralize___pluralize_7.0.0.tgz"; - path = fetchurl { - name = "pluralize___pluralize_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz"; - sha1 = "298b89df8b93b0221dbf421ad2b1b1ea23fc6777"; - }; - } - { name = "pn___pn_1.1.0.tgz"; path = fetchurl { name = "pn___pn_1.1.0.tgz"; @@ -9362,19 +9402,19 @@ }; } { - name = "popper.js___popper.js_1.15.0.tgz"; + name = "popper.js___popper.js_1.16.0.tgz"; path = fetchurl { - name = "popper.js___popper.js_1.15.0.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz"; - sha1 = "5560b99bbad7647e9faa475c6b8056621f5a4ff2"; + name = "popper.js___popper.js_1.16.0.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.0.tgz"; + sha1 = "2e1816bcbbaa518ea6c2e15a466f4cb9c6e2fbb3"; }; } { - name = "portal_vue___portal_vue_2.1.7.tgz"; + name = "portal_vue___portal_vue_2.1.6.tgz"; path = fetchurl { - name = "portal_vue___portal_vue_2.1.7.tgz"; - url = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz"; - sha1 = "ea08069b25b640ca08a5b86f67c612f15f4e4ad4"; + name = "portal_vue___portal_vue_2.1.6.tgz"; + url = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.6.tgz"; + sha1 = "a7d4790b14a79af7fd159a60ec88c30cddc6c639"; }; } { @@ -9658,11 +9698,11 @@ }; } { - name = "progress___progress_2.0.0.tgz"; + name = "progress___progress_2.0.3.tgz"; path = fetchurl { - name = "progress___progress_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz"; - sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"; + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; }; } { @@ -10370,11 +10410,11 @@ }; } { - name = "require_uncached___require_uncached_1.0.3.tgz"; + name = "require_package_name___require_package_name_2.0.1.tgz"; path = fetchurl { - name = "require_uncached___require_uncached_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz"; - sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; + name = "require_package_name___require_package_name_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz"; + sha1 = "c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"; }; } { @@ -10426,14 +10466,6 @@ }; } { - name = "resolve_from___resolve_from_1.0.1.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz"; - sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; - }; - } - { name = "resolve_from___resolve_from_3.0.0.tgz"; path = fetchurl { name = "resolve_from___resolve_from_3.0.0.tgz"; @@ -10442,6 +10474,14 @@ }; } { + 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_from___resolve_from_5.0.0.tgz"; path = fetchurl { name = "resolve_from___resolve_from_5.0.0.tgz"; @@ -10466,19 +10506,19 @@ }; } { - name = "resolve___resolve_1.12.0.tgz"; + name = "resolve___resolve_1.15.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz"; - sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6"; + name = "resolve___resolve_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz"; + sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5"; }; } { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; + name = "restore_cursor___restore_cursor_3.1.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 = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; }; } { @@ -10506,6 +10546,14 @@ }; } { + 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 = "rimraf___rimraf_2.6.3.tgz"; path = fetchurl { name = "rimraf___rimraf_2.6.3.tgz"; @@ -10562,11 +10610,11 @@ }; } { - name = "rxjs___rxjs_6.2.1.tgz"; + name = "rxjs___rxjs_6.5.4.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz"; - sha1 = "246cebec189a6cbc143a3ef9f62d6f4c91813ca1"; + name = "rxjs___rxjs_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz"; + sha1 = "e0777fe0d184cec7872df147f303572d414e211c"; }; } { @@ -10650,11 +10698,11 @@ }; } { - name = "schema_utils___schema_utils_2.2.0.tgz"; + name = "schema_utils___schema_utils_2.6.1.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz"; - sha1 = "48a065ce219e0cacf4631473159037b2c1ae82da"; + name = "schema_utils___schema_utils_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz"; + sha1 = "eb78f0b945c7bcfa2082b3565e8db3548011dc4f"; }; } { @@ -10714,11 +10762,11 @@ }; } { - name = "semver___semver_5.7.0.tgz"; + name = "semver___semver_5.7.1.tgz"; path = fetchurl { - name = "semver___semver_5.7.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz"; - sha1 = "790a7cf6fea5459bac96110b29b60412dc8ff96b"; + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; }; } { @@ -10746,14 +10794,6 @@ }; } { - name = "serialize_javascript___serialize_javascript_1.7.0.tgz"; - path = fetchurl { - name = "serialize_javascript___serialize_javascript_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz"; - sha1 = "d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"; - }; - } - { name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; path = fetchurl { name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; @@ -10826,14 +10866,6 @@ }; } { - name = "sha1___sha1_1.1.1.tgz"; - path = fetchurl { - name = "sha1___sha1_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/sha1/-/sha1-1.1.1.tgz"; - sha1 = "addaa7a93168f393f19eb2b15091618e2700f848"; - }; - } - { name = "shallow_clone___shallow_clone_3.0.1.tgz"; path = fetchurl { name = "shallow_clone___shallow_clone_3.0.1.tgz"; @@ -11186,6 +11218,14 @@ }; } { + name = "ssri___ssri_7.1.0.tgz"; + path = fetchurl { + name = "ssri___ssri_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz"; + sha1 = "92c241bf6de82365b5c7fb4bd76e975522e1294d"; + }; + } + { name = "stack_utils___stack_utils_1.0.2.tgz"; path = fetchurl { name = "stack_utils___stack_utils_1.0.2.tgz"; @@ -11330,19 +11370,19 @@ }; } { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; - sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634"; + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; + sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"; }; } { - name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; + name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; - sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58"; + name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; + sha1 = "440314b15996c866ce8a0341894d45186200c5d9"; }; } { @@ -11442,6 +11482,14 @@ }; } { + name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; + sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7"; + }; + } + { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; path = fetchurl { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; @@ -12050,6 +12098,14 @@ }; } { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } + { name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { name = "type_is___type_is_1.6.18.tgz"; @@ -12370,11 +12426,11 @@ }; } { - name = "url_search_params_polyfill___url_search_params_polyfill_5.0.0.tgz"; + name = "url_search_params_polyfill___url_search_params_polyfill_5.1.0.tgz"; path = fetchurl { - name = "url_search_params_polyfill___url_search_params_polyfill_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-5.0.0.tgz"; - sha1 = "09b98337c89dcf6c6a6a0bfeb096f6ba83b7526b"; + name = "url_search_params_polyfill___url_search_params_polyfill_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-5.1.0.tgz"; + sha1 = "f0405dcc2e921bf7f5fdf8c4e616f1e8088ef31b"; }; } { @@ -12466,6 +12522,14 @@ }; } { + name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; + sha1 = "e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"; + }; + } + { name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz"; path = fetchurl { name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz"; @@ -12546,19 +12610,11 @@ }; } { - name = "vue_eslint_parser___vue_eslint_parser_4.0.3.tgz"; + name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-4.0.3.tgz"; - sha1 = "80cf162e484387b2640371ad21ba1f86e0c10a61"; - }; - } - { - name = "vue_eslint_parser___vue_eslint_parser_6.0.4.tgz"; - path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-6.0.4.tgz"; - sha1 = "56ff47e2c2644bff39951d5a284982c7ecd6f7fa"; + name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz"; + sha1 = "a4ed2669f87179dedd06afdd8736acbb3a3864d6"; }; } { @@ -12586,11 +12642,11 @@ }; } { - name = "vue_loader___vue_loader_15.7.1.tgz"; + name = "vue_loader___vue_loader_15.8.3.tgz"; path = fetchurl { - name = "vue_loader___vue_loader_15.7.1.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.1.tgz"; - sha1 = "6ccacd4122aa80f69baaac08ff295a62e3aefcfd"; + name = "vue_loader___vue_loader_15.8.3.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.8.3.tgz"; + sha1 = "857cb9e30eb5fc25e66db48dce7e4f768602a23c"; }; } { @@ -12858,19 +12914,19 @@ }; } { - name = "wordwrap___wordwrap_0.0.3.tgz"; + name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + 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 = "wordwrap___wordwrap_1.0.0.tgz"; + name = "wordwrap___wordwrap_0.0.3.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + name = "wordwrap___wordwrap_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; }; } { @@ -12930,14 +12986,6 @@ }; } { - name = "write___write_0.2.1.tgz"; - path = fetchurl { - name = "write___write_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz"; - sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; - }; - } - { name = "ws___ws_5.2.2.tgz"; path = fetchurl { name = "ws___ws_5.2.2.tgz"; @@ -13090,6 +13138,14 @@ }; } { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { name = "yargs_parser___yargs_parser_10.1.0.tgz"; path = fetchurl { name = "yargs_parser___yargs_parser_10.1.0.tgz"; @@ -13146,6 +13202,14 @@ }; } { + name = "yarn_check_webpack_plugin___yarn_check_webpack_plugin_1.2.0.tgz"; + path = fetchurl { + name = "yarn_check_webpack_plugin___yarn_check_webpack_plugin_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/yarn-check-webpack-plugin/-/yarn-check-webpack-plugin-1.2.0.tgz"; + sha1 = "0eb00cdcdb430f0494222a3eab1d2832737840cc"; + }; + } + { name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz"; path = fetchurl { name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz"; @@ -13178,11 +13242,11 @@ }; } { - name = "zrender___zrender_4.0.7.tgz"; + name = "zrender___zrender_4.2.0.tgz"; path = fetchurl { - name = "zrender___zrender_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/zrender/-/zrender-4.0.7.tgz"; - sha1 = "15ae960822f5efed410995d37e5107fe3de10e6d"; + name = "zrender___zrender_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/zrender/-/zrender-4.2.0.tgz"; + sha1 = "d001302e155f28de1f9fc7fcd5c254bad28471cf"; }; } ]; diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index 8ff384d84b7f..58549fed73a3 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "src"; - version = "1.27"; + version = "1.28"; src = fetchurl { url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz"; - sha256 = "0764kcyh54plzmvfyhh086wpszh67nv1nsxgk95n9bxxinr7sn3x"; + sha256 = "1fkr5z3mlj13djz9w1sb644wc7r1fywz52qq97byw1yyw0bqyi7f"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix new file mode 100644 index 000000000000..019d080f9739 --- /dev/null +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }: + +buildPythonApplication rec { + pname = "plex-mpv-shim"; + version = "1.7.12"; + + src = fetchFromGitHub { + owner = "iwalton3"; + repo = pname; + rev = "v${version}"; + sha256 = "0l13g4vkvcd1q4lkdkbgv4hgkx5pql6ym2fap35581z7rzy9jhkq"; + }; + + propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/iwalton3/plex-mpv-shim"; + description = "Allows casting of videos to MPV via the Plex mobile and web app."; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index d52a4a6ab9b9..ef98239f32f2 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols -, ffmpeg, x264, libpulseaudio +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc +, wayland-protocols, ffmpeg_4, x264, libpulseaudio, ocl-icd, opencl-headers }: stdenv.mkDerivation rec { pname = "wf-recorder"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "ammen99"; repo = pname; rev = "v${version}"; - sha256 = "1rl75r87ijja9mfyrwrsz8r4zvjnhm0103qmgyhq2phlrdpkks5d"; + sha256 = "1772hrd7j8b32y65x5c392kdijlcn13iqg9hrlagfar92102vsbf"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = [ wayland wayland-protocols ffmpeg x264 libpulseaudio ]; + nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; + buildInputs = [ + wayland-protocols ffmpeg_4 x264 libpulseaudio ocl-icd opencl-headers + ]; meta = with stdenv.lib; { description = "Utility program for screen recording of wlroots-based compositors"; - homepage = https://github.com/ammen99/wf-recorder; + inherit (src.meta) homepage; + changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ CrazedProgrammer ]; + maintainers = with maintainers; [ primeos CrazedProgrammer ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 6004898f08e5..8e0bd8e54ed2 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -4,26 +4,17 @@ , makeWrapper }: -let - - version = "1.26.1"; - rev = "2ec04e169b12a87c5286aa09ef44eac1cea2c7a1"; - -in buildGoPackage rec { +buildGoPackage rec { pname = "docker-slim"; - inherit version; + version = "1.27.0"; goPackagePath = "github.com/docker-slim/docker-slim"; src = fetchFromGitHub { owner = "docker-slim"; repo = "docker-slim"; - inherit rev; - # fetchzip yields a different hash on Darwin because `use-case-hack` - sha256 = - if stdenv.isDarwin - then "0j72rn6qap78qparrnslxm3yv83mzy1yc7ha0crb4frwkzmspyvf" - else "01bjb14z7yblm7qdqrx1j2pw5x5da7a6np4rkzay931gly739gbh"; + rev = version; + sha256 = "1pd9sz981qgr5lx6ikrhdp0n21nyrnpjpnyl8i4r2jx35zr8b5q8"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; @@ -32,20 +23,12 @@ in buildGoPackage rec { makeWrapper ]; - # docker-slim vendorized logrus files in different directories, which - # conflicts on case-sensitive filesystems - preBuild = stdenv.lib.optionalString stdenv.isLinux '' - mv go/src/${goPackagePath}/vendor/github.com/Sirupsen/logrus/* \ - go/src/${goPackagePath}/vendor/github.com/sirupsen/logrus/ - ''; - - buildFlagsArray = - let - ldflags = "-ldflags=-s -w " + - "-X ${goPackagePath}/pkg/version.appVersionTag=${version} " + - "-X ${goPackagePath}/pkg/version.appVersionRev=${rev}"; - in - [ ldflags ]; + buildFlagsArray = [ + ''-ldflags= + -s -w -X ${goPackagePath}/pkg/version.appVersionTag=${version} + -X ${goPackagePath}/pkg/version.appVersionRev=${src.rev} + '' + ]; # docker-slim tries to create its state dir next to the binary (inside the nix # store), so we set it to use the working directory at the time of invocation diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 2d99fb3bf573..3d0ae35f5608 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -76,7 +76,7 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "122qk6iv8hd7g2a84y9aqqhij4r0m47vpxzbqhhh6k5livc73qd6"; + sha256 = "1bn7nhv5pag8fdm8l8nvgg3fzvhpy2yv9yl2slrb16lckxzha3v6"; }; buildAttrs = { diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index a17712472b19..47c72bf92602 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -4,8 +4,13 @@ , lib }: +let + bazelPkg = bazel; +in + args@{ name +, bazel ? bazelPkg , bazelFlags ? [] , bazelBuildFlags ? [] , bazelFetchFlags ? [] @@ -117,6 +122,8 @@ in stdenv.mkDerivation (fBuildAttrs // { cp -r $bazelOut/external $out + echo '${bazel.name}' > $out/.nix-bazel-version + runHook postInstall ''; @@ -138,6 +145,14 @@ in stdenv.mkDerivation (fBuildAttrs // { preConfigure = '' mkdir -p "$bazelOut" + + test "${bazel.name}" = "$(<$deps/.nix-bazel-version)" || { + echo "fixed output derivation was built for a different bazel version" >&2 + echo " got: $(<$deps/.nix-bazel-version)" >&2 + echo "expected: ${bazel.name}" >&2 + exit 1 + } + cp -r $deps $bazelOut/external chmod -R +w $bazelOut find $bazelOut -type l | while read symlink; do diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix index 36d8ed3c6747..9ecde1939e8c 100644 --- a/pkgs/data/fonts/amiri/default.nix +++ b/pkgs/data/fonts/amiri/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "0.111"; + version = "0.112"; in fetchzip rec { name = "Amiri-${version}"; url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip"; - sha256 = "1w3a5na4mazspwy8j2hvpjha10sgd287kamm51p49jcr90cvwbdr"; + sha256 = "13j8kglgca296czxjz1xvrbz6yx05s2xassiliyszndbkrhn6bkl"; postFetch = '' unzip $downloadedFile diff --git a/pkgs/data/fonts/navilu/default.nix b/pkgs/data/fonts/navilu/default.nix new file mode 100644 index 000000000000..0433ad22de53 --- /dev/null +++ b/pkgs/data/fonts/navilu/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, fontforge }: + +stdenv.mkDerivation rec { + pname = "navilu-font"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "aravindavk"; + repo = "Navilu"; + rev = "v${version}"; + sha256 = "1vm6n04siaa0zf6jzp5s2gzgr2qxs3vdnmcmg4dcy07py2kd2fla"; + }; + + nativeBuildInputs = [ fontforge ]; + + dontConfigure = true; + + preBuild = "patchShebangs generate.pe"; + + installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Navilu.ttf"; + + meta = with stdenv.lib; src.meta // { + description = "A Kannada handwriting font"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 3b1e8931b897..9636d50a54f9 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchzip }: +{ lib, fetchzip }: -stdenv.mkDerivation rec { - pname = "recursive"; - version = "1.030"; +let + version = "1.042"; +in +fetchzip { + name = "recursive-${version}"; - src = fetchzip { - url = "https://github.com/arrowtype/recursive/releases/download/${version}/recursive-beta_1_030--statics.zip"; - sha256 = "1clds4ljiqdf0zc3b7nlna1w7kc23pc9gxdd5vwbgmz9xfvkam0f"; - stripRoot = false; - }; + url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-Beta_${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/{opentype,truetype,woff2} - find -name "*.otf" -exec cp "{}" $out/share/fonts/opentype \; - find -name "*.ttf" -exec cp "{}" $out/share/fonts/truetype \; - find -name "*.woff2" -exec cp "{}" $out/share/fonts/woff2 \; + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - meta = with stdenv.lib; { - homepage = https://github.com/arrowtype/recursive; + sha256 = "1zcrvnzwd39fim2jxa3by6jgdrx7fdp64iw2bd181iwzinv1yqsa"; + + meta = with lib; { + homepage = "https://recursive.design/"; description = "A variable font family for code & UI"; license = licenses.ofl; maintainers = [ maintainers.eadwu ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index a6751b0938ec..8055b19ad637 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200201"; + version = "20200301"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "06scfncid3mhc99lj7iq99la5ls7gsc9kzzccbvcbfnvpzlmwjfh"; + sha256 = "1hknprylmd5zciaz4nkysmbb03am41r9dgnzm3r9l8qg2548js9v"; }; nativeBuildInputs = [ gtk3 ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Papirus icon theme"; - homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme; + homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; license = licenses.lgpl3; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 6e00bc2d88d9..152b08a960da 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha"; - version = "2020-02-06"; + version = "2020-03-01"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "14kii4dn028yqbsd0pr195di067harh9z2h753856dlxvs8d6vkx"; + sha256 = "09nb6xsysfg477zcm9y49iaczxksxrd4zh3n8dp7rlzc2h2kicpn"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { installPhase = '' patchShebangs . mkdir -p $out/share/themes - name= ./Install -d $out/share/themes + name= ./install.sh -d $out/share/themes install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml + mkdir -p $out/share/doc/${pname} + cp -a src/extra/firefox $out/share/doc/${pname} ''; meta = with stdenv.lib; { diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index 286b2922953e..23afcf5ece22 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2020-02-20"; + version = "2020-02-26"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0f0fa13ql59j9zv24vnsai76i0qwawh3jxzj1p78yfvcfmg45jcn"; + sha256 = "1s14knj0ral5a62ymwbg5k5g94v8cq0acq0kyam8ay0rfi7wycdm"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -19,11 +19,14 @@ stdenv.mkDerivation rec { patchShebangs . mkdir -p $out/share/themes name= ./install.sh -d $out/share/themes + mkdir -p $out/share/doc/${pname} + cp -a src/firefox $out/share/doc/${pname} + rm $out/share/themes/*/{AUTHORS,COPYING} ''; meta = with stdenv.lib; { description = "Flat Design theme for GTK based desktop environments"; - homepage = https://vinceliuice.github.io/Qogir-theme; + homepage = "https://vinceliuice.github.io/Qogir-theme"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/snowblind/default.nix b/pkgs/data/themes/snowblind/default.nix new file mode 100644 index 000000000000..db7b34d78e76 --- /dev/null +++ b/pkgs/data/themes/snowblind/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitLab, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "snowblind"; + version = "2020-02-26"; + + src = fetchFromGitLab { + domain = "www.opencode.net"; + owner = "ju1464"; + repo = pname; + rev = "94c35410be5cccc142c9cd6be9dff973ce0761c4"; + sha256 = "1aqmpg1vyqwp6s6iikp5c5yfrvdkzq75jdr9mmv2ijcam1g0jhnv"; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + mkdir -p $out/share/themes + cp -a Snowblind* $out/share/themes + rm $out/share/themes/*/{COPYING,CREDITS} + ''; + + meta = with stdenv.lib; { + description = "Smooth blue theme based on Materia Design"; + homepage = "https://www.opencode.net/ju1464/Snowblind"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix new file mode 100644 index 000000000000..108ff9afca70 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -0,0 +1,81 @@ +{ stdenv +, rustPlatform +, gettext +, meson +, ninja +, fetchFromGitLab +, pkg-config +, gtk3 +, glib +, gdk-pixbuf +, desktop-file-utils +, appstream-glib +, wrapGAppsHook +, python3 +, gnome3 +, config +}: + +rustPlatform.buildRustPackage rec { + pname = "gnome-tour"; + version = "0.0.1"; + + # We don't use the uploaded tar.xz because it comes pre-vendored + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-tour"; + rev = version; + sha256 = "0lbkspnlziq3z177071w3jpghmdwflzra1krdwchzmkfmrhy50ch"; + }; + + cargoSha256 = "0k1wp9wswr57fv2d9bysxn97fchd4vz29n5r8gfyp0gcm8rclmij"; + + mesonFlags = [ + "-Ddistro_name=NixOS" + "-Ddistro_icon_name=nix-snowflake" + "-Ddistro_version=20.09" + ]; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + gdk-pixbuf + glib + gtk3 + ]; + + # Don't use buildRustPackage phases, only use it for rust deps setup + configurePhase = null; + buildPhase = null; + checkPhase = null; + installPhase = null; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + # passthru = { + # updateScript = gnome3.updateScript { + # packageName = pname; + # }; + # }; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; + description = "GNOME Greeter & Tour"; + maintainers = gnome3.maintainers; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 910007bc05b4..6ec7dee1722a 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "30"; + version = "32"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8"; + sha256 = "1qv9ll4iwkinwk5mf2jppj4fbk8rfncix6q4hhrwnqmhmsbiz6n2"; }; # This package has a Makefile, but it's used for building a zip for @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato ]; platforms = gnome3.gnome-shell.meta.platforms; - homepage = https://github.com/Ubuntu/gnome-shell-extension-appindicator; + homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience/default.nix index b36f3489b57c..b36f3489b57c 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix deleted file mode 100644 index 072d31b84fed..000000000000 --- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchFromGitHub, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-volume-mixer"; - version = "844ed80ad448855d8f6218847183a80474b523c7"; - - src = fetchFromGitHub { - owner = "aleho"; - repo = "gnome-shell-volume-mixer"; - rev = version; - sha256 = "1vcj2spbymhdi1nazvhldvcfgad23r3h7f0ihh4nianbxn7hjs9w"; - }; - - buildInputs = [ - glib - ]; - - buildPhase = '' - glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas - ''; - - installPhase = '' - cp -r ${uuid} $out - ''; - - uuid = "shell-volume-mixer@derhofbauer.at"; - - meta = with stdenv.lib; { - description = "GNOME Shell Extension allowing separate configuration of PulseAudio devices"; - license = licenses.gpl2; - maintainers = with maintainers; [ aneeshusa ]; - homepage = https://github.com/aleho/gnome-shell-volume-mixer; - }; -} diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 85bf57ff1c04..e1f19ca8d695 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, fetchurl, meson, ninja, gettext }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16rmsy02fyq6mj6xgc5mdyh146z3zmkn7iwsi44s962aqwbpn4i8"; + sha256 = "0b9yx68p9l867bqsl9z2g4wrs8p396ls673jgaliys5snmk8n8dn"; }; - nativeBuildInputs = [ gettext ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ + gettext + meson + ninja + ]; meta = with stdenv.lib; { description = "Background images and data for MATE"; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index d92f24d615e0..148b82fd84a0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "3.2.0"; + version = "3.3.0"; repoName = "code"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0sdh22dc38qikak9iyrw402ap6zxckg9vkfppvv526jg88cckibd"; + sha256 = "0v544zw99wjcy0bflaci9fssx4sibz4b05bxs3a7j8hrpl102r4w"; }; passthru = { diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 858e49900c5a..d83510c49f67 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "4.4.0"; + version = "4.4.1"; repoName = "files"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1l5ki203agy3wkhnxf89ziy4xfmn7m3q0qz1hyrzy7a7qaslq3bg"; + sha256 = "0s874qnqbx20vyp2z2rhz3z8py0dm21v26xc0h6hyc2gfz4s3jcg"; }; passthru = { diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 25c3f2201ef1..c1af68e8d5ba 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "5.4.1"; + version = "5.4.2"; repoName = "stylesheet"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0fnh08wqlhvigkxp69xkdha19ny9j0hg4ycwhhwvyr0d0z47kilw"; + sha256 = "0aqq0d21mqgrfiyhpfa8k51wxw2pia0qlsgp0sli79v7nwn3ykbq"; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 9d2669821de6..5a9a28382ca9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-nightlight"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0kw83ws91688xg96k9034dnz15szx2kva9smh1nb7xmdbpzn3qph"; + sha256 = "1ihg5iz69jgcbyzdkcc2fqmr5l34h2d1jjsx7y86ag1jvhljb82r"; }; passthru = { diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 7442ff478f59..9f49299c03a8 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -78,7 +78,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs.gnome3) libsoup; }; - xfdashbooard = callPackage ./applications/xfdashboard {}; + xfdashboard = callPackage ./applications/xfdashboard {}; # TODO: this repo is inactive for many years. Remove? xfce4-volumed = callPackage ./applications/xfce4-volumed { }; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 3e47e4136363..eefd8e35a272 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: let - version = "5.1.0"; + version = "5.2.0"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; - sha256 = "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw"; + sha256 = "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1"; }; setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 8d4a62776d0e..f5ed4b4b7f8b 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation ({ for f in $out/bin/* do wrapProgram $f \ - --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}/:$CHICKEN_REPOSITORY_PATH" \ - --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share/" \ + --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}:$CHICKEN_REPOSITORY_PATH" \ + --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share" \ --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_PATH" done diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index a35b1f058919..3c4ae74c1e66 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -19,12 +19,12 @@ rec { }; matchable = eggDerivation { - name = "matchable-1.0"; + name = "matchable-1.1"; src = fetchegg { name = "matchable"; - version = "1.0"; - sha256 = "01vy2ppq3sq0wirvsvl3dh0bwa5jqs1i6rdjdd7pnwj4nncxd1ga"; + version = "1.1"; + sha256 = "084hm5dvbvgnpb32ispkp3hjili8z02hamln860r99jx68jx6j2v"; }; buildInputs = [ diff --git a/pkgs/development/compilers/chicken/5/setup-hook.sh b/pkgs/development/compilers/chicken/5/setup-hook.sh index f5ebaaf638e3..55324c05508e 100644 --- a/pkgs/development/compilers/chicken/5/setup-hook.sh +++ b/pkgs/development/compilers/chicken/5/setup-hook.sh @@ -1,6 +1,6 @@ addChickenRepositoryPath() { - addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11/" - addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share/" + addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11" + addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share" } addEnvHooks "$targetOffset" addChickenRepositoryPath diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 3660e42e363b..e498b4b1494f 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -6,11 +6,11 @@ }: mkDerivation { pname = "elm-format"; - version = "0.8.2"; + version = "0.8.3"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0ly37fszrfviwqgrww57ikdcr7i8lcpczhqm8xqp5s7mrlpdxv7z"; - rev = "ab3627cce01e5556b3fe8c2b5e3d92b80bfc74af"; + sha256 = "0n6lrqj6mq044hdyraj3ss5cg74dn8k4z05xmwn2apjpm146iaw8"; + rev = "b97e3593d564a1e069c0a022da8cbd98ca2c5a4b"; }; postPatch = '' mkdir -p ./generated @@ -18,7 +18,7 @@ mkDerivation { module Build_elm_format where gitDescribe :: String - gitDescribe = "0.8.2" + gitDescribe = "0.8.3" EOHS ''; isLibrary = false; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 0af8a6cd42dd..9d2f828dfa6c 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0zfdsnrnxplvi4f92l7sqdp5yk5p738ra64m41izlcilkwj1j3vp"; + cargoSha256 = "1vhra9v4jsy9hyhjrmxjy6rnraxz13h1b7l51xvbai5wxsxm7z8m"; meta = with stdenv.lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt-sys-ustat.patch b/pkgs/development/compilers/llvm/5/compiler-rt-sys-ustat.patch new file mode 100644 index 000000000000..d9e9a10d8600 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/compiler-rt-sys-ustat.patch @@ -0,0 +1,58 @@ +From 521935db9de17ad08748fd050137ac83b7734835 Mon Sep 17 00:00:00 2001 +From: Craig Topper <craig.topper@intel.com> +Date: Thu, 24 May 2018 17:59:47 +0000 +Subject: [PATCH] sanitizer: Use pre-computed size of struct ustat for Linux + +<sys/ustat.h> has been removed from glibc 2.28 by: + +commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7 +Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> +Date: Sun Mar 18 11:28:59 2018 +0800 + +Deprecate ustat syscall interface +This patch uses pre-computed size of struct ustat for Linux to fix + +https://bugs.llvm.org/show_bug.cgi?id=37418 + +Patch by H.J. Lu. + +Differential Revision: https://reviews.llvm.org/D47281 + +git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333213 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + .../sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 94b8f3f627..936d818673 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include <sys/procfs.h> + #endif + #include <sys/user.h> +-#include <sys/ustat.h> + #include <linux/cyclades.h> + #include <linux/if_eql.h> + #include <linux/if_plip.h> +@@ -253,7 +252,19 @@ namespace __sanitizer { + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned struct_ustat_sz = sizeof(struct ustat); ++ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which ++ // has been removed from glibc 2.28. ++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++#define SIZEOF_STRUCT_USTAT 32 ++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) ++#define SIZEOF_STRUCT_USTAT 20 ++#else ++#error Unknown size of struct ustat ++#endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 0282591b6e20..4740180eb294 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; + ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix index 234b2c446318..955cc3bebe2a 100644 --- a/pkgs/development/compilers/ocaml/4.10.nix +++ b/pkgs/development/compilers/ocaml/4.10.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "10"; - patch_version = "0+rc2"; - sha256 = "1iv8x9xr4k2s1x1p4rj4fqdh2iwzhgi56lyshvh6gg224i14rkbz"; + patch_version = "0"; + sha256 = "1dzy7lbdapcmwn1wg8k87419khi54f8hb6n314bdv7v0gfqlswrh"; } diff --git a/pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch b/pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch new file mode 100644 index 000000000000..c5c9846300f1 --- /dev/null +++ b/pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch @@ -0,0 +1,34 @@ +For 5.7 the copyright header is different. + +From ad32de7f181acaffaba78d5c3d9e5aa6b84a741c Mon Sep 17 00:00:00 2001 +From: David Matthews <dm@prolingua.co.uk> +Date: Sun, 7 Apr 2019 13:41:33 +0100 +Subject: [PATCH] Remove FFI_SYSV from abi table for X86/64 Unix. It appears + that this has been removed in upstream versions of libffi and causes problems + when building using the system libffi. + +--- + libpolyml/polyffi.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libpolyml/polyffi.cpp b/libpolyml/polyffi.cpp +index 5424dd84..3dc9cc7c 100644 +--- a/libpolyml/polyffi.cpp ++++ b/libpolyml/polyffi.cpp +@@ -1,7 +1,7 @@ + /* + Title: New Foreign Function Interface + +- Copyright (c) 2015 David C.J. Matthews ++ Copyright (c) 2015, 2019 David C.J. Matthews + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public +@@ -109,7 +109,6 @@ static struct _abiTable { const char *abiName; ffi_abi abiCode; } abiTable[] = + #elif defined(X86_WIN64) + {"win64", FFI_WIN64}, + #elif defined(X86_ANY) +- {"sysv", FFI_SYSV}, + {"unix64", FFI_UNIX64}, + #endif + { "default", FFI_DEFAULT_ABI} diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index db1c7613f65b..5b2d127f377f 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace stdc++ c++ ''; + patches = [ ./5.7-new-libffi-FFI_SYSV.patch ]; + buildInputs = [ libffi gmp ]; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; @@ -33,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://www.polyml.org/; license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); - maintainers = with maintainers; [ maggesi yurrriq ]; + maintainers = with maintainers; [ maggesi ]; }; } diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 7be5fd993aef..dafcdc3d6868 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }: stdenv.mkDerivation rec { pname = "polyml"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace stdc++ c++ ''; + patches = [ + (fetchpatch { + name = "new-libffi-FFI_SYSV.patch"; + url = "https://github.com/polyml/polyml/commit/ad32de7f181acaffaba78d5c3d9e5aa6b84a741c.patch"; + sha256 = "007q3r2h9kfh3c1nv0dyhipmak44q468ab9bwnz4kk4a2dq76n8v"; + }) + ]; + buildInputs = [ libffi gmp ]; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; @@ -33,6 +41,6 @@ stdenv.mkDerivation rec { homepage = https://www.polyml.org/; license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); - maintainers = with maintainers; [ maggesi yurrriq ]; + maintainers = with maintainers; [ maggesi kovirobi ]; }; } diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 56aa005c4a92..0dd8817ab3f3 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -2,9 +2,14 @@ let params = { "8.10" = rec { - version = "1.1.0"; + version = "1.3.0"; rev = "v${version}"; - sha256 = "06jyw7n27ylg02jvlaa3hs13hg8qgx47yn4dxhg9as1xri9a2rvm"; + sha256 = "1bbadh4qmsm0c5qw41apf4k8va6d44rpw294mc6pg556nmma87ra"; + }; + "8.11" = rec { + version = "1.3.1"; + rev = "v${version}"; + sha256 = "06dg0i1jay9anhx68jfki5qs2g481n3s4q3m124qniyadlx80bh3"; }; }; param = params.${coq.coq-version}; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index fee6de7b35bf..4c0ca4673005 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -19,13 +19,15 @@ let "8.7" = versions.post_8_6; "8.8" = versions.post_8_6; "8.9" = versions.post_8_6; + "8.10" = versions.post_8_6; + "8.11" = versions.post_8_6; }; param = params.${coq.coq-version}; in stdenv.mkDerivation rec { inherit (param) version; - name = "coq-paco-${coq.coq-version}-${version}"; + name = "coq${coq.coq-version}-paco-${version}"; src = fetchFromGitHub { inherit (param) rev sha256; @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; }; } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 9ba25e09db93..17fb1ab8ae85 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -315,10 +315,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // { in self.mkDerivation genericBuilderArgs; - envFuncArgs = builtins.removeAttrs args [ "packages" ]; - in (combinedPackageFor packages).env.overrideAttrs (old: envFuncArgs // { - nativeBuildInputs = old.nativeBuildInputs ++ envFuncArgs.nativeBuildInputs or []; - buildInputs = old.buildInputs ++ envFuncArgs.buildInputs or []; + mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" ]; + in ((combinedPackageFor packages).envFunc { inherit withHoogle; }).overrideAttrs (old: mkDerivationArgs // { + nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or []; + buildInputs = old.buildInputs ++ mkDerivationArgs.buildInputs or []; }); ghc = ghc // { diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 0d3fe100329c..d243ae9bc580 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }: +{ stdenv, fetchFromGitHub, fetchpatch, libX11, libXt, withGraphics ? true }: stdenv.mkDerivation rec { pname = "icon-lang"; @@ -12,6 +12,18 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; + patches = [ + # Patch on git master, likely won't be necessary in future release + (fetchpatch { + url = "https://github.com/gtownsend/icon/commit/bfc4a6004d0d3984c8066289b8d8e563640c4ddd.patch"; + sha256 = "1pqapjghk10rb73a1mfflki2wipjy4kvnravhmrilkqzb9hd6v8m"; + excludes = [ + "doc/relnotes.htm" + "src/h/version.h" + ]; + }) + ]; + configurePhase = let _name = if stdenv.isDarwin then "macintosh" else "linux"; diff --git a/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/pkgs/development/interpreters/wasmtime/cargo-lock.patch deleted file mode 100644 index 3ce3f7659886..000000000000 --- a/pkgs/development/interpreters/wasmtime/cargo-lock.patch +++ /dev/null @@ -1,2282 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 00000000..818de492 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,2276 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "aho-corasick" -+version = "0.7.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "arrayref" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "arrayvec" -+version = "0.4.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "autocfg" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.40" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "backtrace-sys" -+version = "0.1.32" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "base64" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "base64" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "bincode" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "bindgen" -+version = "0.51.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cexpr 0.3.6 (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.28.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "which 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "blake2b_simd" -+version = "0.5.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "block-buffer" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+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.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "block-padding" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "byte-tools" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "byteorder" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "capstone" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "capstone-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "capstone-sys" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.49" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cexpr" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "chrono" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "clang-sys" -+version = "0.28.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "clap" -+version = "2.33.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cloudabi" -+version = "0.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cmake" -+version = "0.1.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "cpu-time" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cranelift-bforest" -+version = "0.50.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cranelift-codegen" -+version = "0.50.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-bforest 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen-meta 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen-shared 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cranelift-codegen-meta" -+version = "0.50.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cranelift-codegen-shared 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cranelift-codegen-shared" -+version = "0.50.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "cranelift-entity" -+version = "0.50.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cranelift-frontend" -+version = "0.50.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cranelift-native" -+version = "0.50.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cranelift-wasm" -+version = "0.50.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "crossbeam-deque" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "crossbeam-epoch" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "crossbeam-queue" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.6.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+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)", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "ctor" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cvt" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "digest" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "directories" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "dirs-sys" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "docopt" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "dynasm" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "dynasmrt" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "either" -+version = "1.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "env_logger" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "errno" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "errno-dragonfly" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "faerie" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "goblin 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "fake-simd" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "fallible-iterator" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "file-per-thread-logger" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "filetime" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "fuchsia-cprng" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "gcc" -+version = "0.3.55" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "generic-array" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "ghost" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "gimli" -+version = "0.19.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "goblin" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "heck" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "humantime" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "id-arena" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "indexmap" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "indoc" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "indoc-impl 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "indoc-impl" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "inventory" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "inventory-impl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "inventory-impl" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "itertools" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "jobserver" -+version = "0.1.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "leb128" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "libc" -+version = "0.2.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "libloading" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "lightbeam" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dynasm 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dynasmrt 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itertools 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)", -+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "mach" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "memchr" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "memmap" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "memoffset" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "more-asserts" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "multi_mut" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "nix" -+version = "0.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "nodrop" -+version = "0.1.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "nom" -+version = "4.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num-complex" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num-integer" -+version = "0.1.41" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num-iter" -+version = "0.1.39" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num-rational" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "opaque-debug" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "os_pipe" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "owning_ref" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "paste" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "paste-impl" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "peeking_take_while" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "plain" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "pretty_env_logger" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "proc-macro-hack" -+version = "0.5.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "pyo3" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "indoc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "inventory 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pyo3cls 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "pyo3-derive-backend" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "pyo3cls" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pyo3-derive-backend 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "quick-error" -+version = "1.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "quickcheck" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_os" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_pcg" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "raw-cpuid" -+version = "7.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rayon" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rayon-core" -+version = "1.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rdrand" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.56" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "redox_users" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "regex" -+version = "1.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "region" -+version = "2.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rust-argon2" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "rustc-hash" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "scopeguard" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "scroll" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "scroll_derive" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "serde" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "sha2" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+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)", -+] -+ -+[[package]] -+name = "shlex" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "smallvec" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "spin" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "stable_deref_trait" -+version = "1.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "string-interner" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "strsim" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "syn" -+version = "1.0.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "synstructure" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "target-lexicon" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "tempfile" -+version = "3.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "test-programs" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common 0.8.0", -+ "wasmtime 0.8.0", -+ "wasmtime-environ 0.8.0", -+ "wasmtime-jit 0.8.0", -+ "wasmtime-runtime 0.8.0", -+ "wasmtime-wasi 0.8.0", -+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "thread_local" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "time" -+version = "0.1.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "traitobject" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "trybuild" -+version = "1.0.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "typemap" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "typenum" -+version = "1.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unindent" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unsafe-any" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "vec_map" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "version_check" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "version_check" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "void" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "walrus" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "walrus-macro" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "wasi-common" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common-cbindgen 0.8.0", -+ "wig 0.8.0", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winx 0.8.0", -+] -+ -+[[package]] -+name = "wasi-common-cbindgen" -+version = "0.8.0" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasm-webidl-bindings" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasmparser" -+version = "0.39.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "wasmtime" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common 0.8.0", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.8.0", -+ "wasmtime-jit 0.8.0", -+ "wasmtime-runtime 0.8.0", -+ "wasmtime-wasi 0.8.0", -+ "wasmtime-wast 0.8.0", -+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasmtime-cli" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "test-programs 0.8.0", -+ "wasi-common 0.8.0", -+ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime 0.8.0", -+ "wasmtime-debug 0.8.0", -+ "wasmtime-environ 0.8.0", -+ "wasmtime-interface-types 0.8.0", -+ "wasmtime-jit 0.8.0", -+ "wasmtime-obj 0.8.0", -+ "wasmtime-runtime 0.8.0", -+ "wasmtime-wasi 0.8.0", -+ "wasmtime-wasi-c 0.8.0", -+ "wasmtime-wast 0.8.0", -+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasmtime-debug" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.8.0", -+] -+ -+[[package]] -+name = "wasmtime-environ" -+version = "0.8.0" -+dependencies = [ -+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lightbeam 0.8.0", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasmtime-interface-types" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime 0.8.0", -+ "wasmtime-jit 0.8.0", -+ "wasmtime-runtime 0.8.0", -+ "wasmtime-wasi 0.8.0", -+] -+ -+[[package]] -+name = "wasmtime-jit" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-debug 0.8.0", -+ "wasmtime-environ 0.8.0", -+ "wasmtime-runtime 0.8.0", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasmtime-obj" -+version = "0.8.0" -+dependencies = [ -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.8.0", -+] -+ -+[[package]] -+name = "wasmtime-py" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pyo3 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime 0.8.0", -+ "wasmtime-environ 0.8.0", -+ "wasmtime-interface-types 0.8.0", -+ "wasmtime-jit 0.8.0", -+ "wasmtime-runtime 0.8.0", -+ "wasmtime-wasi 0.8.0", -+] -+ -+[[package]] -+name = "wasmtime-runtime" -+version = "0.8.0" -+dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.8.0", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasmtime-rust" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime 0.8.0", -+ "wasmtime-interface-types 0.8.0", -+ "wasmtime-jit 0.8.0", -+ "wasmtime-rust-macro 0.8.0", -+ "wasmtime-wasi 0.8.0", -+] -+ -+[[package]] -+name = "wasmtime-rust-macro" -+version = "0.8.0" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wasmtime-wasi" -+version = "0.8.0" -+dependencies = [ -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common 0.8.0", -+ "wasmtime 0.8.0", -+ "wasmtime-environ 0.8.0", -+ "wasmtime-jit 0.8.0", -+ "wasmtime-runtime 0.8.0", -+] -+ -+[[package]] -+name = "wasmtime-wasi-c" -+version = "0.8.0" -+dependencies = [ -+ "bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.8.0", -+ "wasmtime-jit 0.8.0", -+ "wasmtime-runtime 0.8.0", -+] -+ -+[[package]] -+name = "wasmtime-wast" -+version = "0.8.0" -+dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.8.0", -+ "wasmtime-jit 0.8.0", -+ "wasmtime-runtime 0.8.0", -+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wast" -+version = "3.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wast" -+version = "5.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wat" -+version = "1.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "which" -+version = "3.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wig" -+version = "0.8.0" -+dependencies = [ -+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "witx 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+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)", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "wincolor" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "winx" -+version = "0.8.0" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cvt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "witx" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "zstd" -+version = "0.5.1+zstd.1.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "zstd-safe" -+version = "2.0.3+zstd.1.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "zstd-sys" -+version = "1.4.15+zstd.1.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[metadata] -+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" -+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -+"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -+"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 backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" -+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" -+"checksum bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf" -+"checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -+"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -+"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.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+"checksum capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "031ba51c39151a1d6336ec859646153187204b0147c7b3f6fe2de636f1b8dbb3" -+"checksum capstone-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fae25eddcb80e24f98c35952c37a91ff7f8d0f60dbbdafb9763e8d5cc566b8d7" -+"checksum cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)" = "e450b8da92aa6f274e7c6437692f9f2ce6d701fb73bacfcf87897b3f89a4c20e" -+"checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" -+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" -+"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" -+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62" -+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" -+"checksum cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" -+"checksum cranelift-bforest 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd05aac8cefcde54ce26178df8f36cb1f518ac691db650e7d2440c2b6b41c4dc" -+"checksum cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63d9b6ff8a94f98deabab21880d7fd54996e0e16be687b6f80a3b6bdd9c188d" -+"checksum cranelift-codegen-meta 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7cb3df51c2c07d719d02869bfac6cabd8d82ee308d5b29ca62e6528723cc33a4" -+"checksum cranelift-codegen-shared 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "758f9426b2e22bf83fc1a6b231a9d53cd4830751883c7f0e196ebb3c210467b3" -+"checksum cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff064733df8b98f453060264a8790393d1e807aca6942706b42f79a4f7aae9ed" -+"checksum cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1eaafb5fa623dcbe19a28084a8226d7a1b17184a949c1a1f29a46b479867998d" -+"checksum cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90033dbd7293f6fad4cf9dcd769cd621d60df22b1c5a11799e86359b7447a51d" -+"checksum cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54cb82a1071f88822763a583ec1a8688ffe5e2cda02c111d4483dd4376ed14d8" -+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" -+"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" -+"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" -+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" -+"checksum ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8ce37ad4184ab2ce004c33bf6379185d3b1c95801cab51026bd271bf68eedc" -+"checksum cvt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34ac344c7efccb80cd25bc61b2170aec26f2f693fd40e765a539a1243db48c71" -+"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -+"checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" -+"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" -+"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" -+"checksum dynasm 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "42a814e1edeb85dd2a3c6fc0d6bf76d02ca5695d438c70ecee3d90774f3259c5" -+"checksum dynasmrt 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8a393aaeb4441a48bcf47b5b6155971f82cc1eb77e22855403ccc0415ac8328d" -+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -+"checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" -+"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" -+"checksum faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f902f2af041f6c7177a2a04f805687cdc71e69c7cbef059a2755d8923f4cd7a8" -+"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -+"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -+"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -+"checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" -+"checksum file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9" -+"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" -+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+"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 getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" -+"checksum ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a36606a68532b5640dc86bb1f33c64b45c4682aad4c50f3937b317ea387f3d6" -+"checksum gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00" -+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+"checksum goblin 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3081214398d39e4bd7f2c1975f0488ed04614ffdd976c6fc7a0708278552c0da" -+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -+"checksum id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" -+"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" -+"checksum indoc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3f9553c1e16c114b8b77ebeb329e5f2876eed62a8d51178c8bc6bff0d65f98f8" -+"checksum indoc-impl 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b714fc08d0961716390977cdff1536234415ac37b509e34e5a983def8340fb75" -+"checksum inventory 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2bf98296081bd2cb540acc09ef9c97f22b7e487841520350293605db1b2c7a27" -+"checksum inventory-impl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8e30575afe28eea36a9a39136b70b2fb6b0dd0a212a5bd1f30a498395c0274" -+"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -+"checksum jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" -+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" -+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -+"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" -+"checksum more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" -+"checksum multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "816df386e5557ac1843a96f1ba8a7cbf4ab175d05ccc15c87a3cda27b4fbdece" -+"checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" -+"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -+"checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" -+"checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" -+"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -+"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" -+"checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" -+"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4" -+"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" -+"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -+"checksum os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22" -+"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" -+"checksum paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" -+"checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" -+"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -+"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" -+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+"checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" -+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" -+"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" -+"checksum pyo3 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1bfe257586436fbe1296d917f14a167d4253d0873bf43e2c9b9bdd58a3f9f35" -+"checksum pyo3-derive-backend 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4882d8237fd8c7373cc25cb802fe0dab9ff70830fd56f47ef6c7f3f287fcc057" -+"checksum pyo3cls 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fdf321cfab555f7411298733c86d21e5136f5ded13f5872fabf9de3337beecda" -+"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -+"checksum quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5ca504a2fdaa08d3517f442fbbba91ac24d1ec4c51ea68688a038765e3b2662" -+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -+"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" -+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -+"checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -+"checksum raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf" -+"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" -+"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" -+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" -+"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" -+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" -+"checksum region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "448e868c6e4cfddfa49b6a72c95906c04e8547465e9536575b95c70a4044f856" -+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" -+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" -+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -+"checksum scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1" -+"checksum scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -+"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" -+"checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" -+"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" -+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" -+"checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -+"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" -+"checksum string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd710eadff449a1531351b0e43eb81ea404336fa2f56c777427ab0e32a4cf183" -+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" -+"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" -+"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" -+"checksum target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4" -+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6f357d1814b33bc2dc221243f8424104bfe72dbe911d5b71b3816a2dff1c977e" -+"checksum thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2e25d25307eb8436894f727aba8f65d07adf02e5b35a13cebed48bd282bfef" -+"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 toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" -+"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -+"checksum trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "987d6fdc45ddd7f3be5aa7386c8c8a844d1655c95b9ed948a9cd9cded8f2b79f" -+"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" -+"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" -+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+"checksum unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "63f18aa3b0e35fed5a0048f029558b1518095ffe2a0a31fb87c93dece93a4993" -+"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" -+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -+"checksum walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85ce93ab0c27412ba41d509f2410fa575ecbfdb4a6aba0e02e79e12c09745485" -+"checksum walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8757b0da38353d55a9687f4dee68a8f441f980dd36e16ab07d6e6c673f505f76" -+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" -+"checksum wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cae185868c6038a48f487b9af3766ee0c68d4a85fa3610c3a0522092b3cec1" -+"checksum wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c702914acda5feeeffbc29e4d953e5b9ce79d8b98da4dbf18a77086e116c5470" -+"checksum wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1" -+"checksum wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8d1de68310854a9840d39487701a8c1acccb5c9f9f2650d5fce3cdfe6650c372" -+"checksum wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d916cc60b1b79ac1ca7683af8d6ec56b789167f7f696b3f1ab3d98961129f192" -+"checksum which 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5475d47078209a02e60614f7ba5e645ef3ed60f771920ac1906d7c1cc65024c8" -+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" -+"checksum witx 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d075344afebe51633c0302fc11698c2d6414f9d366c749db1af57710f112561" -+"checksum zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c5d978b793ae64375b80baf652919b148f6a496ac8802922d9999f5a553194f" -+"checksum zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bee25eac9753cfedd48133fa1736cbd23b774e253d89badbeac7d12b23848d3f" -+"checksum zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "89719b034dc22d240d5b407fb0a3fe6d29952c181cff9a9f95c0bd40b4f8f7d8" diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 08d583c54b43..eaecd1eb89b9 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,28 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "v0.8.0"; + version = "v0.12.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "${pname}"; rev = "${version}"; - sha256 = "0az893srw49szvs5461bd165ffla4cc98gh42p3dwskwfkhpqjm4"; + sha256 = "08dhk5s8rv41mjqbwfqwqmp6p6p9y7qc5yc76ljjd9l7j1phl7mr"; fetchSubmodules = true; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "08b3rbnl7qwyfbwaqcb7z84sh0h94v18v6557hrf0dlil414v54i"; - - cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0wqd2yy6ih1rcz1fq7x3aiqq1ma2nmif1w8r8x0vpxjxk395zil9"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + doCheck = false; # https://github.com/bytecodealliance/wasmtime/issues/1197 + meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; homepage = https://github.com/CraneStation/wasmtime; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 6179ea983e33..89b7938de1e4 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -23,6 +23,9 @@ , python3 , readline , gtk3 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 }: # TODO: enable more folks backends @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { pname = "folks"; version = "0.13.2"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -39,14 +42,16 @@ stdenv.mkDerivation rec { }; mesonFlags = [ - # TODO: https://gitlab.gnome.org/GNOME/folks/issues/108 - "-Ddocs=false" + "-Ddocs=true" ]; nativeBuildInputs = [ gettext gobject-introspection gtk3 + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 meson ninja pkgconfig @@ -75,10 +80,16 @@ stdenv.mkDerivation rec { checkInputs = [ dbus + (python3.withPackages (pp: with pp; [ + python-dbusmock + # The following possibly need to be propagated by dbusmock + # if they are not optional + dbus-python + pygobject3 + ])) ]; - # TODO: enable tests - # doCheck = true; + doCheck = true; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 721245ceb6d7..c0268c161aeb 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, libtool, unbound, libidn, m4, file -, openssl, doxygen, autoreconfHook, automake }: +{ stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }: stdenv.mkDerivation rec { pname = "getdns"; - version = "1.5.2"; + version = "1.6.0"; versionRewrite = builtins.splitVersion version; src = fetchurl { - url = "https://getdnsapi.net/releases/${pname}-${builtins.concatStringsSep "-" versionRewrite}/${pname}-${version}.tar.gz"; - sha256 = "1h4l0sbkpiahpx2pd5lby10yi22mdxgx5xf1y80r77pa46iac9hq"; + url = "https://getdnsapi.net/releases/${pname}-${ + builtins.concatStringsSep "-" versionRewrite + }/${pname}-${version}.tar.gz"; + sha256 = "0jhg7258wz287kjymimvdvv04n69lwxdc3sb62l2p453f5s77ra0"; }; - nativeBuildInputs = [ libtool m4 autoreconfHook automake file ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ unbound libidn openssl doxygen ]; - - patchPhase = '' - substituteInPlace m4/acx_openssl.m4 \ - --replace /usr/local/ssl ${openssl.dev} - ''; + buildInputs = [ unbound libidn2 openssl doxygen ]; meta = with stdenv.lib; { description = "A modern asynchronous DNS API"; @@ -32,9 +28,9 @@ stdenv.mkDerivation rec { interface that enables end-to-end trust in the DNS architecture, and which will inspire application developers to implement innovative security solutions in their applications. -''; - homepage = https://getdnsapi.net; - maintainers = with maintainers; [ leenaars ]; + ''; + homepage = "https://getdnsapi.net"; + maintainers = with maintainers; [ leenaars ehmry ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index e006f8cd6f8e..2d5133afab4d 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , meson , ninja , pkgconfig @@ -14,26 +13,16 @@ stdenv.mkDerivation rec { pname = "gom"; - version = "0.3.3"; + version = "0.4"; outputs = [ "out" "py" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1n1n226dyb3q98216aah87in9hhjcwsbpspsdqqfswz2bx5y6mxc"; + sha256 = "aNCABqqjtYFpznzxg5SY9FaG+6gRXwms7Lidd+EBip0="; }; patches = [ - # Needed to apply the next patch - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gom/commit/e8b7c314ce61d459132cf03c9e455d2a01fdc6ea.patch"; - sha256 = "0d7g3nm5lrfhfx9ly8qgf5bfp12kvr7m1xmlgin2q8vqpn0r2ggp"; - }) - # https://gitlab.gnome.org/GNOME/gom/merge_requests/3 - (fetchpatch { - url = "https://gitlab.gnome.org/worldofpeace/gom/commit/b621c15600b1c32826c9878565eb2398a50907f2.patch"; - sha256 = "1hqck9bb7sxn4akisnn26sbddlphjsavgksick5k4h3rsc0xwx1v"; - }) ./longer-stress-timeout.patch ]; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 899aa116b2ca..c5e1deea6e12 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -12,16 +12,19 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gssapi-impl=mit" ]; + preCheck = '' + export LOCALDOMAIN="dummydomain" + ''; doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "GNU SASL, Simple Authentication and Security Layer library"; longDescription = - '' GNU SASL is a library that implements the IETF Simple - Authentication and Security Layer (SASL) framework and - some SASL mechanisms. SASL is used in network servers - (e.g. IMAP, SMTP, etc.) to authenticate peers. + '' GNU SASL is a library that implements the IETF Simple + Authentication and Security Layer (SASL) framework and + some SASL mechanisms. SASL is used in network servers + (e.g. IMAP, SMTP, etc.) to authenticate peers. ''; homepage = https://www.gnu.org/software/gsasl/; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7caf32921de3..9f381c5ac708 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -77,9 +77,6 @@ stdenv.mkDerivation rec { # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 ./patches/3.0-darwin-x11.patch - # 3.24.13 failed to ship a header file - # https://gitlab.gnome.org/GNOME/gtk/issues/2279 - ./patches/missing-header.patch ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/development/libraries/gtk/patches/missing-header.patch b/pkgs/development/libraries/gtk/patches/missing-header.patch deleted file mode 100644 index 49eb51dae9af..000000000000 --- a/pkgs/development/libraries/gtk/patches/missing-header.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/gdk/quartz/gdkquartz-gtk-only.h b/gdk/quartz/gdkquartz-gtk-only.h -new file mode 100644 -index 0000000000000000000000000000000000000000..193686c041971e4d8b3a1bc6bb2a79d8ba6e9a70 ---- /dev/null -+++ b/gdk/quartz/gdkquartz-gtk-only.h -@@ -0,0 +1,50 @@ -+/* gdkquartz-gtk-only.h -+ * -+ * Copyright (C) 2005-2007 Imendio AB -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see <http://www.gnu.org/licenses/>. -+ */ -+ -+#ifndef __GDK_QUARTZ_GTK_ONLY_H__ -+#define __GDK_QUARTZ_GTK_ONLY_H__ -+ -+#if !(defined (GTK_COMPILATION) || defined (GDK_COMPILATION)) -+#error "This API is for use only in Gtk internal code." -+#endif -+ -+#include <Appkit/Appkit.h> -+#include <gdk/gdk.h> -+#include <gdk/quartz/gdkquartz.h> -+ -+/* Drag and Drop/Clipboard */ -+GDK_AVAILABLE_IN_ALL -+GdkAtom gdk_quartz_pasteboard_type_to_atom_libgtk_only (NSString *type); -+GDK_AVAILABLE_IN_ALL -+NSString *gdk_quartz_target_to_pasteboard_type_libgtk_only (const gchar *target); -+GDK_AVAILABLE_IN_ALL -+NSString *gdk_quartz_atom_to_pasteboard_type_libgtk_only (GdkAtom atom); -+ -+/* Utilities */ -+GDK_AVAILABLE_IN_ALL -+NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf); -+GDK_AVAILABLE_IN_ALL -+NSEvent *gdk_quartz_event_get_nsevent (GdkEvent *event); -+ -+/* Window */ -+GDK_AVAILABLE_IN_ALL -+NSWindow *gdk_quartz_window_get_nswindow (GdkWindow *window); -+GDK_AVAILABLE_IN_ALL -+NSView *gdk_quartz_window_get_nsview (GdkWindow *window); -+ -+#endif diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index 30e5c92b8f09..185af3dff319 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }: +{ stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }: stdenv.mkDerivation rec { pname = "howard-hinnant-date-unstable"; @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch"; sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2"; }) + # Without this patch, this library will drop a `tzdata` directory into + # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it + # searches for `zoneinfo` be the one from the `tzdata` package. + (substituteAll { + src = ./make-zoneinfo-available.diff; + inherit tzdata; + }) ]; nativeBuildInputs = [ cmake ]; @@ -24,6 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TZ_LIB=true" "-DBUILD_SHARED_LIBS=true" + "-DUSE_SYSTEM_TZ_DB=true" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff b/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff new file mode 100644 index 000000000000..f9e69ff38cbb --- /dev/null +++ b/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff @@ -0,0 +1,13 @@ +diff --git a/src/tz.cpp b/src/tz.cpp +index 68436c3..2bfe19e 100644 +--- a/src/tz.cpp ++++ b/src/tz.cpp +@@ -349,7 +349,7 @@ discover_tz_dir() + struct stat sb; + using namespace std; + # ifndef __APPLE__ +- CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo"; ++ CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo"; + CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc"; + + // Check special path which is valid for buildroot with uclibc builds diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 315d3f499560..bdf081222b6d 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.1.5"; + version = "4.1.6"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "1jyvpa68wymnn8wnh8i59pa9kdbixv86mh8q338agnwkmzvlgm58"; + sha256 = "0cw1apj4qxfxpp0gz4my4656d5ijjj6s2y4rjahhj67h10qj4bd2"; }; buildInputs = [ openssl ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for communicating with a RabbitMQ server"; - homepage = https://github.com/CopernicaMarketingSoftware/AMQP-CPP; + homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP"; license = licenses.asl20; maintainers = [ maintainers.mjp ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 6830d47df74b..91bb9869f3c6 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -12,7 +12,6 @@ , gcr , gnome-online-accounts , gobject-introspection -, liboauth , gnome3 , p11-kit , openssl @@ -22,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgdata"; - version = "0.17.11"; + version = "0.17.12"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11m99sh2k679rnsvqsi95s1l0r8lkvj61dmwg1pnxvsd5q91g6bb"; + sha256 = "0613nihsvwvdnmlbjnwi8zqxgmpwyxdapzznq4cy1fp84246zzd0"; }; patches = [ @@ -47,7 +46,6 @@ stdenv.mkDerivation rec { buildInputs = [ gcr glib - liboauth libsoup libxml2 openssl @@ -80,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GData API library"; - homepage = https://wiki.gnome.org/Projects/libgdata; + homepage = "https://wiki.gnome.org/Projects/libgdata"; maintainers = with maintainers; [ raskin lethalman ] ++ gnome3.maintainers; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 063588e9f1e5..5c25a4d5abf6 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib, libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib, - libimobiledevice, mutagen, + libimobiledevice, monoSupport ? false, mono, gtk-sharp-2_0 }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { dontStrip = true; propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils - gdk-pixbuf taglib libimobiledevice mutagen ]; + gdk-pixbuf taglib libimobiledevice ]; nativeBuildInputs = [ gettext intltool pkgconfig ] ++ (with perlPackages; [ perl XMLParser ]) diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 34ca7406d697..26d7e1e961d4 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "0fi3j3y37id24cgy3868pyvxkd6mvbbraalvpm99f5dhrxdlv961"; + sha256 = "0pvki6cm3ia27nsd6dljddjgz1bd6avf6c0ppj63fa3sz52lfmga"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 932edd20e9a6..83d08dc019bf 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "0sw7iwb9158z7jslxj9jwh2vqbg0q8wq6fbmk9iz7sfkjqhi80hv"; + sha256 = "1srpafxdw4627lyv92cn8wd9zda3507qpp5s2z66bsln8jnb1mza"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source braille translator and back-translator"; - homepage = http://liblouis.org/; + homepage = "http://liblouis.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 32251afffde5..409867695fc0 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libmypaint"; - version = "1.5.0"; + version = "1.5.1"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "06szsadj589vlvn33gzybygdknsaahr4cpigh2xyg8mr3h9ngqrl"; + sha256 = "1pxx8fjdabcindxhzgbhg4p7yanl4ihbd8kq71y2nyi9dqsjr2fw"; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = http://mypaint.org/; + homepage = "http://mypaint.org/"; description = "Library for making brushstrokes which is used by MyPaint and other projects"; license = licenses.isc; maintainers = with maintainers; [ goibhniu jtojnar ]; diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 82c76f7ea372..fb494909c838 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -1,33 +1,28 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, intltool, libtool, pkgconfig }: +{ stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "libvmaf"; - version = "1.3.15"; + version = "1.5.1"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256="10kgcdf06hzhbl5r7zsllq88bxbyn282hfqx5i3hkp66fpq896d2"; + sha256 = "10fw53k9k4aq4p2qi5qkfjfnhldw4p5bbmxggf8220gfa95nvyl3"; }; - nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ]; + sourceRoot = "source/libvmaf"; + + nativeBuildInputs = [ meson ninja ]; outputs = [ "out" "dev" ]; doCheck = true; - postFixup = '' - substituteInPlace "$dev/lib/pkgconfig/libvmaf.pc" \ - --replace "includedir=/usr/local/include" "includedir=$dev" - ''; - - makeFlags = [ "INSTALL_PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; - maintainers = [ maintainers.cfsmp3 ]; + maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; }; } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 3d0a94a35d0b..cf880ef1e16c 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s"; }; + # 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" ]; diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix new file mode 100644 index 000000000000..127f25a50bea --- /dev/null +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, meson, pkg-config, ninja +, pixman, libuv, gnutls, libdrm +# libjpeg_turbo: Optional, for tight encoding (disabled because experimental) +, enableCpuAcceleration ? false # Whether to use CPU extensions (e.g. AVX) +}: + +stdenv.mkDerivation rec { + pname = "neatvnc"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "any1"; + repo = pname; + rev = "v${version}"; + sha256 = "04wcpwxlcf0bczcs97j21346mn6finfj7xgc2dsrwrw9xq8qa7wc"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ pixman libuv gnutls libdrm ]; + + patches = stdenv.lib.optional (!enableCpuAcceleration) ./disable-cpu-acceleration.patch; + + meta = with stdenv.lib; { + description = "A VNC server library"; + longDescription = '' + This is a liberally licensed VNC server library that's intended to be + fast and neat. Goals: + - Speed + - Clean interface + - Interoperability with the Freedesktop.org ecosystem + ''; + inherit (src.meta) homepage; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch b/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch new file mode 100644 index 000000000000..97b77c02df48 --- /dev/null +++ b/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch @@ -0,0 +1,17 @@ +diff --git a/meson.build b/meson.build +index 31dd8b8..8761087 100644 +--- a/meson.build ++++ b/meson.build +@@ -21,12 +21,6 @@ endif + + cpu = host_machine.cpu_family() + +-if cpu == 'x86_64' +- c_args += '-mavx' +-elif cpu == 'arm' +- c_args += '-mfpu=neon' +-endif +- + add_project_arguments(c_args, language: 'c') + + cc = meson.get_compiler('c') diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 3efbea97c5e9..094e90fd500d 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,16 +1,36 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg -, sbc, SDL2, makeFontsConf +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, doxygen +, graphviz +, valgrind +, glib +, dbus +, gst_all_1 +, alsaLib +, ffmpeg +, libjack2 +, udev +, libva +, xorg +, sbc +, SDL2 +, makeFontsConf }: let fontsConf = makeFontsConf { - fontDirectories = [ ]; + fontDirectories = []; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "pipewire"; version = "0.2.7"; + outputs = [ "out" "lib" "dev" "doc" ]; + src = fetchFromGitHub { owner = "PipeWire"; repo = "pipewire"; @@ -18,14 +38,28 @@ in stdenv.mkDerivation rec { sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc"; }; - outputs = [ "out" "lib" "dev" "doc" ]; - nativeBuildInputs = [ - meson ninja pkgconfig doxygen graphviz valgrind + doxygen + graphviz + meson + ninja + pkgconfig + valgrind ]; + buildInputs = [ - glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 + SDL2 + alsaLib + dbus + ffmpeg + glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + libjack2 + libva + sbc + udev + xorg.libX11 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 5224744c6a2c..4bf49e297e33 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Cross-platform library for building Telegram clients"; homepage = "https://core.telegram.org/tdlib/"; license = [ licenses.boost ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vyorkin ]; }; } diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/pkgs/development/mobile/androidenv/generated/packages.nix index db1f7f1b8d32..fc9f50e13164 100644 --- a/pkgs/development/mobile/androidenv/generated/packages.nix +++ b/pkgs/development/mobile/androidenv/generated/packages.nix @@ -1504,6 +1504,23 @@ }; }; + "platforms"."29" = { + + name = "platforms"; + path = "platforms/android-29"; + revision = "29"; + displayName = "Android SDK Platform 29"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-29_r03.zip; + sha1 = "670e2e104333dae90e16ea3b615f0b63da5883ae"; + }; + + }; + }; + + "platforms"."3" = { name = "platforms"; diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index c85eab108ffc..5e0f943a158d 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,9 +1,10 @@ -{pkgs, androidenv, xcodeenv, tiVersion ? "8.2.1.GA"}: +{pkgs, androidenv, xcodeenv, tiVersion ? "8.3.2.GA"}: rec { titaniumsdk = let titaniumSdkFile = if tiVersion == "8.2.1.GA" then ./titaniumsdk-8.2.nix else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix + else if tiVersion == "8.3.2.GA" then ./titaniumsdk-8.3.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix new file mode 100644 index 000000000000..b8e6b5a2271d --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -0,0 +1,97 @@ +{stdenv, fetchurl, unzip, makeWrapper}: + +let + # Gradle is a build system that bootstraps itself. This is what it actually + # downloads in the bootstrap phase. + gradleAllZip = fetchurl { + url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; + }; + + # A Titanium-Android build requires proguard plugins. We create a fake + # repository so that Gradle does not attempt to download them in the builder. + # Since there are only 3 plugins required, this is still (sort of) manageable + # without a generator. + proguardVersion = "5.3.3"; + + proguardGradlePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom"; + sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj"; + }; + proguardGradleJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar"; + sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk"; + }; + proguardParentPOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom"; + sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202"; + }; + proguardBasePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom"; + sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5"; + }; + proguardBaseJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar"; + sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx"; + }; + + # Put the downloaded plugins in a fake Maven repository + fakeMavenRepo = stdenv.mkDerivation { + name = "fake-maven-repo"; + buildCommand = '' + mkdir -p $out + cd $out + mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion} + cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom + cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar + mkdir -p net/sf/proguard/proguard-parent/${proguardVersion} + cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom + mkdir -p net/sf/proguard/proguard-base/${proguardVersion} + cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom + cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar + ''; + }; +in +stdenv.mkDerivation { + name = "mobilesdk-8.3.2.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip; + sha256 = "04pfw21jrx9w259lphynwykqjk4c9hm0zix4d40s7mf8mmh3xdx9"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip; + sha256 = "1zflq5hc96lrriw71ya623kkskkisi9yayg8qs03zimi0gksizxw"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + + # Rename ugly version number + cd mobilesdk/* + mv * 8.3.2.GA + cd * + + # Patch bundled gradle build infrastructure to make shebangs work + patchShebangs android/templates/gradle + + # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app + sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip + echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + + # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts + sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle + + ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # Patch the strip frameworks script in the iPhone build template to not let + # it skip the strip phase. This is caused by an assumption on the file + # permissions in which Nix deviates from the standard. + sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh + ''} + ''; +} diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 54bd0337fade..5d7e2c7668f2 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -115,12 +115,9 @@ nodePackages // { joplin = nodePackages.joplin.override { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ - # sharp, dep list: - # http://sharp.pixelplumbing.com/en/stable/install/ - cairo expat fontconfig freetype fribidi gettext giflib - glib harfbuzz lcms libcroco libexif libffi libgsf - libjpeg_turbo libpng librsvg libtiff vips - libwebp libxml2 pango pixman zlib + # required by sharp + # https://sharp.pixelplumbing.com/install + vips nodePackages.node-pre-gyp ]; diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index 7c1ec79f7da3..8f26213c23ae 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, ctypes }: +{ stdenv, buildDune2Package, fetchFromGitHub, ctypes }: -buildDunePackage rec { +buildDune2Package rec { pname = "eigen"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "owlbarn"; repo = pname; rev = version; - sha256 = "0pbqd87i9h7qpx84hr8k4iw0rhmjgma4s3wihxh992jjvsrgdyfi"; + sha256 = "1zaw03as14hyvfpyj6bjrfbcxp2ljdbqcqqgm53kms244mig425f"; }; - minimumOCamlVersion = "4.04"; + minimumOCamlVersion = "4.02"; propagatedBuildInputs = [ ctypes ]; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index b69a4900f6f1..1c71f7fceb78 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "elpi"; - version = "1.7.0"; + version = "1.10.2"; src = fetchFromGitHub { owner = "LPCIC"; repo = "elpi"; rev = "v${version}"; - sha256 = "1q6s3x4gba0hdymlgj4rf1bny4v7ac4jj7q134cwd3sxiwqcyhww"; + sha256 = "0w5z0pxyshqawq7w5rw3nqii49y88rizvwqf202pl11xqi14icsn"; }; minimumOCamlVersion = "4.04"; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index fe276ac6e94f..7d9a0573db7b 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -2,14 +2,17 @@ , gnutls, nettle }: -let version = "4.1.6"; in +if stdenv.lib.versionOlder ocaml.version "4.02" +then throw "ocamlnet is not available for OCaml ${ocaml.version}" +else -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocamlnet-${version}"; + version = "4.1.7"; src = fetchurl { url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "1j0k0drybcjpysvs8xpq3cnpg3wqk6d5sy7y1h5rq8jk7hrirf0k"; + sha256 = "0r9gl0lsgxk2achixxqzm8bm5l9jwc4vwihf0rvxxa9v9q9vfdhi"; }; nativeBuildInputs = [ pkgconfig ]; @@ -37,7 +40,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://projects.camlcity.org/projects/ocamlnet.html; + homepage = "http://projects.camlcity.org/projects/ocamlnet.html"; description = "A library implementing Internet protocols (http, cgi, email, etc.) for OCaml"; license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL."; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index 12cd54363085..ce6ee124466c 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }: +{ stdenv, buildDune2Package, fetchFromGitHub, stdlib-shims }: -buildDunePackage rec { +buildDune2Package rec { pname = "owl-base"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "owlbarn"; repo = "owl"; rev = version; - sha256 = "1a2lbhywrb3bmm4k48wwbp6iszpd3aj1f23v10i78cbqm5slk6dj"; + sha256 = "1j3xmr4izfznmv8lbn8vkx9c77py2xr6fqyn6ypjlf5k9b8g4mmw"; }; propagatedBuildInputs = [ stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index 0cc1c1db42a4..c6eaf69b704b 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -1,14 +1,26 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, alcotest -, eigen, stdio, stdlib-shims, openblasCompat, owl-base +{ stdenv +, buildDune2Package +, dune-configurator +, fetchFromGitHub +, alcotest +, eigen +, stdio +, stdlib-shims +, openblasCompat +, owl-base +, npy }: -buildDunePackage rec { +buildDune2Package rec { pname = "owl"; inherit (owl-base) version src meta; checkInputs = [ alcotest ]; - propagatedBuildInputs = [ eigen stdio stdlib-shims openblasCompat owl-base ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ + eigen stdio stdlib-shims openblasCompat owl-base npy + ]; doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 } diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index e665a3235788..049a9a97c8e2 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,7 +1,7 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving +{ stdenv, buildDune2Package, fetchFromGitHub, ppx_deriving , alcotest, biocaml, gnuplot, lacaml, menhir, owl }: -buildDunePackage rec { +buildDune2Package rec { pname = "phylogenetics"; version = "unstable-2019-11-15"; @@ -20,7 +20,7 @@ buildDunePackage rec { doCheck = false; # many tests require bppsuite meta = with stdenv.lib; { - inherit (std.meta) homepage; + inherit (src.meta) homepage; description = "Bioinformatics library for Ocaml"; maintainers = [ maintainers.bcdarwin ]; license = licenses.cecill-b; diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index d45298972cce..612a12bb4183 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { pname = "ppx_deriving"; - version = "4.4"; + version = "4.4.1"; src = fetchzip { url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz"; - sha256 = "0b2gaxlh54pcz3b4891yd143nx852mwggcy0yhq8g85dl3iisxzq"; + sha256 = "1map50w2a35y83bcd19p9yakdkhp04z5as2j2wlygi0b6s0a9vba"; }; buildInputs = [ ppxfind cppo ounit ]; diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 384421c8966f..dd845b1d3496 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.5.0"; + version = "2.5.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1qddczr5vhlbhmzmw6bwmkrvsj8dml76zf9gnk22qzab60ali99j"; + sha256 = "0ai5l62ldaq1cqfmq3hvnzp8gp0hjjmjnck9d3cnx5r8la5ig18y"; }; postPatch = '' @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tools to handle ASDF files"; - homepage = https://github.com/spacetelescope/asdf; + homepage = "https://github.com/spacetelescope/asdf"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 461d8801e608..c6620de3d0c3 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -9,21 +9,26 @@ , pytest , pytest-astropy , astropy-helpers +, isPy3k }: buildPythonPackage rec { pname = "astroquery"; - version = "0.3.10"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "1ce57a8792c7d5d74206d797d379de6da35d56be433ea5840c41a49f202e2fab"; + sha256 = "1ddwnj9vpvxkrfb45c4pwv5f5za9kn2q0040dpw2ymj2bwlpl61h"; }; + disabled = !isPy3k; + propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ]; nativeBuildInputs = [ astropy-helpers ]; + # Tests disabled until pytest-astropy has been updated to include pytest-astropy-header + doCheck = false; checkInputs = [ pytest pytest-astropy ]; # Disable automatic update of the astropy-helper module diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 579652c3f95e..cbbf64524f57 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.13"; + version = "0.14.1"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "v${version}"; - sha256 = "1nv0jbsaqr9qjn7nnl55s42iyx655k7fsj8hs69652lqnfn5y3d5"; + sha256 = "0z56r5s8z8pfp0p8zrf1chgzan4q25zg0awgc7bgkvkwgxbhzx4m"; }; propagatedBuildInputs = [ cryptography requests ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/lepture/authlib; + homepage = "https://github.com/lepture/authlib"; description = "The ultimate Python library in building OAuth and OpenID Connect servers. JWS,JWE,JWK,JWA,JWT included."; maintainers = with maintainers; [ flokli ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 26918fbd7db6..43f0394669b7 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "2.0.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "057ii54h8yr7rhfnbl0r29xbsg7mhf031hjffmdv0zf93552kmja"; + sha256 = "0ga6lzqlinfxlzx1g35a5sv5chjx4im0m4b8i33hqrhmdv9m7ypg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 1f1d33fe329e..990d471bc6b0 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "bayesian-optimization"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "fmfn"; repo = "BayesianOptimization"; rev = "v${version}"; - sha256 = "07sqymg6k5512k7wq4kbp7rsrkb4g90n0ck1f0b9s6glyfpcy4pq"; + sha256 = "0ylip9xdi0cjzmdayxxpazdfaa9dl0sdcl2qsfn3p0cipj59bdvd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 528acf572f2a..b088480f5de4 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -3,7 +3,7 @@ sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, - parameterized, git, openssh, glibcLocales }: + parameterized, git, openssh, glibcLocales, nixosTests }: let withPlugins = plugins: buildPythonPackage { @@ -91,6 +91,7 @@ let passthru = { inherit withPlugins; + tests.buildbot = nixosTests.buildbot; }; meta = with lib; { diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 4f3a0ea04b8f..cb3124ec7e38 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "07ynk46c9h47ibbdm93h15xbrzflsl4llm0jr4c8pm6krs6byb4z"; + sha256 = "03zb09r8w8dvd9qas7h6gdwlqc7q482ikph6h3708lpnkn72xdkb"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 4bb82b598568..cd35f14fb37d 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,14 +7,12 @@ src = fetchPypi { inherit pname version; - sha256 = "0njix8g6g1dgfviick55p9calm82nnkhhgkikh7a5yvqk524cprg"; + sha256 = "1d8xdk4rq4p3fw03cvz7d1pmpjjbyrnzzjifzv46q88vk7jakgxi"; }; # Remove unneccessary circular dependency on buildbot postPatch = '' - sed -i setup.py \ - -e "/import buildbot/d" \ - -e "s/'buildbot',//" + sed -i "s/'buildbot'//" setup.py ''; buildInputs = [ buildbot-pkg mock ]; @@ -36,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1wmay9bbb1wwf0zh9rw95swmdc7bxabgvx2n6dyyzs4p8k92px10"; + sha256 = "03pl75avi6cmmhjvfn0a0b4drn35yv37kvgn04zjdwa3m6p3haa8"; }; buildInputs = [ buildbot-pkg ]; @@ -58,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "14b28vpkk68yk6zmdd64n7izb1r3barb7y711n4g37skqd13jygb"; + sha256 = "0rzjk3qmlvid8qag3r00zaszchncl1nl8l2yapvc1zqh2dqlln58"; }; buildInputs = [ buildbot-pkg ]; @@ -80,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1m8kbycjq7jsl72xbrzjj48hb65r53lfxx78yvlnhc2f9ian5vnh"; + sha256 = "1n4j73y9kwfqk7dz1fh1bpan68vlpnbz7idxpmsphyay8w8y9dd4"; }; buildInputs = [ buildbot-pkg ]; @@ -102,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1sbp13qimv8kc7dp0xz1pmda1x1n4948zgrz2pc45rwlbbn5h69r"; + sha256 = "1babkcgxczs6zfk2b6jmsy2vwbrgdydrp2px1mfwa3wmv8fwlssg"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 6352b22b55d6..365ca0bcf14a 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -3,11 +3,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0hr42fp3sw6c59qahihm9440618z7prwsy4z0ax553zvw47pc22l"; + sha256 = "1vwy46acvczgk1hhpsqdwpcw55j4hm5pkw6j01f92axiga8r5jk6"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index e10ecd8e840a..9bde31d1f13c 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "091q63jcm87xggqgqi44lw2vjxhl1v4yl0mv2c76hgavb29w4w5y"; + sha256 = "0gwd79zm7196fhnbzbdpyvgzsfjfzl3pmc5hh27h7hckfpxzj9yw"; }; propagatedBuildInputs = [ @@ -24,10 +24,10 @@ buildPythonPackage rec { cocotb/share/makefiles/simulators/Makefile.* do substituteInPlace $f --replace 'shell which' 'shell command -v' - # replace hardcoded gcc. Remove once https://github.com/cocotb/cocotb/pull/1137 gets merged - substituteInPlace $f --replace 'gcc' '$(CC)' - substituteInPlace $f --replace 'g++' '$(CXX)' done + + # This can probably be removed in the next update after 1.3.0 + substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" "" ''; checkInputs = [ swig verilog ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python"; - homepage = https://github.com/cocotb/cocotb; + homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; maintainers = with maintainers; [ matthuszagh ]; }; diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index dfcbb9b6404a..4f1e26e42cbf 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.7.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "16jjanq4glj6c2cwyw94954hrqqv49fknisbxj03lfmflg61j32k"; + sha256 = "0qqf51mphv1pqqc2ff50rkbw44sp9liifg0mg7xkh41sgnv032cs"; }; # No tests in archive @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "A dash component starter pack"; - homepage = https://dash.plot.ly/dash-core-components; + homepage = "https://dash.plot.ly/dash-core-components"; license = licenses.mit; maintainers = [ maintainers.antoinerg ]; }; diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index 97942a13043b..d009ce192d7b 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "1ccsykv24dz9xj24106aaj7f0w7x7sv7mamjbx0m6k0wyhh58vw1"; + sha256 = "1w6mpmvfj6nv5rdzikwc7wwhrgscbh50d0azzydhsa9jccxvkakl"; }; # No tests in archive @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Renderer for the Dash framework"; - homepage = https://dash.plot.ly/; + homepage = "https://dash.plot.ly/"; license = licenses.mit; maintainers = [ maintainers.antoinerg ]; }; diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 4a9a6c42ff48..3a0e0c401768 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.6.0"; + version = "4.6.1"; src = fetchPypi { inherit pname version; - sha256 = "01wzac09ac6nr27if1liaxafzdf67x00vw1iq5vaad1147rdh36k"; + sha256 = "0xwwkp7zsmrcnl3fswm5f319cxk7hk4dzacvfsarll2b47rmm434"; }; # No tests in archive @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "A First-Class Interactive DataTable for Dash"; - homepage = https://dash.plot.ly/datatable; + homepage = "https://dash.plot.ly/datatable"; license = licenses.mit; maintainers = [ maintainers.antoinerg ]; }; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 2106235230f8..72ae7104536d 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "11skbvjlj93aw1pqx6j56h73sy9r06jwq7z5h64fd1a3d4z2gsvy"; + sha256 = "0lqvcq7xaw5l1mwmgfdhr9jspq8jzkxf77862k0ca4d9zglkqp4z"; }; propagatedBuildInputs = [ @@ -43,11 +43,8 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest tests/unit/test_configs.py - pytest tests/unit/test_fingerprint.py - pytest tests/unit/test_import.py - pytest tests/unit/test_resources.py - pytest tests/unit/dash/ + pytest tests/unit/test_{configs,fingerprint,import,resources}.py \ + tests/unit/dash/ ''; pythonImportsCheck = [ @@ -56,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python framework for building analytical web applications"; - homepage = https://dash.plot.ly/; + homepage = "https://dash.plot.ly/"; license = licenses.mit; maintainers = [ maintainers.antoinerg ]; }; diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index e81caa66e5f3..404331a49577 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -1,23 +1,53 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, jsonpickle }: +{ buildPythonPackage +, fetchFromGitHub +, fetchPypi +, isPy3k +, jsonpickle +, mock +, pytest +, pytestCheckHook +, requests +, responses +, stdenv +}: buildPythonPackage rec { pname = "python-digitalocean"; - version = "1.13.2"; + version = "1.15.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0h4drpdsmk0b3rlvg6q6cz11k23w0swj1iddk7xdcw4m7r7c52kw"; + src = fetchFromGitHub { + owner = "koalalorenzo"; + repo = "python-digitalocean"; + rev = "v${version}"; + sha256 = "1pz15mh72i992p63grwzqn2bbp6sm37zcp4f0fy1z7rsargwsbcz"; }; - propagatedBuildInputs = [ requests jsonpickle ]; + propagatedBuildInputs = [ + jsonpickle + requests + ]; - # Package doesn't distribute tests. - doCheck = false; + dontUseSetuptoolsCheck = true; + + checkInputs = [ + pytest + pytestCheckHook + responses + ] ++ stdenv.lib.optionals (!isPy3k) [ + mock + ]; + + preCheck = '' + cd digitalocean + ''; meta = with stdenv.lib; { description = "digitalocean.com API to manage Droplets and Images"; - homepage = https://pypi.python.org/pypi/python-digitalocean; + homepage = "https://pypi.python.org/pypi/python-digitalocean"; license = licenses.lgpl3; - maintainers = with maintainers; [ teh ]; + maintainers = with maintainers; [ + kiwi + teh + ]; }; } diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 4ce61680f03b..603d900b8106 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -36,7 +36,7 @@ let bazelTarget = ":install"; fetchAttrs = { - sha256 = "0mxma7jajm42v1hv6agl909xra0azihj588032ivhlmmh403x6wg"; + sha256 = "0wb2gh9ji8bgq4s9ci9x017dybxqzjhncpw33b1wjksm2yhbkvlz"; }; bazelFlags = [ diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index 9fc0acc30afa..e9b33f330813 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -14,13 +14,13 @@ with stdenv.lib; buildPythonPackage rec { pname = "GooCalendar"; - version = "0.6"; + version = "0.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4c22c93e19b933d10d8ea1c67a67f485267af82175ef59419427dd39d1e3af18"; + sha256 = "14m05pi1vwl7i8iv1wvc0r3450dlivsh85f4cyny08l869cr9lf1"; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A calendar widget for GTK using PyGoocanvas."; - homepage = https://goocalendar.tryton.org/; + homepage = "https://goocalendar.tryton.org/"; license = licenses.gpl2; maintainers = [ maintainers.udono ]; }; diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix new file mode 100644 index 000000000000..934f3bd58202 --- /dev/null +++ b/pkgs/development/python-modules/gtts/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, beautifulsoup4 +, click +, gtts-token +, mock +, pytest +, requests +, six +, testfixtures +, twine +, urllib3 +}: + +buildPythonPackage rec { + pname = "gtts"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "pndurette"; + repo = "gTTS"; + rev = "v${version}"; + sha256 = "1d0r6dnb8xvgyvxz7nfj4q4xqmpmvcwcsjghxrh76m6p364lh1hj"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + click + gtts-token + requests + six + urllib3 + twine + ]; + + checkInputs = [ pytest mock testfixtures ]; + + # majority of tests just try to call out to Google's Translate API endpoint + doCheck = false; + checkPhase = '' + pytest + ''; + + pythonImportsCheck = [ "gtts" ]; + + meta = with lib; { + description = "A Python library and CLI tool to interface with Google Translate text-to-speech API"; + homepage = "https://gtts.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ unode ]; + }; +} diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index e14b97d94ceb..87a4a21568c8 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.29"; + version = "0.31"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "182nh5i3hlj0kqkbynk69md0ddq83w02l8lz4m03d8xbjixzi1k1"; + sha256 = "0hxdvdj41gq5ryafjhrcgf6y8l33lyf45a1vgwwbk0q29sir9bnr"; }; # upstreamed in https://github.com/NabuCasa/hass-nabucasa/pull/119 diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index b642bdf311e1..d304dddd79db 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "ics"; - version = "0.6"; + version = "0.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "C4ptainCrunch"; repo = "ics.py"; rev = "v${version}"; - sha256 = "02bs9wlh40p1n33jchrl2cdpsnm5hq84070by3b6gm0vmgz6gn5v"; + sha256 = "0rrdc9rcxc3ys6rml81b8m8qdlisk78a34bdib0wy65hlkmyyykn"; }; propagatedBuildInputs = [ tatsu arrow ]; @@ -34,6 +34,7 @@ buildPythonPackage rec { write ics data in a developer friendly way. ''; homepage = "http://icspy.readthedocs.org/en/stable/"; + changelog = "https://github.com/C4ptainCrunch/ics.py/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 86d1617852b8..7102995cdf24 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.10"; + version = "1.4.11"; src = fetchPypi { inherit pname version; - sha256 = "0q1k22n8w7mmab1vh2r3bsqbxkxbb2zka548rcnn2rd9yg8rxnca"; + sha256 = "15kbcgqz6zf9qqvyw3pwy611knv1lyaqmc213ivmqciq3zifn96q"; }; # Tests not included in PyPI tarball @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "File identification library for Python"; - homepage = https://github.com/chriskuehl/identify; + homepage = "https://github.com/chriskuehl/identify"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/ifconfig-parser/default.nix b/pkgs/development/python-modules/ifconfig-parser/default.nix new file mode 100644 index 000000000000..cb3fb0fded5d --- /dev/null +++ b/pkgs/development/python-modules/ifconfig-parser/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "ifconfig-parser"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "KnightWhoSayNi"; + repo = pname; + rev = "4921ac9d6be6244b062d082c164f5a5e69522478"; + sha256 = "07hbkbr1qspr7qgzldkaslzc6ripj5zlif12d4fk5j801yhvnxjd"; + }; + + checkPhase = '' + export PYTHONPATH=$PYTHONPATH:$(pwd)/ifconfigparser:$(pwd)/ifconfigparser/tests + python -m unittest -v test_ifconfig_parser.TestIfconfigParser + ''; + + meta = with stdenv.lib; { + description = "Unsophisticated python package for parsing raw output of ifconfig."; + homepage = "https://github.com/KnightWhoSayNi/ifconfig-parser"; + license = licenses.mit; + maintainers = with maintainers; [ atemu ]; + }; +} diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 49b0991f1fd0..5de9e25bcf1f 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.12.3"; + version = "0.13.0"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "1zbj7xjhkr44grfyv1hb7ff5n1218f9jjabgzica29vh7c74m6jx"; + sha256 = "0nbs9m2pqg4j10m7c31vyb8h7wy29d9s8kiv0k2igbr821k1y3xr"; }; propagatedBuildInputs = [ ipython ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gotcha/ipdb; + homepage = "https://github.com/gotcha/ipdb"; description = "IPython-enabled pdb"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 6e356665d044..9c0ab175004e 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { pname = "ipykernel"; version = "5.1.4"; - disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; @@ -38,12 +37,23 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) ''; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin ([ # see https://github.com/NixOS/nixpkgs/issues/76197 "test_subprocess_print" "test_subprocess_error" "test_ipython_start_kernel_no_userns" - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + # flaky test https://github.com/ipython/ipykernel/issues/485 + "test_shutdown" + + # test regression https://github.com/ipython/ipykernel/issues/486 + "test_sys_path_profile_dir" + "test_save_history" + "test_help_output" + "test_write_kernel_spec" + "test_ipython_start_kernel_userns" + "ZMQDisplayPublisherTests" + ]); # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix new file mode 100644 index 000000000000..1773a077fdd5 --- /dev/null +++ b/pkgs/development/python-modules/jc/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi, + ruamel_yaml +, ifconfig-parser +, xmltodict +, isPy27 +}: + +buildPythonPackage rec { + pname = "jc"; + version = "1.7.5"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "16ndzvyvx4s3b6cnhxbd5fs3fkc3fwygz7qzaw7ws76sag1zpx67"; + }; + + propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ]; + + meta = with stdenv.lib; { + description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output."; + homepage = "https://github.com/kellyjonbrazil/jc"; + license = licenses.mit; + maintainers = with maintainers; [ atemu ]; + }; +} diff --git a/pkgs/development/python-modules/jsonpath/default.nix b/pkgs/development/python-modules/jsonpath/default.nix new file mode 100644 index 000000000000..383df6e2652e --- /dev/null +++ b/pkgs/development/python-modules/jsonpath/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jsonpath"; + version = "0.82"; + + src = fetchPypi { + inherit pname version; + sha256 = "46d3fd2016cd5b842283d547877a02c418a0fe9aa7a6b0ae344115a2c990fef4"; + }; + + meta = with lib; { + description = "An XPath for JSON"; + homepage = "https://github.com/json-path/JsonPath"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 41eb2b58ca88..a77a1a576b47 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.3.2"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "081c8dbql93bpl72pzg0z8vg482r3f350490mhqn965s10bz8say"; + sha256 = "0jijf4a3iaskzi6frjwhd8drh7brn94r1zl7gni6d0dzr296mm93"; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts"; - homepage = https://github.com/mwouts/jupytext; + homepage = "https://github.com/mwouts/jupytext"; license = licenses.mit; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index 9c968fa37229..3827c2972058 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "localzone"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "ags-slc"; repo = pname; rev = "v${version}"; - sha256 = "1zziqyhbg8vg901b4hjzzab0paag5cng48vk9xf1hchxk5naf58n"; + sha256 = "154l7qglsm4jrhqddvlas8cgl9qm2z4dzihv05jmsyqjikcmfwk8"; }; propagatedBuildInputs = [ dnspython sphinx ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple DNS library for managing zone files"; - homepage = https://localzone.iomaestro.com; + homepage = "https://localzone.iomaestro.com"; license = licenses.bsd3; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix index f1e6f1bf918e..ac7b21361c97 100644 --- a/pkgs/development/python-modules/orderedset/default.nix +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -2,16 +2,16 @@ buildPythonPackage rec { pname = "orderedset"; - version = "2.0.1"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "11643qr12ypxfffcminlsgl9xz751b2d0pnjl6zn8vfhxddjr57f"; + sha256 = "0abf19w37kxypsj6v7dz79jj92y1kivjk2zivnrv7rw6bbxwrxdj"; }; meta = with stdenv.lib; { description = "An Ordered Set implementation in Cython"; - homepage = https://pypi.python.org/pypi/orderedset; + homepage = "https://pypi.python.org/pypi/orderedset"; license = licenses.bsd3; maintainers = [ maintainers.jtojnar ]; }; diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix new file mode 100644 index 000000000000..1c80dd6fe552 --- /dev/null +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, geojson +, lxml +, matplotlib +, numpy +, pandas +, ujson +, xarray +}: + +buildPythonPackage rec { + pname = "osmpythontools"; + version = "0.2.6"; + + src = fetchPypi { + pname = "OSMPythonTools"; + inherit version; + sha256 = "efc72e3963971c6c7fd94bd374704a5b78eb6c07397a4ffb5f9176c1e4aee096"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + geojson + lxml + matplotlib + numpy + pandas + ujson + xarray + ]; + + patches = [ ./remove-unused-dependency.patch ]; + + # no tests included + doCheck = false; + + pythonImportsCheck = [ + "OSMPythonTools" + "OSMPythonTools.api" + "OSMPythonTools.data" + "OSMPythonTools.element" + "OSMPythonTools.nominatim" + "OSMPythonTools.overpass" + ]; + + meta = with lib; { + description = "A library to access OpenStreetMap-related services"; + longDescription = '' + The python package OSMPythonTools provides easy access to + OpenStreetMap-related services, among them an Overpass endpoint, + Nominatim, and the OpenStreetMap editing API. + ''; + homepage = "https://github.com/mocnik-science/osm-python-tools"; + license = licenses.gpl3; + maintainers = with maintainers; [ das-g ]; + }; +} diff --git a/pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch b/pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch new file mode 100644 index 000000000000..bac80e9bd8cc --- /dev/null +++ b/pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch @@ -0,0 +1,22 @@ +diff --git a/OSMPythonTools.egg-info/requires.txt b/OSMPythonTools.egg-info/requires.txt +index 16a5019..e58155c 100644 +--- a/OSMPythonTools.egg-info/requires.txt ++++ b/OSMPythonTools.egg-info/requires.txt +@@ -1,5 +1,4 @@ + beautifulsoup4 +-datetime + geojson + lxml + matplotlib +diff --git a/setup.py b/setup.py +index 08e9455..1a6435e 100644 +--- a/setup.py ++++ b/setup.py +@@ -14,7 +14,6 @@ setup( + packages = ['OSMPythonTools', 'OSMPythonTools.internal'], + install_requires = [ + 'beautifulsoup4', +- 'datetime', + 'geojson', + 'lxml', + 'matplotlib', diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 6b219ed0dd17..ff64f9ca82df 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,16 +2,16 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.11.3"; + version = "8.11.4"; src = fetchPypi { inherit pname version; - sha256 = "1rh0860ml00kw5c4b4r31wz5s8cmd5mpxx5slypdgljk4ralyg6p"; + sha256 = "13hfcw89kppm8s2qx0s5bafzxjc0qhm9sxmpf6yqvshz2fn82pk8"; }; meta = { description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers"; - homepage = https://github.com/daviddrysdale/python-phonenumbers; + homepage = "https://github.com/daviddrysdale/python-phonenumbers"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ fadenb ]; }; diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 44621d353830..2828cb6b3f97 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -32,6 +32,7 @@ let in buildPythonPackage rec { pname = "poetry"; version = "1.0.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -42,12 +43,10 @@ in buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.15.0\"" \ --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.0\"" \ - --replace "importlib-metadata = {version = \"~1.1.3\", python = \"<3.8\"}" \ - "importlib-metadata = {version = \"~1.3.0\", python = \"<3.8\"}" + --replace 'importlib-metadata = {version = "~1.1.3", python = "<3.8"}' \ + 'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}' ''; - format = "pyproject"; - nativeBuildInputs = [ intreehooks ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix new file mode 100644 index 000000000000..b526ba6cab11 --- /dev/null +++ b/pkgs/development/python-modules/pushover-complete/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, six +, tox +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pushover-complete"; + version = "1.1.1"; + + src = fetchPypi { + pname = "pushover_complete"; + inherit version; + sha256 = "8a8f867e1f27762a28a0832c33c6003ca54ee04c935678d124b4c071f7cf5a1f"; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + checkInputs = [ pytest tox ]; + + # Fails also on their travis right now: + # - https://travis-ci.org/scolby33/pushover_complete/builds?utm_medium=notification&utm_source=github_status + doCheck = pythonOlder "3.7"; + + meta = with lib; { + description = "A Python package for interacting with *all* aspects of the Pushover API"; + homepage = https://github.com/scolby33/pushover_complete; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 50dd1a09890f..1c6fe286db5a 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -10,15 +10,16 @@ , certifi , bitstring , unittest2 +, future }: buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "580b52e95f67a41ed86c56a514aa2b362f53fbaf23f16c69fb24e0d19fd373ee"; + sha256 = "1jjkzf7vwms6pymnmdr893830vrymxnq455xnqp21wqhjjiy2amd"; }; propagatedBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { tzlocal certifi bitstring + future ]; checkInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 4ff50ad7b96c..7cd504dec810 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.10"; + version = "1.16.11"; src = fetchPypi { inherit pname version; - sha256 = "d7893954f97fa6087629f3875f3be066dab51302e7c73f4c98c0516a8e2893fb"; + sha256 = "006m31qvvdwbpmxnhj1gs7rpd1jb214mf2hacqmisryx8dnb2jm7"; }; patchPhase = '' @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for MuPDF's rendering library."; - homepage = https://github.com/pymupdf/PyMuPDF; + homepage = "https://github.com/pymupdf/PyMuPDF"; maintainers = with maintainers; [ teto ]; license = licenses.agpl3; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix new file mode 100644 index 000000000000..18e73f56686d --- /dev/null +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests +, tqdm, websocket_client, pythonOlder }: + +buildPythonPackage rec { + pname = "python-mpv-jsonipc"; + version = "1.1.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "iwalton3"; + repo = "python-mpv-jsonipc"; + rev = "v${version}"; + sha256 = "08bs6qrcf5fi72jijmr2w7zs6aa5976dwv04f11ajwhj6i8kfq35"; + }; + + # 'mpv-jsonipc' does not have any tests + doCheck = false; + + propagatedBuildInputs = [ requests tqdm websocket_client ]; + + pythonImportsCheck = [ "python_mpv_jsonipc" ]; + + meta = with lib; { + homepage = "https://github.com/iwalton3/python-mpv-jsonipc"; + description = "Python API to MPV using JSON IPC"; + license = licenses.gpl3; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 4fe5fd9e63b4..0916695ed43a 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.1.2"; + version = "1.1.3"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "12szhfify7wn02cbiz9xapwfyp7bg0zm2ja9wq4jyaz5ijy6rm45"; + sha256 = "0i081bkmv7qw24ivmdh92ma6x0hnjlf8jgj6rp2c3rb8hjzmi452"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to read and write geospatial raster data"; license = licenses.bsd3; - homepage = https://rasterio.readthedocs.io/en/latest/; + homepage = "https://rasterio.readthedocs.io/en/latest/"; maintainers = with maintainers; [ mredaelli ]; }; } diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 6a16b38c6e15..b2578d5dd63d 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -1,29 +1,58 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, websocket_client, requests, six, pytest, codecov, coverage, mock, pytestcov, pytest-mock, responses, flake8 }: +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, black +, codecov +, flake8 +, isPy3k +, mock +, pytest-mock +, pytestCheckHook +, pytestcov +, pytestrunner +, requests +, responses +, six +, websocket_client +}: buildPythonPackage rec { pname = "python-slackclient"; - version = "1.2.1"; + version = "2.5.0"; + + disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = pname; rev = version; - sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0"; + sha256 = "1ngj1mivbln19546195k400w9yaw69g0w6is7c75rqwyxr8wgzsk"; }; - propagatedBuildInputs = [ websocket_client requests six ]; + propagatedBuildInputs = [ + aiohttp + websocket_client + requests + six + ]; - checkInputs = [ pytest codecov coverage mock pytestcov pytest-mock responses flake8 ]; - # test_server.py fails because it needs connection (I think); - checkPhase = '' - py.test --cov-report= --cov=slackclient tests --ignore=tests/test_server.py - ''; + checkInputs = [ + black + codecov + flake8 + mock + pytest-mock + pytestCheckHook + pytestcov + pytestrunner + responses + ]; meta = with stdenv.lib; { description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API"; - homepage = https://github.com/slackapi/python-slackclient; + homepage = "https://github.com/slackapi/python-slackclient"; license = licenses.mit; - maintainers = with maintainers; [ psyanticy ]; + maintainers = with maintainers; [ flokli psyanticy ]; }; } - diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 366897d3e198..469c892a9034 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "smmap"; - version = "0.9.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0qlx25f6n2n9ff37w9gg62f217fzj16xlbh0pkz0lpxxjys64aqf"; + sha256 = "0ijlnv60y8f41py1wnn5n1a1i81cxd9dfpdhr0k3cgkrcbz8850p"; }; checkInputs = [ nosexcover ]; meta = { description = "A pure python implementation of a sliding window memory map manager"; - homepage = https://github.com/gitpython-developers/smmap; + homepage = "https://github.com/gitpython-developers/smmap"; maintainers = [ ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix b/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix new file mode 100644 index 000000000000..39c667357c8f --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage +, numpy +, absl-py +, mock +}: + +buildPythonPackage rec { + pname = "tensorflow-estimator"; + version = "1.15.1"; + format = "wheel"; + + src = fetchPypi { + pname = "tensorflow_estimator"; + inherit version format; + sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8"; + }; + + propagatedBuildInputs = [ mock numpy absl-py ]; + + meta = with stdenv.lib; { + description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ jyp ]; + }; +} + diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index 9f6be4d1ddac..47ce0f83b02d 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -1,19 +1,18 @@ { stdenv, fetchPypi, buildPythonPackage , numpy -, absl-py +, absl-py , mock }: buildPythonPackage rec { pname = "tensorflow-estimator"; - # This is effectively 1.15.0. Upstream tagged 1.15.0 by mistake before actually updating the version in setup.py, which is why this tag is called 1.15.1. - version = "1.15.1"; + version = "2.1.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8"; + sha256 = "0wk9viil54ms1s2ir7zxygqa425i69hx8zngwhdqvw9nlr4gdig5"; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index b585ab4f81b5..99a3a978a4e7 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -42,7 +42,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + sha256 = "0135nxxvkmjzpd80r1g9fdkk9h62g0xlvp32g5zgk0hkma5kq0bx"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index e0108aed5ef6..202b167c7e6c 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -7,6 +7,7 @@ , markdown , futures , absl-py +, google-auth-oauthlib }: # tensorflow/tensorboard is built from a downloaded wheel, because @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "1.15.0"; + version = "2.1.0"; format = "wheel"; src = fetchPypi ({ @@ -24,10 +25,10 @@ buildPythonPackage rec { format = "wheel"; } // (if isPy3k then { python = "py3"; - sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac"; + sha256 = "1wpjdzhjpcdkyaahzd4bl71k4l30z5c55280ndiwj32hw70lxrp6"; } else { python = "py2"; - sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1"; + sha256 = "1f805839xa36wxb7xac9fyxzaww92vw4d50vs6g61wnlr4byp00w"; })); propagatedBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { markdown grpcio absl-py + google-auth-oauthlib # not declared in install_requires, but used at runtime # https://github.com/NixOS/nixpkgs/issues/73840 wheel diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 38fec9adc7dc..e81dc2dbd002 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -14,6 +14,9 @@ , absl-py , grpcio , mock +, scipy +, wheel +, opt-einsum , backports_weakref , tensorflow-estimator , tensorflow-tensorboard @@ -55,21 +58,22 @@ in buildPythonPackage { src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; - pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot; platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; - key = "${platform}_py_${pyver}_${unit}"; + key = "${platform}_py_${pyVerNoDot}_${unit}"; in fetchurl packages.${key}; propagatedBuildInputs = [ protobuf numpy + scipy termcolor grpcio six astor absl-py gast + opt-einsum google-pasta wrapt tensorflow-estimator @@ -79,40 +83,94 @@ in buildPythonPackage { ] ++ lib.optional (!isPy3k) mock ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ]; - nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + nativeBuildInputs = [ wheel ] ++ lib.optional cudaSupport addOpenGLRunpath; - # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow - # and the propageted input tensorflow-tensorboard which causes environment collisions. - # another possibility would be to have tensorboard only in the buildInputs - # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 - postInstall = '' - rm $out/bin/tensorboard + preConfigure = '' + unset SOURCE_DATE_EPOCH + + # Make sure that dist and the wheel file are writable. + chmod u+rwx -R ./dist + + pushd dist + + # Unpack the wheel file. + wheel unpack --dest unpacked ./*.whl + + # Tensorflow has a hard dependency on gast==0.2.2, but we relax it to + # gast==0.3.2. + substituteInPlace ./unpacked/tensorflow*/tensorflow_core/tools/pip_package/setup.py --replace "gast == 0.2.2" "gast == 0.3.2" + substituteInPlace ./unpacked/tensorflow*/tensorflow_*.dist-info/METADATA --replace "gast (==0.2.2)" "gast (==0.3.2)" + + # Pack the wheel file back up. + wheel pack ./unpacked/tensorflow* + + popd ''; # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then # patchelf --shrink-rpath will remove the cuda libraries. - postFixup = let - rpath = stdenv.lib.makeLibraryPath - ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); - in - lib.optionalString stdenv.isLinux '' - rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}" - internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" - find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - patchelf --set-rpath "$rrPath" "$lib" - ${lib.optionalString cudaSupport '' - addOpenGLRunpath "$lib" - ''} - done - ''; + postFixup = + let + # rpaths we only need to add if CUDA is enabled. + cudapaths = lib.optionals cudaSupport [ + cudatoolkit.out + cudatoolkit.lib + cudnn + nvidia_x11 + ]; + + libpaths = [ + stdenv.cc.cc.lib + zlib + ]; + + rpath = stdenv.lib.makeLibraryPath (libpaths ++ cudapaths); + in + lib.optionalString stdenv.isLinux '' + # This is an array containing all the directories in the tensorflow2 + # package that contain .so files. + # + # TODO: Create this list programmatically, and remove paths that aren't + # actually needed. + rrPathArr=( + "$out/${python.sitePackages}/tensorflow_core/" + "$out/${python.sitePackages}/tensorflow_core/compiler/tf2tensorrt/" + "$out/${python.sitePackages}/tensorflow_core/compiler/tf2xla/ops/" + "$out/${python.sitePackages}/tensorflow_core/lite/experimental/microfrontend/python/ops/" + "$out/${python.sitePackages}/tensorflow_core/lite/python/interpreter_wrapper/" + "$out/${python.sitePackages}/tensorflow_core/lite/python/optimize/" + "$out/${python.sitePackages}/tensorflow_core/python/" + "$out/${python.sitePackages}/tensorflow_core/python/framework/" + "${rpath}" + ) + + # The the bash array into a colon-separated list of RPATHs. + rrPath=$(IFS=$':'; echo "''${rrPathArr[*]}") + echo "about to run patchelf with the following rpath: $rrPath" + + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + echo "about to patchelf $lib..." + chmod a+rx "$lib" + patchelf --set-rpath "$rrPath" "$lib" + ${lib.optionalString cudaSupport '' + addOpenGLRunpath "$lib" + ''} + done + ''; + pythonImportsCheck = [ + "tensorflow" + "tensorflow.keras" + "tensorflow.python" + "tensorflow.python.framework" + ]; meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; homepage = http://tensorflow.org; license = licenses.asl20; - maintainers = with maintainers; [ jyp abbradar ]; + maintainers = with maintainers; [ jyp abbradar cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; # Python 2.7 build uses different string encoding. # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253 diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index fa4809dc3f19..90848e93273f 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,43 +1,51 @@ { -version = "1.14.0"; +version = "2.1.0"; +linux_py_27_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp27-cp27mu-manylinux2010_x86_64.whl"; + sha256 = "17lnhr7vdrls68c79n3sah5rpd0q1x2v5m84azvlyxxh2wpypfmb"; +}; linux_py_27_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl"; - sha256 = "0yywdrfk97dh1bxhibspg0raz70fx9lcczj6xlimqy4xb60clx7k"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp27-cp27mu-manylinux2010_x86_64.whl"; + sha256 = "10lz3i4pcpgqrcbjmxm0n7k1gsqlpna3kdid902j2fy060cpi93z"; +}; +linux_py_35_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp35-cp35m-manylinux2010_x86_64.whl"; + sha256 = "09s081n08dpmflwgir3zwzfijfpmahbh2gy5fn5bv5ll86g1szsy"; }; linux_py_35_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "1xvyb6xcrjhlwvrmrhn5vs9xy7g98smqmpv4i3hhpry4qyasphhj"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp35-cp35m-manylinux2010_x86_64.whl"; + sha256 = "1aa7v9fnvx03hqvhl3x3xcn41qy6qxw5xybg54ifjvvicp455c8l"; }; -linux_py_36_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "1psd9vyxz9f39dwj77nvrg373sxv3p5vdp9fnz81dpsm0b0mwl44"; +linux_py_36_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp36-cp36m-manylinux2010_x86_64.whl"; + sha256 = "1dqp080ljbl9v3115vjp63ls0fimiwym6zxyanyhrlk8kwsq20zc"; }; -linux_py_37_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp37-cp37m-linux_x86_64.whl"; - sha256 = "0bg2sb1n2ag27r7ww695kg5hb0mjrw4kc5893krmixx2j71860c5"; +linux_py_36_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp36-cp36m-manylinux2010_x86_64.whl"; + sha256 = "133z8anx7xm9rr5i9s9dwnp1wf06nr6s7q1lbs4lxpk6kn9nl480"; }; -linux_py_27_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp27-none-linux_x86_64.whl"; - sha256 = "0y1x91gayg6pjddgl8ndcm63wfzhyv4s5khgl7ffzsgni1ivaqw5"; +linux_py_37_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp37-cp37m-manylinux2010_x86_64.whl"; + sha256 = "0yabl3xmcpr67w0zksqs3qc68nl9ax0vcd7w7b35nq8f65xl0ghy"; }; -linux_py_35_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "03piggpbz1jx8m2b95spq3jrdff4w6xx63ji07am7hyw2nsgx3mx"; +linux_py_37_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp37-cp37m-manylinux2010_x86_64.whl"; + sha256 = "04gngbngyg7p1gwx1q89my0cl8j7lq4kknqh51s2ynrix71zvsy6"; }; -linux_py_36_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "0ypkp8cfhharsyyikb1qgf44cfm6284km9xswzvzymjzz75vg3gd"; +mac_py_27_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp27-cp27m-macosx_10_9_x86_64.whl"; + sha256 = "1mprp72w5kk0lyjm2mh4lf57827xk3wsg28c4gizwm00ydfgacg6"; }; -linux_py_37_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp37-cp37m-linux_x86_64.whl"; - sha256 = "0virp8nn2ysx4855hq29kas6fm6b3dsiybwzdxy9nnb9n2d8qlm2"; +mac_py_35_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp35-cp35m-macosx_10_6_intel.whl"; + sha256 = "1as7brf5ai6r7v1di9646jfrbnirpk2b0d1g29mn3shavb62kw8w"; }; -mac_py_2_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl"; - sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26"; +mac_py_36_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp36-cp36m-macosx_10_9_x86_64.whl"; + sha256 = "1v1rw9kjrskhcq1yas4ly2yfnzf2i1pjh6qg6zixfbkpkw7sw3wc"; }; -mac_py_3_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl"; - sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3"; +mac_py_37_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp37-cp37m-macosx_10_9_x86_64.whl"; + sha256 = "1hh4n0d97mrq35cmmsrnlmcv9vlswsyjy368lj3pda3y9dvck3rf"; }; } diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index a9f3ebf9e486..cdf659a74dc7 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +{ stdenv, pkgs, bazel_1, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin , addOpenGLRunpath # Python deps , buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python @@ -7,7 +7,7 @@ , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta , functools32 , opt-einsum -, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator +, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1_15_1 # Common deps , git, swig, which, binutils, glibcLocales, cython # Common libraries @@ -69,7 +69,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "1.15.0"; + version = "1.15.1"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -94,6 +94,7 @@ let bazel-build = buildBazelPackage { name = "${pname}-${version}"; + bazel = bazel_1; src = fetchFromGitHub { owner = "tensorflow"; @@ -114,6 +115,11 @@ let url = "https://github.com/tensorflow/tensorflow/pull/29673/commits/498e35a3bfe38dd75cf1416a1a23c07c3b59e6af.patch"; sha256 = "1m2qmwv1ysqa61z6255xggwbq6mnxbig749bdvrhnch4zydxb4di"; }) + (fetchpatch { + name = "backport-pr-18950.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/73640aaec2ab0234d9fff138e3c9833695570c0a.patch"; + sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz"; + }) ./tf-1.15-bazel-1.0.patch @@ -290,10 +296,12 @@ let TF_SYSTEM_LIBS = null; # cudaSupport causes fetch of ncclArchive, resulting in different hashes + # FIXME: can't (re)produce this output with current bazel. + # FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35 sha256 = if cudaSupport then - "1rbg8w8pjf15hpvzrclsi19lhsrwdns6f8psb1wz35ay0ggdw8c0" + "0gyhjvzshgj59mbns8njlfl9qpz4sdg4j0xs2dva0w2nql7cr7im" else - "0d8wq89iz9vrzvr971mgdclxxjcjr32r7aj817h019x3pc53qnwx"; + "04jvg3mc2si4xdbszc1vnw1rmf22p7snbjphmnklp7bc39jxkcrz"; }; buildAttrs = { @@ -368,7 +376,7 @@ in buildPythonPackage { numpy six protobuf - tensorflow-estimator + tensorflow-estimator_1_15_1 termcolor wrapt grpcio diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index d590fb0f1732..abb0faac2834 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,33 +1,44 @@ #!/usr/bin/env bash -version=1.14.0 +version=2.1.0 + +# List of binary wheels for Tensorflow. The most recent versions can be found +# on the following page: +# https://www.tensorflow.org/install/pip?lang=python3#package-location +url_and_key_list=( + "linux_py_27_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp27-cp27mu-manylinux2010_x86_64.whl" + "linux_py_27_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp27-cp27mu-manylinux2010_x86_64.whl" + "linux_py_35_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp35-cp35m-manylinux2010_x86_64.whl" + "linux_py_35_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp35-cp35m-manylinux2010_x86_64.whl" + "linux_py_36_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp36-cp36m-manylinux2010_x86_64.whl" + "linux_py_36_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp36-cp36m-manylinux2010_x86_64.whl" + "linux_py_37_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl" + "linux_py_37_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl" + "mac_py_27_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp27-cp27m-macosx_10_9_x86_64.whl" + "mac_py_35_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp35-cp35m-macosx_10_6_intel.whl" + "mac_py_36_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp36-cp36m-macosx_10_9_x86_64.whl" + "mac_py_37_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp37-cp37m-macosx_10_9_x86_64.whl" +) + hashfile=binary-hashes.nix rm -f $hashfile echo "{" >> $hashfile echo "version = \"$version\";" >> $hashfile -for sys in "linux" "mac"; do - for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do - for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64" "cp37-cp37m-linux_x86_64"; do - if [ $sys == "mac" ]; then - [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]] - result=$? - pyver=${pykind:2:1} - flavour=cpu - else - [[ $pykind =~ .*linux.* ]] - result=$? - pyver=${pykind:2:2} - flavour=${tfpref:0:3} - fi - if [ $result == 0 ]; then - url=https://storage.googleapis.com/tensorflow/$sys/$tfpref-$version-$pykind.whl - hash=$(nix-prefetch-url $url) - echo "${sys}_py_${pyver}_${flavour} = {" >> $hashfile - echo " url = \"$url\";" >> $hashfile - echo " sha256 = \"$hash\";" >> $hashfile - echo "};" >> $hashfile - fi - done - done + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + + echo "prefetching ${url}..." + hash=$(nix-prefetch-url $url) + + echo "$key = {" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " sha256 = \"$hash\";" >> $hashfile + echo "};" >> $hashfile + + echo done + echo "}" >> $hashfile +echo "done." diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 72e6e0aca632..de48b3736cfc 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.5.8"; + version = "0.5.11"; src = fetchPypi { inherit pname version; - sha256 = "32c10cc16ded7e4101c79f269910658cc2a0be5913f1252121c3cd603051c269"; + sha256 = "1kq1663iqxgwrmb883n55ypi5axnixla2hrby9g2x227asifsi7h"; }; propagatedBuildInputs = @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/sdispater/tomlkit; + homepage = "https://github.com/sdispater/tomlkit"; description = "Style-preserving TOML library for Python"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 0812ff590a50..66f33f6e31f4 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, ruby, lib +{ stdenv, runCommand, ruby, lib, rsync , defaultGemConfig, buildRubyGem, buildEnv , makeWrapper , bundler @@ -13,6 +13,7 @@ , lockfile ? null , gemset ? null , ruby ? defs.ruby +, copyGemFiles ? false # Copy gem files instead of symlinking , gemConfig ? defaultGemConfig , postBuild ? null , document ? [] @@ -96,7 +97,8 @@ let envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler; - basicEnv = buildEnv { + + basicEnvArgs = { inherit buildInputs ignoreCollisions; name = name'; @@ -154,5 +156,17 @@ let }; }; }; + + basicEnv = + if copyGemFiles then + runCommand name' basicEnvArgs '' + mkdir -p $out + for i in $paths; do + ${rsync}/bin/rsync -a $i/lib $out/ + done + eval "$postBuild" + '' + else + buildEnv basicEnvArgs; in basicEnv diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index 9e9ccb128cf9..d412d10102f7 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -1,4 +1,6 @@ -{ ruby, lib, callPackage, defaultGemConfig, buildEnv, bundler }@defs: +{ ruby, lib, callPackage, defaultGemConfig, buildEnv, runCommand +, bundler, rsync +}@defs: { name ? null , pname ? null @@ -8,6 +10,7 @@ , gemset ? null , groups ? ["default"] , ruby ? defs.ruby +, copyGemFiles ? false # Copy gem files instead of symlinking , gemConfig ? defaultGemConfig , postBuild ? null , document ? [] @@ -38,23 +41,35 @@ in if pname == null then basicEnv // { inherit name basicEnv; } else - (buildEnv { - inherit ignoreCollisions; - - name = basicEnv.name; - - paths = envPaths; - pathsToLink = [ "/lib" ]; - - postBuild = genStubsScript { - inherit lib ruby bundler groups; - confFiles = basicEnv.confFiles; - binPaths = [ basicEnv.gems.${pname} ]; - } + lib.optionalString (postBuild != null) postBuild; - - meta = { platforms = ruby.meta.platforms; } // meta; - passthru = basicEnv.passthru // { - inherit basicEnv; - inherit (basicEnv) env; - } // passthru; - }) + let + bundlerEnvArgs = { + inherit ignoreCollisions; + + name = basicEnv.name; + + paths = envPaths; + pathsToLink = [ "/lib" ]; + + postBuild = genStubsScript { + inherit lib ruby bundler groups; + confFiles = basicEnv.confFiles; + binPaths = [ basicEnv.gems.${pname} ]; + } + lib.optionalString (postBuild != null) postBuild; + + meta = { platforms = ruby.meta.platforms; } // meta; + passthru = basicEnv.passthru // { + inherit basicEnv; + inherit (basicEnv) env; + } // passthru; + }; + in + if copyGemFiles then + runCommand basicEnv.name bundlerEnvArgs '' + mkdir -p $out + for i in $paths; do + ${rsync}/bin/rsync -a $i/lib $out/ + done + eval "$postBuild" + '' + else + buildEnv bundlerEnvArgs diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index f26e33ca2427..d68e1592d887 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -506,7 +506,7 @@ in --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}" substituteInPlace lib/vips.rb \ - --replace "vips_libname = 'vips'" "vips_libname = '${vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" + --replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; }; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 5ac52c71abea..8649c05d73b9 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.29"; + version = "8.30"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1rbipf4031inv34ci0rczz7dipi3b12cpn45h949i095gdh37pgh"; + sha256 = "1wsgpfdqasfz6chhy0w5pdjm4by6ih2g0l44lxwks9kik2lrs4av"; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { adheres to a coding standard. By default it supports the Sun Code Conventions, but is highly configurable. ''; - homepage = http://checkstyle.sourceforge.net/; + homepage = "http://checkstyle.sourceforge.net/"; license = licenses.lgpl21; maintainers = with maintainers; [ pSub ]; platforms = jre.meta.platforms; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 4772a0e2308e..67ded5bbb4a9 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.119.0"; + version = "0.119.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0myvhdanhwljqa3irmkkdchd81416xnh9w0mgdajyh4az4safc1k"; + sha256 = "1p3kjdm4lsbc2lzab3kj1fjvccv8p47bj4s3jnfp2n7qppy7sbbf"; }; installPhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A static type checker for JavaScript"; - homepage = https://flow.org/; + homepage = "https://flow.org/"; changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index f5a5d0e65d65..38fd32f38b65 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -30,11 +30,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.41.0"; + version = "0.43.0"; src = fetchPypi { inherit pname version; - sha256 = "1v21bhylys1mvrsvxqw88cvghl6s46hdni52xn661bbn4byrrv3b"; + sha256 = "0v852636chil5n4cjqjvh29hhik881pkljs64jy5jiznbrph9ryr"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 62ecc47b17bd..29276fb6bfba 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -62,7 +62,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0g2y283glx2ykxxqc3vsg520a6s2w5d937wndhgpfajc5yjgiz43"; + sha256 = "0cmj186n2y1g9kkdhcivmh2qvigvpnbp03m575b7hgsxi1cp3ssj"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix index 2a784b30b322..6c12003b9649 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' # This is breaking the build of any C target. This patch removes the last # argument if it's found to be an empty string. - ./trim-last-argument-to-gcc-if-empty.patch + ../trim-last-argument-to-gcc-if-empty.patch # --experimental_strict_action_env (which may one day become the default # see bazelbuild/bazel#2574) hardcodes the default @@ -169,17 +169,17 @@ stdenv.mkDerivation rec { # So we are replacing this bazel paths by defaultShellPath, # improving hermeticity and making it work in nixos. (substituteAll { - src = ./strict_action_env.patch; + src = ../strict_action_env.patch; strictActionEnvPatch = defaultShellPath; }) # bazel reads its system bazelrc in /etc # override this path to a builtin one (substituteAll { - src = ./bazel_rc.patch; + src = ../bazel_rc.patch; bazelSystemBazelRCPath = bazelRC; }) - ] ++ lib.optional enableNixHacks ./nix-hacks.patch; + ] ++ lib.optional enableNixHacks ../nix-hacks.patch; # Additional tests that check bazel’s functionality. Execute @@ -290,7 +290,7 @@ stdenv.mkDerivation rec { #!${runtimeShell} cat ${runCommand "bazel-deps.json" {} '' ${unzip}/bin/unzip ${src} WORKSPACE - ${python3}/bin/python3 ${./update-srcDeps.py} ./WORKSPACE > $out + ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out ''} > ${builtins.toString ./src-deps.json} ''; diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json index 7517a8c1b958..7517a8c1b958 100644 --- a/pkgs/development/tools/build-managers/bazel/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index ffdeb01c2bb1..3222406c15d7 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -64,7 +64,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "1n66hg1w5jv2rc8q4sjlaf0agvxr713aa40mbkhgjv57x9j7bgn0"; + sha256 = "141kw2zpr612xdcrg6x9kslg4d5b3fbpzx0vgp3lqwdihfj3sc1l"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix new file mode 100644 index 000000000000..ffb5714631ca --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -0,0 +1,559 @@ +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub +, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +# this package (through the fixpoint glass) +, bazel_1 +, lr, xe, zip, unzip, bash, writeCBin, coreutils +, which, gawk, gnused, gnutar, gnugrep, gzip, findutils +# updater +, python27, python3, writeScript +# Apple dependencies +, cctools, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk, runJdk +, buildJdkName +, runtimeShell +# Downstream packages for tests +, bazel-watcher +# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). +# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). +, enableNixHacks ? false +, gcc-unwrapped +, autoPatchelfHook +, file +, substituteAll +, writeTextFile +}: + +let + version = "1.2.1"; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + sha256 = "1qfk14mgx1m454b4w4ldggljzqkqwpdwrlynq7rc8aq11yfs8p95"; + }; + + # Update with `eval $(nix-build -A bazel.updater)`, + # then add new dependencies from the dict in ./src-deps.json as required. + srcDeps = lib.attrsets.attrValues srcDepsSet; + srcDepsSet = + let + srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { + urls = d.urls; + sha256 = d.sha256; + }); + in builtins.listToAttrs (map toFetchurl [ + srcs.desugar_jdk_libs + srcs.io_bazel_skydoc + srcs.bazel_skylib + srcs.io_bazel_rules_sass + srcs.platforms + (if stdenv.hostPlatform.isDarwin + then srcs."java_tools_javac11_darwin-v6.1.zip" + else srcs."java_tools_javac11_linux-v6.1.zip") + srcs."coverage_output_generator-v2.0.zip" + srcs.build_bazel_rules_nodejs + srcs."android_tools_pkg-0.12.tar.gz" + srcs."0.28.3.tar.gz" + srcs.rules_pkg + srcs.rules_cc + srcs.rules_java + srcs.rules_proto + ]); + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellPath = lib.makeBinPath + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # + [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ]; + + # Java toolchain used for the build and tests + javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; + + platforms = lib.platforms.linux ++ lib.platforms.darwin; + + # This repository is fetched by bazel at runtime + # however it contains prebuilt java binaries, with wrong interpreter + # and libraries path. + # We prefetch it, patch it, and override it in a global bazelrc. + system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; + + remote_java_tools = stdenv.mkDerivation { + name = "remote_java_tools_${system}"; + + src = srcDepsSet."java_tools_javac11_${system}-v6.1.zip"; + + nativeBuildInputs = [ autoPatchelfHook unzip ]; + buildInputs = [ gcc-unwrapped ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir $out; + ''; + + installPhase = '' + cp -Ra * $out/ + touch $out/WORKSPACE + ''; + }; + + bazelRC = writeTextFile { + name = "bazel-rc"; + text = '' + build --override_repository=${remote_java_tools.name}=${remote_java_tools} + build --distdir=${distDir} + startup --server_javabase=${runJdk} + + # load default location for the system wide configuration + try-import /etc/bazel.bazelrc + ''; + }; + +in +stdenv.mkDerivation rec { + pname = "bazel"; + inherit version; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel/"; + description = "Build tool that builds code quickly and reliably"; + license = licenses.asl20; + maintainers = [ maintainers.mboes ]; + inherit platforms; + }; + + inherit src; + sourceRoot = "."; + + patches = [ + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' + # This is breaking the build of any C target. This patch removes the last + # argument if it's found to be an empty string. + ../trim-last-argument-to-gcc-if-empty.patch + ./glibc.patch + + # --experimental_strict_action_env (which may one day become the default + # see bazelbuild/bazel#2574) hardcodes the default + # action environment to a non hermetic value (e.g. "/usr/local/bin"). + # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. + # So we are replacing this bazel paths by defaultShellPath, + # improving hermeticity and making it work in nixos. + (substituteAll { + src = ../strict_action_env.patch; + strictActionEnvPatch = defaultShellPath; + }) + + # bazel reads its system bazelrc in /etc + # override this path to a builtin one + (substituteAll { + src = ../bazel_rc.patch; + bazelSystemBazelRCPath = bazelRC; + }) + ] ++ lib.optional enableNixHacks ../nix-hacks.patch; + + + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel.tests + # + # in the nixpkgs checkout root to exercise them locally. + passthru.tests = + let + runLocal = name: attrs: script: + let + attrs' = removeAttrs attrs [ "buildInputs" ]; + buildInputs = [ python3 ] ++ (attrs.buildInputs or []); + in + runCommandCC name ({ + inherit buildInputs; + preferLocalBuild = true; + meta.platforms = platforms; + } // attrs') script; + + # bazel wants to extract itself into $install_dir/install every time it runs, + # so let’s do that only once. + extracted = bazelPkg: + let install_dir = + # `install_base` field printed by `bazel info`, minus the hash. + # yes, this path is kinda magic. Sorry. + "$HOME/.cache/bazel/_bazel_nixbld"; + in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' + export HOME=$(mktemp -d) + touch WORKSPACE # yeah, everything sucks + install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" + # assert it’s actually below install_dir + [[ "$install_base" =~ ${install_dir} ]] \ + || (echo "oh no! $install_base but we are \ + trying to copy ${install_dir} to $out instead!"; exit 1) + cp -R ${install_dir} $out + ''; + + bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: + let + be = extracted bazelPkg; + in runLocal name { inherit buildInputs; } ( + # skip extraction caching on Darwin, because nobody knows how Darwin works + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # set up home with pre-unpacked bazel + export HOME=$(mktemp -d) + mkdir -p ${be.install_dir} + cp -R ${be}/install ${be.install_dir} + + # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 + # Bazel checks whether the mtime of the install dir files + # is >9 years in the future, otherwise it extracts itself again. + # see PosixFileMTime::IsUntampered in src/main/cpp/util + # What the hell bazel. + ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} + '') + + + '' + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + + ${bazelScript} + + touch $out + ''); + + bazelWithNixHacks = bazel_1.override { enableNixHacks = true; }; + + bazel-examples = fetchFromGitHub { + owner = "bazelbuild"; + repo = "examples"; + rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc"; + sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8"; + }; + + in (if !stdenv.hostPlatform.isDarwin then { + # `extracted` doesn’t work on darwin + shebang = callPackage ./shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + } else {}) // { + bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + # downstream packages using buildBazelPackage + # fixed-output hashes of the fetch phase need to be spot-checked manually + downstream = recurseIntoAttrs ({ + inherit bazel-watcher; + } + # dm-sonnet is only packaged for linux + // (lib.optionalAttrs stdenv.isLinux { + # TODO(timokau) dm-sonnet is broken currently + # dm-sonnet-linux = python3.pkgs.dm-sonnet; + })); + }; + + # update the list of workspace dependencies + passthru.updater = writeScript "update-bazel-deps.sh" '' + #!${runtimeShell} + cat ${runCommand "bazel-deps.json" {} '' + ${unzip}/bin/unzip ${src} WORKSPACE + ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out + ''} > ${builtins.toString ./src-deps.json} + ''; + + # Necessary for the tests to pass on Darwin with sandbox enabled. + # Bazel starts a local server and needs to bind a local address. + __darwinAllowLocalNetworking = true; + + # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. + customBash = writeCBin "bash" '' + #include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include <unistd.h> + + extern char **environ; + + int main(int argc, char *argv[]) { + char *path = getenv("PATH"); + char *pathToAppend = "${defaultShellPath}"; + char *newPath; + if (path != NULL) { + int length = strlen(path) + 1 + strlen(pathToAppend) + 1; + newPath = malloc(length * sizeof(char)); + snprintf(newPath, length, "%s:%s", path, pathToAppend); + } else { + newPath = pathToAppend; + } + setenv("PATH", newPath, 1); + execve("${bash}/bin/bash", argv, environ); + return 0; + } + ''; + + postPatch = let + + darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails + export GCOV=${coreutils}/bin/false + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD + + # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead + sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done + ''; + + genericPatches = '' + # Substitute j2objc and objc wrapper's python shebang to plain python path. + # These scripts explicitly depend on Python 2.7, hence we use python27. + # See also `postFixup` where python27 is added to $out/nix-support + substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + + # md5sum is part of coreutils + sed -i 's|/sbin/md5|md5sum|' \ + src/BUILD + + # substituteInPlace is rather slow, so prefilter the files with grep + grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do + # If you add more replacements here, you must change the grep above! + # Only files containing /bin are taken into account. + # We default to python3 where possible. See also `postFixup` where + # python3 is added to $out/nix-support + substituteInPlace "$path" \ + --replace /bin/bash ${customBash}/bin/bash \ + --replace "/usr/bin/env bash" ${customBash}/bin/bash \ + --replace "/usr/bin/env python" ${python3}/bin/python \ + --replace /usr/bin/env ${coreutils}/bin/env \ + --replace /bin/true ${coreutils}/bin/true + done + + # bazel test runner include references to /bin/bash + substituteInPlace tools/build_rules/test_rules.bzl \ + --replace /bin/bash ${customBash}/bin/bash + + for i in $(find tools/cpp/ -type f) + do + substituteInPlace $i \ + --replace /bin/bash ${customBash}/bin/bash + done + + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/bash ${customBash}/bin/bash + + # add nix environment vars to .bazelrc + cat >> .bazelrc <<EOF + build --distdir=${distDir} + fetch --distdir=${distDir} + build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" + build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" + build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" + build --host_javabase='@local_jdk//:jdk' + build --host_java_toolchain='${javaToolchain}' + EOF + + # add the same environment vars to compile.sh + sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ + -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \ + -i scripts/bootstrap/compile.sh + + # This is necessary to avoid: + # "error: no visible @interface for 'NSDictionary' declares the selector + # 'initWithContentsOfURL:error:'" + # This can be removed when the apple_sdk is upgraded beyond 10.13+ + sed -i '/initWithContentsOfURL:versionPlistUrl/ { + N + s/error:nil\];/\];/ + }' tools/osx/xcode_locator.m + + # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash + echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp + cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp + mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash + + patchShebangs . + ''; + in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + + genericPatches; + + buildInputs = [ + buildJdk + python3 + ]; + + # when a command can’t be found in a bazel build, you might also + # need to add it to `defaultShellPath`. + nativeBuildInputs = [ + zip + python3 + unzip + makeWrapper + which + customBash + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + + # Bazel makes extensive use of symlinks in the WORKSPACE. + # This causes problems with infinite symlinks if the build output is in the same location as the + # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a + # subdirectory. + # Failing to do this causes "infinite symlink expansion detected" + preBuildPhases = ["preBuildPhase"]; + preBuildPhase = '' + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + ''; + + buildPhase = '' + # Increasing memory during compilation might be necessary. + # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + ./bazel_src/compile.sh + ./bazel_src/scripts/generate_bash_completion.sh \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.bash \ + --prepend=./bazel_src/scripts/bazel-complete-header.bash \ + --prepend=./bazel_src/scripts/bazel-complete-template.bash + ''; + + installPhase = '' + mkdir -p $out/bin + + # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel + # if it can’t find something in tools, it calls $out/bin/bazel-real + cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + mv ./bazel_src/output/bazel $out/bin/bazel-real + + # shell completion files + mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions + mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel + cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ + ''; + + doInstallCheck = true; + installCheckPhase = '' + export TEST_TMPDIR=$(pwd) + + hello_test () { + $out/bin/bazel test --distdir=${distDir} \ + --test_output=errors \ + --java_toolchain='${javaToolchain}' \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello + } + + cd ./bazel_src + + # test whether $WORKSPACE_ROOT/tools/bazel works + + mkdir -p tools + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exit 1 + EOF + chmod +x tools/bazel + + # first call should fail if tools/bazel is used + ! hello_test + + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exec "$BAZEL_REAL" "$@" + EOF + + # second call succeeds because it defers to $out/bin/bazel-real + hello_test + ''; + + # Save paths to hardcoded dependencies so Nix can detect them. + postFixup = '' + mkdir -p $out/nix-support + echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends + # The templates get tar’d up into a .jar, + # so nix can’t detect python is needed in the runtime closure + # Some of the scripts explicitly depend on Python 2.7. Otherwise, we + # default to using python3. Therefore, both python27 and python3 are + # runtime dependencies. + echo "${python27}" >> $out/nix-support/depends + echo "${python3}" >> $out/nix-support/depends + '' + lib.optionalString stdenv.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends + ''; + + dontStrip = true; + dontPatchELF = true; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch new file mode 100644 index 000000000000..c4de48068f11 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch @@ -0,0 +1,78 @@ +From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853 +From: Benjamin Peterson <benjamin@dropbox.com> +Date: Fri, 3 May 2019 08:11:00 -0700 +Subject: [PATCH] Rename gettid() functions. + +glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. +--- + src/core/lib/gpr/log_linux.cc | 6 ++---- + src/core/lib/gpr/log_posix.cc | 4 ++-- + src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 81026e5689b..8b597b4cf2f 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,7 @@ + #include <time.h> + #include <unistd.h> + +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = sys_gettid(); + + timer = static_cast<time_t>(now.tv_sec); + final_slash = strrchr(args->file, '/'); +diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc +index b6edc14ab6b..2f7c6ce3760 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc +@@ -31,7 +31,7 @@ + #include <string.h> + #include <time.h> + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { + char* prefix; + gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-70s %s\n", prefix, args->message); + gpr_free(prefix); +diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc +index c2d80c08ddb..4a83cb6c215 100644 +--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc ++++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc +@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, + } + + #ifndef NDEBUG +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + #endif + + /* pollset->mu lock must be held by the caller before calling this. +@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, + #define WORKER_PTR (&worker) + #endif + #ifndef NDEBUG +- WORKER_PTR->originator = gettid(); ++ WORKER_PTR->originator = sys_gettid(); + #endif + if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { + gpr_log(GPR_INFO, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json new file mode 100644 index 000000000000..7cf939daa72b --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json @@ -0,0 +1,506 @@ +{ + "0.16.2.zip": { + "name": "0.16.2.zip", + "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", + "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" + ] + }, + "0.28.3.tar.gz": { + "name": "0.28.3.tar.gz", + "sha256": "d8c2f20deb2f6143bac792d210db1a4872102d81529fe0ea3476c1696addd7ff", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz" + ] + }, + "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": { + "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": { + "name": "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" + ] + }, + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { + "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { + "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" + ] + }, + "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": { + "name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", + "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" + ] + }, + "android_tools_pkg-0.12.tar.gz": { + "name": "android_tools_pkg-0.12.tar.gz", + "sha256": "96c4eef4d195dd95e43a4259cf5b82a1e34f67333439e91955bbdc0e1c8e7a31", + "urls": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.12.tar.gz" + ] + }, + "bazel_j2objc": { + "name": "bazel_j2objc", + "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", + "strip_prefix": "j2objc-2.5", + "urls": [ + "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", + "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" + ] + }, + "bazel_skylib": { + "name": "bazel_skylib", + "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", + "strip_prefix": "bazel-skylib-f83cb8dd6f5658bc574ccd873e25197055265d1c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" + ] + }, + "bazel_toolchains": { + "name": "bazel_toolchains", + "sha256": "d8c2f20deb2f6143bac792d210db1a4872102d81529fe0ea3476c1696addd7ff", + "strip_prefix": "bazel-toolchains-0.28.3", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz" + ] + }, + "build_bazel_rules_nodejs": { + "name": "build_bazel_rules_nodejs", + "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", + "strip_prefix": "rules_nodejs-0.16.2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", + "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" + ] + }, + "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": { + "name": "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", + "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz" + ] + }, + "com_google_googletest": { + "name": "com_google_googletest", + "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", + "strip_prefix": "googletest-release-1.10.0", + "urls": [ + "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", + "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" + ] + }, + "coverage_output_generator-v2.0.zip": { + "name": "coverage_output_generator-v2.0.zip", + "sha256": "3a6951051272d51613ac4c77af6ce238a3db321bf06506fde1b8866eb18a89dd", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.0.zip" + ] + }, + "desugar_jdk_libs": { + "name": "desugar_jdk_libs", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { + "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": { + "name": "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" + ] + }, + "io_bazel_rules_sass": { + "name": "io_bazel_rules_sass", + "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", + "strip_prefix": "rules_sass-8ccf4f1c351928b55d5dddf3672e3667f6978d60", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" + ] + }, + "io_bazel_skydoc": { + "name": "io_bazel_skydoc", + "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7", + "strip_prefix": "skydoc-c7bbde2950769aac9a99364b0926230060a3ce04", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz" + ] + }, + "java_tools_javac11_darwin-v6.1.zip": { + "name": "java_tools_javac11_darwin-v6.1.zip", + "sha256": "f0c488dac18f18ab1a0d18bbd65288c7a128e90a24d9c16f65bd8243f79483a0", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_darwin-v6.1.zip" + ] + }, + "java_tools_javac11_linux-v6.1.zip": { + "name": "java_tools_javac11_linux-v6.1.zip", + "sha256": "12f7940ed0bc4c2e82238951cdf19b4179c7dcc361d16fe40fe4266538fb4ac6", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_linux-v6.1.zip" + ] + }, + "java_tools_javac11_windows-v6.1.zip": { + "name": "java_tools_javac11_windows-v6.1.zip", + "sha256": "e2deb2efff684de78787e0bdc7620f9672d13f04a12856d8e7f677369a8e286b", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_windows-v6.1.zip" + ] + }, + "java_tools_langtools_javac10": { + "name": "java_tools_langtools_javac10", + "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip" + ] + }, + "java_tools_langtools_javac11": { + "name": "java_tools_langtools_javac11", + "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" + ] + }, + "java_tools_langtools_javac12": { + "name": "java_tools_langtools_javac12", + "sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip" + ] + }, + "java_tools_langtools_javac9": { + "name": "java_tools_langtools_javac9", + "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip" + ] + }, + "jdk10-server-release-1804.tar.xz": { + "name": "jdk10-server-release-1804.tar.xz", + "sha256": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be", + "urls": [ + "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz" + ] + }, + "jdk9-server-release-1708.tar.xz": { + "name": "jdk9-server-release-1708.tar.xz", + "sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022", + "urls": [ + "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz" + ] + }, + "openjdk10_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk10_linux_archive", + "sha256": "b3c2d762091a615b0c1424ebbd05d75cc114da3bf4f25a0dec5c51ea7e84146f", + "strip_prefix": "zulu10.2+3-jdk10.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64.tar.gz" + ] + }, + "openjdk11_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk11_linux_archive", + "sha256": "ddb0fd4526089cf1ce2db36282c282263f587a9e8be373fa02f511a12923cc48", + "strip_prefix": "zulu11.31.11-ca-jdk11.0.3-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.11-ca-jdk11.0.3/zulu11.31.11-ca-jdk11.0.3-linux_x64.tar.gz" + ] + }, + "openjdk12_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk12_linux_archive", + "sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13", + "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz" + ] + }, + "openjdk9_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk9_linux_archive", + "sha256": "45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8", + "strip_prefix": "zulu9.0.7.1-jdk9.0.7-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64.tar.gz" + ] + }, + "openjdk_linux": { + "downloaded_file_path": "zulu-linux.tar.gz", + "name": "openjdk_linux", + "sha256": "460d8a4f0c0204160b48086e341b22943c9cca471b195340e75b38ae9eb33c1c", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209950.tar.gz" + ] + }, + "openjdk_linux_aarch64": { + "downloaded_file_path": "zulu-linux-aarch64.tar.gz", + "name": "openjdk_linux_aarch64", + "sha256": "23c37c0c3a8fdcbc68e96e70ff5c5c020c14db76deaae9b547849afda4586e5e", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-allmodules-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" + ] + }, + "openjdk_linux_aarch64_minimal": { + "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", + "name": "openjdk_linux_aarch64_minimal", + "sha256": "7af2583fe5ef0a781d4a9dca0c0160d42e7db1305ec1b66f98aa44c91cc875df", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-minimal-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" + ] + }, + "openjdk_linux_aarch64_vanilla": { + "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", + "name": "openjdk_linux_aarch64_vanilla", + "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" + ] + }, + "openjdk_linux_minimal": { + "downloaded_file_path": "zulu-linux-minimal.tar.gz", + "name": "openjdk_linux_minimal", + "sha256": "5123bc8dd21886761d1fd9ca0fb1898b3372d7243064a070ec81ca9c9d1a6791", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556011926.tar.gz" + ] + }, + "openjdk_linux_vanilla": { + "downloaded_file_path": "zulu-linux-vanilla.tar.gz", + "name": "openjdk_linux_vanilla", + "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" + ] + }, + "openjdk_macos": { + "downloaded_file_path": "zulu-macos.tar.gz", + "name": "openjdk_macos", + "sha256": "8fa61d85ca6f657d646fdb50cfc8634987f8f7d8a3250ed39fb7364647633252", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209951.tar.gz" + ] + }, + "openjdk_macos_minimal": { + "downloaded_file_path": "zulu-macos-minimal.tar.gz", + "name": "openjdk_macos_minimal", + "sha256": "ac56e44db46fd56ac78b39b6823daed4faa74a2677ac340c7d217f863884ec0f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003114.tar.gz" + ] + }, + "openjdk_macos_vanilla": { + "downloaded_file_path": "zulu-macos-vanilla.tar.gz", + "name": "openjdk_macos_vanilla", + "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" + ] + }, + "openjdk_win": { + "downloaded_file_path": "zulu-win.zip", + "name": "openjdk_win", + "sha256": "e6ddb361309f8e84eb5fb5ad8b0f5cc031ba3679910139262c31efd8f7579d05", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip" + ] + }, + "openjdk_win_minimal": { + "downloaded_file_path": "zulu-win-minimal.zip", + "name": "openjdk_win_minimal", + "sha256": "8e5dada6e9ebcc9ce29b4d051449bb95d3ee1e620e166da862224bbf15211f8b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003136.zip" + ] + }, + "openjdk_win_vanilla": { + "downloaded_file_path": "zulu-win-vanilla.zip", + "name": "openjdk_win_vanilla", + "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" + ] + }, + "platforms": { + "name": "platforms", + "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + "strip_prefix": "platforms-441afe1bfdadd6236988e9cac159df6b5a9f5a98", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" + ] + }, + "rules_cc": { + "name": "rules_cc", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "rules_java": { + "name": "rules_java", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "rules_pkg": { + "name": "rules_pkg", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_pkg-0.2.0.tar.gz": { + "name": "rules_pkg-0.2.0.tar.gz", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_proto": { + "name": "rules_proto", + "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", + "strip_prefix": "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": { + "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz", + "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": { + "name": "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz", + "sha256": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": { + "name": "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip", + "sha256": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip" + ] + }, + "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": { + "name": "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz", + "sha256": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz" + ] + }, + "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": { + "name": "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz", + "sha256": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz" + ] + }, + "zulu11.2.3-jdk11.0.1-win_x64.zip": { + "name": "zulu11.2.3-jdk11.0.1-win_x64.zip", + "sha256": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz": { + "name": "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz", + "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": { + "name": "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip", + "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-win_x64.zip": { + "name": "zulu11.29.3-ca-jdk11.0.2-win_x64.zip", + "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" + ] + }, + "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": { + "name": "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz", + "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": { + "name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz", + "sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz": { + "name": "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz", + "sha256": "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip": { + "name": "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip", + "sha256": "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip" + ] + } +} diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 7e84baba0dda..5b1e91dda2a1 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1cbyy9rc33f69hbs0ff00v0v3p92f3lqq8ma5aqid5dm6d8l2dx5"; + cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm"; nativeBuildInputs = [ openssl perl pkgconfig ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix index da9dfc9a8193..cdf15f3ad707 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/development/tools/cmake-format/default.nix @@ -10,12 +10,12 @@ buildPythonApplication rec { pname = "cmake-format"; - version = "0.6.8"; + version = "0.6.9"; src = fetchPypi { inherit version; pname = "cmake_format"; - sha256 = "0zpx7g5j8wv52zj0s7bk7cj5v82icn4il0jfydc1cmg4p5krf5iy"; + sha256 = "082d7949gsk5v72ap7k4p3vgmc126a0bfm195xpi4lb6khpbzy5j"; }; propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 9708674c6d67..662daeb873f1 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.204.2"; + version = "2.204.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1iviffgz32i6rhmk6hgas4l8wpwr0h5lw5s1f5zjk3aw0r6cb42a"; + sha256 = "1sn9km7r3dbhbchn1szmhkwmx5im3qmy4lkzv4gm2aw1j9pghdda"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 990fbba7226c..890ef73a73f9 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "19x6v8kji3mjpf3r0khmlvgkljm269r16w8p4yvknsw4rf0rl9x4"; + sha256 = "0gs3pmzyx2bz6af2fr5jla3s33vfaw64pgahfvj5bgpj6d7vx1wg"; }; buildInputs = [ jre makeWrapper ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { description = "Version Control for your database"; - homepage = http://www.liquibase.org/; + homepage = "http://www.liquibase.org/"; changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt"; license = licenses.asl20; maintainers = with maintainers; [ nequissimus ]; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index aaccfe8ee762..37c6396e2e3a 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.14.3"; + version = "0.15.7"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "163d05081yrbnzvpkjd7knsl50pkqg9g22ncc2hi54i1i0h5pp80"; + sha256 = "18scwla36bjpylha4fwis0aa333r14bavzd7xhx4677xgaz7l73j"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 7a2252c6b273..8806b5a81cd1 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -57,7 +57,7 @@ let noweb = stdenv.mkDerivation rec { # HACK: This is ugly, but functional. PATH=$out/bin:$PATH make -BC xdoc - make "''${installFlags[@]}" install-man + make "''${installFlags[@]} install-man" ln -s "$tex" "$out/share/texmf" ''; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 227fb27051a2..03bd2696cce5 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,20 +2,22 @@ buildGoModule rec { pname = "act"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "1sn36686nfmqvhmippdapk0pxqx3x1q4dwdyhjr8j8scyfrk68iv"; + sha256 = "00clafq3izvfwxkb85hf6s40yfw2hpsfz3xg4da28pgh1wlqb9ps"; }; modSha256 = "0ghp61m8fxg1iwq2ypmp99cqv3n16c06v2xzg9v34299vmd89gi2"; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with lib; { description = "Run your GitHub Actions locally"; - homepage = "https://circleci.com/"; + homepage = "https://github.com/nektos/act"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; }; diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index ddc15f856b53..29aa99d3a15b 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi1 +, gcc-arm-embedded, libftdi1, libusb, pkgconfig , python, pythonPackages }: @@ -7,24 +7,25 @@ with lib; stdenv.mkDerivation rec { pname = "blackmagic"; - version = "unstable-2019-08-13"; + version = "unstable-2020-02-20"; # `git describe --always` - firmwareVersion = "v1.6.1-317-gc9c8b08"; + firmwareVersion = "v1.6.1-409-g7a595ea"; src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "c9c8b089f716c31433432f5ee54c5c206e4945cf"; - sha256 = "0175plba7h3r1p584ygkjlvg2clvxa2m0xfdcb2v8jza2vzc8ywd"; + rev = "7a595ead255f2a052fe4561c24a0577112c9de84"; + sha256 = "01kdm1rkj7ll0px882crf9w27d2ka8f3hcdmvhb9jwd60bf5dlap"; fetchSubmodules = true; }; nativeBuildInputs = [ - gcc-arm-embedded + gcc-arm-embedded pkgconfig ]; buildInputs = [ libftdi1 + libusb python pythonPackages.intelhex ]; @@ -60,7 +61,9 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/blacksphere/blackmagic; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pjones emily ]; - platforms = platforms.unix; + maintainers = with maintainers; [ pjones emily sorki ]; + # fails on darwin with + # arm-none-eabi-gcc: error: unrecognized command line option '-iframework' + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/blackmagic/helper.sh b/pkgs/development/tools/misc/blackmagic/helper.sh index 991d0249e169..278a758c186a 100755 --- a/pkgs/development/tools/misc/blackmagic/helper.sh +++ b/pkgs/development/tools/misc/blackmagic/helper.sh @@ -23,11 +23,18 @@ make_platform() { make clean make PROBE_HOST="$1" - if [ "$1" = libftdi ]; then - mkdir -p "$out/bin" + if [ "$1" = "libftdi" ]; then install -m 0555 blackmagic "$out/bin" fi + if [ "$1" = "pc-hosted" ]; then + install -m 0555 blackmagic_hosted "$out/bin" + fi + + if [ "$1" = "pc-stlinkv2" ]; then + install -m 0555 blackmagic_stlinkv2 "$out/bin" + fi + for f in $PRODUCTS; do if [ -r "$f" ]; then mkdir -p "$out/firmware/$1" @@ -45,6 +52,8 @@ make -C libopencm3 # And now all of the platforms: cd src +mkdir -p "$out/bin" + for platform in platforms/*/Makefile.inc; do probe=$(basename "$(dirname "$platform")") make_platform "$probe" diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 565b6a5ca041..fa19b2494076 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luarocks"; - version = "3.3.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${version}"; - sha256 = "0859k2b9pihmcw45fdsbwx936npcj3vbp3hxi1v3j7n61dkw7r0s"; + sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2"; }; patches = [ ./darwin-3.1.3.patch ]; diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index a29f329ca8af..c13c9646393a 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -2,15 +2,15 @@ GEM remote: https://rubygems.org/ specs: addressable (2.4.0) - backports (3.15.0) + backports (3.16.1) coderay (1.1.2) ethon (0.12.0) ffi (>= 1.3.0) - faraday (0.17.0) + faraday (0.17.3) multipart-post (>= 1.2, < 3) - faraday_middleware (0.13.1) + faraday_middleware (0.14.0) faraday (>= 0.7.4, < 1.0) - ffi (1.11.2) + ffi (1.12.2) gh (0.15.1) addressable (~> 2.4.0) backports @@ -19,7 +19,7 @@ GEM net-http-persistent (~> 2.9) net-http-pipeline highline (1.7.10) - json (2.2.0) + json (2.3.0) launchy (2.4.3) addressable (~> 2.3) method_source (0.9.2) @@ -33,7 +33,7 @@ GEM pusher-client (0.6.2) json websocket (~> 1.0) - travis (1.8.10) + travis (1.8.11) backports faraday (~> 0.9) faraday_middleware (~> 0.9, >= 0.9.1) @@ -54,4 +54,4 @@ DEPENDENCIES travis BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix index a12a891b3e78..da2f5e8e7ac8 100644 --- a/pkgs/development/tools/misc/travis/gemset.nix +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -8,12 +8,14 @@ version = "2.4.0"; }; backports = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cczfi1yp7a68bg7ipzi4lvrmi4xsi36n9a19krr4yb3nfwd8fn2"; + sha256 = "0sp3l5wa77klj34sqib95ppxyam53x3p57xk0y6gy2c3z29z6hs5"; type = "gem"; }; - version = "3.15.0"; + version = "3.16.1"; }; coderay = { groups = ["default"]; @@ -40,29 +42,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az"; + sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; type = "gem"; }; - version = "0.17.0"; + version = "0.17.3"; }; faraday_middleware = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr"; + sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc"; type = "gem"; }; - version = "0.13.1"; + version = "0.14.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw"; + sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; type = "gem"; }; - version = "1.11.2"; + version = "1.12.2"; }; gh = { dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"]; @@ -82,12 +86,14 @@ version = "1.7.10"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; launchy = { dependencies = ["addressable"]; @@ -164,12 +170,14 @@ }; travis = { dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ggdksipvnkl7s0g84l4wfpm9v70x9id8xvb9jmn3l0hhlk54dsk"; + sha256 = "18zbi46as4d2wn83safawciyny0g2sk7yz5fvjvqmfk4ywpfrwrr"; type = "gem"; }; - version = "1.8.10"; + version = "1.8.11"; }; typhoeus = { dependencies = ["ethon"]; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index cf5372bdc202..ca74a701315a 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }: +{ stdenv, fetchpatch, fetchFromGitHub, ocaml, findlib, ncurses }: let version = "1.99.19-beta"; in @@ -13,6 +13,11 @@ stdenv.mkDerivation { sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; }; + patches = stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.08") (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-pp/ocp-pp.1.99.19-beta/files/0001-Fix-ocp-pp-for-changes-in-compiler-libs.patch"; + sha256 = "0s0s2hh4d7cmwd6i7ixjgb79vij0r1v54m0vwwi26b3fips09qyn"; + }); + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 9ea01a8dca72..cf2be985b143 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, ocp-build, ocp-indent, cmdliner, re, }: +{ lib, fetchurl, buildDunePackage, ocp-build, ocp-indent, cmdliner, re }: buildDunePackage rec { pname = "ocp-index"; - version = "1.1.9"; + version = "1.2"; - src = fetchFromGitHub { - owner = "OCamlPro"; - repo = pname; - rev = version; - sha256 = "0dq1kap16xfajc6gg9hbiadax782winpvxnr3dkm2ncznnxds37p"; + src = fetchurl { + url = "https://github.com/OCamlPro/ocp-index/releases/download/${version}/ocp-index-${version}.tbz"; + sha256 = "1lchw02sakjjppmzr0rzlarwbg1lc2bl7pwcfpsiycnaz46x6gmr"; }; buildInputs = [ ocp-build cmdliner re ]; @@ -18,7 +16,7 @@ buildDunePackage rec { meta = { homepage = http://typerex.ocamlpro.com/ocp-index.html; description = "A simple and light-weight documentation extractor for OCaml"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/poetry/default.nix b/pkgs/development/tools/poetry/default.nix index 1517e53f219c..ac2ab258df47 100644 --- a/pkgs/development/tools/poetry/default.nix +++ b/pkgs/development/tools/poetry/default.nix @@ -17,38 +17,6 @@ poetry2nix.mkPoetryApplication { done ''; - # Poetry is a bit special in that it can't use itself as the `build-system` property in pyproject.toml. - # That's why we need to hackily install outputs completely manually. - # - # For projects using poetry normally overriding the installPhase is not required. - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/${python.libPrefix}/site-packages - cp -r poetry $out/lib/${python.libPrefix}/site-packages - - mkdir -p $out/bin - cat > $out/bin/poetry <<EOF - #!${python.interpreter} - import sys - - if __name__ == '__main__': - sys.path.append("$out/lib/${python.libPrefix}/site-packages") - from poetry.console import main - main() - EOF - chmod +x $out/bin/poetry - - mkdir -p "$out/share/bash-completion/completions" - "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry" - mkdir -p "$out/share/zsh/vendor-completions" - "$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry" - mkdir -p "$out/share/fish/vendor_completions.d" - "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" - - runHook postInstall - ''; - # Propagating dependencies leads to issues downstream # We've already patched poetry to prefer "vendored" dependencies postFixup = '' diff --git a/pkgs/development/tools/poetry/poetry.lock b/pkgs/development/tools/poetry/poetry.lock index 8cc557994055..68b195a47b16 100644 --- a/pkgs/development/tools/poetry/poetry.lock +++ b/pkgs/development/tools/poetry/poetry.lock @@ -1,7 +1,6 @@ [[package]] category = "dev" description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -marker = "python_version >= \"3.6\" and python_version < \"4.0\"" name = "appdirs" optional = false python-versions = "*" @@ -109,7 +108,7 @@ marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platfo name = "cffi" optional = false python-versions = "*" -version = "1.13.2" +version = "1.14.0" [package.dependencies] pycparser = "*" @@ -159,10 +158,10 @@ description = "CliKit is a group of utilities to build beautiful and testable co name = "clikit" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.4.1" +version = "0.4.2" [package.dependencies] -pastel = ">=0.1.0,<0.2.0" +pastel = ">=0.2.0,<0.3.0" pylev = ">=1.3,<2.0" [package.dependencies.enum34] @@ -173,6 +172,10 @@ version = ">=1.1,<2.0" python = ">=2.7,<2.8 || >=3.4,<3.5" version = ">=3.6,<4.0" +[package.dependencies.typing-extensions] +python = ">=3.5.0,<3.5.4" +version = ">=3.6,<4.0" + [[package]] category = "dev" description = "Cross-platform colored terminal text." @@ -261,6 +264,14 @@ pep8test = ["flake8", "flake8-import-order", "pep8-naming"] test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] [[package]] +category = "dev" +description = "Distribution utilities" +name = "distlib" +optional = false +python-versions = "*" +version = "0.3.0" + +[[package]] category = "main" description = "Discover and load entry points from installed packages." marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" @@ -281,7 +292,7 @@ marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_versi name = "enum34" optional = false python-versions = "*" -version = "1.1.6" +version = "1.1.9" [[package]] category = "dev" @@ -311,6 +322,15 @@ version = "3.2.3-2" [[package]] category = "dev" +description = "Clean single-source support for Python 3 and 2" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "future" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +version = "0.18.2" + +[[package]] +category = "dev" description = "Backport of the concurrent.futures package from Python 3" marker = "python_version < \"3.2\"" name = "futures" @@ -378,6 +398,14 @@ version = "2.8" [[package]] category = "main" +description = "Internationalized Domain Names in Applications (IDNA)" +name = "idna" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "2.9" + +[[package]] +category = "main" description = "Read metadata from Python packages" name = "importlib-metadata" optional = false @@ -559,6 +587,26 @@ version = "0.12.2" [[package]] category = "dev" +description = "A Python implementation of Lunr.js" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "lunr" +optional = false +python-versions = "*" +version = "0.5.6" + +[package.dependencies] +future = ">=0.16.0" +six = ">=1.11.0" + +[package.dependencies.nltk] +optional = true +version = ">=3.2.5" + +[package.extras] +languages = ["nltk (>=3.2.5)"] + +[[package]] +category = "dev" description = "Python implementation of Markdown." name = "markdown" optional = false @@ -581,6 +629,20 @@ testing = ["coverage", "pyyaml"] [[package]] category = "dev" +description = "Python implementation of Markdown." +name = "markdown" +optional = false +python-versions = ">=3.5" +version = "3.2.1" + +[package.dependencies] +setuptools = ">=36" + +[package.extras] +testing = ["coverage", "pyyaml"] + +[[package]] +category = "dev" description = "This is an extension to Python-Markdown which provides an \"include\" function, similar to that found in LaTeX (and also the C pre-processor and Fortran). I originally wrote it for my FORD Fortran auto-documentation generator." name = "markdown-include" optional = false @@ -618,6 +680,27 @@ tornado = ">=5.0" [[package]] category = "dev" +description = "Project documentation with Markdown." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "mkdocs" +optional = false +python-versions = ">=3.5" +version = "1.1" + +[package.dependencies] +Jinja2 = ">=2.10.1" +Markdown = ">=3.2.1" +PyYAML = ">=3.10" +click = ">=3.3" +livereload = ">=2.5.1" +tornado = ">=5.0" + +[package.dependencies.lunr] +extras = ["languages"] +version = "0.5.6" + +[[package]] +category = "dev" description = "Rolling backport of unittest.mock for all Pythons" marker = "python_version < \"3.0\"" name = "mock" @@ -673,7 +756,27 @@ description = "MessagePack (de)serializer." name = "msgpack" optional = false python-versions = "*" -version = "0.6.2" +version = "1.0.0" + +[[package]] +category = "dev" +description = "Natural Language Toolkit" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "nltk" +optional = false +python-versions = "*" +version = "3.4.5" + +[package.dependencies] +six = "*" + +[package.extras] +all = ["pyparsing", "scikit-learn", "python-crfsuite", "matplotlib", "scipy", "gensim", "requests", "twython", "numpy"] +corenlp = ["requests"] +machine_learning = ["gensim", "numpy", "python-crfsuite", "scikit-learn", "scipy"] +plot = ["matplotlib"] +tgrep = ["pyparsing"] +twitter = ["twython"] [[package]] category = "dev" @@ -681,7 +784,7 @@ description = "Node.js virtual environment builder" name = "nodeenv" optional = false python-versions = "*" -version = "1.3.4" +version = "1.3.5" [[package]] category = "dev" @@ -701,7 +804,7 @@ description = "Bring colors to your terminal." name = "pastel" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.1.1" +version = "0.2.0" [[package]] category = "main" @@ -911,6 +1014,17 @@ Markdown = ">=3.0.1" pep562 = "*" [[package]] +category = "dev" +description = "Extension pack for Python Markdown." +name = "pymdown-extensions" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" +version = "6.3" + +[package.dependencies] +Markdown = ">=3.2" + +[[package]] category = "main" description = "Python parsing module" name = "pyparsing" @@ -1055,7 +1169,7 @@ marker = "python_version >= \"3.6\" and python_version < \"4.0\"" name = "regex" optional = false python-versions = "*" -version = "2020.1.8" +version = "2020.2.20" [[package]] category = "main" @@ -1081,16 +1195,16 @@ description = "Python HTTP for Humans." name = "requests" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "2.22.0" +version = "2.23.0" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<3.1.0" -idna = ">=2.5,<2.9" +chardet = ">=3.0.2,<4" +idna = ">=2.5,<3" urllib3 = ">=1.21.1,<1.25.0 || >1.25.0,<1.25.1 || >1.25.1,<1.26" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"] +security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] [[package]] @@ -1107,7 +1221,7 @@ requests = ">=2.0.1,<3.0.0" [[package]] category = "main" description = "scandir, a better directory iterator and faster os.walk()" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.5\"" name = "scandir" optional = false python-versions = "*" @@ -1146,8 +1260,8 @@ category = "main" description = "Tool to Detect Surrounding Shell" name = "shellingham" optional = false -python-versions = ">=2.6,!=3.0,!=3.1,!=3.2,!=3.3" -version = "1.3.1" +python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6" +version = "1.3.2" [[package]] category = "main" @@ -1188,7 +1302,7 @@ description = "Style preserving TOML library" name = "tomlkit" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.5.8" +version = "0.5.11" [package.dependencies] [package.dependencies.enum34] @@ -1248,7 +1362,7 @@ description = "tox is a generic virtualenv management and test command line tool name = "tox" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -version = "3.14.3" +version = "3.14.5" [package.dependencies] colorama = ">=0.4.1" @@ -1256,7 +1370,7 @@ filelock = ">=3.0.0,<4" packaging = ">=14" pluggy = ">=0.12.0,<1" py = ">=1.4.17,<2" -six = ">=1.0.0,<2" +six = ">=1.14.0,<2" toml = ">=0.9.4" virtualenv = ">=16.0.0" @@ -1288,6 +1402,15 @@ version = "3.7.4.1" [[package]] category = "main" +description = "Backported and Experimental Type Hints for Python 3.5+" +marker = "python_version >= \"3.5.0\" and python_version < \"3.5.4\"" +name = "typing-extensions" +optional = false +python-versions = "*" +version = "3.7.4.1" + +[[package]] +category = "main" description = "HTTP library with thread-safe connection pooling, file post, and more." name = "urllib3" optional = false @@ -1317,7 +1440,7 @@ description = "Virtual Python Environment builder" name = "virtualenv" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" -version = "16.7.9" +version = "16.7.10" [package.extras] docs = ["sphinx (>=1.8.0,<2)", "towncrier (>=18.5.0)", "sphinx-rtd-theme (>=0.4.2,<1)"] @@ -1325,6 +1448,32 @@ testing = ["pytest (>=4.0.0,<5)", "coverage (>=4.5.0,<5)", "pytest-timeout (>=1. [[package]] category = "dev" +description = "Virtual Python Environment builder" +name = "virtualenv" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +version = "20.0.7" + +[package.dependencies] +appdirs = ">=1.4.3,<2" +distlib = ">=0.3.0,<1" +filelock = ">=3.0.0,<4" +six = ">=1.9.0,<2" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12,<2" + +[package.dependencies.importlib-resources] +python = "<3.7" +version = ">=1.0,<2" + +[package.extras] +docs = ["sphinx (>=2.0.0,<3)", "sphinx-argparse (>=0.2.5,<1)", "sphinx-rtd-theme (>=0.4.3,<1)", "towncrier (>=19.9.0rc1)", "proselint (>=0.10.2,<1)"] +testing = ["pytest (>=4.0.0,<6)", "coverage (>=4.5.1,<6)", "pytest-mock (>=2.0.0,<3)", "pytest-env (>=0.6.2,<1)", "packaging (>=20.0)", "xonsh (>=0.9.13,<1)"] + +[[package]] +category = "dev" description = "Measures number of Terminal column cells of wide-character codes" name = "wcwidth" optional = false @@ -1342,11 +1491,10 @@ version = "0.5.1" [[package]] category = "main" description = "Backport of pathlib-compatible object wrapper for zip files" -marker = "python_version >= \"3.5\" and python_version < \"3.8\" or python_version < \"3.8\"" name = "zipp" optional = false python-versions = ">=2.7" -version = "1.1.0" +version = "1.2.0" [package.dependencies] [package.dependencies.contextlib2] @@ -1355,10 +1503,10 @@ version = "*" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pathlib2", "unittest2", "jaraco.itertools"] +testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"] [metadata] -content-hash = "e0b632d8363fdf9f70d93901ff537714611bfc31705a897f6d2fb3bc010bca0a" +content-hash = "70609fddc0d3768b1003fc24207951ab7ad8bfad4c6cb326d6217c52f5a92e3d" python-versions = "~2.7 || ^3.4" [metadata.files] @@ -1395,39 +1543,34 @@ certifi = [ {file = "certifi-2019.11.28.tar.gz", hash = "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"}, ] cffi = [ - {file = "cffi-1.13.2-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:3c9fff570f13480b201e9ab69453108f6d98244a7f495e91b6c654a47486ba43"}, - {file = "cffi-1.13.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:2c5e309ec482556397cb21ede0350c5e82f0eb2621de04b2633588d118da4396"}, - {file = "cffi-1.13.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:19db0cdd6e516f13329cba4903368bff9bb5a9331d3410b1b448daaadc495e54"}, - {file = "cffi-1.13.2-cp27-cp27m-win32.whl", hash = "sha256:5c4fae4e9cdd18c82ba3a134be256e98dc0596af1e7285a3d2602c97dcfa5159"}, - {file = "cffi-1.13.2-cp27-cp27m-win_amd64.whl", hash = "sha256:32a262e2b90ffcfdd97c7a5e24a6012a43c61f1f5a57789ad80af1d26c6acd97"}, - {file = "cffi-1.13.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:4a43c91840bda5f55249413037b7a9b79c90b1184ed504883b72c4df70778579"}, - {file = "cffi-1.13.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:8169cf44dd8f9071b2b9248c35fc35e8677451c52f795daa2bb4643f32a540bc"}, - {file = "cffi-1.13.2-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:71a608532ab3bd26223c8d841dde43f3516aa5d2bf37b50ac410bb5e99053e8f"}, - {file = "cffi-1.13.2-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:7f627141a26b551bdebbc4855c1157feeef18241b4b8366ed22a5c7d672ef858"}, - {file = "cffi-1.13.2-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:0b49274afc941c626b605fb59b59c3485c17dc776dc3cc7cc14aca74cc19cc42"}, - {file = "cffi-1.13.2-cp34-cp34m-win32.whl", hash = "sha256:4424e42199e86b21fc4db83bd76909a6fc2a2aefb352cb5414833c030f6ed71b"}, - {file = "cffi-1.13.2-cp34-cp34m-win_amd64.whl", hash = "sha256:7d4751da932caaec419d514eaa4215eaf14b612cff66398dd51129ac22680b20"}, - {file = "cffi-1.13.2-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:ccb032fda0873254380aa2bfad2582aedc2959186cce61e3a17abc1a55ff89c3"}, - {file = "cffi-1.13.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:dcd65317dd15bc0451f3e01c80da2216a31916bdcffd6221ca1202d96584aa25"}, - {file = "cffi-1.13.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:135f69aecbf4517d5b3d6429207b2dff49c876be724ac0c8bf8e1ea99df3d7e5"}, - {file = "cffi-1.13.2-cp35-cp35m-win32.whl", hash = "sha256:7b93a885bb13073afb0aa73ad82059a4c41f4b7d8eb8368980448b52d4c7dc2c"}, - {file = "cffi-1.13.2-cp35-cp35m-win_amd64.whl", hash = "sha256:e570d3ab32e2c2861c4ebe6ffcad6a8abf9347432a37608fe1fbd157b3f0036b"}, - {file = "cffi-1.13.2-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:0e3ea92942cb1168e38c05c1d56b0527ce31f1a370f6117f1d490b8dcd6b3a04"}, - {file = "cffi-1.13.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:5ecfa867dea6fabe2a58f03ac9186ea64da1386af2159196da51c4904e11d652"}, - {file = "cffi-1.13.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:291f7c42e21d72144bb1c1b2e825ec60f46d0a7468f5346841860454c7aa8f57"}, - {file = "cffi-1.13.2-cp36-cp36m-win32.whl", hash = "sha256:62f2578358d3a92e4ab2d830cd1c2049c9c0d0e6d3c58322993cc341bdeac22e"}, - {file = "cffi-1.13.2-cp36-cp36m-win_amd64.whl", hash = "sha256:fd43a88e045cf992ed09fa724b5315b790525f2676883a6ea64e3263bae6549d"}, - {file = "cffi-1.13.2-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:d75c461e20e29afc0aee7172a0950157c704ff0dd51613506bd7d82b718e7410"}, - {file = "cffi-1.13.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:aa00d66c0fab27373ae44ae26a66a9e43ff2a678bf63a9c7c1a9a4d61172827a"}, - {file = "cffi-1.13.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2e9c80a8c3344a92cb04661115898a9129c074f7ab82011ef4b612f645939f12"}, - {file = "cffi-1.13.2-cp37-cp37m-win32.whl", hash = "sha256:d754f39e0d1603b5b24a7f8484b22d2904fa551fe865fd0d4c3332f078d20d4e"}, - {file = "cffi-1.13.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6471a82d5abea994e38d2c2abc77164b4f7fbaaf80261cb98394d5793f11b12a"}, - {file = "cffi-1.13.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:74a1d8c85fb6ff0b30fbfa8ad0ac23cd601a138f7509dc617ebc65ef305bb98d"}, - {file = "cffi-1.13.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:42194f54c11abc8583417a7cf4eaff544ce0de8187abaf5d29029c91b1725ad3"}, - {file = "cffi-1.13.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:415bdc7ca8c1c634a6d7163d43fb0ea885a07e9618a64bda407e04b04333b7db"}, - {file = "cffi-1.13.2-cp38-cp38-win32.whl", hash = "sha256:6d4f18483d040e18546108eb13b1dfa1000a089bcf8529e30346116ea6240506"}, - {file = "cffi-1.13.2-cp38-cp38-win_amd64.whl", hash = "sha256:2781e9ad0e9d47173c0093321bb5435a9dfae0ed6a762aabafa13108f5f7b2ba"}, - {file = "cffi-1.13.2.tar.gz", hash = "sha256:599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346"}, + {file = "cffi-1.14.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:1cae98a7054b5c9391eb3249b86e0e99ab1e02bb0cc0575da191aedadbdf4384"}, + {file = "cffi-1.14.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:cf16e3cf6c0a5fdd9bc10c21687e19d29ad1fe863372b5543deaec1039581a30"}, + {file = "cffi-1.14.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f2b0fa0c01d8a0c7483afd9f31d7ecf2d71760ca24499c8697aeb5ca37dc090c"}, + {file = "cffi-1.14.0-cp27-cp27m-win32.whl", hash = "sha256:99f748a7e71ff382613b4e1acc0ac83bf7ad167fb3802e35e90d9763daba4d78"}, + {file = "cffi-1.14.0-cp27-cp27m-win_amd64.whl", hash = "sha256:c420917b188a5582a56d8b93bdd8e0f6eca08c84ff623a4c16e809152cd35793"}, + {file = "cffi-1.14.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:399aed636c7d3749bbed55bc907c3288cb43c65c4389964ad5ff849b6370603e"}, + {file = "cffi-1.14.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cab50b8c2250b46fe738c77dbd25ce017d5e6fb35d3407606e7a4180656a5a6a"}, + {file = "cffi-1.14.0-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:001bf3242a1bb04d985d63e138230802c6c8d4db3668fb545fb5005ddf5bb5ff"}, + {file = "cffi-1.14.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:e56c744aa6ff427a607763346e4170629caf7e48ead6921745986db3692f987f"}, + {file = "cffi-1.14.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:b8c78301cefcf5fd914aad35d3c04c2b21ce8629b5e4f4e45ae6812e461910fa"}, + {file = "cffi-1.14.0-cp35-cp35m-win32.whl", hash = "sha256:8c0ffc886aea5df6a1762d0019e9cb05f825d0eec1f520c51be9d198701daee5"}, + {file = "cffi-1.14.0-cp35-cp35m-win_amd64.whl", hash = "sha256:8a6c688fefb4e1cd56feb6c511984a6c4f7ec7d2a1ff31a10254f3c817054ae4"}, + {file = "cffi-1.14.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:95cd16d3dee553f882540c1ffe331d085c9e629499ceadfbda4d4fde635f4b7d"}, + {file = "cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:66e41db66b47d0d8672d8ed2708ba91b2f2524ece3dee48b5dfb36be8c2f21dc"}, + {file = "cffi-1.14.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:028a579fc9aed3af38f4892bdcc7390508adabc30c6af4a6e4f611b0c680e6ac"}, + {file = "cffi-1.14.0-cp36-cp36m-win32.whl", hash = "sha256:cef128cb4d5e0b3493f058f10ce32365972c554572ff821e175dbc6f8ff6924f"}, + {file = "cffi-1.14.0-cp36-cp36m-win_amd64.whl", hash = "sha256:337d448e5a725bba2d8293c48d9353fc68d0e9e4088d62a9571def317797522b"}, + {file = "cffi-1.14.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e577934fc5f8779c554639376beeaa5657d54349096ef24abe8c74c5d9c117c3"}, + {file = "cffi-1.14.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:62ae9af2d069ea2698bf536dcfe1e4eed9090211dbaafeeedf5cb6c41b352f66"}, + {file = "cffi-1.14.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:14491a910663bf9f13ddf2bc8f60562d6bc5315c1f09c704937ef17293fb85b0"}, + {file = "cffi-1.14.0-cp37-cp37m-win32.whl", hash = "sha256:c43866529f2f06fe0edc6246eb4faa34f03fe88b64a0a9a942561c8e22f4b71f"}, + {file = "cffi-1.14.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2089ed025da3919d2e75a4d963d008330c96751127dd6f73c8dc0c65041b4c26"}, + {file = "cffi-1.14.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3b911c2dbd4f423b4c4fcca138cadde747abdb20d196c4a48708b8a2d32b16dd"}, + {file = "cffi-1.14.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:7e63cbcf2429a8dbfe48dcc2322d5f2220b77b2e17b7ba023d6166d84655da55"}, + {file = "cffi-1.14.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:3d311bcc4a41408cf5854f06ef2c5cab88f9fded37a3b95936c9879c1640d4c2"}, + {file = "cffi-1.14.0-cp38-cp38-win32.whl", hash = "sha256:675686925a9fb403edba0114db74e741d8181683dcf216be697d208857e04ca8"}, + {file = "cffi-1.14.0-cp38-cp38-win_amd64.whl", hash = "sha256:00789914be39dffba161cfc5be31b55775de5ba2235fe49aa28c148236c4e06b"}, + {file = "cffi-1.14.0.tar.gz", hash = "sha256:2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6"}, ] cfgv = [ {file = "cfgv-2.0.1-py2.py3-none-any.whl", hash = "sha256:fbd93c9ab0a523bf7daec408f3be2ed99a980e20b2d19b50fc184ca6b820d289"}, @@ -1446,8 +1589,8 @@ click = [ {file = "Click-7.0.tar.gz", hash = "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"}, ] clikit = [ - {file = "clikit-0.4.1-py2.py3-none-any.whl", hash = "sha256:80b0bfee42310a715773dded69590c4c33fa9fc9a351fa7c262cb67f21d0758f"}, - {file = "clikit-0.4.1.tar.gz", hash = "sha256:8ae4766b974d7b1983e39d501da9a0aadf118a907a0c9b50714d027c8b59ea81"}, + {file = "clikit-0.4.2-py2.py3-none-any.whl", hash = "sha256:95394982cfa460a77ded2f173380a958e5f90c16972307c19d79b96f6e335326"}, + {file = "clikit-0.4.2.tar.gz", hash = "sha256:f67336462800078e0896cf6ecfa3b460dfea4dfa01de659388a4ff0d83c8d6ca"}, ] colorama = [ {file = "colorama-0.4.1-py2.py3-none-any.whl", hash = "sha256:f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"}, @@ -1551,15 +1694,17 @@ cryptography = [ {file = "cryptography-2.8-cp38-cp38-win_amd64.whl", hash = "sha256:971221ed40f058f5662a604bd1ae6e4521d84e6cad0b7b170564cc34169c8f13"}, {file = "cryptography-2.8.tar.gz", hash = "sha256:3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651"}, ] +distlib = [ + {file = "distlib-0.3.0.zip", hash = "sha256:2e166e231a26b36d6dfe35a48c4464346620f8645ed0ace01ee31822b288de21"}, +] entrypoints = [ {file = "entrypoints-0.3-py2.py3-none-any.whl", hash = "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19"}, {file = "entrypoints-0.3.tar.gz", hash = "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"}, ] enum34 = [ - {file = "enum34-1.1.6-py2-none-any.whl", hash = "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79"}, - {file = "enum34-1.1.6-py3-none-any.whl", hash = "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a"}, - {file = "enum34-1.1.6.tar.gz", hash = "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"}, - {file = "enum34-1.1.6.zip", hash = "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850"}, + {file = "enum34-1.1.9-py2-none-any.whl", hash = "sha256:98df1f1937840b7d8012fea7f0b36392a3e6fd8a2f429c48a3ff4b1aad907f3f"}, + {file = "enum34-1.1.9-py3-none-any.whl", hash = "sha256:708aabfb3d5898f99674c390d360d59efdd08547019763622365f19e84a7fef4"}, + {file = "enum34-1.1.9.tar.gz", hash = "sha256:13ef9a1c478203252107f66c25b99b45b1865693ca1284aab40dafa7e1e7ac17"}, ] filelock = [ {file = "filelock-3.0.12-py3-none-any.whl", hash = "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"}, @@ -1573,6 +1718,9 @@ functools32 = [ {file = "functools32-3.2.3-2.tar.gz", hash = "sha256:f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"}, {file = "functools32-3.2.3-2.zip", hash = "sha256:89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0"}, ] +future = [ + {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, +] futures = [ {file = "futures-3.3.0-py2-none-any.whl", hash = "sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16"}, {file = "futures-3.3.0.tar.gz", hash = "sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"}, @@ -1594,6 +1742,8 @@ identify = [ idna = [ {file = "idna-2.8-py2.py3-none-any.whl", hash = "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"}, {file = "idna-2.8.tar.gz", hash = "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"}, + {file = "idna-2.9-py2.py3-none-any.whl", hash = "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"}, + {file = "idna-2.9.tar.gz", hash = "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb"}, ] importlib-metadata = [ {file = "importlib_metadata-1.1.3-py2.py3-none-any.whl", hash = "sha256:7c7f8ac40673f507f349bef2eed21a0e5f01ddf5b2a7356a6c65eb2099b53764"}, @@ -1635,11 +1785,17 @@ lockfile = [ {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, ] +lunr = [ + {file = "lunr-0.5.6-py2.py3-none-any.whl", hash = "sha256:1208622930c915a07e6f8e8640474357826bad48534c0f57969b6fca9bffc88e"}, + {file = "lunr-0.5.6.tar.gz", hash = "sha256:7be69d7186f65784a4f2adf81e5c58efd6a9921aa95966babcb1f2f2ada75c20"}, +] markdown = [ {file = "Markdown-3.0.1-py2.py3-none-any.whl", hash = "sha256:c00429bd503a47ec88d5e30a751e147dcb4c6889663cd3e2ba0afe858e009baa"}, {file = "Markdown-3.0.1.tar.gz", hash = "sha256:d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"}, {file = "Markdown-3.1.1-py2.py3-none-any.whl", hash = "sha256:56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c"}, {file = "Markdown-3.1.1.tar.gz", hash = "sha256:2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"}, + {file = "Markdown-3.2.1-py2.py3-none-any.whl", hash = "sha256:e4795399163109457d4c5af2183fbe6b60326c17cfdf25ce6e7474c6624f725d"}, + {file = "Markdown-3.2.1.tar.gz", hash = "sha256:90fee683eeabe1a92e149f7ba74e5ccdc81cd397bd6c516d93a8da0ef90b6902"}, ] markdown-include = [ {file = "markdown-include-0.5.1.tar.gz", hash = "sha256:72a45461b589489a088753893bc95c5fa5909936186485f4ed55caa57d10250f"}, @@ -1672,11 +1828,18 @@ markupsafe = [ {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, ] mkdocs = [ {file = "mkdocs-1.0.4-py2.py3-none-any.whl", hash = "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"}, {file = "mkdocs-1.0.4.tar.gz", hash = "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939"}, + {file = "mkdocs-1.1-py2.py3-none-any.whl", hash = "sha256:1e385a70aea8a9dedb731aea4fd5f3704b2074801c4f96f06b2920999babda8a"}, + {file = "mkdocs-1.1.tar.gz", hash = "sha256:9243291392f59e20b655e4e46210233453faf97787c2cf72176510e868143174"}, ] mock = [ {file = "mock-3.0.5-py2.py3-none-any.whl", hash = "sha256:d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"}, @@ -1692,38 +1855,39 @@ more-itertools = [ {file = "more_itertools-8.2.0-py3-none-any.whl", hash = "sha256:5dd8bcf33e5f9513ffa06d5ad33d78f31e1931ac9a18f33d37e77a180d393a7c"}, ] msgpack = [ - {file = "msgpack-0.6.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:774f5edc3475917cd95fe593e625d23d8580f9b48b570d8853d06cac171cd170"}, - {file = "msgpack-0.6.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:a06efd0482a1942aad209a6c18321b5e22d64eb531ea20af138b28172d8f35ba"}, - {file = "msgpack-0.6.2-cp27-cp27m-win32.whl", hash = "sha256:8a3ada8401736df2bf497f65589293a86c56e197a80ae7634ec2c3150a2f5082"}, - {file = "msgpack-0.6.2-cp27-cp27m-win_amd64.whl", hash = "sha256:b8b4bd3dafc7b92608ae5462add1c8cc881851c2d4f5d8977fdea5b081d17f21"}, - {file = "msgpack-0.6.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:24149a75643aeaa81ece4259084d11b792308a6cf74e796cbb35def94c89a25a"}, - {file = "msgpack-0.6.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:757bd71a9b89e4f1db0622af4436d403e742506dbea978eba566815dc65ec895"}, - {file = "msgpack-0.6.2-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:32fea0ea3cd1ef820286863a6202dcfd62a539b8ec3edcbdff76068a8c2cc6ce"}, - {file = "msgpack-0.6.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:db7ff14abc73577b0bcbcf73ecff97d3580ecaa0fc8724babce21fdf3fe08ef6"}, - {file = "msgpack-0.6.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:187794cd1eb73acccd528247e3565f6760bd842d7dc299241f830024a7dd5610"}, - {file = "msgpack-0.6.2-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:b24afc52e18dccc8c175de07c1d680bdf315844566f4952b5bedb908894bec79"}, - {file = "msgpack-0.6.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:355f7fd0f90134229eaeefaee3cf42e0afc8518e8f3cd4b25f541a7104dcb8f9"}, - {file = "msgpack-0.6.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:76df51492bc6fa6cc8b65d09efdb67cbba3cbfe55004c3afc81352af92b4a43c"}, - {file = "msgpack-0.6.2-cp36-cp36m-win32.whl", hash = "sha256:f0f47bafe9c9b8ed03e19a100a743662dd8c6d0135e684feea720a0d0046d116"}, - {file = "msgpack-0.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:c6e5024fc0cdf7f83b6624850309ddd7e06c48a75fa0d1c5173de4d93300eb19"}, - {file = "msgpack-0.6.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:30b88c47e0cdb6062daed88ca283b0d84fa0d2ad6c273aa0788152a1c643e408"}, - {file = "msgpack-0.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:229a0ccdc39e9b6c6d1033cd8aecd9c296823b6c87f0de3943c59b8bc7c64bee"}, - {file = "msgpack-0.6.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:4abdb88a9b67e64810fb54b0c24a1fd76b12297b4f7a1467d85a14dd8367191a"}, - {file = "msgpack-0.6.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:dedf54d72d9e7b6d043c244c8213fe2b8bbfe66874b9a65b39c4cc892dd99dd4"}, - {file = "msgpack-0.6.2-cp37-cp37m-win32.whl", hash = "sha256:0cc7ca04e575ba34fea7cfcd76039f55def570e6950e4155a4174368142c8e1b"}, - {file = "msgpack-0.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:1904b7cb65342d0998b75908304a03cb004c63ef31e16c8c43fee6b989d7f0d7"}, - {file = "msgpack-0.6.2.tar.gz", hash = "sha256:ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830"}, + {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08"}, + {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be"}, + {file = "msgpack-1.0.0-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a"}, + {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf"}, + {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8"}, + {file = "msgpack-1.0.0-cp36-cp36m-win32.whl", hash = "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1"}, + {file = "msgpack-1.0.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2"}, + {file = "msgpack-1.0.0-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97"}, + {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e"}, + {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140"}, + {file = "msgpack-1.0.0-cp37-cp37m-win32.whl", hash = "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272"}, + {file = "msgpack-1.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322"}, + {file = "msgpack-1.0.0-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab"}, + {file = "msgpack-1.0.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84"}, + {file = "msgpack-1.0.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e"}, + {file = "msgpack-1.0.0-cp38-cp38-win32.whl", hash = "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408"}, + {file = "msgpack-1.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d"}, + {file = "msgpack-1.0.0.tar.gz", hash = "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0"}, +] +nltk = [ + {file = "nltk-3.4.5.win32.exe", hash = "sha256:a08bdb4b8a1c13de16743068d9eb61c8c71c2e5d642e8e08205c528035843f82"}, + {file = "nltk-3.4.5.zip", hash = "sha256:bed45551259aa2101381bbdd5df37d44ca2669c5c3dad72439fa459b29137d94"}, ] nodeenv = [ - {file = "nodeenv-1.3.4-py2.py3-none-any.whl", hash = "sha256:561057acd4ae3809e665a9aaaf214afff110bbb6a6d5c8a96121aea6878408b3"}, + {file = "nodeenv-1.3.5-py2.py3-none-any.whl", hash = "sha256:5b2438f2e42af54ca968dd1b374d14a1194848955187b0e5e4be1f73813a5212"}, ] packaging = [ {file = "packaging-20.1-py2.py3-none-any.whl", hash = "sha256:170748228214b70b672c581a3dd610ee51f733018650740e98c7df862a583f73"}, {file = "packaging-20.1.tar.gz", hash = "sha256:e665345f9eef0c621aa0bf2f8d78cf6d21904eef16a93f020240b704a57f1334"}, ] pastel = [ - {file = "pastel-0.1.1-py2.py3-none-any.whl", hash = "sha256:a904e1659512cc9880a028f66de77cc813a4c32f7ceb68725cbc8afad57ef7ef"}, - {file = "pastel-0.1.1.tar.gz", hash = "sha256:bf3b1901b2442ea0d8ab9a390594e5b0c9584709d543a3113506fe8b28cbace3"}, + {file = "pastel-0.2.0-py2.py3-none-any.whl", hash = "sha256:18b559dc3ad4ba9b8bd5baebe6503f25f36d21460f021cf27a8d889cb5d17840"}, + {file = "pastel-0.2.0.tar.gz", hash = "sha256:46155fc523bdd4efcd450bbcb3f2b94a6e3b25edc0eb493e081104ad09e1ca36"}, ] pathlib2 = [ {file = "pathlib2-2.3.5-py2.py3-none-any.whl", hash = "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db"}, @@ -1785,6 +1949,8 @@ pymdown-extensions = [ {file = "pymdown_extensions-6.0-py2.py3-none-any.whl", hash = "sha256:25b0a7967fa697b5035e23340a48594e3e93acb10b06d74574218ace3347d1df"}, {file = "pymdown-extensions-6.2.1.tar.gz", hash = "sha256:3bbe6048275f8a0d13a0fe44e0ea201e67268aa7bb40c2544eef16abbf168f7b"}, {file = "pymdown_extensions-6.2.1-py2.py3-none-any.whl", hash = "sha256:dce5e17b93be0572322b7d06c9a13c13a9d98694d6468277911d50ca87d26f29"}, + {file = "pymdown-extensions-6.3.tar.gz", hash = "sha256:cb879686a586b22292899771f5e5bc3382808e92aa938f71b550ecdea709419f"}, + {file = "pymdown_extensions-6.3-py2.py3-none-any.whl", hash = "sha256:66fae2683c7a1dac53184f7de57f51f8dad73f9ead2f453e94e85096cb811335"}, ] pyparsing = [ {file = "pyparsing-2.4.6-py2.py3-none-any.whl", hash = "sha256:c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec"}, @@ -1838,33 +2004,33 @@ pyyaml = [ {file = "PyYAML-5.3.tar.gz", hash = "sha256:e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615"}, ] regex = [ - {file = "regex-2020.1.8-cp27-cp27m-win32.whl", hash = "sha256:4e8f02d3d72ca94efc8396f8036c0d3bcc812aefc28ec70f35bb888c74a25161"}, - {file = "regex-2020.1.8-cp27-cp27m-win_amd64.whl", hash = "sha256:e6c02171d62ed6972ca8631f6f34fa3281d51db8b326ee397b9c83093a6b7242"}, - {file = "regex-2020.1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:4eae742636aec40cf7ab98171ab9400393360b97e8f9da67b1867a9ee0889b26"}, - {file = "regex-2020.1.8-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:bd25bb7980917e4e70ccccd7e3b5740614f1c408a642c245019cff9d7d1b6149"}, - {file = "regex-2020.1.8-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:3e77409b678b21a056415da3a56abfd7c3ad03da71f3051bbcdb68cf44d3c34d"}, - {file = "regex-2020.1.8-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:07b39bf943d3d2fe63d46281d8504f8df0ff3fe4c57e13d1656737950e53e525"}, - {file = "regex-2020.1.8-cp36-cp36m-win32.whl", hash = "sha256:23e2c2c0ff50f44877f64780b815b8fd2e003cda9ce817a7fd00dea5600c84a0"}, - {file = "regex-2020.1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:27429b8d74ba683484a06b260b7bb00f312e7c757792628ea251afdbf1434003"}, - {file = "regex-2020.1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0e182d2f097ea8549a249040922fa2b92ae28be4be4895933e369a525ba36576"}, - {file = "regex-2020.1.8-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e3cd21cc2840ca67de0bbe4071f79f031c81418deb544ceda93ad75ca1ee9f7b"}, - {file = "regex-2020.1.8-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:ecc6de77df3ef68fee966bb8cb4e067e84d4d1f397d0ef6fce46913663540d77"}, - {file = "regex-2020.1.8-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:26ff99c980f53b3191d8931b199b29d6787c059f2e029b2b0c694343b1708c35"}, - {file = "regex-2020.1.8-cp37-cp37m-win32.whl", hash = "sha256:7bcd322935377abcc79bfe5b63c44abd0b29387f267791d566bbb566edfdd146"}, - {file = "regex-2020.1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:10671601ee06cf4dc1bc0b4805309040bb34c9af423c12c379c83d7895622bb5"}, - {file = "regex-2020.1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:98b8ed7bb2155e2cbb8b76f627b2fd12cf4b22ab6e14873e8641f266e0fb6d8f"}, - {file = "regex-2020.1.8-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6a6ba91b94427cd49cd27764679024b14a96874e0dc638ae6bdd4b1a3ce97be1"}, - {file = "regex-2020.1.8-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:6a6ae17bf8f2d82d1e8858a47757ce389b880083c4ff2498dba17c56e6c103b9"}, - {file = "regex-2020.1.8-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:0932941cdfb3afcbc26cc3bcf7c3f3d73d5a9b9c56955d432dbf8bbc147d4c5b"}, - {file = "regex-2020.1.8-cp38-cp38-win32.whl", hash = "sha256:d58e4606da2a41659c84baeb3cfa2e4c87a74cec89a1e7c56bee4b956f9d7461"}, - {file = "regex-2020.1.8-cp38-cp38-win_amd64.whl", hash = "sha256:e7c7661f7276507bce416eaae22040fd91ca471b5b33c13f8ff21137ed6f248c"}, - {file = "regex-2020.1.8.tar.gz", hash = "sha256:d0f424328f9822b0323b3b6f2e4b9c90960b24743d220763c7f07071e0778351"}, + {file = "regex-2020.2.20-cp27-cp27m-win32.whl", hash = "sha256:99272d6b6a68c7ae4391908fc15f6b8c9a6c345a46b632d7fdb7ef6c883a2bbb"}, + {file = "regex-2020.2.20-cp27-cp27m-win_amd64.whl", hash = "sha256:974535648f31c2b712a6b2595969f8ab370834080e00ab24e5dbb9d19b8bfb74"}, + {file = "regex-2020.2.20-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:5de40649d4f88a15c9489ed37f88f053c15400257eeb18425ac7ed0a4e119400"}, + {file = "regex-2020.2.20-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:82469a0c1330a4beb3d42568f82dffa32226ced006e0b063719468dcd40ffdf0"}, + {file = "regex-2020.2.20-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d58a4fa7910102500722defbde6e2816b0372a4fcc85c7e239323767c74f5cbc"}, + {file = "regex-2020.2.20-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:f1ac2dc65105a53c1c2d72b1d3e98c2464a133b4067a51a3d2477b28449709a0"}, + {file = "regex-2020.2.20-cp36-cp36m-win32.whl", hash = "sha256:8c2b7fa4d72781577ac45ab658da44c7518e6d96e2a50d04ecb0fd8f28b21d69"}, + {file = "regex-2020.2.20-cp36-cp36m-win_amd64.whl", hash = "sha256:269f0c5ff23639316b29f31df199f401e4cb87529eafff0c76828071635d417b"}, + {file = "regex-2020.2.20-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:bed7986547ce54d230fd8721aba6fd19459cdc6d315497b98686d0416efaff4e"}, + {file = "regex-2020.2.20-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:046e83a8b160aff37e7034139a336b660b01dbfe58706f9d73f5cdc6b3460242"}, + {file = "regex-2020.2.20-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:b33ebcd0222c1d77e61dbcd04a9fd139359bded86803063d3d2d197b796c63ce"}, + {file = "regex-2020.2.20-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:bba52d72e16a554d1894a0cc74041da50eea99a8483e591a9edf1025a66843ab"}, + {file = "regex-2020.2.20-cp37-cp37m-win32.whl", hash = "sha256:01b2d70cbaed11f72e57c1cfbaca71b02e3b98f739ce33f5f26f71859ad90431"}, + {file = "regex-2020.2.20-cp37-cp37m-win_amd64.whl", hash = "sha256:113309e819634f499d0006f6200700c8209a2a8bf6bd1bdc863a4d9d6776a5d1"}, + {file = "regex-2020.2.20-cp38-cp38-manylinux1_i686.whl", hash = "sha256:25f4ce26b68425b80a233ce7b6218743c71cf7297dbe02feab1d711a2bf90045"}, + {file = "regex-2020.2.20-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9b64a4cc825ec4df262050c17e18f60252cdd94742b4ba1286bcfe481f1c0f26"}, + {file = "regex-2020.2.20-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:9ff16d994309b26a1cdf666a6309c1ef51ad4f72f99d3392bcd7b7139577a1f2"}, + {file = "regex-2020.2.20-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:c7f58a0e0e13fb44623b65b01052dae8e820ed9b8b654bb6296bc9c41f571b70"}, + {file = "regex-2020.2.20-cp38-cp38-win32.whl", hash = "sha256:200539b5124bc4721247a823a47d116a7a23e62cc6695744e3eb5454a8888e6d"}, + {file = "regex-2020.2.20-cp38-cp38-win_amd64.whl", hash = "sha256:7f78f963e62a61e294adb6ff5db901b629ef78cb2a1cfce3cf4eeba80c1c67aa"}, + {file = "regex-2020.2.20.tar.gz", hash = "sha256:9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5"}, ] requests = [ {file = "requests-2.21.0-py2.py3-none-any.whl", hash = "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"}, {file = "requests-2.21.0.tar.gz", hash = "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e"}, - {file = "requests-2.22.0-py2.py3-none-any.whl", hash = "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"}, - {file = "requests-2.22.0.tar.gz", hash = "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4"}, + {file = "requests-2.23.0-py2.py3-none-any.whl", hash = "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee"}, + {file = "requests-2.23.0.tar.gz", hash = "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"}, ] requests-toolbelt = [ {file = "requests-toolbelt-0.8.0.tar.gz", hash = "sha256:f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"}, @@ -1889,8 +2055,8 @@ secretstorage = [ {file = "SecretStorage-3.1.2.tar.gz", hash = "sha256:15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6"}, ] shellingham = [ - {file = "shellingham-1.3.1-py2.py3-none-any.whl", hash = "sha256:77d37a4fd287c1e663006f7ecf1b9deca9ad492d0082587bd813c44eb49e4e62"}, - {file = "shellingham-1.3.1.tar.gz", hash = "sha256:985b23bbd1feae47ca6a6365eacd314d93d95a8a16f8f346945074c28fe6f3e0"}, + {file = "shellingham-1.3.2-py2.py3-none-any.whl", hash = "sha256:7f6206ae169dc1a03af8a138681b3f962ae61cc93ade84d0585cca3aaf770044"}, + {file = "shellingham-1.3.2.tar.gz", hash = "sha256:576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e"}, ] six = [ {file = "six-1.14.0-py2.py3-none-any.whl", hash = "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"}, @@ -1909,8 +2075,8 @@ toml = [ {file = "toml-0.10.0.tar.gz", hash = "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c"}, ] tomlkit = [ - {file = "tomlkit-0.5.8-py2.py3-none-any.whl", hash = "sha256:96e6369288571799a3052c1ef93b9de440e1ab751aa045f435b55e9d3bcd0690"}, - {file = "tomlkit-0.5.8.tar.gz", hash = "sha256:32c10cc16ded7e4101c79f269910658cc2a0be5913f1252121c3cd603051c269"}, + {file = "tomlkit-0.5.11-py2.py3-none-any.whl", hash = "sha256:4e1bd6c9197d984528f9ff0cc9db667c317d8881288db50db20eeeb0f6b0380b"}, + {file = "tomlkit-0.5.11.tar.gz", hash = "sha256:f044eda25647882e5ef22b43a1688fb6ab12af2fc50e8456cdfc751c873101cf"}, ] tornado = [ {file = "tornado-5.1.1-cp35-cp35m-win32.whl", hash = "sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f"}, @@ -1931,8 +2097,8 @@ tornado = [ tox = [ {file = "tox-3.12.1-py2.py3-none-any.whl", hash = "sha256:f5c8e446b51edd2ea97df31d4ded8c8b72e7d6c619519da6bb6084b9dd5770f9"}, {file = "tox-3.12.1.tar.gz", hash = "sha256:f87fd33892a2df0950e5e034def9468988b8d008c7e9416be665fcc0dd45b14f"}, - {file = "tox-3.14.3-py2.py3-none-any.whl", hash = "sha256:806d0a9217584558cc93747a945a9d9bff10b141a5287f0c8429a08828a22192"}, - {file = "tox-3.14.3.tar.gz", hash = "sha256:06ba73b149bf838d5cd25dc30c2dd2671ae5b2757cf98e5c41a35fe449f131b3"}, + {file = "tox-3.14.5-py2.py3-none-any.whl", hash = "sha256:0cbe98369081fa16bd6f1163d3d0b2a62afa29d402ccfad2bd09fb2668be0956"}, + {file = "tox-3.14.5.tar.gz", hash = "sha256:676f1e3e7de245ad870f956436b84ea226210587d1f72c8dfb8cd5ac7b6f0e70"}, ] typed-ast = [ {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3"}, @@ -1962,6 +2128,11 @@ typing = [ {file = "typing-3.7.4.1-py3-none-any.whl", hash = "sha256:f38d83c5a7a7086543a0f649564d661859c5146a85775ab90c0d2f93ffaa9714"}, {file = "typing-3.7.4.1.tar.gz", hash = "sha256:91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23"}, ] +typing-extensions = [ + {file = "typing_extensions-3.7.4.1-py2-none-any.whl", hash = "sha256:910f4656f54de5993ad9304959ce9bb903f90aadc7c67a0bef07e678014e892d"}, + {file = "typing_extensions-3.7.4.1-py3-none-any.whl", hash = "sha256:cf8b63fedea4d89bab840ecbb93e75578af28f76f66c35889bd7065f5af88575"}, + {file = "typing_extensions-3.7.4.1.tar.gz", hash = "sha256:091ecc894d5e908ac75209f10d5b4f118fbdb2eb1ede6a63544054bb1edb41f2"}, +] urllib3 = [ {file = "urllib3-1.24.3-py2.py3-none-any.whl", hash = "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"}, {file = "urllib3-1.24.3.tar.gz", hash = "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4"}, @@ -1969,8 +2140,10 @@ urllib3 = [ {file = "urllib3-1.25.8.tar.gz", hash = "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc"}, ] virtualenv = [ - {file = "virtualenv-16.7.9-py2.py3-none-any.whl", hash = "sha256:55059a7a676e4e19498f1aad09b8313a38fcc0cdbe4fdddc0e9b06946d21b4bb"}, - {file = "virtualenv-16.7.9.tar.gz", hash = "sha256:0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3"}, + {file = "virtualenv-16.7.10-py2.py3-none-any.whl", hash = "sha256:105893c8dc66b7817691c7371439ec18e3b6c5e323a304b5ed96cdd2e75cc1ec"}, + {file = "virtualenv-16.7.10.tar.gz", hash = "sha256:e88fdcb08b0ecb11da97868f463dd06275923f50d87f4b9c8b2fc0994eec40f4"}, + {file = "virtualenv-20.0.7-py2.py3-none-any.whl", hash = "sha256:30ea90b21dabd11da5f509710ad3be2ae47d40ccbc717dfdd2efe4367c10f598"}, + {file = "virtualenv-20.0.7.tar.gz", hash = "sha256:4a36a96d785428278edd389d9c36d763c5755844beb7509279194647b1ef47f1"}, ] wcwidth = [ {file = "wcwidth-0.1.8-py2.py3-none-any.whl", hash = "sha256:8fd29383f539be45b20bd4df0dc29c20ba48654a41e661925e612311e9f3c603"}, @@ -1981,6 +2154,6 @@ webencodings = [ {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, ] zipp = [ - {file = "zipp-1.1.0-py2.py3-none-any.whl", hash = "sha256:15428d652e993b6ce86694c3cccf0d71aa7afdc6ef1807fa25a920e9444e0281"}, - {file = "zipp-1.1.0.tar.gz", hash = "sha256:d9d2efe11d3a3fb9184da550d35bd1319dc8e30a63255927c82bb42fca1f4f7c"}, + {file = "zipp-1.2.0-py2.py3-none-any.whl", hash = "sha256:e0d9e63797e483a30d27e09fffd308c59a700d365ec34e93cc100844168bf921"}, + {file = "zipp-1.2.0.tar.gz", hash = "sha256:c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1"}, ] diff --git a/pkgs/development/tools/poetry/pyproject.toml b/pkgs/development/tools/poetry/pyproject.toml index 13e8199331b6..938b89fe422c 100644 --- a/pkgs/development/tools/poetry/pyproject.toml +++ b/pkgs/development/tools/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.0.3" +version = "1.0.5" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace <sebastien@eustace.io>" @@ -24,7 +24,7 @@ classifiers = [ [tool.poetry.dependencies] python = "~2.7 || ^3.4" cleo = "^0.7.6" -clikit = "^0.4.1" +clikit = "^0.4.2" requests = "^2.18" cachy = "^0.3.0" requests-toolbelt = "^0.8.0" @@ -35,7 +35,7 @@ cachecontrol = { version = "^0.12.4", extras = ["filecache"] } pkginfo = "^1.4" html5lib = "^1.0" shellingham = "^1.1" -tomlkit = "^0.5.8" +tomlkit = "^0.5.11" pexpect = "^4.7.0" # The typing module is not in the stdlib in Python 2.7 and 3.4 diff --git a/pkgs/development/tools/poetry/src.json b/pkgs/development/tools/poetry/src.json index dd8816ac0724..45f41ab9cfcf 100644 --- a/pkgs/development/tools/poetry/src.json +++ b/pkgs/development/tools/poetry/src.json @@ -1,6 +1,6 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "ed4434253762f943255af20e98098b19a65ca1a6", - "sha256": "1ivi984rkavxzxap1rq55yf6jjf2pi90f4riw2ww41hj87prv26q" + "rev": "754dbf80dc022b89974288cff10b40ab2f1c2697", + "sha256": "1khjx598n222fhzvsxsc6cq4m2i8rss1k1whxw9k03kxi4dx6x5g" } \ No newline at end of file diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index ac866a139d97..7d3164fcec62 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -3,12 +3,11 @@ , poetry ? null , poetryLib ? import ./lib.nix { inherit lib pkgs; } }: - let inherit (poetryLib) isCompatible readTOML; # Poetry2nix version - version = "1.1.0"; + version = "1.6.0"; /* The default list of poetry2nix override overlays */ defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; }); @@ -29,14 +28,15 @@ let Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. */ mkPoetryPackages = - { pyproject - , poetrylock - , poetryPkg + { projectDir ? null + , pyproject ? projectDir + "/pyproject.toml" + , poetrylock ? projectDir + "/poetry.lock" , overrides ? [ defaultPoetryOverrides ] - , meta ? {} , python ? pkgs.python3 - , pwd ? null + , pwd ? projectDir }@attrs: let + poetryPkg = poetry.override { inherit python; }; + pyProject = readTOML pyproject; poetryLock = readTOML poetrylock; lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; @@ -52,14 +52,7 @@ let # Filter packages by their PEP508 markers & pyproject interpreter version partitions = let - supportsPythonVersion = pkgMeta: let - pep508Result = if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; - - flatDeps = (pyProject.tool.poetry.dependencies or {}) // (pyProject.tool.poetry.dev-dependencies or {}); - constraints = flatDeps.${pkgMeta.name}.python or ""; - pyprojectResult = isCompatible python.pythonVersion constraints; - in - pyprojectResult && pep508Result; + supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; in lib.partition supportsPythonVersion poetryLock.package; @@ -105,7 +98,7 @@ let # The canonical name is setuptools-scm setuptools-scm = super.setuptools_scm; - inherit (hooks) removePathDependenciesHook; + inherit (hooks) removePathDependenciesHook poetry2nixFixupHook; } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs @@ -133,18 +126,17 @@ let poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; } */ mkPoetryEnv = - { pyproject - , poetrylock + { projectDir ? null + , pyproject ? projectDir + "/pyproject.toml" + , poetrylock ? projectDir + "/poetry.lock" , overrides ? [ defaultPoetryOverrides ] - , meta ? {} - , pwd ? null + , pwd ? projectDir , python ? pkgs.python3 }: let - poetryPkg = poetry.override { inherit python; }; py = mkPoetryPackages ( { - inherit poetryPkg pyproject poetrylock overrides meta python pwd; + inherit pyproject poetrylock overrides python pwd; } ); in @@ -152,19 +144,18 @@ let /* Creates a Python application from pyproject.toml and poetry.lock */ mkPoetryApplication = - { src - , pyproject - , poetrylock + { projectDir ? null + , src ? poetryLib.cleanPythonSources { src = projectDir; } + , pyproject ? projectDir + "/pyproject.toml" + , poetrylock ? projectDir + "/poetry.lock" , overrides ? [ defaultPoetryOverrides ] , meta ? {} , python ? pkgs.python3 - , pwd ? null + , pwd ? projectDir , ... }@attrs: let - poetryPkg = poetry.override { inherit python; }; - poetryPython = mkPoetryPackages { - inherit poetryPkg pyproject poetrylock overrides meta python pwd; + inherit pyproject poetrylock overrides python pwd; }; py = poetryPython.python; @@ -178,11 +169,20 @@ let ]; passedAttrs = builtins.removeAttrs attrs specialAttrs; + # Get dependencies and filter out depending on interpreter version getDeps = depAttr: let + compat = isCompatible py.pythonVersion; deps = pyProject.tool.poetry.${depAttr} or {}; depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); in - builtins.map (dep: py.pkgs."${dep}") depAttrs; + builtins.map ( + dep: let + pkg = py.pkgs."${dep}"; + constraints = deps.${dep}.python or ""; + isCompat = compat constraints; + in + if isCompat then pkg else null + ) depAttrs; getInputs = attr: attrs.${attr} or []; mkInput = attr: extraInputs: getInputs attr ++ extraInputs; @@ -198,6 +198,8 @@ let pname = pyProject.tool.poetry.name; version = pyProject.tool.poetry.version; + inherit src; + format = "pyproject"; buildInputs = mkInput "buildInputs" buildSystemPkgs; @@ -211,6 +213,7 @@ let meta = meta // { inherit (pyProject.tool.poetry) description homepage; + inherit (py.meta) platforms; license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); }; @@ -220,34 +223,11 @@ let /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ cli = import ./cli.nix { inherit pkgs lib version; }; - /* Poetry2nix documentation */ - doc = pkgs.stdenv.mkDerivation { - pname = "poetry2nix-docs"; - inherit version; - - src = pkgs.runCommandNoCC "poetry2nix-docs-src" {} '' - mkdir -p $out - cp ${./default.nix} $out/default.nix - ''; - - buildInputs = [ - pkgs.nixdoc - ]; - - buildPhase = '' - nixdoc --category poetry2nix --description "Poetry2nix functions" --file ./default.nix > poetry2nix.xml - ''; - - installPhase = '' - mkdir -p $out - cp poetry2nix.xml $out/ - ''; - - }; - in { - inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli doc; + inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli version; + + inherit (poetryLib) cleanPythonSources; /* The default list of poetry2nix override overlays @@ -262,4 +242,25 @@ in in defaultSet // customSet; }; + + /* + Convenience functions for specifying overlays with or without the poerty2nix default overrides + */ + overrides = { + /* + Returns the specified overlay in a list + */ + withoutDefaults = overlay: [ + overlay + ]; + + /* + Returns the specified overlay and returns a list + combining it with poetry2nix default overrides + */ + withDefaults = overlay: [ + defaultPoetryOverrides + overlay + ]; + }; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index dd24b2634e00..ec3fa0afa69d 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -22,4 +22,12 @@ in } ./remove-path-dependencies.sh ) {}; + poetry2nixFixupHook = callPackage ( + {}: + makeSetupHook { + name = "fixup-hook.sh"; + deps = []; + } ./fixup-hook.sh + ) {}; + } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh new file mode 100644 index 000000000000..fc539e4298c6 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh @@ -0,0 +1,8 @@ +poetry2nix-fixup-hook() { + # Including tests in the output is a common mistake + if [ -z "${dontFixupTests-}" ]; then + rm -rf $out/lib/python3.7/site-packages/tests + fi +} + +postFixupHooks+=(poetry2nix-fixup-hook) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh index 900fe66908bf..b22a05900a05 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh @@ -1,4 +1,8 @@ remove-path-dependencies-hook() { + if ! test -f pyproject.toml; then + return + fi + # Tell poetry not to resolve the path dependencies. Any version is fine! @yj@ -tj < pyproject.toml | @pythonInterpreter@ @pyprojectPatchScript@ > pyproject.json @yj@ -jt < pyproject.json > pyproject.toml diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 64ba0293132e..b816feb38e89 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -96,6 +96,38 @@ let [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] ); + # Find gitignore files recursively in parent directory stopping with .git + findGitIgnores = path: let + parent = path + "/.."; + gitIgnore = path + "/.gitignore"; + isGitRoot = builtins.pathExists (path + "/.git"); + hasGitIgnore = builtins.pathExists gitIgnore; + gitIgnores = if hasGitIgnore then [ gitIgnore ] else []; + in + lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; + + /* + Provides a source filtering mechanism that: + + - Filters gitignore's + - Filters pycache/pyc files + - Uses cleanSourceFilter to filter out .git/.hg, .o/.so, editor backup files & nix result symlinks + */ + cleanPythonSources = { src }: let + gitIgnores = findGitIgnores src; + pycacheFilter = name: type: + (type == "directory" && ! lib.strings.hasInfix "__pycache__" name) + || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) + ; + in + lib.cleanSourceWith { + filter = lib.cleanSourceFilter; + src = lib.cleanSourceWith { + filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; + inherit src; + }; + }; + in { inherit @@ -105,5 +137,6 @@ in readTOML getBuildSystemPkgs satisfiesSemver + cleanPythonSources ; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 5113ad25e4b6..5ae35dfed49e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -106,8 +106,10 @@ pythonPackages.callPackage ( # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` dontStrip = format == "wheel"; - nativeBuildInputs = (if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else []) - ++ lib.optional (isLocal) pkgs.yj + nativeBuildInputs = [ + pythonPackages.poetry2nixFixupHook + ] + ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook ; @@ -117,14 +119,24 @@ pythonPackages.callPackage ( ++ lib.optional isLocal buildSystemPkgs ); - propagatedBuildInputs = - # Some dependencies like django get the attribute name django - # but dependencies try to access Django - builtins.map (n: pythonPackages.${lib.toLower n}) (builtins.attrNames dependencies); + propagatedBuildInputs = let + compat = isCompatible python.pythonVersion; + deps = lib.filterAttrs (n: v: v) ( + lib.mapAttrs ( + n: v: let + constraints = v.python or ""; + in + compat constraints + ) dependencies + ); + depAttrs = lib.attrNames deps; + in + builtins.map (n: pythonPackages.${lib.toLower n}) depAttrs; meta = { broken = ! isCompatible python.pythonVersion python-versions; license = []; + inherit (python.meta) platforms; }; passthru = { @@ -139,7 +151,7 @@ pythonPackages.callPackage ( inherit (source) url; rev = source.reference; } - ) else if isLocal then (localDepPath) else fetchFromPypi { + ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else fetchFromPypi { pname = name; inherit (fileInfo) file hash kind; }; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 6316dcf51c0c..9eb3f92bd12b 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -6,6 +6,13 @@ self: super: { + astroid = super.astroid.overrideAttrs ( + old: rec { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); + av = super.av.overrideAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ @@ -82,16 +89,35 @@ self: super: faker = super.faker.overrideAttrs ( old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); + + fancycompleter = super.fancycompleter.overrideAttrs ( + old: { postPatch = '' - substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' 'setup_requires=[],' || true + substituteInPlace setup.py \ + --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ + --replace 'versioning="devcommit"' 'version="${old.version}"' ''; } ); grandalf = super.grandalf.overrideAttrs ( old: { - postPatch = '' - substituteInPlace setup.py --replace "setup_requires=['pytest-runner',]," "setup_requires=[]," || true + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); + + h5py = super.h5py.overrideAttrs ( + old: rec { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + configure_flags = "--hdf5=${pkgs.hdf5}"; + postConfigure = '' + ${self.python.executable} setup.py configure ${configure_flags} ''; } ); @@ -103,12 +129,21 @@ self: super: ); # importlib-metadata has an incomplete dependency specification - importlib-metadata = if super.importlib-metadata == null then null else super.importlib-metadata.overrideAttrs ( + importlib-metadata = super.importlib-metadata.overrideAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; } ); + jupyter = super.jupyter.overrideAttrs ( + old: rec { + # jupyter is a meta-package. Everything relevant comes from the + # dependencies. It does however have a jupyter.py file that conflicts + # with jupyter-core so this meta solves this conflict. + meta.priority = 100; + } + ); + lap = super.lap.overrideAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ @@ -202,9 +237,8 @@ self: super: mccabe = super.mccabe.overrideAttrs ( old: { - postPatch = '' - substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "setup_requires=[]," || true - ''; + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; } ); @@ -264,6 +298,13 @@ self: super: } ); + openexr = super.openexr.overrideAttrs ( + old: rec { + buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; + NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; + } + ); + peewee = super.peewee.overridePythonAttrs ( old: let withPostgres = old.passthru.withPostgres or false; @@ -346,6 +387,13 @@ self: super: } ); + pylint = super.pylint.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); + pyopenssl = super.pyopenssl.overrideAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.openssl ]; @@ -461,6 +509,14 @@ self: super: } ); + pytest = super.pytest.overridePythonAttrs ( + old: { + doCheck = false; + } + ); + + pytest-runner = super.pytest-runner or super.pytestrunner; + python-prctl = super.python-prctl.overrideAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -469,6 +525,21 @@ self: super: } ); + pyzmq = super.pyzmq.overrideAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; + } + ); + + rockset = super.rockset.overrideAttrs ( + old: rec { + postPatch = '' + cp ./setup_rockset.py ./setup.py + ''; + } + ); + scaleapi = super.scaleapi.overrideAttrs ( old: { postPatch = '' @@ -477,6 +548,12 @@ self: super: } ); + pandas = super.pandas.overrideAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; + } + ); + # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs # Make it not fail with infinite recursion pybind11 = super.pybind11.overridePythonAttrs ( @@ -529,6 +606,30 @@ self: super: } ); + shellingham = if lib.versionAtLeast super.shellingham.version "1.3.2" then ( + super.shellingham.overridePythonAttrs ( + old: { + format = "pyproject"; + } + ) + ) else super.shellingham; + + tables = super.tables.overrideAttrs ( + old: { + HDF5_DIR = "${pkgs.hdf5}"; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; + } + ); + + tensorpack = super.tensorpack.overrideAttrs ( + old: { + postPatch = '' + substituteInPlace setup.cfg --replace "# will call find_packages()" "" + ''; + } + ); + urwidtrees = super.urwidtrees.overrideAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index c61c7306b8c3..a31bcab82d4b 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0qy4xb7bxyw2x2ya7zmbkz48wxb69jcnvvj7021f1kyc6wdwcxs7"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1d42cmpg1yn1ql9isx26kxsxzf5rg6qw6j948skc5p054r0c9n3f"; + cargoSha256 = "0d24crgx6wrb1p96w2yww7cs474x2pz4i6f26cry8pf5dwqfsqdm"; meta = with stdenv.lib; { description = "Command line helpers for fuzzing"; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 3fed52a2fafe..a5337e94087a 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "07hklya22ixklb44f3qp6yyh5d03a7rjcn0g76icqr36hvcjyjjh"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1rsk9j1ij53dz4gakxwdppgmv12lmyj0ihh9qypdbgskvyq3a2j9"; + cargoSha256 = "133n8j4d0j0rasns3a4kkflhrvmvkqfggcrfj4sp79am19pr146b"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index ccd9fd3e4879..34d45ac83c72 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1pxvcf991w0jfxdissvwal5slrx7vpk3rqkzwk4hxfv0mjiqxsg5"; + cargoSha256 = "0v7g9rkw7axy99vcfi7sy2pw7wnpq424jvd8xchcv8ghh8yw9lyc"; meta = with lib; { description = "See what Rust is doing behind the curtains"; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 54008300c512..d37b578ced9c 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1wh8w5p9rb9cqgpmclaywfsz3ckfi9mw38hhg31w7hkgjmqalyj9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0vb2qr03qv66mmxgs1d5fvs63cdfxaldlg7pilhmdzha1kgy7ib0"; + cargoSha256 = "0g56rvan0p57hkl00warx4ig7a54g0qw6p2gkwn9yxi6p3p2wddj"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index d0b20ffe3b25..d092274cf367 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0l1aalb8ans7scljrza7akhi821jbpqgn6sa8kgd8sys83r93fkj"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0dlbln8nsvmrc9p99bl6yni57fravicias9gbv88fg7az904ilzz"; + cargoSha256 = "07zkfpw0zyakpsm1mg525ibpsfs9swwmijb0xfsk3nbv66caqd04"; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 1877ac6e1223..b92a65842cc3 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1haq8gv4k6qgihyjplf76589d2hbb1720g6yvwk88aksjxmqj4jm"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "011r5n68ay94dvfm37xpd9s8x086l6qsll74iw98hcvw3inxp1ws"; + cargoSha256 = "08y64yqvar1ph1pcbh6lhqf4kj85zw74dfg0ii9lycvzxvkwvhqp"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index b9a417e3b665..5d4e4fbeb8d9 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0d7l3j8js16zgdx37kykavr343v65vchldz88j38jjyc43pcm2pg"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0kn3sq99sgsh8msignyb4vjllv0wf1crqaw7sqp3ggmlkrdq35sd"; + cargoSha256 = "1y13kfski36rfvqkp3mxxn12aidp339j7rigv49msyr004ac5y8s"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index e91a08303947..77920dfeeed9 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -18,10 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "095gk6lcck5864wjhrkhgnkxn9pzcg82xk5p94br7lmf15y9gc7j"; + cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index eb507857ca83..9041667a0fc7 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -1,19 +1,19 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "yq-go"; - version = "3.1.2"; + version = "3.2.1"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "0gjxmnmphav8ms4zdkcjcsgrjs77ccwdfpc1qpxjp6fr2g4v5vmq"; + sha256 = "1n20m1zizbkgzag4676fvf16h6f8vll6pniblj7haqdwvnza8zwd"; }; - modSha256 = "035w9bh96rr2x21w7bwwpngyng6839wglpgwf7gy8p6difvnn2v9"; + modSha256 = "0hbazc6hf3zrni25lpbyi36sbxyabbrpi591gkqwxgr9hdbdpcg9"; - meta = with stdenv.lib; { + meta = with lib; { description = "Portable command-line YAML processor"; homepage = "https://mikefarah.gitbook.io/yq/"; license = [ licenses.mit ]; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 142ce8cd5e8c..647bdf6f3af9 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.18.0"; + version = "7.19.1"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "144yd4w1hqjmcp5v24ghkxh78fxc5ylzbgv7szp7y3vhwdanaiy7"; + sha256 = "1p3614lhyn0qwqj99iqclpg4xfd3x4n1m34ya79530phqrrmnsh7"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix new file mode 100644 index 000000000000..1936c93ab843 --- /dev/null +++ b/pkgs/games/alephone/default.nix @@ -0,0 +1,99 @@ +{ stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libmad, libogg, libpng +, libsndfile, libvorbis, lua, pkgconfig, SDL, SDL_image, SDL_net, SDL_ttf, smpeg +, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip, alephone }: + +let + self = stdenv.mkDerivation rec { + outputs = [ "out" "icons" ]; + pname = "alephone"; + version = "20150620"; + + src = fetchurl { + url = + "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/AlephOne-${version}.tar.bz2"; + sha256 = "0cz18fa3gx8mz5j09ywz8gq0r4q082kh6l9pbpwn8qjanzgn1wy0"; + }; + + nativeBuildInputs = [ pkgconfig icoutils ]; + + buildInputs = [ + boost + curl + ffmpeg + libmad + libsndfile + libogg + libpng + libvorbis + lua + SDL + SDL_image + SDL_net + SDL_ttf + smpeg + speex + zziplib + zlib + ]; + + configureFlags = [ "--with-boost=${boost}" ]; + + enableParallelBuilding = true; + + postInstall = '' + mkdir $icons + icotool -x -i 5 -o $icons Resources/Windows/*.ico + pushd $icons + for x in *_5_48x48x32.png; do + mv $x ''${x%_5_48x48x32.png}.png + done + popd + ''; + + meta = with stdenv.lib; { + description = + "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; + homepage = "https://alephone.lhowon.org/"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ ehmry ]; + platforms = platforms.linux; + }; + }; + +in self // { + makeWrapper = { pname, desktopName, version, zip, meta + , icon ? alephone.icons + "/alephone.png", ... }@extraArgs: + stdenv.mkDerivation ({ + inherit pname version; + + desktopItem = makeDesktopItem { + name = desktopName; + exec = pname; + genericName = pname; + categories = "Game;"; + comment = meta.description; + inherit desktopName icon; + }; + + src = zip; + + nativeBuildInputs = [ makeWrapper unzip ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/data/$pname $out/share/applications + cp -a * $out/data/$pname + cp $desktopItem/share/applications/* $out/share/applications + makeWrapper ${alephone}/bin/alephone $out/bin/$pname \ + --add-flags $out/data/$pname + ''; + + meta = with stdenv.lib; + { + maintainers = with maintainers; [ ehmry ]; + inherit (alephone.meta) platforms; + } // meta; + } // extraArgs); +} diff --git a/pkgs/games/alephone/durandal/default.nix b/pkgs/games/alephone/durandal/default.nix new file mode 100644 index 000000000000..cd5450d1c2e4 --- /dev/null +++ b/pkgs/games/alephone/durandal/default.nix @@ -0,0 +1,25 @@ +{ alephone, fetchurl }: + +alephone.makeWrapper rec { + pname = "durandal"; + desktopName = "Marathon-Durandal"; + version = "20150620"; + icon = alephone.icons + "/marathon2.png"; + + zip = fetchurl { + url = + "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip"; + sha256 = "1gpg0dk3z8irvdkm4nj71v14lqx77109chqr2ly594jqf6j9wwqv"; + }; + + meta = { + description = "Second chapter of the Marathon trilogy"; + longDescription = '' + Fresh from your triumph on the starship Marathon, you are seized by the rogue computer Durandal to do his bidding in a distant part of the galaxy. Within the ruins of an ancient civilization, you must seek the remnants of a lost clan and uncover their long-buried secrets. Battle opponents ancient and terrible, with sophisticated weapons and devious strategies, all the while struggling to escape the alien nightmare… + + This release of Marathon 2: Durandal includes the classic graphics, and revamped high-definition textures and monsters from the Xbox Live Arcade edition. + ''; + homepage = "https://alephone.lhowon.org/games/marathon2.html"; + }; + +} diff --git a/pkgs/games/alephone/eternal/default.nix b/pkgs/games/alephone/eternal/default.nix new file mode 100644 index 000000000000..c21284150618 --- /dev/null +++ b/pkgs/games/alephone/eternal/default.nix @@ -0,0 +1,21 @@ +{ alephone, fetchurl, unrar }: + +alephone.makeWrapper rec { + pname = "marathon-eternal"; + version = "1.2.0"; + desktopName = "Marathon-Eternal"; + + zip = fetchurl { + url = "http://eternal.bungie.org/files/_releases/EternalXv120.zip"; + sha256 = "1qrvx0sp9xc8zbpp5yz8jdz458ajzmyv2si7hrppiyawc8dpcwck"; + }; + + sourceRoot = "Eternal 1.2.0"; + + meta = { + description = + "Picking up from the end of the Marathon trilogy, you find yourself suddenly ninety-four years in the future, in the year 2905"; + homepage = "http://eternal.bungie.org/"; + }; + +} diff --git a/pkgs/games/alephone/evil/default.nix b/pkgs/games/alephone/evil/default.nix new file mode 100644 index 000000000000..a0120348c14e --- /dev/null +++ b/pkgs/games/alephone/evil/default.nix @@ -0,0 +1,18 @@ +{ alephone, fetchurl, unrar }: + +alephone.makeWrapper rec { + pname = "marathon-evil"; + version = "0"; + desktopName = "Marathon-Evil"; + + zip = fetchurl { + url = "http://files3.bungie.org/trilogy/MarathonEvil.zip"; + sha256 = "08nizbjp2rx10bpqrbhb76as0j2zynmy2c0qa5b482lz1szf9b95"; + }; + + meta = { + description = "The first conversion for Marathon Infinity"; + homepage = "https://alephone.lhowon.org/scenarios.html"; + }; + +} diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/games/alephone/infinity/default.nix new file mode 100644 index 000000000000..f4cea6c73435 --- /dev/null +++ b/pkgs/games/alephone/infinity/default.nix @@ -0,0 +1,25 @@ +{ alephone, fetchurl }: + +alephone.makeWrapper rec { + pname = "marathon-infinity"; + desktopName = "Marathon-Infinity"; + version = "20150620"; + icon = alephone.icons + "/marathon-infinity.png"; + + zip = fetchurl { + url = + "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; + sha256 = "0sgfahppanp9c0p115dg0makrdzghzmbz3iggl6x28fh62j03q64"; + }; + + meta = { + description = "Third chapter of the Marathon trilogy"; + longDescription = '' + Marathon Infinity takes the closed universe of the Marathon series and blows it wide open. The solo/co-op campaign, “Blood Tides of Lh’owon,” is a 20-level scenario sporting new textures, weapons, and aliens. More than that, the scenario sheds a surprising new light on the story’s characters and the meaning of events. Having defeated the Pfhor and reawakened the ancient remnants of the S’pht, the player now faces a world where friends become enemies and all is not what it seems… + + Marathon Infinity is the most popular Marathon game in online play, and is compatible with hundreds of community-made maps. This release includes the classic graphics, and revamped high-definition textures and weapons. + ''; + homepage = "https://alephone.lhowon.org/games/infinity.html"; + }; + +} diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix new file mode 100644 index 000000000000..84831b6a2691 --- /dev/null +++ b/pkgs/games/alephone/marathon/default.nix @@ -0,0 +1,25 @@ +{ alephone, fetchurl }: + +alephone.makeWrapper rec { + pname = "marathon"; + desktopName = "Marathon"; + version = "20150620"; + icon = alephone.icons + "/marathon.png"; + + zip = fetchurl { + url = + "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; + sha256 = "0cagsigsjlsr8jqfaqjdxv8fs0f079cjzs26679aacyykc6b8k3p"; + }; + + meta = { + description = "First chapter of the Marathon trilogy"; + longDescription = '' + Alien forces have boarded the interstellar colony ship Marathon. The situation is dire. As a security officer onboard, it is your duty to defend the ship and its crew. + + Experience the start of Bungie’s iconic trilogy with Marathon. This release uses the original Marathon data files for the most authentic experience outside of a classic Mac or emulator. + ''; + homepage = "https://alephone.lhowon.org/games/marathon.html"; + }; + +} diff --git a/pkgs/games/alephone/pathways-into-darkness/default.nix b/pkgs/games/alephone/pathways-into-darkness/default.nix new file mode 100644 index 000000000000..6c6de4b88e8f --- /dev/null +++ b/pkgs/games/alephone/pathways-into-darkness/default.nix @@ -0,0 +1,19 @@ +{ alephone, fetchurl }: + +alephone.makeWrapper rec { + pname = "pathways-into-darkness"; + desktopName = "Pathways-Into-Darkness"; + version = "1.1.1"; + + zip = fetchurl { + url = "http://simplici7y.com/version/file/1185/AOPID_v1.1.1.zip"; + sha256 = "0x83xjcw5n5s7sw8z6rb6zzhihjkjgk7x7ynnqq917dcklr7bz4g"; + }; + + meta = { + description = '' + Port of the 1993 mac game "Pathways Into Darkness" by Bungie to the Aleph One engine''; + homepage = "http://simplici7y.com/items/aleph-one-pathways-into-darkness"; + }; + +} diff --git a/pkgs/games/alephone/pheonix/default.nix b/pkgs/games/alephone/pheonix/default.nix new file mode 100644 index 000000000000..90db1aa7c73d --- /dev/null +++ b/pkgs/games/alephone/pheonix/default.nix @@ -0,0 +1,18 @@ +{ alephone, fetchurl }: + +alephone.makeWrapper rec { + pname = "marathon-pheonix"; + desktopName = "Marathon-Pheonix"; + version = "1.3"; + + zip = fetchurl { + url = "http://simplici7y.com/version/file/998/Marathon_Phoenix_1.3.zip"; + sha256 = "1r06k0z8km7l9d3njinsrci4jhk8hrnjdcmjd8n5z2qxkqvhn9qj"; + }; + + meta = { + description = "A 35-level single player major Marathon conversion"; + homepage = "http://www.simplici7y.com/items/marathon-phoenix-2"; + }; + +} diff --git a/pkgs/games/alephone/red/default.nix b/pkgs/games/alephone/red/default.nix new file mode 100644 index 000000000000..f24c9010cd63 --- /dev/null +++ b/pkgs/games/alephone/red/default.nix @@ -0,0 +1,18 @@ +{ alephone, fetchurl, unrar }: + +alephone.makeWrapper rec { + pname = "marathon-red"; + version = "0"; + desktopName = "Marathon-Red"; + + zip = fetchurl { + url = "http://files3.bungie.org/trilogy/MarathonRED.zip"; + sha256 = "1p13snlrvn39znvfkxql67crhysn71db2bwsfrkhjkq58wzs6qgw"; + }; + + meta = { + description = "Survival horror-esque Marathon conversion"; + homepage = "https://alephone.lhowon.org/scenarios.html"; + }; + +} diff --git a/pkgs/games/alephone/rubicon-x/default.nix b/pkgs/games/alephone/rubicon-x/default.nix new file mode 100644 index 000000000000..b59fa4cfeb62 --- /dev/null +++ b/pkgs/games/alephone/rubicon-x/default.nix @@ -0,0 +1,23 @@ +{ alephone, fetchurl }: + +alephone.makeWrapper rec { + pname = "rubicon-x"; + version = "20150620"; + desktopName = "Marathon-Rubicon-X"; + + zip = fetchurl { + url = "http://files5.bungie.org/marathon/marathonRubiconX.zip"; + sha256 = "095si89wap76pvkvk90zqw7djhrhwb1anjm2s8i503jbcn5n4ipm"; + }; + + sourceRoot = "Rubicon X ƒ"; + + meta = { + description = "Unofficial forth chapter of the Marathon series"; + longDescription = '' + Rubicon X is a free, cross platform, first person shooter that continues the story of Bungie’s Marathon trilogy. First released as Marathon:Rubicon in 2001, Rubicon X is a complete overhaul of the original. It features all new high-resolution artwork, new and updated maps, and enough surprises to feel like a whole new game. + ''; + homepage = "http://www.marathonrubicon.com/"; + }; + +} diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index e85cebde0408..e6b669b8d675 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.6.4"; + version = "5.7"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2"; + sha256 = "1m9bk7hp3d4sdd3y3isvf26rxya7511mnwyv99l2f80adbsv3nq2"; }; postPatch = '' diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 8349be64264a..f138e1d04913 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, desktop-file-utils , gtk3, libX11 , makeWrapper, pkgconfig, perl, autoreconfHook, wrapGAppsHook }: @@ -8,28 +8,55 @@ stdenv.mkDerivation rec { version = "20191114.1c0c49d"; src = fetchurl { - url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "01fi2f3w71bfbgcfr6gxdp5a9cxh4dshbflv83q2j5rxxs2ll870"; + url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; + sha256 = "01fi2f3w71bfbgcfr6gxdp5a9cxh4dshbflv83q2j5rxxs2ll870"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ]; + sgt-puzzles-menu = fetchurl { + url = "https://raw.githubusercontent.com/Oleh-Kravchenko/portage/master/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu"; + sha256 = "088w0x9g3j8pn725ix8ny8knhdsfgjr3hpswsh9fvfkz5vlg2xkm"; + }; + + nativeBuildInputs = [ autoreconfHook desktop-file-utils makeWrapper + pkgconfig perl wrapGAppsHook ]; buildInputs = [ gtk3 libX11 ]; - makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"]; + makeFlags = [ "prefix=$(out)" "gamesdir=$(out)/bin"]; + preInstall = '' mkdir -p "$out"/{bin,share/doc/sgtpuzzles} cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles" ''; - # SGT Puzzles use generic names like net, map, etc. - # Create symlinks with sgt-puzzle- prefix for possibility of - # disambiguation + postInstall = '' - ( - cd "$out"/bin ; - for i in *; do ln -s "$i" "sgt-puzzle-$i"; done - ) + for i in $(basename -s $out/bin/*); do + + ln -s $out/bin/$i $out/bin/sgt-puzzle-$i + install -Dm644 icons/$i-48d24.png -t $out/share/icons/hicolor/48x48/apps/ + + # Generate/validate/install .desktop files. + echo "[Desktop Entry]" > $i.desktop + desktop-file-install --dir $out/share/applications \ + --set-key Type --set-value Application \ + --set-key Exec --set-value $i \ + --set-key Name --set-value $i \ + --set-key Comment --set-value "${meta.description}" \ + --set-key Categories --set-value "Game;LogicGame;X-sgt-puzzles;" \ + --set-key Icon --set-value $out/share/icons/hicolor/48x48/apps/$i-48d24 \ + $i.desktop + done + + echo "[Desktop Entry]" > sgt-puzzles.directory + desktop-file-install --dir $out/share/desktop-directories \ + --set-key Type --set-value Directory \ + --set-key Name --set-value Puzzles \ + --set-key Icon --set-value $out/share/icons/hicolor/48x48/apps/sgt-puzzles_map \ + sgt-puzzles.directory + + install -Dm644 ${sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/ ''; + preConfigure = '' perl mkfiles.pl export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" @@ -39,7 +66,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simon Tatham's portable puzzle collection"; license = licenses.mit; - maintainers = [ maintainers.raskin ]; + maintainers = [ maintainers.raskin maintainers.genesis ]; platforms = platforms.linux; homepage = https://www.chiark.greenend.org.uk/~sgtatham/puzzles/; }; diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix index 34eb5315e749..2e417e2a3cfc 100644 --- a/pkgs/games/system-syzygy/default.nix +++ b/pkgs/games/system-syzygy/default.nix @@ -23,10 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ SDL2 ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03724z33dqxbbrzpvz172qh45qrgnyb801algjdcm32v8xsx81qg"; + cargoSha256 = "001cwdq8zxji56yahwfsydi7s0j7c5zsip60lxk3qmn078wcipdp"; postInstall = '' mkdir -p $out/share/syzygy/ diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 337d19804fc4..777c9f043f40 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: +, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib }: stdenv.mkDerivation rec { pname = "mednafen"; - version = "0.9.48"; + version = "1.22.2"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; + sha256 = "159gvzrf4as1fp74czzc14vamhd6s3hlnvwglfgdd5j6d6n37m7s"; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { libsamplerate libsndfile libX11 - SDL - SDL_net + SDL2 + SDL2_net zlib ]; @@ -34,7 +34,38 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - homepage = https://mednafen.github.io/; + longDescription = '' + Mednafen is a portable, utilizing OpenGL and SDL, + argument(command-line)-driven multi-system emulator. Mednafen has the + ability to remap hotkey functions and virtual system inputs to a keyboard, + a joystick, or both simultaneously. Save states are supported, as is + real-time game rewinding. Screen snapshots may be taken, in the PNG file + format, at the press of a button. Mednafen can record audiovisual movies + in the QuickTime file format, with several different lossless codecs + supported. + + The following systems are supported (refer to the emulation module + documentation for more details): + + - Apple II/II+ + - Atari Lynx + - Neo Geo Pocket (Color) + - WonderSwan + - GameBoy (Color) + - GameBoy Advance + - Nintendo Entertainment System + - Super Nintendo Entertainment System/Super Famicom + - Virtual Boy + - PC Engine/TurboGrafx 16 (CD) + - SuperGrafx + - PC-FX + - Sega Game Gear + - Sega Genesis/Megadrive + - Sega Master System + - Sega Saturn (experimental, x86_64 only) + - Sony PlayStation + ''; + homepage = "https://mednafen.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 146d53202614..9a1edc00452d 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Netplay server for Mednafen"; - homepage = https://mednafen.github.io/; + homepage = "https://mednafen.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 40390068e7be..7e231c5edd3a 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mednaffe"; - version = "0.8.6"; + version = "0.8.8"; src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; - rev = "v${version}"; - sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m"; + rev = "${version}"; + sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ]; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "GTK-based frontend for mednafen emulator"; - homepage = https://github.com/AmatCoder/mednaffe; + homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sheenobu yegortimoshenko ]; + maintainers = with maintainers; [ sheenobu yegortimoshenko AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index c2b30f8ce47a..597737646615 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig -, cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit -, qttools, minizip }: +, cmake, epoxy, libzip, libelf, libedit, ffmpeg, SDL2, imagemagick +, qtbase, qtmultimedia, qttools, minizip }: let desktopItem = makeDesktopItem { @@ -15,21 +15,21 @@ let }; in stdenv.mkDerivation rec { pname = "mgba"; - version = "0.7.3"; + version = "0.8.1"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1wrmwh50rv8bd328r8cisrihq6h90kx2bfb0vmjfbsd3l1jvgrgm"; + sha256 = "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429"; }; enableParallelBuilding = true; nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ]; buildInputs = [ - libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia libedit minizip - qttools + epoxy libzip libelf libedit ffmpeg SDL2 imagemagick + qtbase qtmultimedia qttools minizip ]; postInstall = '' diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 6236b3a71ba8..3277abbb77b9 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.5"; + version = "7.0.6"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "162dnm3sf7bkrnyqd8bcb6il6f2cam9gnaxj6d5dn48k77fw9ryc"; + sha256 = "0pc6xbwxljpj7h37za63kspdi90ap58x6x5b7hsmlhahblvlw0b8"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4181ddbdd9dc..9d6a47e507db 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2190,17 +2190,6 @@ let }; }; - notational-fzf-vim = buildVimPluginFrom2Nix { - pname = "notational-fzf-vim"; - version = "2019-12-03"; - src = fetchFromGitHub { - owner = "alok"; - repo = "notational-fzf-vim"; - rev = "16ea3477c8dbf3167f15246a29bd1d1fcc18c914"; - sha256 = "1j1nfb297rqmg2h96hx4bmgxq55z179fh4f1ak79d6v815mr72bi"; - }; - }; - NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; version = "2019-12-12"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index cecd53ae8201..79418c62aa8e 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,6 +1,6 @@ { lib, stdenv , python, cmake, meson, vim, ruby -, which, fetchFromGitHub, fetchgit, fetchurl, fetchzip +, which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch , llvmPackages, rustPlatform , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses @@ -28,9 +28,6 @@ # vCoolor dependency , gnome3 - -# notational-fzf-vim dependencies -, ripgrep }: self: super: { @@ -252,17 +249,6 @@ self: super: { ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: { dependencies = with super; [ ultisnips ]; }); - - notational-fzf-vim = super.notational-fzf-vim.overrideAttrs(old: { - dependencies = with self; [ fzf-vim ]; - patchPhase = '' - substituteInPlace plugin/notational_fzf.vim \ - --replace "'rg'" "'${ripgrep}/bin/rg'" \ - --replace \ - "let s:python_executable = executable('pypy3') ? 'pypy3' : 'python3'" \ - "let s:python_executable = '${python3}/bin/python3'" - ''; - }); fzf-vim = super.fzf-vim.overrideAttrs(old: { dependencies = [ self.fzfWrapper ]; @@ -365,6 +351,12 @@ self: super: { vim-easytags = super.vim-easytags.overrideAttrs(old: { dependencies = with super; [ vim-misc ]; + patches = [ + (fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags + url = https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch; + sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4"; + }) + ]; }); # change the go_bin_path to point to a path in the nix store. See the code in diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7f271aa0adc0..0dc770ea29ef 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -4,7 +4,6 @@ airblade/vim-rooter ajh17/Spacegray.vim aklt/plantuml-syntax albfan/nerdtree-git-plugin -alok/notational-fzf-vim altercation/vim-colors-solarized alvan/vim-closetag alx741/vim-hindent diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index efbd163abbbb..dec6bbbba10a 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.1.58038"; - sha256 = "09iawy1p2akan090461137d4p5gqqf0aanm9i534p0kmbxmjfpqv"; + version = "2020.2.64397"; + sha256 = "1kwyc5ycz1276i2zbw93mpq59y2py6kj71gvhzya8xvm184jk07a"; }; buildInputs = [ diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index da8d940f71c7..30b2f94f1a58 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "2.2.1"; - sha256 = "18hdmx993wvhcv13z9p8ylp3lf480axv4lyl0qx52pw2y2jgj1z8"; + version = "4.0.0"; + sha256 = "0bwxz8dg00k8frnvkvcngll5yaf9k7z13dg309vmw8xbdgkiyid4"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index a5262d6ae9ed..b524d7906da4 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-plugins"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; - sha256 = "1nj8cpbi05rb62yzs01c1k7lymdn1ch229b599hbhd0psixdx52d"; + sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw"; }; # ToDo: a52, etc.? @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Various plugins for ALSA"; - homepage = http://alsa-project.org/; + homepage = "http://alsa-project.org/"; license = licenses.lgpl21; maintainers = [maintainers.marcweber]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 7b356746861f..f05bb6a0d59c 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "039c19b7091is0czl9jlrfczp7pp1jpdri0vvc4k07gl3skhn48b"; + sha256 = "1wz460by17rmxrcydn583rd4lhj6wlvqs6x1j5pdzxn5g3app024"; }; patchPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; meta = with stdenv.lib; { - homepage = http://www.alsa-project.org/; + homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture utils"; longDescription = '' The Advanced Linux Sound Architecture (ALSA) provides audio and diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index c20206dc351a..ef247ad956b6 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "fnotifystat"; - version = "0.02.03"; + version = "0.02.05"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "1b5s50dc8ag6k631nfp09chrqfpwai0r9ld822xqwp3qlszp0pv9"; + sha256 = "1b8pxq731sj976m2daf0hnqfaaq688vqnjffinpwh2w9nzzi4gi9"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "File activity monitoring tool"; - homepage = https://kernel.ubuntu.com/~cking/fnotifystat/; + homepage = "https://kernel.ubuntu.com/~cking/fnotifystat/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ womfoo ]; diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index f68be3e8d2f0..78ecded20cf7 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.02.12"; + version = "0.02.13"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; - sha256 = "0na6didnqcjn0am65qyf32a01zilk736hqlnpfyqmv4jg31r02i5"; + sha256 = "01ih89yw9gi6j3l40q5m26la1y0p1jidkxs3yffbdiqm6gwz0xbx"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Process fork/exec/exit monitoring tool"; - homepage = https://kernel.ubuntu.com/~cking/forkstat/; + homepage = "https://kernel.ubuntu.com/~cking/forkstat/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ womfoo ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f9579a9fde53..e925068421d6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -104,6 +104,7 @@ let networking = { NET = yes; + IP_ADVANCED_ROUTER = yes; IP_PNP = no; IP_VS_PROTO_TCP = yes; IP_VS_PROTO_UDP = yes; @@ -126,6 +127,7 @@ let IP_ROUTE_VERBOSE = yes; IP_MROUTE_MULTIPLE_TABLES = yes; IP_MULTICAST = yes; + IP_MULTIPLE_TABLES = yes; IPV6_ROUTER_PREF = yes; IPV6_ROUTE_INFO = yes; IPV6_OPTIMISTIC_DAD = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 81e39ad647cd..77a4327e89f9 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6-rc2"; + version = "5.6-rc3"; extraMeta.branch = "5.6"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1b3ds8dv5rc9f4c3czj689dxbl8lyrmnfk6ywa51h9vx3lsd5jrp"; + sha256 = "1w265k9rspg9rkmay6cy6r1rxy4javpj1f6ify4jc3zpwqmp4ymk"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 8e224c8f33b8..a92970726dca 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linuxHeaders, perl }: +{ lib, stdenv, fetchurl, linuxHeaders, perl }: let commonMakeFlags = [ @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.4"; + version = "2.0.7"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "7f9a0850586def7cf4faeeb75e5d0f66e613674c524f6e77b0f4d93a26c801cb"; + sha256 = "08li3aj9bvzabrih98jdxi3m19h85cp53s8cr7cqad42r8vjdvxb"; }; patches = [ ./no-reinstall-kernel-headers.patch ]; @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { dir=$out/lib/klibc/bin.static mkdir $dir cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/ - cp usr/dash/sh $dir/ for file in ${linuxHeaders}/include/*; do ln -sv $file $out/lib/klibc/include @@ -43,6 +42,10 @@ stdenv.mkDerivation rec { ''; meta = { - platforms = [ "x86_64-linux" ]; + description = "Minimalistic libc subset for initramfs usage"; + homepage = "https://kernel.org/pub/linux/libs/klibc/"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch index d3e55fc8731d..709dd30f8c7e 100644 --- a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch +++ b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch @@ -5,7 +5,7 @@ diff -Naur klibc-2.0.3-orig/scripts/Kbuild.install klibc-2.0.3/scripts/Kbuild.in $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin -- $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install +- $(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index aba907039aca..57778357d006 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "lsscsi-0.30"; + name = "lsscsi-0.31"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.30.tgz"; - sha256 = "05cba72m0hj3kpikk26h7j02cly7zy5lgww2fvswa0jz823j36k1"; + url = "http://sg.danny.cz/scsi/lsscsi-0.31.tgz"; + sha256 = "1jpk15y9vqjb1lcj4pdzygpg0jf0lja7azjldpywc0s805rikgqj"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index b4c6952d44d3..30e5d16b60f3 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -75,11 +75,18 @@ installPhase() { fi install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia.json fi + if [ -e nvidia_layers.json ]; then + sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_layers.json > nvidia_layers.json.fixed + install -Dm644 nvidia_layers.json.fixed $i/share/vulkan/implicit_layer.d/nvidia_layers.json + fi # EGL if [ "$useGLVND" = "1" ]; then sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed + sed -E "s#(libnvidia-egl-wayland)#$i/lib/\\1#" 10_nvidia_wayland.json > 10_nvidia_wayland.json.fixed + install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json + install -Dm644 10_nvidia_wayland.json.fixed $i/share/glvnd/egl_vendor.d/nvidia_wayland.json fi done diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index eeb7b99bbaae..9e2ee6e834c2 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -32,7 +32,7 @@ let pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; i686bundled = versionAtLeast version "391"; - libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.xorg.libXext pkgs.xorg.libX11 + libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11 pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ]; self = stdenv.mkDerivation { diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index dbaf6f413251..6693b3799482 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "smemstat"; - version = "0.02.06"; + version = "0.02.07"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; - sha256 = "1069gwmc29vbw7zszqa5v5yxfvgaq7c41r0g456zdpm6msy5kb0w"; + sha256 = "09i5n1zjw45qrfbc2vglh1xk1jwqnc91bgsq7bkp29d9dpfpzhdc"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Memory usage monitoring tool"; - homepage = https://kernel.ubuntu.com/~cking/smemstat/; + homepage = "https://kernel.ubuntu.com/~cking/smemstat/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ womfoo ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 90cdfc3e7051..40760093462a 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libtool, ninja +{ stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja , boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion, gperftools , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl , poco, protobuf, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ck6kcifj7y4i2j1jj1a9vf5nfpp9mxk5x8y8557zp9yayjm9qyr"; }; - nativeBuildInputs = [ cmake libtool ninja ]; + nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ]; buildInputs = [ boost brotli capnproto cctz clang-unwrapped double-conversion gperftools icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 234a39574506..7756c5fa3f19 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -8,11 +8,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "298cdf33aa7589b50df7e5833694b24cd2de8b6d17cee7e1673873fe576db6ee"; + sha256 = "f2adf137d70955a4a20df90c5409e10be8e1127204a98b27d626ac090531a07e"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 375631d5cbf8..35c6e1452437 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gortr"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "1kg42qynqqj05bvfwzd77mpl63y3gnkk15x2a4rspxf4w1ziaxkr"; + sha256 = "03wxlras2akk2ig8sxzs89nvbc6zr2kbcmjlqldjdfhs1rcg82ra"; }; modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0dfb69b95384..2b2bdabc6265 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,911 +2,917 @@ # Do not edit! { - version = "0.104.3"; + version = "0.106.1"; components = { - "abode" = ps: with ps; [ ]; - "acer_projector" = ps: with ps; [ pyserial ]; - "actiontec" = ps: with ps; [ ]; - "adguard" = ps: with ps; [ ]; - "ads" = ps: with ps; [ ]; - "aftership" = ps: with ps; [ ]; - "air_quality" = ps: with ps; [ ]; - "airly" = ps: with ps; [ ]; - "airvisual" = ps: with ps; [ pyairvisual ]; - "aladdin_connect" = ps: with ps; [ ]; - "alarm_control_panel" = ps: with ps; [ ]; - "alarmdecoder" = ps: with ps; [ ]; - "alarmdotcom" = ps: with ps; [ ]; - "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ aiohttp-cors ]; - "almond" = ps: with ps; [ aiohttp-cors ]; - "alpha_vantage" = ps: with ps; [ ]; - "amazon_polly" = ps: with ps; [ boto3 ]; - "ambiclimate" = ps: with ps; [ aiohttp-cors ]; - "ambient_station" = ps: with ps; [ ]; - "amcrest" = ps: with ps; [ ha-ffmpeg ]; - "ampio" = ps: with ps; [ ]; - "android_ip_webcam" = ps: with ps; [ ]; - "androidtv" = ps: with ps; [ ]; - "anel_pwrctrl" = ps: with ps; [ ]; - "anthemav" = ps: with ps; [ ]; - "apache_kafka" = ps: with ps; [ aiokafka ]; - "apcupsd" = ps: with ps; [ ]; - "api" = ps: with ps; [ aiohttp-cors ]; - "apns" = ps: with ps; [ ]; - "apple_tv" = ps: with ps; [ pyatv ]; - "apprise" = ps: with ps; [ apprise ]; - "aprs" = ps: with ps; [ ]; - "aqualogic" = ps: with ps; [ ]; - "aquostv" = ps: with ps; [ ]; - "arcam_fmj" = ps: with ps; [ ]; - "arduino" = ps: with ps; [ ]; - "arest" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ ha-ffmpeg ]; - "aruba" = ps: with ps; [ pexpect ]; - "arwn" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ]; - "asterisk_cdr" = ps: with ps; [ ]; - "asterisk_mbox" = ps: with ps; [ ]; - "asuswrt" = ps: with ps; [ ]; - "aten_pe" = ps: with ps; [ ]; - "atome" = ps: with ps; [ ]; - "august" = ps: with ps; [ ]; - "aurora" = ps: with ps; [ ]; - "aurora_abb_powerone" = ps: with ps; [ ]; - "auth" = ps: with ps; [ aiohttp-cors ]; - "automatic" = ps: with ps; [ aiohttp-cors ]; - "automation" = ps: with ps; [ aiohttp-cors ]; - "avea" = ps: with ps; [ ]; - "avion" = ps: with ps; [ ]; - "awair" = ps: with ps; [ ]; - "aws" = ps: with ps; [ ]; - "axis" = ps: with ps; [ ]; - "azure_event_hub" = ps: with ps; [ ]; - "azure_service_bus" = ps: with ps; [ azure-servicebus ]; - "baidu" = ps: with ps; [ ]; - "bayesian" = ps: with ps; [ ]; - "bbb_gpio" = ps: with ps; [ ]; - "bbox" = ps: with ps; [ ]; - "beewi_smartclim" = ps: with ps; [ ]; - "bh1750" = ps: with ps; [ ]; - "binary_sensor" = ps: with ps; [ ]; - "bitcoin" = ps: with ps; [ ]; - "bizkaibus" = ps: with ps; [ ]; - "blackbird" = ps: with ps; [ ]; - "blink" = ps: with ps; [ ]; - "blinksticklight" = ps: with ps; [ BlinkStick ]; - "blinkt" = ps: with ps; [ ]; - "blockchain" = ps: with ps; [ ]; - "bloomsky" = ps: with ps; [ ]; - "bluesound" = ps: with ps; [ xmltodict ]; - "bluetooth_le_tracker" = ps: with ps; [ ]; - "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; - "bme280" = ps: with ps; [ ]; - "bme680" = ps: with ps; [ ]; - "bmw_connected_drive" = ps: with ps; [ ]; - "bom" = ps: with ps; [ ]; - "braviatv" = ps: with ps; [ ]; - "broadlink" = ps: with ps; [ broadlink ]; - "brother" = ps: with ps; [ ]; - "brottsplatskartan" = ps: with ps; [ ]; - "browser" = ps: with ps; [ ]; - "brunt" = ps: with ps; [ ]; - "bt_home_hub_5" = ps: with ps; [ ]; - "bt_smarthub" = ps: with ps; [ ]; - "buienradar" = ps: with ps; [ ]; - "caldav" = ps: with ps; [ caldav ]; - "calendar" = ps: with ps; [ aiohttp-cors ]; - "camera" = ps: with ps; [ aiohttp-cors ]; - "canary" = ps: with ps; [ ha-ffmpeg ]; - "cast" = ps: with ps; [ PyChromecast ]; - "cert_expiry" = ps: with ps; [ ]; - "channels" = ps: with ps; [ ]; - "cisco_ios" = ps: with ps; [ pexpect ]; - "cisco_mobility_express" = ps: with ps; [ ]; - "cisco_webex_teams" = ps: with ps; [ ]; - "ciscospark" = ps: with ps; [ ]; - "citybikes" = ps: with ps; [ ]; - "clementine" = ps: with ps; [ ]; - "clickatell" = ps: with ps; [ ]; - "clicksend" = ps: with ps; [ ]; - "clicksend_tts" = ps: with ps; [ ]; - "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; - "cloudflare" = ps: with ps; [ ]; - "cmus" = ps: with ps; [ ]; - "co2signal" = ps: with ps; [ ]; - "coinbase" = ps: with ps; [ ]; - "coinmarketcap" = ps: with ps; [ coinmarketcap ]; - "comed_hourly_pricing" = ps: with ps; [ ]; - "comfoconnect" = ps: with ps; [ ]; - "command_line" = ps: with ps; [ ]; - "concord232" = ps: with ps; [ ]; - "config" = ps: with ps; [ aiohttp-cors ]; - "configurator" = ps: with ps; [ ]; - "conversation" = ps: with ps; [ aiohttp-cors ]; - "coolmaster" = ps: with ps; [ ]; - "counter" = ps: with ps; [ ]; - "cover" = ps: with ps; [ ]; - "cppm_tracker" = ps: with ps; [ ]; - "cpuspeed" = ps: with ps; [ py-cpuinfo ]; - "crimereports" = ps: with ps; [ ]; - "cups" = ps: with ps; [ pycups ]; - "currencylayer" = ps: with ps; [ ]; - "daikin" = ps: with ps; [ ]; - "danfoss_air" = ps: with ps; [ ]; - "darksky" = ps: with ps; [ python-forecastio ]; - "datadog" = ps: with ps; [ datadog ]; - "ddwrt" = ps: with ps; [ ]; - "deconz" = ps: with ps; [ ]; - "decora" = ps: with ps; [ ]; - "decora_wifi" = ps: with ps; [ ]; - "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro hass-nabucasa netdisco sqlalchemy zeroconf ]; - "delijn" = ps: with ps; [ ]; - "deluge" = ps: with ps; [ deluge-client ]; - "demo" = ps: with ps; [ aiohttp-cors ]; - "denon" = ps: with ps; [ ]; - "denonavr" = ps: with ps; [ ]; - "deutsche_bahn" = ps: with ps; [ ]; - "device_automation" = ps: with ps; [ aiohttp-cors ]; - "device_sun_light_trigger" = ps: with ps; [ ]; - "device_tracker" = ps: with ps; [ ]; - "dht" = ps: with ps; [ ]; - "dialogflow" = ps: with ps; [ aiohttp-cors ]; - "digital_ocean" = ps: with ps; [ digital-ocean ]; - "digitalloggers" = ps: with ps; [ ]; - "directv" = ps: with ps; [ ]; - "discogs" = ps: with ps; [ discogs_client ]; - "discord" = ps: with ps; [ discordpy ]; - "discovery" = ps: with ps; [ netdisco ]; - "dlib_face_detect" = ps: with ps; [ face_recognition ]; - "dlib_face_identify" = ps: with ps; [ face_recognition ]; - "dlink" = ps: with ps; [ ]; - "dlna_dmr" = ps: with ps; [ ]; - "dnsip" = ps: with ps; [ aiodns ]; - "dominos" = ps: with ps; [ aiohttp-cors ]; - "doods" = ps: with ps; [ pillow ]; - "doorbird" = ps: with ps; [ aiohttp-cors ]; - "dovado" = ps: with ps; [ ]; - "downloader" = ps: with ps; [ ]; - "dsmr" = ps: with ps; [ ]; - "dsmr_reader" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ]; - "dte_energy_bridge" = ps: with ps; [ ]; - "dublin_bus_transport" = ps: with ps; [ ]; - "duckdns" = ps: with ps; [ ]; - "duke_energy" = ps: with ps; [ ]; - "dunehd" = ps: with ps; [ ]; - "dwd_weather_warnings" = ps: with ps; [ ]; - "dweet" = ps: with ps; [ ]; - "dyson" = ps: with ps; [ ]; - "ebox" = ps: with ps; [ ]; - "ebusd" = ps: with ps; [ ]; - "ecoal_boiler" = ps: with ps; [ ]; - "ecobee" = ps: with ps; [ ]; - "econet" = ps: with ps; [ ]; - "ecovacs" = ps: with ps; [ ]; - "eddystone_temperature" = ps: with ps; [ construct ]; - "edimax" = ps: with ps; [ ]; - "ee_brightbox" = ps: with ps; [ ]; - "efergy" = ps: with ps; [ ]; - "egardia" = ps: with ps; [ ]; - "eight_sleep" = ps: with ps; [ ]; - "elgato" = ps: with ps; [ ]; - "eliqonline" = ps: with ps; [ ]; - "elkm1" = ps: with ps; [ ]; - "elv" = ps: with ps; [ ]; - "emby" = ps: with ps; [ ]; - "emoncms" = ps: with ps; [ ]; - "emoncms_history" = ps: with ps; [ ]; - "emulated_hue" = ps: with ps; [ aiohttp-cors ]; - "emulated_roku" = ps: with ps; [ ]; - "enigma2" = ps: with ps; [ ]; - "enocean" = ps: with ps; [ ]; - "enphase_envoy" = ps: with ps; [ ]; - "entur_public_transport" = ps: with ps; [ ]; - "environment_canada" = ps: with ps; [ ]; - "envirophat" = ps: with ps; [ ]; - "envisalink" = ps: with ps; [ ]; - "ephember" = ps: with ps; [ ]; - "epson" = ps: with ps; [ ]; - "epsonworkforce" = ps: with ps; [ ]; - "eq3btsmart" = ps: with ps; [ construct ]; - "esphome" = ps: with ps; [ aioesphomeapi ]; - "essent" = ps: with ps; [ ]; - "etherscan" = ps: with ps; [ ]; - "eufy" = ps: with ps; [ ]; - "everlights" = ps: with ps; [ ]; - "evohome" = ps: with ps; [ ]; - "facebook" = ps: with ps; [ ]; - "facebox" = ps: with ps; [ ]; - "fail2ban" = ps: with ps; [ ]; - "familyhub" = ps: with ps; [ ]; - "fan" = ps: with ps; [ ]; - "fastdotcom" = ps: with ps; [ ]; - "feedreader" = ps: with ps; [ ]; - "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; - "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; - "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; - "fibaro" = ps: with ps; [ ]; - "fido" = ps: with ps; [ ]; - "file" = ps: with ps; [ ]; - "filesize" = ps: with ps; [ ]; - "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; - "fints" = ps: with ps; [ fints ]; - "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; - "fixer" = ps: with ps; [ ]; - "fleetgo" = ps: with ps; [ ]; - "flexit" = ps: with ps; [ ]; - "flic" = ps: with ps; [ ]; - "flock" = ps: with ps; [ ]; - "flume" = ps: with ps; [ ]; - "flunearyou" = ps: with ps; [ ]; - "flux" = ps: with ps; [ ]; - "flux_led" = ps: with ps; [ ]; - "folder" = ps: with ps; [ ]; - "folder_watcher" = ps: with ps; [ watchdog ]; - "foobot" = ps: with ps; [ ]; - "fortigate" = ps: with ps; [ ]; - "fortios" = ps: with ps; [ ]; - "foscam" = ps: with ps; [ ]; - "foursquare" = ps: with ps; [ aiohttp-cors ]; - "free_mobile" = ps: with ps; [ ]; - "freebox" = ps: with ps; [ ]; - "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection ]; - "fritzbox" = ps: with ps; [ ]; - "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; - "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; - "fritzdect" = ps: with ps; [ ]; - "fronius" = ps: with ps; [ ]; - "frontend" = ps: with ps; [ aiohttp-cors ]; - "frontier_silicon" = ps: with ps; [ ]; - "futurenow" = ps: with ps; [ ]; - "garadget" = ps: with ps; [ ]; - "gc100" = ps: with ps; [ ]; - "gearbest" = ps: with ps; [ ]; - "geizhals" = ps: with ps; [ ]; - "generic" = ps: with ps; [ ]; - "generic_thermostat" = ps: with ps; [ ]; - "geniushub" = ps: with ps; [ ]; - "geo_json_events" = ps: with ps; [ ]; - "geo_location" = ps: with ps; [ ]; - "geo_rss_events" = ps: with ps; [ ]; - "geofency" = ps: with ps; [ aiohttp-cors ]; - "geonetnz_quakes" = ps: with ps; [ ]; - "geonetnz_volcano" = ps: with ps; [ ]; - "gios" = ps: with ps; [ ]; - "github" = ps: with ps; [ PyGithub ]; - "gitlab_ci" = ps: with ps; [ python-gitlab ]; - "gitter" = ps: with ps; [ ]; - "glances" = ps: with ps; [ ]; - "gntp" = ps: with ps; [ ]; - "goalfeed" = ps: with ps; [ ]; - "gogogate2" = ps: with ps; [ ]; - "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; - "google_assistant" = ps: with ps; [ aiohttp-cors ]; - "google_cloud" = ps: with ps; [ google_cloud_texttospeech ]; - "google_domains" = ps: with ps; [ ]; - "google_maps" = ps: with ps; [ ]; - "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; - "google_translate" = ps: with ps; [ gtts-token ]; - "google_travel_time" = ps: with ps; [ ]; - "google_wifi" = ps: with ps; [ ]; - "gpmdp" = ps: with ps; [ websocket_client ]; - "gpsd" = ps: with ps; [ ]; - "gpslogger" = ps: with ps; [ aiohttp-cors ]; - "graphite" = ps: with ps; [ ]; - "greeneye_monitor" = ps: with ps; [ ]; - "greenwave" = ps: with ps; [ ]; - "group" = ps: with ps; [ ]; - "growatt_server" = ps: with ps; [ ]; - "gstreamer" = ps: with ps; [ ]; - "gtfs" = ps: with ps; [ ]; - "habitica" = ps: with ps; [ ]; - "hangouts" = ps: with ps; [ ]; - "harman_kardon_avr" = ps: with ps; [ ]; - "harmony" = ps: with ps; [ ]; - "hassio" = ps: with ps; [ aiohttp-cors ]; - "haveibeenpwned" = ps: with ps; [ ]; - "hddtemp" = ps: with ps; [ ]; - "hdmi_cec" = ps: with ps; [ ]; - "heatmiser" = ps: with ps; [ ]; - "heos" = ps: with ps; [ ]; - "here_travel_time" = ps: with ps; [ ]; - "hikvision" = ps: with ps; [ ]; - "hikvisioncam" = ps: with ps; [ ]; - "hisense_aehw4a1" = ps: with ps; [ ]; - "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; - "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy ]; - "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ]; - "hitron_coda" = ps: with ps; [ ]; - "hive" = ps: with ps; [ ]; - "hlk_sw16" = ps: with ps; [ ]; - "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ ]; - "homekit_controller" = ps: with ps; [ ]; - "homematic" = ps: with ps; [ pyhomematic ]; - "homematicip_cloud" = ps: with ps; [ ]; - "homeworks" = ps: with ps; [ ]; - "honeywell" = ps: with ps; [ ]; - "hook" = ps: with ps; [ ]; - "horizon" = ps: with ps; [ ]; - "hp_ilo" = ps: with ps; [ ]; - "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; - "http" = ps: with ps; [ aiohttp-cors ]; - "htu21d" = ps: with ps; [ ]; - "huawei_lte" = ps: with ps; [ stringcase ]; - "huawei_router" = ps: with ps; [ ]; - "hue" = ps: with ps; [ aiohue ]; - "hunterdouglas_powerview" = ps: with ps; [ ]; - "hydrawise" = ps: with ps; [ ]; - "hyperion" = ps: with ps; [ ]; - "ialarm" = ps: with ps; [ ]; - "iaqualink" = ps: with ps; [ ]; - "icloud" = ps: with ps; [ pyicloud ]; - "idteck_prox" = ps: with ps; [ ]; - "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; - "iglo" = ps: with ps; [ ]; - "ign_sismologia" = ps: with ps; [ ]; - "ihc" = ps: with ps; [ defusedxml ]; - "image_processing" = ps: with ps; [ aiohttp-cors ]; - "imap" = ps: with ps; [ ]; - "imap_email_content" = ps: with ps; [ ]; - "incomfort" = ps: with ps; [ ]; - "influxdb" = ps: with ps; [ influxdb ]; - "input_boolean" = ps: with ps; [ ]; - "input_datetime" = ps: with ps; [ ]; - "input_number" = ps: with ps; [ ]; - "input_select" = ps: with ps; [ ]; - "input_text" = ps: with ps; [ ]; - "insteon" = ps: with ps; [ ]; - "integration" = ps: with ps; [ ]; - "intent" = ps: with ps; [ aiohttp-cors ]; - "intent_script" = ps: with ps; [ ]; - "intesishome" = ps: with ps; [ ]; - "ios" = ps: with ps; [ aiohttp-cors zeroconf ]; - "iota" = ps: with ps; [ ]; - "iperf3" = ps: with ps; [ ]; - "ipma" = ps: with ps; [ ]; - "iqvia" = ps: with ps; [ numpy ]; - "irish_rail_transport" = ps: with ps; [ ]; - "islamic_prayer_times" = ps: with ps; [ ]; - "iss" = ps: with ps; [ ]; - "isy994" = ps: with ps; [ ]; - "itach" = ps: with ps; [ ]; - "itunes" = ps: with ps; [ ]; - "izone" = ps: with ps; [ ]; - "jewish_calendar" = ps: with ps; [ ]; - "joaoapps_join" = ps: with ps; [ ]; - "juicenet" = ps: with ps; [ ]; - "kaiterra" = ps: with ps; [ ]; - "kankun" = ps: with ps; [ ]; - "keba" = ps: with ps; [ ]; - "keenetic_ndms2" = ps: with ps; [ ]; - "kef" = ps: with ps; [ ]; - "keyboard" = ps: with ps; [ ]; - "keyboard_remote" = ps: with ps; [ evdev ]; - "kira" = ps: with ps; [ ]; - "kiwi" = ps: with ps; [ ]; - "knx" = ps: with ps; [ ]; - "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; - "konnected" = ps: with ps; [ aiohttp-cors ]; - "kwb" = ps: with ps; [ ]; - "lacrosse" = ps: with ps; [ ]; - "lametric" = ps: with ps; [ ]; - "lannouncer" = ps: with ps; [ ]; - "lastfm" = ps: with ps; [ pylast ]; - "launch_library" = ps: with ps; [ ]; - "lcn" = ps: with ps; [ ]; - "lg_netcast" = ps: with ps; [ ]; - "lg_soundbar" = ps: with ps; [ ]; - "life360" = ps: with ps; [ ]; - "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; - "lifx_cloud" = ps: with ps; [ ]; - "lifx_legacy" = ps: with ps; [ ]; - "light" = ps: with ps; [ ]; - "lightwave" = ps: with ps; [ ]; - "limitlessled" = ps: with ps; [ limitlessled ]; - "linksys_smart" = ps: with ps; [ ]; - "linky" = ps: with ps; [ ]; - "linode" = ps: with ps; [ linode-api ]; - "linux_battery" = ps: with ps; [ batinfo ]; - "lirc" = ps: with ps; [ ]; - "litejet" = ps: with ps; [ ]; - "liveboxplaytv" = ps: with ps; [ ]; - "llamalab_automate" = ps: with ps; [ ]; - "local_file" = ps: with ps; [ ]; - "local_ip" = ps: with ps; [ ]; - "locative" = ps: with ps; [ aiohttp-cors ]; - "lock" = ps: with ps; [ ]; - "lockitron" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; - "logentries" = ps: with ps; [ ]; - "logger" = ps: with ps; [ ]; - "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; - "london_air" = ps: with ps; [ ]; - "london_underground" = ps: with ps; [ ]; - "loopenergy" = ps: with ps; [ ]; - "lovelace" = ps: with ps; [ ]; - "luci" = ps: with ps; [ ]; - "luftdaten" = ps: with ps; [ luftdaten ]; - "lupusec" = ps: with ps; [ ]; - "lutron" = ps: with ps; [ ]; - "lutron_caseta" = ps: with ps; [ ]; - "lw12wifi" = ps: with ps; [ ]; - "lyft" = ps: with ps; [ ]; - "magicseaweed" = ps: with ps; [ ]; - "mailbox" = ps: with ps; [ aiohttp-cors ]; - "mailgun" = ps: with ps; [ aiohttp-cors ]; - "manual" = ps: with ps; [ ]; - "manual_mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ]; - "map" = ps: with ps; [ aiohttp-cors ]; - "marytts" = ps: with ps; [ ]; - "mastodon" = ps: with ps; [ ]; - "matrix" = ps: with ps; [ matrix-client ]; - "maxcube" = ps: with ps; [ ]; - "mcp23017" = ps: with ps; [ ]; - "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; - "media_player" = ps: with ps; [ aiohttp-cors ]; - "mediaroom" = ps: with ps; [ ]; - "melissa" = ps: with ps; [ ]; - "meraki" = ps: with ps; [ aiohttp-cors ]; - "message_bird" = ps: with ps; [ ]; - "met" = ps: with ps; [ ]; - "meteo_france" = ps: with ps; [ ]; - "meteoalarm" = ps: with ps; [ ]; - "metoffice" = ps: with ps; [ ]; - "mfi" = ps: with ps; [ ]; - "mhz19" = ps: with ps; [ ]; - "microsoft" = ps: with ps; [ ]; - "microsoft_face" = ps: with ps; [ aiohttp-cors ]; - "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; - "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; - "miflora" = ps: with ps; [ ]; - "mikrotik" = ps: with ps; [ ]; - "mill" = ps: with ps; [ ]; - "min_max" = ps: with ps; [ ]; - "minio" = ps: with ps; [ minio ]; - "mitemp_bt" = ps: with ps; [ ]; - "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors ]; - "mochad" = ps: with ps; [ ]; - "modbus" = ps: with ps; [ ]; - "modem_callerid" = ps: with ps; [ ]; - "mold_indicator" = ps: with ps; [ ]; - "monoprice" = ps: with ps; [ ]; - "moon" = ps: with ps; [ ]; - "mopar" = ps: with ps; [ ]; - "mpchc" = ps: with ps; [ ]; - "mpd" = ps: with ps; [ mpd2 ]; - "mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ]; - "mqtt_eventstream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ]; - "mqtt_json" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ]; - "mqtt_room" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ]; - "mqtt_statestream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ]; - "msteams" = ps: with ps; [ ]; - "mvglive" = ps: with ps; [ PyMVGLive ]; - "mychevy" = ps: with ps; [ ]; - "mycroft" = ps: with ps; [ ]; - "myq" = ps: with ps; [ ]; - "mysensors" = ps: with ps; [ ]; - "mystrom" = ps: with ps; [ aiohttp-cors ]; - "mythicbeastsdns" = ps: with ps; [ ]; - "n26" = ps: with ps; [ ]; - "nad" = ps: with ps; [ ]; - "namecheapdns" = ps: with ps; [ defusedxml ]; - "nanoleaf" = ps: with ps; [ ]; - "neato" = ps: with ps; [ pybotvac ]; - "nederlandse_spoorwegen" = ps: with ps; [ ]; - "nello" = ps: with ps; [ ]; - "ness_alarm" = ps: with ps; [ ]; - "nest" = ps: with ps; [ ]; - "netatmo" = ps: with ps; [ aiohttp-cors pyatmo ]; - "netdata" = ps: with ps; [ ]; - "netgear" = ps: with ps; [ ]; - "netgear_lte" = ps: with ps; [ ]; - "netio" = ps: with ps; [ aiohttp-cors ]; - "neurio_energy" = ps: with ps; [ ]; - "nextbus" = ps: with ps; [ ]; - "nfandroidtv" = ps: with ps; [ ]; - "niko_home_control" = ps: with ps; [ ]; - "nilu" = ps: with ps; [ ]; - "nissan_leaf" = ps: with ps; [ ]; - "nmap_tracker" = ps: with ps; [ ]; - "nmbs" = ps: with ps; [ ]; - "no_ip" = ps: with ps; [ ]; - "noaa_tides" = ps: with ps; [ ]; - "norway_air" = ps: with ps; [ ]; - "notify" = ps: with ps; [ ]; - "notion" = ps: with ps; [ ]; - "nsw_fuel_station" = ps: with ps; [ ]; - "nsw_rural_fire_service_feed" = ps: with ps; [ ]; - "nuheat" = ps: with ps; [ ]; - "nuimo_controller" = ps: with ps; [ ]; - "nuki" = ps: with ps; [ ]; - "nut" = ps: with ps; [ ]; - "nws" = ps: with ps; [ ]; - "nx584" = ps: with ps; [ ]; - "nzbget" = ps: with ps; [ ]; - "oasa_telematics" = ps: with ps; [ ]; - "obihai" = ps: with ps; [ ]; - "octoprint" = ps: with ps; [ ]; - "oem" = ps: with ps; [ ]; - "ohmconnect" = ps: with ps; [ defusedxml ]; - "ombi" = ps: with ps; [ ]; - "onboarding" = ps: with ps; [ aiohttp-cors ]; - "onewire" = ps: with ps; [ ]; - "onkyo" = ps: with ps; [ onkyo-eiscp ]; - "onvif" = ps: with ps; [ ha-ffmpeg ]; - "openalpr_cloud" = ps: with ps; [ ]; - "openalpr_local" = ps: with ps; [ ]; - "opencv" = ps: with ps; [ numpy ]; - "openevse" = ps: with ps; [ ]; - "openexchangerates" = ps: with ps; [ ]; - "opengarage" = ps: with ps; [ ]; - "openhardwaremonitor" = ps: with ps; [ ]; - "openhome" = ps: with ps; [ ]; - "opensensemap" = ps: with ps; [ ]; - "opensky" = ps: with ps; [ ]; - "opentherm_gw" = ps: with ps; [ ]; - "openuv" = ps: with ps; [ ]; - "openweathermap" = ps: with ps; [ pyowm ]; - "opple" = ps: with ps; [ ]; - "orangepi_gpio" = ps: with ps; [ ]; - "oru" = ps: with ps; [ ]; - "orvibo" = ps: with ps; [ ]; - "osramlightify" = ps: with ps; [ ]; - "otp" = ps: with ps; [ pyotp ]; - "owlet" = ps: with ps; [ ]; - "owntracks" = ps: with ps; [ pynacl aiohttp-cors ]; - "panasonic_bluray" = ps: with ps; [ ]; - "panasonic_viera" = ps: with ps; [ wakeonlan ]; - "pandora" = ps: with ps; [ pexpect ]; - "panel_custom" = ps: with ps; [ aiohttp-cors ]; - "panel_iframe" = ps: with ps; [ aiohttp-cors ]; - "pcal9535a" = ps: with ps; [ ]; - "pencom" = ps: with ps; [ ]; - "persistent_notification" = ps: with ps; [ ]; - "person" = ps: with ps; [ ]; - "philips_js" = ps: with ps; [ ]; - "pi_hole" = ps: with ps; [ ]; - "picotts" = ps: with ps; [ ]; - "piglow" = ps: with ps; [ ]; - "pilight" = ps: with ps; [ ]; - "ping" = ps: with ps; [ ]; - "pioneer" = ps: with ps; [ ]; - "pjlink" = ps: with ps; [ ]; - "plaato" = ps: with ps; [ aiohttp-cors ]; - "plant" = ps: with ps; [ ]; - "plex" = ps: with ps; [ aiohttp-cors ]; - "plugwise" = ps: with ps; [ ]; - "plum_lightpad" = ps: with ps; [ ]; - "pocketcasts" = ps: with ps; [ ]; - "point" = ps: with ps; [ aiohttp-cors ]; - "postnl" = ps: with ps; [ ]; - "prezzibenzina" = ps: with ps; [ ]; - "proliphix" = ps: with ps; [ ]; - "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; - "prowl" = ps: with ps; [ ]; - "proximity" = ps: with ps; [ ]; - "proxmoxve" = ps: with ps; [ ]; - "proxy" = ps: with ps; [ pillow ]; - "ps4" = ps: with ps; [ ]; - "ptvsd" = ps: with ps; [ ]; - "pulseaudio_loopback" = ps: with ps; [ ]; - "push" = ps: with ps; [ aiohttp-cors ]; - "pushbullet" = ps: with ps; [ pushbullet ]; - "pushetta" = ps: with ps; [ ]; - "pushover" = ps: with ps; [ python-pushover ]; - "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ ]; - "pyload" = ps: with ps; [ ]; - "python_script" = ps: with ps; [ restrictedpython ]; - "qbittorrent" = ps: with ps; [ ]; - "qld_bushfire" = ps: with ps; [ ]; - "qnap" = ps: with ps; [ ]; - "qrcode" = ps: with ps; [ pillow ]; - "quantum_gateway" = ps: with ps; [ ]; - "qwikswitch" = ps: with ps; [ ]; - "rachio" = ps: with ps; [ aiohttp-cors ]; - "radarr" = ps: with ps; [ ]; - "radiotherm" = ps: with ps; [ ]; - "rainbird" = ps: with ps; [ ]; - "raincloud" = ps: with ps; [ ]; - "rainforest_eagle" = ps: with ps; [ ]; - "rainmachine" = ps: with ps; [ ]; - "random" = ps: with ps; [ ]; - "raspihats" = ps: with ps; [ ]; - "raspyrfm" = ps: with ps; [ ]; - "recollect_waste" = ps: with ps; [ ]; - "recorder" = ps: with ps; [ sqlalchemy ]; - "recswitch" = ps: with ps; [ ]; - "reddit" = ps: with ps; [ praw ]; - "rejseplanen" = ps: with ps; [ ]; - "remember_the_milk" = ps: with ps; [ httplib2 ]; - "remote" = ps: with ps; [ ]; - "remote_rpi_gpio" = ps: with ps; [ ]; - "repetier" = ps: with ps; [ ]; - "rest" = ps: with ps; [ ]; - "rest_command" = ps: with ps; [ ]; - "rflink" = ps: with ps; [ ]; - "rfxtrx" = ps: with ps; [ ]; - "ring" = ps: with ps; [ ha-ffmpeg ]; - "ripple" = ps: with ps; [ ]; - "rmvtransport" = ps: with ps; [ ]; - "rocketchat" = ps: with ps; [ ]; - "roku" = ps: with ps; [ ]; - "roomba" = ps: with ps; [ ]; - "route53" = ps: with ps; [ boto3 ]; - "rova" = ps: with ps; [ ]; - "rpi_camera" = ps: with ps; [ ]; - "rpi_gpio" = ps: with ps; [ ]; - "rpi_gpio_pwm" = ps: with ps; [ ]; - "rpi_pfio" = ps: with ps; [ ]; - "rpi_rf" = ps: with ps; [ ]; - "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; - "rtorrent" = ps: with ps; [ ]; - "russound_rio" = ps: with ps; [ ]; - "russound_rnet" = ps: with ps; [ ]; - "sabnzbd" = ps: with ps; [ ]; - "saj" = ps: with ps; [ ]; - "samsungtv" = ps: with ps; [ wakeonlan ]; - "satel_integra" = ps: with ps; [ ]; - "scene" = ps: with ps; [ ]; - "scrape" = ps: with ps; [ beautifulsoup4 ]; - "script" = ps: with ps; [ ]; - "scsgate" = ps: with ps; [ ]; - "season" = ps: with ps; [ ephem ]; - "sendgrid" = ps: with ps; [ ]; - "sense" = ps: with ps; [ ]; - "sensehat" = ps: with ps; [ ]; - "sensibo" = ps: with ps; [ ]; - "sensor" = ps: with ps; [ ]; - "sentry" = ps: with ps; [ sentry-sdk ]; - "serial" = ps: with ps; [ pyserial-asyncio ]; - "serial_pm" = ps: with ps; [ ]; - "sesame" = ps: with ps; [ ]; - "seven_segments" = ps: with ps; [ pillow ]; - "seventeentrack" = ps: with ps; [ ]; - "shell_command" = ps: with ps; [ ]; - "shiftr" = ps: with ps; [ paho-mqtt ]; - "shodan" = ps: with ps; [ shodan ]; - "shopping_list" = ps: with ps; [ aiohttp-cors ]; - "sht31" = ps: with ps; [ ]; - "sigfox" = ps: with ps; [ ]; - "signal_messenger" = ps: with ps; [ ]; - "simplepush" = ps: with ps; [ ]; - "simplisafe" = ps: with ps; [ ]; - "simulated" = ps: with ps; [ ]; - "sinch" = ps: with ps; [ ]; - "sisyphus" = ps: with ps; [ ]; - "sky_hub" = ps: with ps; [ ]; - "skybeacon" = ps: with ps; [ ]; - "skybell" = ps: with ps; [ ]; - "slack" = ps: with ps; [ ]; - "sleepiq" = ps: with ps; [ ]; - "slide" = ps: with ps; [ ]; - "sma" = ps: with ps; [ ]; - "smappee" = ps: with ps; [ ]; - "smarthab" = ps: with ps; [ ]; - "smartthings" = ps: with ps; [ aiohttp-cors ]; - "smarty" = ps: with ps; [ ]; - "smhi" = ps: with ps; [ ]; - "smtp" = ps: with ps; [ ]; - "snapcast" = ps: with ps; [ snapcast ]; - "snips" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ]; - "snmp" = ps: with ps; [ pysnmp ]; - "sochain" = ps: with ps; [ ]; - "socialblade" = ps: with ps; [ ]; - "solaredge" = ps: with ps; [ stringcase ]; - "solaredge_local" = ps: with ps; [ ]; - "solarlog" = ps: with ps; [ ]; - "solax" = ps: with ps; [ ]; - "soma" = ps: with ps; [ ]; - "somfy" = ps: with ps; [ aiohttp-cors ]; - "somfy_mylink" = ps: with ps; [ ]; - "sonarr" = ps: with ps; [ ]; - "songpal" = ps: with ps; [ ]; - "sonos" = ps: with ps; [ pysonos ]; - "sony_projector" = ps: with ps; [ ]; - "soundtouch" = ps: with ps; [ libsoundtouch ]; - "spaceapi" = ps: with ps; [ aiohttp-cors ]; - "spc" = ps: with ps; [ ]; - "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; - "spider" = ps: with ps; [ ]; - "splunk" = ps: with ps; [ ]; - "spotcrime" = ps: with ps; [ ]; - "spotify" = ps: with ps; [ aiohttp-cors ]; - "sql" = ps: with ps; [ sqlalchemy ]; - "squeezebox" = ps: with ps; [ ]; - "ssdp" = ps: with ps; [ defusedxml netdisco ]; - "starline" = ps: with ps; [ ]; - "starlingbank" = ps: with ps; [ ]; - "startca" = ps: with ps; [ xmltodict ]; - "statistics" = ps: with ps; [ ]; - "statsd" = ps: with ps; [ statsd ]; - "steam_online" = ps: with ps; [ ]; - "stiebel_eltron" = ps: with ps; [ ]; - "stookalert" = ps: with ps; [ ]; - "stream" = ps: with ps; [ aiohttp-cors av ]; - "streamlabswater" = ps: with ps; [ ]; - "stt" = ps: with ps; [ aiohttp-cors ]; - "suez_water" = ps: with ps; [ ]; - "sun" = ps: with ps; [ ]; - "supervisord" = ps: with ps; [ ]; - "supla" = ps: with ps; [ ]; - "surepetcare" = ps: with ps; [ ]; - "swiss_hydrological_data" = ps: with ps; [ ]; - "swiss_public_transport" = ps: with ps; [ ]; - "swisscom" = ps: with ps; [ ]; - "switch" = ps: with ps; [ ]; - "switchbot" = ps: with ps; [ ]; - "switcher_kis" = ps: with ps; [ ]; - "switchmate" = ps: with ps; [ ]; - "syncthru" = ps: with ps; [ ]; - "synology" = ps: with ps; [ ]; - "synology_chat" = ps: with ps; [ ]; - "synology_srm" = ps: with ps; [ ]; - "synologydsm" = ps: with ps; [ ]; - "syslog" = ps: with ps; [ ]; - "system_health" = ps: with ps; [ aiohttp-cors ]; - "system_log" = ps: with ps; [ aiohttp-cors ]; - "systemmonitor" = ps: with ps; [ psutil ]; - "tado" = ps: with ps; [ ]; - "tahoma" = ps: with ps; [ ]; - "tank_utility" = ps: with ps; [ ]; - "tapsaff" = ps: with ps; [ ]; - "tautulli" = ps: with ps; [ ]; - "tcp" = ps: with ps; [ ]; - "ted5000" = ps: with ps; [ xmltodict ]; - "teksavvy" = ps: with ps; [ ]; - "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; - "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; - "tellduslive" = ps: with ps; [ ]; - "tellstick" = ps: with ps; [ ]; - "telnet" = ps: with ps; [ ]; - "temper" = ps: with ps; [ ]; - "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow ]; - "tesla" = ps: with ps; [ ]; - "tfiac" = ps: with ps; [ ]; - "thermoworks_smoke" = ps: with ps; [ stringcase ]; - "thethingsnetwork" = ps: with ps; [ ]; - "thingspeak" = ps: with ps; [ ]; - "thinkingcleaner" = ps: with ps; [ ]; - "thomson" = ps: with ps; [ ]; - "threshold" = ps: with ps; [ ]; - "tibber" = ps: with ps; [ ]; - "tikteck" = ps: with ps; [ ]; - "tile" = ps: with ps; [ ]; - "time_date" = ps: with ps; [ ]; - "timer" = ps: with ps; [ ]; - "tmb" = ps: with ps; [ ]; - "tod" = ps: with ps; [ ]; - "todoist" = ps: with ps; [ todoist ]; - "tof" = ps: with ps; [ ]; - "tomato" = ps: with ps; [ ]; - "toon" = ps: with ps; [ ]; - "torque" = ps: with ps; [ aiohttp-cors ]; - "totalconnect" = ps: with ps; [ ]; - "touchline" = ps: with ps; [ ]; - "tplink" = ps: with ps; [ ]; - "tplink_lte" = ps: with ps; [ ]; - "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; - "trackr" = ps: with ps; [ ]; - "tradfri" = ps: with ps; [ ]; - "trafikverket_train" = ps: with ps; [ ]; - "trafikverket_weatherstation" = ps: with ps; [ ]; - "transmission" = ps: with ps; [ transmissionrpc ]; - "transport_nsw" = ps: with ps; [ ]; - "travisci" = ps: with ps; [ ]; - "trend" = ps: with ps; [ numpy ]; - "tts" = ps: with ps; [ aiohttp-cors mutagen ]; - "tuya" = ps: with ps; [ ]; - "twentemilieu" = ps: with ps; [ ]; - "twilio" = ps: with ps; [ aiohttp-cors twilio ]; - "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; - "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; - "twitch" = ps: with ps; [ ]; - "twitter" = ps: with ps; [ ]; - "ubee" = ps: with ps; [ ]; - "ubus" = ps: with ps; [ ]; - "ue_smart_radio" = ps: with ps; [ ]; - "uk_transport" = ps: with ps; [ ]; - "unifi" = ps: with ps; [ aiounifi ]; - "unifi_direct" = ps: with ps; [ pexpect ]; - "unifiled" = ps: with ps; [ ]; - "universal" = ps: with ps; [ ]; - "upc_connect" = ps: with ps; [ ]; - "upcloud" = ps: with ps; [ ]; - "updater" = ps: with ps; [ distro ]; - "upnp" = ps: with ps; [ ]; - "uptime" = ps: with ps; [ ]; - "uptimerobot" = ps: with ps; [ ]; - "uscis" = ps: with ps; [ ]; - "usgs_earthquakes_feed" = ps: with ps; [ ]; - "utility_meter" = ps: with ps; [ ]; - "uvc" = ps: with ps; [ ]; - "vacuum" = ps: with ps; [ ]; - "vallox" = ps: with ps; [ ]; - "vasttrafik" = ps: with ps; [ ]; - "velbus" = ps: with ps; [ ]; - "velux" = ps: with ps; [ ]; - "venstar" = ps: with ps; [ ]; - "vera" = ps: with ps; [ ]; - "verisure" = ps: with ps; [ ]; - "versasense" = ps: with ps; [ ]; - "version" = ps: with ps; [ pyhaversion ]; - "vesync" = ps: with ps; [ ]; - "viaggiatreno" = ps: with ps; [ ]; - "vicare" = ps: with ps; [ ]; - "vivotek" = ps: with ps; [ ]; - "vizio" = ps: with ps; [ ]; - "vlc" = ps: with ps; [ python-vlc ]; - "vlc_telnet" = ps: with ps; [ ]; - "voicerss" = ps: with ps; [ ]; - "volkszaehler" = ps: with ps; [ ]; - "volumio" = ps: with ps; [ ]; - "volvooncall" = ps: with ps; [ ]; - "vultr" = ps: with ps; [ vultr ]; - "w800rf32" = ps: with ps; [ ]; - "wake_on_lan" = ps: with ps; [ wakeonlan ]; - "waqi" = ps: with ps; [ ]; - "water_heater" = ps: with ps; [ ]; - "waterfurnace" = ps: with ps; [ ]; - "watson_iot" = ps: with ps; [ ]; - "watson_tts" = ps: with ps; [ ]; - "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; - "weather" = ps: with ps; [ ]; - "webhook" = ps: with ps; [ aiohttp-cors ]; - "weblink" = ps: with ps; [ ]; - "webostv" = ps: with ps; [ ]; - "websocket_api" = ps: with ps; [ aiohttp-cors ]; - "wemo" = ps: with ps; [ ]; - "whois" = ps: with ps; [ ]; - "wink" = ps: with ps; [ aiohttp-cors ]; - "wirelesstag" = ps: with ps; [ ]; - "withings" = ps: with ps; [ aiohttp-cors ]; - "wled" = ps: with ps; [ ]; - "workday" = ps: with ps; [ holidays ]; - "worldclock" = ps: with ps; [ ]; - "worldtidesinfo" = ps: with ps; [ ]; - "worxlandroid" = ps: with ps; [ ]; - "wsdot" = ps: with ps; [ ]; - "wunderground" = ps: with ps; [ ]; - "wunderlist" = ps: with ps; [ ]; - "wwlln" = ps: with ps; [ ]; - "x10" = ps: with ps; [ ]; - "xbox_live" = ps: with ps; [ ]; - "xeoma" = ps: with ps; [ ]; - "xfinity" = ps: with ps; [ ]; - "xiaomi" = ps: with ps; [ ha-ffmpeg ]; - "xiaomi_aqara" = ps: with ps; [ ]; - "xiaomi_miio" = ps: with ps; [ construct python-miio ]; - "xiaomi_tv" = ps: with ps; [ ]; - "xmpp" = ps: with ps; [ slixmpp ]; - "xs1" = ps: with ps; [ ]; - "yale_smart_alarm" = ps: with ps; [ ]; - "yamaha" = ps: with ps; [ rxv ]; - "yamaha_musiccast" = ps: with ps; [ ]; - "yandex_transport" = ps: with ps; [ ]; - "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ ]; - "yeelightsunflower" = ps: with ps; [ ]; - "yessssms" = ps: with ps; [ ]; - "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; - "yr" = ps: with ps; [ xmltodict ]; - "yweather" = ps: with ps; [ yahooweather ]; - "zabbix" = ps: with ps; [ ]; - "zamg" = ps: with ps; [ ]; - "zengge" = ps: with ps; [ ]; - "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; - "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ zha-quirks zigpy-deconz zigpy ]; - "zhong_hong" = ps: with ps; [ ]; - "zigbee" = ps: with ps; [ ]; - "ziggo_mediabox_xl" = ps: with ps; [ ]; - "zone" = ps: with ps; [ ]; - "zoneminder" = ps: with ps; [ zm-py ]; - "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; + "abode" = ps: with ps; [ ]; # missing inputs: abodepy + "acer_projector" = ps: with ps; [ pyserial]; + "actiontec" = ps: with ps; [ ]; + "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome + "ads" = ps: with ps; [ ]; # missing inputs: pyads + "aftership" = ps: with ps; [ ]; # missing inputs: pyaftership + "air_quality" = ps: with ps; [ ]; + "airly" = ps: with ps; [ ]; # missing inputs: airly + "airvisual" = ps: with ps; [ pyairvisual]; + "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect + "alarm_control_panel" = ps: with ps; [ ]; + "alarmdecoder" = ps: with ps; [ ]; # missing inputs: alarmdecoder + "alarmdotcom" = ps: with ps; [ ]; # missing inputs: pyalarmdotcom + "alert" = ps: with ps; [ ]; + "alexa" = ps: with ps; [ aiohttp-cors]; + "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond + "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage + "amazon_polly" = ps: with ps; [ boto3]; + "ambiclimate" = ps: with ps; [ aiohttp-cors]; # missing inputs: ambiclimate + "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient + "amcrest" = ps: with ps; [ ha-ffmpeg]; # missing inputs: amcrest + "ampio" = ps: with ps; [ ]; # missing inputs: asmog + "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam + "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell androidtv pure-python-adb + "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant + "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav + "apache_kafka" = ps: with ps; [ aiokafka]; + "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess + "api" = ps: with ps; [ aiohttp-cors]; + "apns" = ps: with ps; [ ]; # missing inputs: apns2 + "apple_tv" = ps: with ps; [ pyatv]; + "apprise" = ps: with ps; [ apprise]; + "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy + "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic + "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc + "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj + "arduino" = ps: with ps; [ ]; # missing inputs: PyMata + "arest" = ps: with ps; [ ]; + "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo + "aruba" = ps: with ps; [ pexpect]; + "arwn" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox + "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox + "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt + "aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu + "atome" = ps: with ps; [ ]; # missing inputs: pyatome + "august" = ps: with ps; [ ]; # missing inputs: py-august + "aurora" = ps: with ps; [ ]; + "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy + "auth" = ps: with ps; [ aiohttp-cors]; + "automatic" = ps: with ps; [ aiohttp-cors]; # missing inputs: aioautomatic + "automation" = ps: with ps; [ aiohttp-cors]; + "avea" = ps: with ps; [ ]; # missing inputs: avea + "avion" = ps: with ps; [ ]; # missing inputs: avion + "awair" = ps: with ps; [ ]; # missing inputs: python_awair + "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore + "axis" = ps: with ps; [ ]; # missing inputs: axis + "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub + "azure_service_bus" = ps: with ps; [ azure-servicebus]; + "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip + "bayesian" = ps: with ps; [ ]; + "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO + "bbox" = ps: with ps; [ ]; # missing inputs: pybbox + "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim + "bh1750" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi + "binary_sensor" = ps: with ps; [ ]; + "bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain + "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus + "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird + "blink" = ps: with ps; [ ]; # missing inputs: blinkpy + "blinksticklight" = ps: with ps; [ BlinkStick]; + "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt + "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api + "bloomsky" = ps: with ps; [ ]; + "bluesound" = ps: with ps; [ xmltodict]; + "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] + "bluetooth_tracker" = ps: with ps; [ bt_proximity]; # missing inputs: pybluez + "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi + "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi + "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected + "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop + "braviatv" = ps: with ps; [ getmac]; # missing inputs: bravia-tv + "broadlink" = ps: with ps; [ broadlink]; + "brother" = ps: with ps; [ ]; # missing inputs: brother + "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan + "browser" = ps: with ps; [ ]; + "brunt" = ps: with ps; [ ]; # missing inputs: brunt + "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist + "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist + "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar + "caldav" = ps: with ps; [ caldav]; + "calendar" = ps: with ps; [ aiohttp-cors]; + "camera" = ps: with ps; [ aiohttp-cors]; + "canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary + "cast" = ps: with ps; [ PyChromecast]; + "cert_expiry" = ps: with ps; [ ]; + "channels" = ps: with ps; [ ]; # missing inputs: pychannels + "cisco_ios" = ps: with ps; [ pexpect]; + "cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress + "cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk + "citybikes" = ps: with ps; [ ]; + "clementine" = ps: with ps; [ ]; # missing inputs: python-clementine-remote + "clickatell" = ps: with ps; [ ]; + "clicksend" = ps: with ps; [ ]; + "clicksend_tts" = ps: with ps; [ ]; + "climate" = ps: with ps; [ ]; + "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa]; + "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns + "cmus" = ps: with ps; [ ]; # missing inputs: pycmus + "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal + "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase + "coinmarketcap" = ps: with ps; [ coinmarketcap]; + "comed_hourly_pricing" = ps: with ps; [ ]; + "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect + "command_line" = ps: with ps; [ ]; + "concord232" = ps: with ps; [ ]; # missing inputs: concord232 + "config" = ps: with ps; [ aiohttp-cors]; + "configurator" = ps: with ps; [ ]; + "conversation" = ps: with ps; [ aiohttp-cors]; + "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet + "counter" = ps: with ps; [ ]; + "cover" = ps: with ps; [ ]; + "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy + "cpuspeed" = ps: with ps; [ py-cpuinfo]; + "crimereports" = ps: with ps; [ ]; # missing inputs: crimereports + "cups" = ps: with ps; [ pycups]; + "currencylayer" = ps: with ps; [ ]; + "daikin" = ps: with ps; [ ]; # missing inputs: pydaikin + "danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair + "darksky" = ps: with ps; [ python-forecastio]; + "datadog" = ps: with ps; [ datadog]; + "ddwrt" = ps: with ps; [ ]; + "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz + "decora" = ps: with ps; [ ]; # missing inputs: bluepy decora + "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi + "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend + "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn + "deluge" = ps: with ps; [ deluge-client]; + "demo" = ps: with ps; [ aiohttp-cors]; + "denon" = ps: with ps; [ ]; + "denonavr" = ps: with ps; [ denonavr]; + "derivative" = ps: with ps; [ ]; + "deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene + "device_automation" = ps: with ps; [ aiohttp-cors]; + "device_sun_light_trigger" = ps: with ps; [ ]; + "device_tracker" = ps: with ps; [ ]; + "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT + "dialogflow" = ps: with ps; [ aiohttp-cors]; + "digital_ocean" = ps: with ps; [ digital-ocean]; + "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower + "directv" = ps: with ps; [ ]; # missing inputs: directpy + "discogs" = ps: with ps; [ discogs_client]; + "discord" = ps: with ps; [ discordpy]; + "discovery" = ps: with ps; [ netdisco]; + "dlib_face_detect" = ps: with ps; [ face_recognition]; + "dlib_face_identify" = ps: with ps; [ face_recognition]; + "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 + "dlna_dmr" = ps: with ps; [ ]; # missing inputs: async-upnp-client + "dnsip" = ps: with ps; [ aiodns]; + "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi + "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods + "doorbird" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: doorbirdpy home-assistant-frontend + "dovado" = ps: with ps; [ ]; # missing inputs: dovado + "downloader" = ps: with ps; [ ]; + "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser + "dsmr_reader" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "dte_energy_bridge" = ps: with ps; [ ]; + "dublin_bus_transport" = ps: with ps; [ ]; + "duckdns" = ps: with ps; [ ]; + "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd + "dwd_weather_warnings" = ps: with ps; [ ]; + "dweet" = ps: with ps; [ ]; # missing inputs: dweepy + "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices + "dyson" = ps: with ps; [ ]; # missing inputs: libpurecool + "ebox" = ps: with ps; [ ]; # missing inputs: pyebox + "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy + "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface + "ecobee" = ps: with ps; [ ]; # missing inputs: python-ecobee-api + "econet" = ps: with ps; [ ]; # missing inputs: pyeconet + "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks + "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan] + "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax + "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox + "efergy" = ps: with ps; [ ]; + "egardia" = ps: with ps; [ ]; # missing inputs: pythonegardia + "eight_sleep" = ps: with ps; [ ]; # missing inputs: pyeight + "elgato" = ps: with ps; [ ]; # missing inputs: elgato + "eliqonline" = ps: with ps; [ ]; # missing inputs: eliqonline + "elkm1" = ps: with ps; [ ]; # missing inputs: elkm1-lib + "elv" = ps: with ps; [ ]; # missing inputs: pypca + "emby" = ps: with ps; [ ]; # missing inputs: pyemby + "emoncms" = ps: with ps; [ ]; + "emoncms_history" = ps: with ps; [ ]; + "emulated_hue" = ps: with ps; [ aiohttp-cors]; + "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku + "enigma2" = ps: with ps; [ ]; # missing inputs: openwebifpy + "enocean" = ps: with ps; [ ]; # missing inputs: enocean + "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader + "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient + "environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada + "envirophat" = ps: with ps; [ ]; # missing inputs: envirophat smbus-cffi + "envisalink" = ps: with ps; [ ]; # missing inputs: pyenvisalink + "ephember" = ps: with ps; [ ]; # missing inputs: pyephember + "epson" = ps: with ps; [ ]; # missing inputs: epson-projector + "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter + "eq3btsmart" = ps: with ps; [ construct]; # missing inputs: python-eq3bt + "esphome" = ps: with ps; [ aioesphomeapi]; + "essent" = ps: with ps; [ ]; # missing inputs: PyEssent + "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api + "eufy" = ps: with ps; [ ]; # missing inputs: lakeside + "everlights" = ps: with ps; [ ]; # missing inputs: pyeverlights + "evohome" = ps: with ps; [ ]; # missing inputs: evohome-async + "facebook" = ps: with ps; [ ]; + "facebox" = ps: with ps; [ ]; + "fail2ban" = ps: with ps; [ ]; + "familyhub" = ps: with ps; [ ]; # missing inputs: python-family-hub-local + "fan" = ps: with ps; [ ]; + "fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom + "feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant + "ffmpeg" = ps: with ps; [ ha-ffmpeg]; + "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg]; + "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg]; + "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 + "fido" = ps: with ps; [ ]; # missing inputs: pyfido + "file" = ps: with ps; [ ]; + "filesize" = ps: with ps; [ ]; + "filter" = ps: with ps; [ aiohttp-cors sqlalchemy]; + "fints" = ps: with ps; [ fints]; + "fitbit" = ps: with ps; [ aiohttp-cors fitbit]; + "fixer" = ps: with ps; [ ]; # missing inputs: fixerio + "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist + "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus + "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant + "flock" = ps: with ps; [ ]; + "flume" = ps: with ps; [ ]; # missing inputs: pyflume + "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou + "flux" = ps: with ps; [ ]; + "flux_led" = ps: with ps; [ flux-led]; + "folder" = ps: with ps; [ ]; + "folder_watcher" = ps: with ps; [ watchdog]; + "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async + "fortigate" = ps: with ps; [ ]; # missing inputs: pyfgt + "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi + "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam + "foursquare" = ps: with ps; [ aiohttp-cors]; + "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms + "freebox" = ps: with ps; [ ]; # missing inputs: aiofreepybox + "freedns" = ps: with ps; [ ]; + "fritz" = ps: with ps; [ fritzconnection]; + "fritzbox" = ps: with ps; [ ]; # missing inputs: pyfritzhome + "fritzbox_callmonitor" = ps: with ps; [ fritzconnection]; + "fritzbox_netmonitor" = ps: with ps; [ fritzconnection]; + "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius + "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi + "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip + "garadget" = ps: with ps; [ ]; + "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect + "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 + "gdacs" = ps: with ps; [ ]; # missing inputs: aio_georss_gdacs + "gearbest" = ps: with ps; [ ]; # missing inputs: gearbest_parser + "geizhals" = ps: with ps; [ ]; # missing inputs: geizhals + "generic" = ps: with ps; [ ]; + "generic_thermostat" = ps: with ps; [ ]; + "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client + "geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client + "geo_location" = ps: with ps; [ ]; + "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client + "geofency" = ps: with ps; [ aiohttp-cors]; + "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes + "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano + "gios" = ps: with ps; [ ]; # missing inputs: gios + "github" = ps: with ps; [ PyGithub]; + "gitlab_ci" = ps: with ps; [ python-gitlab]; + "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy + "glances" = ps: with ps; [ ]; # missing inputs: glances_api + "gntp" = ps: with ps; [ ]; # missing inputs: gntp + "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher + "gogogate2" = ps: with ps; [ ]; # missing inputs: pygogogate2 + "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client]; + "google_assistant" = ps: with ps; [ aiohttp-cors]; + "google_cloud" = ps: with ps; [ google_cloud_texttospeech]; + "google_domains" = ps: with ps; [ ]; + "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib + "google_pubsub" = ps: with ps; [ google_cloud_pubsub]; + "google_translate" = ps: with ps; [ gtts-token]; + "google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps + "google_wifi" = ps: with ps; [ ]; + "gpmdp" = ps: with ps; [ websocket_client]; + "gpsd" = ps: with ps; [ ]; # missing inputs: gps3 + "gpslogger" = ps: with ps; [ aiohttp-cors]; + "graphite" = ps: with ps; [ ]; + "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor + "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality + "group" = ps: with ps; [ ]; + "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer + "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player + "gtfs" = ps: with ps; [ ]; # missing inputs: pygtfs + "habitica" = ps: with ps; [ ]; # missing inputs: habitipy + "hangouts" = ps: with ps; [ ]; # missing inputs: hangups + "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr + "harmony" = ps: with ps; [ ]; # missing inputs: aioharmony + "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "haveibeenpwned" = ps: with ps; [ ]; + "hddtemp" = ps: with ps; [ ]; + "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC + "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 + "heos" = ps: with ps; [ ]; # missing inputs: pyheos + "here_travel_time" = ps: with ps; [ ]; # missing inputs: herepy + "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik + "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision + "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1 + "history" = ps: with ps; [ aiohttp-cors sqlalchemy]; + "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy]; + "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy]; + "hitron_coda" = ps: with ps; [ ]; + "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi + "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 + "homeassistant" = ps: with ps; [ ]; + "homekit" = ps: with ps; [ ]; # missing inputs: HAP-python + "homekit_controller" = ps: with ps; [ ]; # missing inputs: homekit[IP] + "homematic" = ps: with ps; [ pyhomematic]; + "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip + "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks + "honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort + "horizon" = ps: with ps; [ ]; # missing inputs: horimote + "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo + "html5" = ps: with ps; [ aiohttp-cors pywebpush]; + "http" = ps: with ps; [ aiohttp-cors]; + "htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi + "huawei_lte" = ps: with ps; [ getmac stringcase]; # missing inputs: huawei-lte-api url-normalize + "huawei_router" = ps: with ps; [ ]; + "hue" = ps: with ps; [ aiohue]; + "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi + "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser + "hyperion" = ps: with ps; [ ]; + "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm + "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink + "icloud" = ps: with ps; [ pyicloud]; + "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py + "ifttt" = ps: with ps; [ aiohttp-cors pyfttt]; + "iglo" = ps: with ps; [ ]; # missing inputs: iglo + "ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client + "ihc" = ps: with ps; [ defusedxml]; # missing inputs: ihcsdk + "image_processing" = ps: with ps; [ aiohttp-cors]; + "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib + "imap_email_content" = ps: with ps; [ ]; + "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client + "influxdb" = ps: with ps; [ influxdb]; + "input_boolean" = ps: with ps; [ ]; + "input_datetime" = ps: with ps; [ ]; + "input_number" = ps: with ps; [ ]; + "input_select" = ps: with ps; [ ]; + "input_text" = ps: with ps; [ ]; + "insteon" = ps: with ps; [ ]; # missing inputs: insteonplm + "integration" = ps: with ps; [ ]; + "intent" = ps: with ps; [ aiohttp-cors]; + "intent_script" = ps: with ps; [ ]; + "intesishome" = ps: with ps; [ ]; # missing inputs: pyintesishome + "ios" = ps: with ps; [ aiohttp-cors zeroconf]; + "iota" = ps: with ps; [ ]; # missing inputs: pyota + "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 + "ipma" = ps: with ps; [ ]; # missing inputs: pyipma + "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia + "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail + "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator + "iss" = ps: with ps; [ ]; # missing inputs: pyiss + "isy994" = ps: with ps; [ ]; # missing inputs: PyISY + "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir + "itunes" = ps: with ps; [ ]; + "izone" = ps: with ps; [ ]; # missing inputs: python-izone + "jewish_calendar" = ps: with ps; [ ]; # missing inputs: hdate + "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api + "juicenet" = ps: with ps; [ ]; # missing inputs: python-juicenet + "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client + "kankun" = ps: with ps; [ ]; + "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact + "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client + "kef" = ps: with ps; [ getmac]; # missing inputs: aiokef + "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput + "keyboard_remote" = ps: with ps; [ evdev]; # missing inputs: aionotify + "kira" = ps: with ps; [ ]; # missing inputs: pykira + "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client + "knx" = ps: with ps; [ ]; # missing inputs: xknx + "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket]; + "konnected" = ps: with ps; [ aiohttp-cors]; # missing inputs: konnected + "kwb" = ps: with ps; [ ]; # missing inputs: pykwb + "lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse + "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify + "lannouncer" = ps: with ps; [ ]; + "lastfm" = ps: with ps; [ pylast]; + "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches + "lcn" = ps: with ps; [ ]; # missing inputs: pypck + "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant + "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal + "life360" = ps: with ps; [ ]; # missing inputs: life360 + "lifx" = ps: with ps; [ aiolifx aiolifx-effects]; + "lifx_cloud" = ps: with ps; [ ]; + "lifx_legacy" = ps: with ps; [ ]; # missing inputs: liffylights + "light" = ps: with ps; [ ]; + "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave + "limitlessled" = ps: with ps; [ limitlessled]; + "linksys_smart" = ps: with ps; [ ]; + "linky" = ps: with ps; [ ]; # missing inputs: pylinky + "linode" = ps: with ps; [ linode-api]; + "linux_battery" = ps: with ps; [ batinfo]; + "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc + "litejet" = ps: with ps; [ ]; # missing inputs: pylitejet + "llamalab_automate" = ps: with ps; [ ]; + "local_file" = ps: with ps; [ ]; + "local_ip" = ps: with ps; [ ]; + "locative" = ps: with ps; [ aiohttp-cors]; + "lock" = ps: with ps; [ ]; + "lockitron" = ps: with ps; [ ]; + "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "logentries" = ps: with ps; [ ]; + "logger" = ps: with ps; [ ]; + "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg]; # missing inputs: logi_circle + "london_air" = ps: with ps; [ ]; + "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status + "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy + "lovelace" = ps: with ps; [ ]; + "luci" = ps: with ps; [ ]; # missing inputs: openwrt-luci-rpc + "luftdaten" = ps: with ps; [ luftdaten]; + "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy + "lutron" = ps: with ps; [ ]; # missing inputs: pylutron + "lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta + "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 + "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides + "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed + "mailbox" = ps: with ps; [ aiohttp-cors]; + "mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner + "manual" = ps: with ps; [ ]; + "manual_mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary + "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py + "matrix" = ps: with ps; [ matrix-client]; + "maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api + "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx + "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light]; + "media_player" = ps: with ps; [ aiohttp-cors]; + "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom + "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud + "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate + "meraki" = ps: with ps; [ aiohttp-cors]; + "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird + "met" = ps: with ps; [ ]; # missing inputs: pyMetno + "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance vigilancemeteo + "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi + "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint + "mfi" = ps: with ps; [ ]; # missing inputs: mficlient + "mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor + "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts + "microsoft_face" = ps: with ps; [ aiohttp-cors]; + "microsoft_face_detect" = ps: with ps; [ aiohttp-cors]; + "microsoft_face_identify" = ps: with ps; [ aiohttp-cors]; + "miflora" = ps: with ps; [ ]; # missing inputs: bluepy miflora + "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros + "mill" = ps: with ps; [ ]; # missing inputs: millheater + "min_max" = ps: with ps; [ ]; + "minecraft_server" = ps: with ps; [ getmac]; # missing inputs: mcstatus + "minio" = ps: with ps; [ minio]; + "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt + "mjpeg" = ps: with ps; [ ]; + "mobile_app" = ps: with ps; [ pynacl aiohttp-cors]; + "mochad" = ps: with ps; [ ]; # missing inputs: pymochad + "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus + "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem + "mold_indicator" = ps: with ps; [ ]; + "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice + "moon" = ps: with ps; [ ]; + "mopar" = ps: with ps; [ ]; # missing inputs: motorparts + "mpchc" = ps: with ps; [ ]; + "mpd" = ps: with ps; [ mpd2]; + "mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "mqtt_eventstream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "mqtt_json" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "mqtt_room" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "mqtt_statestream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "msteams" = ps: with ps; [ ]; # missing inputs: pymsteams + "mvglive" = ps: with ps; [ PyMVGLive]; + "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy + "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi + "myq" = ps: with ps; [ ]; # missing inputs: pymyq + "mysensors" = ps: with ps; [ ]; # missing inputs: pymysensors + "mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom + "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns + "n26" = ps: with ps; [ ]; # missing inputs: n26 + "nad" = ps: with ps; [ ]; # missing inputs: nad_receiver + "namecheapdns" = ps: with ps; [ defusedxml]; + "nanoleaf" = ps: with ps; [ ]; # missing inputs: pynanoleaf + "neato" = ps: with ps; [ pybotvac]; + "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi + "nello" = ps: with ps; [ ]; # missing inputs: pynello + "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient + "nest" = ps: with ps; [ ]; # missing inputs: python-nest + "netatmo" = ps: with ps; [ aiohttp-cors pyatmo]; + "netdata" = ps: with ps; [ ]; # missing inputs: netdata + "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear + "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt + "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio + "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio + "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext + "nfandroidtv" = ps: with ps; [ ]; + "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control + "nilu" = ps: with ps; [ ]; # missing inputs: niluclient + "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2 + "nmap_tracker" = ps: with ps; [ getmac]; # missing inputs: python-nmap + "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail + "no_ip" = ps: with ps; [ ]; + "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa + "norway_air" = ps: with ps; [ ]; # missing inputs: pyMetno + "notify" = ps: with ps; [ ]; + "notion" = ps: with ps; [ ]; # missing inputs: aionotion + "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client + "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents + "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat + "nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo + "nuki" = ps: with ps; [ ]; # missing inputs: pynuki + "nut" = ps: with ps; [ ]; # missing inputs: pynut2 + "nws" = ps: with ps; [ ]; # missing inputs: pynws + "nx584" = ps: with ps; [ ]; # missing inputs: pynx584 + "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi + "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics + "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai + "octoprint" = ps: with ps; [ ]; + "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat + "ohmconnect" = ps: with ps; [ defusedxml]; + "ombi" = ps: with ps; [ ]; # missing inputs: pyombi + "onboarding" = ps: with ps; [ aiohttp-cors]; + "onewire" = ps: with ps; [ ]; # missing inputs: pyownet + "onkyo" = ps: with ps; [ onkyo-eiscp]; + "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: onvif-zeep-async + "openalpr_cloud" = ps: with ps; [ ]; + "openalpr_local" = ps: with ps; [ ]; + "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless + "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi + "openexchangerates" = ps: with ps; [ ]; + "opengarage" = ps: with ps; [ ]; + "openhardwaremonitor" = ps: with ps; [ ]; + "openhome" = ps: with ps; [ ]; # missing inputs: openhomedevice + "opensensemap" = ps: with ps; [ ]; # missing inputs: opensensemap-api + "opensky" = ps: with ps; [ ]; + "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw + "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv + "openweathermap" = ps: with ps; [ pyowm]; + "opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense + "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio + "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO + "oru" = ps: with ps; [ ]; # missing inputs: oru + "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo + "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify + "otp" = ps: with ps; [ pyotp]; + "owntracks" = ps: with ps; [ pynacl aiohttp-cors]; + "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta + "panasonic_viera" = ps: with ps; [ wakeonlan]; # missing inputs: panasonic_viera + "pandora" = ps: with ps; [ pexpect]; + "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a + "pencom" = ps: with ps; [ ]; # missing inputs: pencompy + "persistent_notification" = ps: with ps; [ ]; + "person" = ps: with ps; [ ]; + "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs + "pi_hole" = ps: with ps; [ ]; # missing inputs: hole + "picotts" = ps: with ps; [ ]; + "piglow" = ps: with ps; [ ]; # missing inputs: piglow + "pilight" = ps: with ps; [ ]; # missing inputs: pilight + "ping" = ps: with ps; [ ]; + "pioneer" = ps: with ps; [ ]; + "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 + "plaato" = ps: with ps; [ aiohttp-cors]; + "plant" = ps: with ps; [ ]; + "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket]; + "plugwise" = ps: with ps; [ ]; # missing inputs: haanna + "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad + "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts + "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint + "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py + "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix + "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client]; + "prowl" = ps: with ps; [ ]; + "proximity" = ps: with ps; [ ]; + "proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer + "proxy" = ps: with ps; [ pillow]; + "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen + "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd + "pulseaudio_loopback" = ps: with ps; [ ]; + "push" = ps: with ps; [ aiohttp-cors]; + "pushbullet" = ps: with ps; [ pushbullet]; + "pushetta" = ps: with ps; [ ]; # missing inputs: pushetta + "pushover" = ps: with ps; [ pushover-complete]; + "pushsafer" = ps: with ps; [ ]; + "pvoutput" = ps: with ps; [ ]; + "pyload" = ps: with ps; [ ]; + "python_script" = ps: with ps; [ restrictedpython]; + "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent + "qld_bushfire" = ps: with ps; [ ]; # missing inputs: georss_qld_bushfire_alert_client + "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats + "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar + "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway + "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch + "rachio" = ps: with ps; [ aiohttp-cors]; # missing inputs: rachiopy + "radarr" = ps: with ps; [ ]; + "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm + "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird + "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy + "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle + "rainmachine" = ps: with ps; [ ]; # missing inputs: regenmaschine + "random" = ps: with ps; [ ]; + "raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi + "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client + "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste + "recorder" = ps: with ps; [ sqlalchemy]; + "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch + "reddit" = ps: with ps; [ praw]; + "rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl + "remember_the_milk" = ps: with ps; [ httplib2]; # missing inputs: RtmAPI + "remote" = ps: with ps; [ ]; + "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero + "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier + "rest" = ps: with ps; [ jsonpath xmltodict]; + "rest_command" = ps: with ps; [ ]; + "rflink" = ps: with ps; [ ]; # missing inputs: rflink + "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx + "ring" = ps: with ps; [ ha-ffmpeg]; # missing inputs: ring_doorbell + "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api + "rmvtransport" = ps: with ps; [ ]; # missing inputs: PyRMVtransport + "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API + "roku" = ps: with ps; [ ]; # missing inputs: roku + "roomba" = ps: with ps; [ ]; # missing inputs: roombapy + "route53" = ps: with ps; [ boto3]; # missing inputs: ipify + "rova" = ps: with ps; [ ]; # missing inputs: rova + "rpi_camera" = ps: with ps; [ ]; + "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO + "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled + "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio + "rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf + "rss_feed_template" = ps: with ps; [ aiohttp-cors]; + "rtorrent" = ps: with ps; [ ]; + "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio + "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound + "sabnzbd" = ps: with ps; [ ]; # missing inputs: pysabnzbd + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend + "saj" = ps: with ps; [ ]; # missing inputs: pysaj + "salt" = ps: with ps; [ ]; # missing inputs: saltbox + "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] + "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra + "scene" = ps: with ps; [ ]; + "scrape" = ps: with ps; [ beautifulsoup4]; + "script" = ps: with ps; [ ]; + "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate + "search" = ps: with ps; [ aiohttp-cors]; + "season" = ps: with ps; [ ephem]; + "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid + "sense" = ps: with ps; [ ]; # missing inputs: sense_energy + "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat + "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo + "sensor" = ps: with ps; [ ]; + "sentry" = ps: with ps; [ sentry-sdk]; + "serial" = ps: with ps; [ pyserial-asyncio]; + "serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor + "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 + "seven_segments" = ps: with ps; [ pillow]; + "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track + "shell_command" = ps: with ps; [ ]; + "shiftr" = ps: with ps; [ paho-mqtt]; + "shodan" = ps: with ps; [ shodan]; + "shopping_list" = ps: with ps; [ aiohttp-cors]; + "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 + "sigfox" = ps: with ps; [ ]; + "sighthound" = ps: with ps; [ ]; # missing inputs: simplehound + "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi + "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush + "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python + "simulated" = ps: with ps; [ ]; + "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms + "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control + "sky_hub" = ps: with ps; [ ]; + "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] + "skybell" = ps: with ps; [ ]; # missing inputs: skybellpy + "slack" = ps: with ps; [ ]; # missing inputs: slacker + "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq + "slide" = ps: with ps; [ ]; # missing inputs: goslide-api + "sma" = ps: with ps; [ ]; # missing inputs: pysma + "smappee" = ps: with ps; [ ]; # missing inputs: smappy + "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab + "smartthings" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmartapp pysmartthings + "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty + "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg + "sms" = ps: with ps; [ ]; # missing inputs: python-gammu + "smtp" = ps: with ps; [ ]; + "snapcast" = ps: with ps; [ snapcast]; + "snips" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; + "snmp" = ps: with ps; [ pysnmp]; + "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api + "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient + "solaredge" = ps: with ps; [ stringcase]; # missing inputs: solaredge + "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local + "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher + "solax" = ps: with ps; [ ]; # missing inputs: solax + "soma" = ps: with ps; [ ]; # missing inputs: pysoma + "somfy" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymfy + "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy + "sonarr" = ps: with ps; [ ]; + "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal + "sonos" = ps: with ps; [ pysonos]; + "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp + "soundtouch" = ps: with ps; [ libsoundtouch]; + "spaceapi" = ps: with ps; [ aiohttp-cors]; + "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw + "speedtestdotnet" = ps: with ps; [ speedtest-cli]; + "spider" = ps: with ps; [ ]; # missing inputs: spiderpy + "splunk" = ps: with ps; [ ]; + "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime + "spotify" = ps: with ps; [ aiohttp-cors spotipy]; + "sql" = ps: with ps; [ sqlalchemy]; + "squeezebox" = ps: with ps; [ ]; + "ssdp" = ps: with ps; [ defusedxml netdisco]; + "starline" = ps: with ps; [ ]; # missing inputs: starline + "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank + "startca" = ps: with ps; [ xmltodict]; + "statistics" = ps: with ps; [ ]; + "statsd" = ps: with ps; [ statsd]; + "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd + "stiebel_eltron" = ps: with ps; [ ]; # missing inputs: pymodbus pystiebeleltron + "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert + "stream" = ps: with ps; [ aiohttp-cors av]; + "streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater + "stt" = ps: with ps; [ aiohttp-cors]; + "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez + "sun" = ps: with ps; [ ]; + "supervisord" = ps: with ps; [ ]; + "supla" = ps: with ps; [ ]; # missing inputs: pysupla + "surepetcare" = ps: with ps; [ ]; # missing inputs: surepy + "swiss_hydrological_data" = ps: with ps; [ ]; # missing inputs: swisshydrodata + "swiss_public_transport" = ps: with ps; [ ]; # missing inputs: python_opendata_transport + "swisscom" = ps: with ps; [ ]; + "switch" = ps: with ps; [ ]; + "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot + "switcher_kis" = ps: with ps; [ ]; # missing inputs: aioswitcher + "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate + "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru + "synology" = ps: with ps; [ ]; # missing inputs: py-synology + "synology_chat" = ps: with ps; [ ]; + "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm + "synologydsm" = ps: with ps; [ ]; # missing inputs: python-synology + "syslog" = ps: with ps; [ ]; + "system_health" = ps: with ps; [ aiohttp-cors]; + "system_log" = ps: with ps; [ aiohttp-cors]; + "systemmonitor" = ps: with ps; [ psutil]; + "tado" = ps: with ps; [ ]; # missing inputs: python-tado + "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api + "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility + "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff + "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli + "tcp" = ps: with ps; [ ]; + "ted5000" = ps: with ps; [ xmltodict]; + "teksavvy" = ps: with ps; [ ]; + "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; + "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; + "tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive + "tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py + "telnet" = ps: with ps; [ ]; + "temper" = ps: with ps; [ ]; # missing inputs: temperusb + "template" = ps: with ps; [ ]; + "tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow]; + "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy + "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac + "thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke + "thethingsnetwork" = ps: with ps; [ ]; + "thingspeak" = ps: with ps; [ ]; # missing inputs: thingspeak + "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner + "thomson" = ps: with ps; [ ]; + "threshold" = ps: with ps; [ ]; + "tibber" = ps: with ps; [ ]; # missing inputs: pyTibber + "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck + "tile" = ps: with ps; [ ]; # missing inputs: pytile + "time_date" = ps: with ps; [ ]; + "timer" = ps: with ps; [ ]; + "tmb" = ps: with ps; [ ]; # missing inputs: tmb + "tod" = ps: with ps; [ ]; + "todoist" = ps: with ps; [ todoist]; + "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 + "tomato" = ps: with ps; [ ]; + "toon" = ps: with ps; [ ]; # missing inputs: toonapilib + "torque" = ps: with ps; [ aiohttp-cors]; + "totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client + "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline + "tplink" = ps: with ps; [ ]; # missing inputs: pyHS100 + "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected + "traccar" = ps: with ps; [ aiohttp-cors stringcase]; # missing inputs: pytraccar + "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr + "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async] + "trafikverket_train" = ps: with ps; [ ]; # missing inputs: pytrafikverket + "trafikverket_weatherstation" = ps: with ps; [ ]; # missing inputs: pytrafikverket + "transmission" = ps: with ps; [ transmissionrpc]; + "transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW + "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy + "trend" = ps: with ps; [ numpy]; + "tts" = ps: with ps; [ aiohttp-cors mutagen]; + "tuya" = ps: with ps; [ ]; # missing inputs: tuyaha + "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu + "twilio" = ps: with ps; [ aiohttp-cors twilio]; + "twilio_call" = ps: with ps; [ aiohttp-cors twilio]; + "twilio_sms" = ps: with ps; [ aiohttp-cors twilio]; + "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client + "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI + "ubee" = ps: with ps; [ ]; # missing inputs: pyubee + "ubus" = ps: with ps; [ ]; + "ue_smart_radio" = ps: with ps; [ ]; + "uk_transport" = ps: with ps; [ ]; + "unifi" = ps: with ps; [ aiounifi]; + "unifi_direct" = ps: with ps; [ pexpect]; + "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled + "universal" = ps: with ps; [ ]; + "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box + "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api + "updater" = ps: with ps; [ distro]; + "upnp" = ps: with ps; [ ]; # missing inputs: async-upnp-client + "uptime" = ps: with ps; [ ]; + "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot + "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus + "usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client + "utility_meter" = ps: with ps; [ ]; + "uvc" = ps: with ps; [ ]; # missing inputs: uvcclient + "vacuum" = ps: with ps; [ ]; + "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api + "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp + "velbus" = ps: with ps; [ ]; # missing inputs: python-velbus + "velux" = ps: with ps; [ ]; # missing inputs: pyvlx + "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch + "vera" = ps: with ps; [ ]; # missing inputs: pyvera + "verisure" = ps: with ps; [ jsonpath]; # missing inputs: vsure + "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense + "version" = ps: with ps; [ pyhaversion]; + "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync + "viaggiatreno" = ps: with ps; [ ]; + "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare + "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client + "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek + "vizio" = ps: with ps; [ ]; # missing inputs: pyvizio + "vlc" = ps: with ps; [ python-vlc]; + "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc + "voicerss" = ps: with ps; [ ]; + "volkszaehler" = ps: with ps; [ ]; # missing inputs: volkszaehler + "volumio" = ps: with ps; [ ]; + "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall + "vultr" = ps: with ps; [ vultr]; + "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 + "wake_on_lan" = ps: with ps; [ wakeonlan]; + "waqi" = ps: with ps; [ ]; # missing inputs: waqiasync + "water_heater" = ps: with ps; [ ]; + "waterfurnace" = ps: with ps; [ ]; # missing inputs: waterfurnace + "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf + "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson + "waze_travel_time" = ps: with ps; [ WazeRouteCalculator]; + "weather" = ps: with ps; [ ]; + "webhook" = ps: with ps; [ aiohttp-cors]; + "weblink" = ps: with ps; [ ]; + "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv + "websocket_api" = ps: with ps; [ aiohttp-cors]; + "wemo" = ps: with ps; [ ]; # missing inputs: pywemo + "whois" = ps: with ps; [ ]; # missing inputs: python-whois + "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink + "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy + "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api + "wled" = ps: with ps; [ ]; # missing inputs: wled + "workday" = ps: with ps; [ holidays]; + "worldclock" = ps: with ps; [ ]; + "worldtidesinfo" = ps: with ps; [ ]; + "worxlandroid" = ps: with ps; [ ]; + "wsdot" = ps: with ps; [ ]; + "wunderground" = ps: with ps; [ ]; + "wunderlist" = ps: with ps; [ ]; # missing inputs: wunderpy2 + "wwlln" = ps: with ps; [ ]; # missing inputs: aiowwlln + "x10" = ps: with ps; [ ]; + "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi + "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma + "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway + "xiaomi" = ps: with ps; [ ha-ffmpeg]; + "xiaomi_aqara" = ps: with ps; [ ]; # missing inputs: PyXiaomiGateway + "xiaomi_miio" = ps: with ps; [ construct python-miio]; + "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv + "xmpp" = ps: with ps; [ slixmpp]; + "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client + "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient + "yamaha" = ps: with ps; [ rxv]; + "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast + "yandex_transport" = ps: with ps; [ ]; # missing inputs: ya_ma + "yandextts" = ps: with ps; [ ]; + "yeelight" = ps: with ps; [ ]; # missing inputs: yeelight + "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower + "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS + "yi" = ps: with ps; [ aioftp ha-ffmpeg]; + "yr" = ps: with ps; [ xmltodict]; + "yweather" = ps: with ps; [ yahooweather]; + "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix + "zamg" = ps: with ps; [ ]; + "zengge" = ps: with ps; [ ]; # missing inputs: zengge + "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; + "zestimate" = ps: with ps; [ xmltodict]; + "zha" = ps: with ps; [ zha-quirks zigpy-deconz zigpy]; # missing inputs: bellows-homeassistant zigpy-cc zigpy-xbee-homeassistant zigpy-zigate + "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac + "zigbee" = ps: with ps; [ ]; # missing inputs: xbee-helper + "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl + "zone" = ps: with ps; [ ]; + "zoneminder" = ps: with ps; [ zm-py]; + "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher]; }; } diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7d32bf9a0584..9f7b3fed4a56 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.104.3"; + hassVersion = "0.106.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -75,6 +75,8 @@ in with py.pkgs; buildPythonApplication rec { disabled = pythonOlder "3.5"; + patches = [ ./relax-importlib-metadata-pyaml.patch ]; + inherit availableComponents; # PyPI tarball is missing tests/ directory @@ -82,7 +84,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "06bh9qrpa1d370pvw6in0isg3yw4p7gh9rpy4hm96p0mf53vxfdp"; + sha256 = "0i261hzjfhqnq7j8dwsnj2h2vmr4vnxkvk2ff910am1knzni3a2z"; }; propagatedBuildInputs = [ @@ -95,7 +97,8 @@ in with py.pkgs; buildPythonApplication rec { ] ++ componentBuildInputs ++ extraBuildInputs; checkInputs = [ - asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco hass-nabucasa + asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco + hass-nabucasa defusedxml ]; postPatch = '' diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 75d02ed06351..f297212442c3 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200108.0"; + version = "20200220.4"; src = fetchPypi { inherit pname version; - sha256 = "1h6fgkx8fffzs829893gjbh0wbjgxjzz2ca64v8r5sb938bfayg8"; + sha256 = "0cb8b6xizxz1q5r0qgwsqs53va9bxdqnp4vwf5lh8ppv9zy7hssc"; }; # no Python tests implemented diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 96cf1d86050e..65c2bcfbfd45 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ attrs ]) +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ mypy attrs ]) # # This script downloads Home Assistant's source tarball. # Inside the homeassistant/components directory, each integration has an associated manifest.json, @@ -15,125 +15,169 @@ # nixpkgs' python3Packages are searched for appropriate names. # Then, a Nix attribute set mapping integration name to dependencies is created. -from io import BytesIO import json -import pathlib import os +import pathlib import re import subprocess import sys -import tempfile import tarfile +import tempfile +from io import BytesIO +from typing import Dict, Optional from urllib.request import urlopen -COMPONENT_PREFIX = 'homeassistant.components' -PKG_SET = 'python3Packages' +COMPONENT_PREFIX = "homeassistant.components" +PKG_SET = "python3Packages" # If some requirements are matched by multiple python packages, # the following can be used to choose one of them PKG_PREFERENCES = { # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl - 'youtube-dl': 'youtube-dl-light', - 'tensorflow-bin': 'tensorflow', - 'tensorflowWithoutCuda': 'tensorflow' + "youtube-dl": "youtube-dl-light", + "tensorflow-bin": "tensorflow", + "tensorflowWithoutCuda": "tensorflow", } + +def run_mypy() -> None: + cmd = ["mypy", "--ignore-missing-imports", __file__] + print(f"$ {' '.join(cmd)}") + subprocess.run(cmd, check=True) + + def get_version(): - with open(os.path.dirname(sys.argv[0]) + '/default.nix') as f: + with open(os.path.dirname(sys.argv[0]) + "/default.nix") as f: # A version consists of digits, dots, and possibly a "b" (for beta) m = re.search('hassVersion = "([\\d\\.b]+)";', f.read()) return m.group(1) -def parse_components(version='master'): + +def parse_components(version="master"): components = {} with tempfile.TemporaryDirectory() as tmp: - with urlopen(f'https://github.com/home-assistant/home-assistant/archive/{version}.tar.gz') as response: + with urlopen( + f"https://github.com/home-assistant/home-assistant/archive/{version}.tar.gz" + ) as response: tarfile.open(fileobj=BytesIO(response.read())).extractall(tmp) # Use part of a script from the Home Assistant codebase - sys.path.append(os.path.join(tmp, f'home-assistant-{version}')) + sys.path.append(os.path.join(tmp, f"home-assistant-{version}")) from script.hassfest.model import Integration - integrations = Integration.load_dir(pathlib.Path( - os.path.join(tmp, f'home-assistant-{version}', 'homeassistant/components') - )) + + integrations = Integration.load_dir( + pathlib.Path( + os.path.join( + tmp, f"home-assistant-{version}", "homeassistant/components" + ) + ) + ) for domain in sorted(integrations): integration = integrations[domain] components[domain] = integration.manifest return components + # Recursively get the requirements of a component and its dependencies def get_reqs(components, component): - requirements = set(components[component]['requirements']) - for dependency in components[component]['dependencies']: + requirements = set(components[component]["requirements"]) + for dependency in components[component]["dependencies"]: requirements.update(get_reqs(components, dependency)) return requirements -# Store a JSON dump of Nixpkgs' python3Packages -output = subprocess.check_output(['nix-env', '-f', os.path.dirname(sys.argv[0]) + '/../../..', '-qa', '-A', PKG_SET, '--json']) -packages = json.loads(output) -def name_to_attr_path(req): +def dump_packages() -> Dict[str, Dict[str, str]]: + # Store a JSON dump of Nixpkgs' python3Packages + output = subprocess.check_output( + [ + "nix-env", + "-f", + os.path.dirname(sys.argv[0]) + "/../../..", + "-qa", + "-A", + PKG_SET, + "--json", + ] + ) + return json.loads(output) + + +def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: attr_paths = set() names = [req] # E.g. python-mpd2 is actually called python3.6-mpd2 # instead of python-3.6-python-mpd2 inside Nixpkgs - if req.startswith('python-') or req.startswith('python_'): - names.append(req[len('python-'):]) + if req.startswith("python-") or req.startswith("python_"): + names.append(req[len("python-") :]) for name in names: # treat "-" and "_" equally - name = re.sub('[-_]', '[-_]', name) - pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I) + name = re.sub("[-_]", "[-_]", name) + pattern = re.compile("^python\\d\\.\\d-{}-\\d".format(name), re.I) for attr_path, package in packages.items(): - if pattern.match(package['name']): + if pattern.match(package["name"]): attr_paths.add(attr_path) if len(attr_paths) > 1: for to_replace, replacement in PKG_PREFERENCES.items(): try: - attr_paths.remove(PKG_SET + '.' + to_replace) - attr_paths.add(PKG_SET + '.' + replacement) + attr_paths.remove(PKG_SET + "." + to_replace) + attr_paths.add(PKG_SET + "." + replacement) except KeyError: pass # Let's hope there's only one derivation with a matching name - assert len(attr_paths) <= 1, "{} matches more than one derivation: {}".format(req, attr_paths) + assert len(attr_paths) <= 1, "{} matches more than one derivation: {}".format( + req, attr_paths + ) if len(attr_paths) == 1: return attr_paths.pop() else: return None -version = get_version() -print('Generating component-packages.nix for version {}'.format(version)) -components = parse_components(version=version) -build_inputs = {} -for component in sorted(components.keys()): - attr_paths = [] - missing_reqs = [] - reqs = sorted(get_reqs(components, component)) - for req in reqs: - # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0 - # Therefore, if there's a "#" in the line, only take the part after it - req = req[req.find('#') + 1:] - name = req.split('==')[0] - attr_path = name_to_attr_path(name) - if attr_path is not None: - # Add attribute path without "python3Packages." prefix - attr_paths.append(attr_path[len(PKG_SET + '.'):]) + +def main() -> None: + packages = dump_packages() + version = get_version() + print("Generating component-packages.nix for version {}".format(version)) + components = parse_components(version=version) + build_inputs = {} + for component in sorted(components.keys()): + attr_paths = [] + missing_reqs = [] + reqs = sorted(get_reqs(components, component)) + for req in reqs: + # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0 + # Therefore, if there's a "#" in the line, only take the part after it + req = req[req.find("#") + 1 :] + name = req.split("==")[0] + attr_path = name_to_attr_path(name, packages) + if attr_path is not None: + # Add attribute path without "python3Packages." prefix + attr_paths.append(attr_path[len(PKG_SET + ".") :]) + else: + missing_reqs.append(name) else: - missing_reqs.append(name) - else: - build_inputs[component] = attr_paths - n_diff = len(reqs) > len(build_inputs[component]) - if n_diff > 0: - print("Component {} is missing {} dependencies".format(component, n_diff)) - print("missing requirements: {}".format(missing_reqs)) - -with open(os.path.dirname(sys.argv[0]) + '/component-packages.nix', 'w') as f: - f.write('# Generated by parse-requirements.py\n') - f.write('# Do not edit!\n\n') - f.write('{\n') - f.write(' version = "{}";\n'.format(version)) - f.write(' components = {\n') - for component, attr_paths in build_inputs.items(): - f.write(' "{}" = ps: with ps; [ '.format(component)) - f.write(' '.join(attr_paths)) - f.write(' ];\n') - f.write(' };\n') - f.write('}\n') + build_inputs[component] = (attr_paths, missing_reqs) + n_diff = len(reqs) > len(build_inputs[component]) + if n_diff > 0: + print("Component {} is missing {} dependencies".format(component, n_diff)) + print("missing requirements: {}".format(missing_reqs)) + + with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f: + f.write("# Generated by parse-requirements.py\n") + f.write("# Do not edit!\n\n") + f.write("{\n") + f.write(f' version = "{version}";\n') + f.write(" components = {\n") + for component, deps in build_inputs.items(): + available, missing = deps + f.write(f' "{component}" = ps: with ps; [ ') + f.write(" ".join(available)) + f.write("];") + if len(missing) > 0: + f.write(f" # missing inputs: {' '.join(missing)}") + f.write("\n") + f.write(" };\n") + f.write("}\n") + + +if __name__ == "__main__": + run_mypy() + main() diff --git a/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch b/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch new file mode 100644 index 000000000000..d35e05c6cd78 --- /dev/null +++ b/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch @@ -0,0 +1,22 @@ +diff --git a/setup.py b/setup.py +index 7f9155d9a..f90a0d965 100755 +--- a/setup.py ++++ b/setup.py +@@ -38,7 +38,7 @@ REQUIRES = [ + "attrs==19.3.0", + "bcrypt==3.1.7", + "certifi>=2019.11.28", +- "importlib-metadata==1.5.0", ++ "importlib-metadata>=1.3.0", + "jinja2>=2.10.3", + "PyJWT==1.7.1", + # PyJWT has loose dependency. We want the latest one. +@@ -46,7 +46,7 @@ REQUIRES = [ + "pip>=8.0.3", + "python-slugify==4.0.0", + "pytz>=2019.03", +- "pyyaml==5.3", ++ "pyyaml>=5.2", + "requests==2.22.0", + "ruamel.yaml==0.15.100", + "voluptuous==0.11.7", diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 15a651d8a321..79020ce78488 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -10,13 +10,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "1v4kbvj9r0hs8jaisq3fr0rg0qndpbhc5h8cbpfpprmkbw4nj6pf"; + sha256 = "15rdxcvnfn3fzjpjz6z2ljrzhlmhn2y4sxz09z2789k442n4m1qv"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index ce3ed9ab9d66..70f39418198e 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nginx_exporter"; - version = "0.5.0"; + version = "0.6.0"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; @@ -14,7 +14,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nginxinc"; repo = "nginx-prometheus-exporter"; - sha256 = "1fyn2bjq80dx4jv1rakrm0vg6i657a5rs7kkg0f9mbv1alir8kkx"; + sha256 = "1rwafmm9x0sxj4z7x4axhrjgdy15z70a1y00hw6smq30fcpkazhq"; }; doCheck = true; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index aa27b6b18ead..2e7afe5266ea 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,16 +1,16 @@ generic: { v44 = generic { - version = "4.4.5"; - sha256 = "1snhpqj5p16giplbxa6xfrsairnf0m1qdh378yrifbh6bf19ga4l"; + version = "4.4.6"; + sha256 = "03mf4sklnw1x0ixp41vnibkz0794yi9jhws7ixld8jj2czk2ifr2"; }; v40 = generic { - version = "4.0.17"; - sha256 = "0h699awyw3rhjkm1b84ld0sh7bbpvy4bplmcik36q1303sfrkw21"; + version = "4.0.18"; + sha256 = "105f0mifgm56dd1y8vychq8m2f2wx9a7gv380xv0hrs1q038i1ki"; }; v30 = generic { - version = "3.0.29"; - sha256 = "1d81w68hnkjdj1a00iasg6aidw25syi4lrbsiyc98pdihmxbpiky"; + version = "3.0.30"; + sha256 = "0g2qw4ff02gsnmqza1cv9dq6bqyg7w9cdli6hsln07irf0hyrb07"; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 7626d487e2ab..e328a79afa69 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -102,13 +102,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.21.19"; + version = "0.21.20"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0awfnhygasww2xbxnc3a81hv2kbw3v3mblav6wjvzz25qipv19dq"; + sha256 = "05148zwaf1ix369i1n1fx84j66qa1ab1p3m7781lk3dz5hqf185x"; }; buildInputs = [ glib boost ] @@ -130,7 +130,7 @@ let meta = with stdenv.lib; { description = "A flexible, powerful daemon for playing music"; - homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; + homepage = "https://www.musicpd.org/"; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ]; platforms = platforms.unix; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 906ee07f3556..9c99faca4842 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "08lizhag7aqz3a59gaapsymn7sf9c6im1aw64n0r9a5advhwdh18"; + cargoSha256 = "1chf1l9jlnhi9cyqpmcz8yfzwzmkn4lfxqhdhclvl8j4b2zvbcgc"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 4bf329fa5db1..7d0079fca203 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03ncwj9bn21590phcnqyclclcird7rikbhxbwhg8i9i0nad81aaa"; + cargoSha256 = "0xifc3jwj0c6ynx0gzm5zlnfcq023fjpjmdg9x0vs1fh3b42pdsy"; meta = with stdenv.lib; { description = "Simple relay server for broadcasting a WebM stream"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 1c3367b12dbb..871791dd4589 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-02-28"; + version = "2020-03-03"; pname = "oh-my-zsh"; - rev = "1689e9bb907ab184d7418dd88bc2639a794c916d"; + rev = "bbe54e4e6009dcbb69a4ace22ddae3672b323fdc"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "095gjh2xymjn808lvbln7qyccnv5gf9nz911a41rzs9cfsvkbsl0"; + sha256 = "13znfpr9dvvvasrszdi2qr4iprx1s1z5rx16f01hc6r9jqnbqi5s"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index e878369f1770..d96eadf0eab5 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { pname = "aws-google-auth"; - version = "0.0.33"; + version = "0.0.34"; # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 @@ -27,7 +27,7 @@ buildPythonApplication rec { owner = "cevoaustralia"; repo = "aws-google-auth"; rev = version; - sha256 = "07sisv7b17bpjwikmm9zpxn3l3xpzywsbxi4brri2hdjmjb6p7w7"; + sha256 = "12c5ssdy870szrizhs4d7dzcpq3hvszjvl8ba60qf1ak5jsr1ay4"; }; propagatedBuildInputs = [ @@ -55,7 +55,7 @@ buildPythonApplication rec { meta = with lib; { description = "Acquire AWS STS (temporary) credentials via Google Apps SAML Single Sign On"; - homepage = https://github.com/cevoaustralia/aws-google-auth; + homepage = "https://github.com/cevoaustralia/aws-google-auth"; maintainers = [ maintainers.marsam ]; license = licenses.mit; }; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index bf4b2eb5351d..b3cf971970a5 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "19j1xscchnckqq1nddx9nr9wxxv124ab40l4mdalqbkli4zd748j"; + cargoSha256 = "1zvg68ilgpnd95b36jvna9h1jr5d72x1a0g6flw2x6sd0msc0mdw"; patches = [ ./v3.1.1-fix-Cargo.lock.patch diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index b67e71c0fdf0..b2452be7339e 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,70 +1,105 @@ -{ lib, stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2 -, makeWrapper, libtiff -, enableX11 ? false, libX11 }: +{ lib +, stdenv +, fetchsvn +, pkgconfig +, libjpeg +, libpng +, flex +, zlib +, perl +, libxml2 +, makeWrapper +, libtiff +, enableX11 ? false +, libX11 +}: stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.82.01"; + name = "netpbm-10.89.1"; + + outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "3264"; - sha256 = "17fmyjbxp1l18rma7gb0m8wd9kx2iwhqs8dd6fpalsn2cr8mf8hf"; + rev = "3735"; + sha256 = "hRepEUBlf83p77Amjze+Qz7XTHhCuPdV01K/UabR89Q="; }; - postPatch = /* CVE-2005-2471, from Arch */ '' - substituteInPlace converter/other/pstopnm.c \ - --replace '"-dSAFER"' '"-dPARANOIDSAFER"' + postPatch = '' + # Install libnetpbm.so symlink to correct destination + substituteInPlace lib/Makefile \ + --replace '/sharedlink' '/lib' ''; - buildInputs = - [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libtiff ] - ++ lib.optional enableX11 libX11; + nativeBuildInputs = [ + pkgconfig + flex + makeWrapper + ]; + + buildInputs = [ + zlib + perl + libpng + libjpeg + libxml2 + libtiff + ] ++ lib.optional enableX11 libX11; configurePhase = '' + runHook preConfigure + cp config.mk.in config.mk - echo "STATICLIB_TOO = n" >> config.mk - substituteInPlace "config.mk" \ - --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \ - --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \ - --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \ - --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + + # Disable building static library + echo "STATICLIB_TOO = N" >> config.mk + + # Use libraries from Nixpkgs + echo "TIFFLIB = libtiff.so" >> config.mk + echo "TIFFLIB_NEEDS_JPEG = N" >> config.mk + echo "TIFFLIB_NEEDS_Z = N" >> config.mk + echo "JPEGLIB = libjpeg.so" >> config.mk + + # Fix path to rgb.txt + echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk + '' + stdenv.lib.optionalString stdenv.isDarwin '' echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk echo "NETPBMLIBTYPE = dylib" >> config.mk echo "NETPBMLIBSUFFIX = dylib" >> config.mk - ''; - preBuild = '' - export LDFLAGS="-lz" - substituteInPlace "pm_config.in.h" \ - --subst-var-by "rgbPath1" "$out/lib/rgb.txt" \ - --subst-var-by "rgbPath2" "/var/empty/rgb.txt" \ - --subst-var-by "rgbPath3" "/var/empty/rgb.txt" - touch lib/standardppmdfont.c + runHook postConfigure ''; - enableParallelBuilding = false; + enableParallelBuilding = true; installPhase = '' + runHook preInstall + make package pkgdir=$out - rm -rf $out/link $out/*_template $out/{pkginfo,README,VERSION} $out/man/web + rm -rf $out/*_template $out/{pkginfo,README,VERSION} $out/man/web mkdir -p $out/share/netpbm mv $out/misc $out/share/netpbm/ + moveToOutput bin "''${!outputBin}" + # wrap any scripts that expect other programs in the package to be in their PATH for prog in ppmquant; do - wrapProgram "$out/bin/$prog" --prefix PATH : "$out/bin" + wrapProgram "''${!outputBin}/bin/$prog" --prefix PATH : "''${!outputBin}/bin" done + + runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { - homepage = http://netpbm.sourceforge.net/; + homepage = "http://netpbm.sourceforge.net/"; description = "Toolkit for manipulation of graphic images"; - license = "GPL,free"; + license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/graphics/netpbm/update.sh b/pkgs/tools/graphics/netpbm/update.sh new file mode 100755 index 000000000000..670e872e951d --- /dev/null +++ b/pkgs/tools/graphics/netpbm/update.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p bash -p subversion -p common-updater-scripts -i bash + +die() { + echo "error: $1" >&2 + exit 1 +} + +attr=netpbm +svnRoot=https://svn.code.sf.net/p/netpbm/code/advanced + +oldRev=$(nix-instantiate --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"') +if [[ -z "$oldRev" ]]; then + die "Could not extract old revision." +fi + +latestRev=$(svn info --show-item "last-changed-revision" "$svnRoot") +if [[ -z "$latestRev" ]]; then + die "Could not find out last changed revision." +fi + +versionInfo=$(svn cat -r "$latestRev" "$svnRoot/version.mk") +if [[ -z "$versionInfo" ]]; then + die "Could not get version info." +fi + +nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') +if [[ ! -f "$nixFile" ]]; then + die "Could not evaluate '$attr.meta.position' to locate the .nix file!" +fi + +# h remembers if we found the pattern; on the last line, if a pattern was previously found, we exit with 1 +# https://stackoverflow.com/a/12145797/160386 +sed -i "$nixFile" -re '/(\brev\b\s*=\s*)"'"$oldRev"'"/{ s||\1"'"$latestRev"'"|; h }; ${x; /./{x; q1}; x}' && die "Unable to update revision." + +majorRelease=$(grep --perl-regex --only-matching 'NETPBM_MAJOR_RELEASE = \K.+' <<< "$versionInfo") +minorRelease=$(grep --perl-regex --only-matching 'NETPBM_MINOR_RELEASE = \K.+' <<< "$versionInfo") +pointRelease=$(grep --perl-regex --only-matching 'NETPBM_POINT_RELEASE = \K.+' <<< "$versionInfo") + +update-source-version "$attr" "$majorRelease.$minorRelease.$pointRelease" diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 6a0385614e87..668f73c04f42 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { preConfigure = '' rm cmake/FindNETPBM.cmake - echo "SET(NETPBM_LIBRARY `find ${netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake - echo "SET(NETPBM_LIBRARIES `find ${netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake - echo "SET(NETPBM_INCLUDE_DIR ${netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake + echo "SET(NETPBM_LIBRARY `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake + echo "SET(NETPBM_LIBRARIES `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake + echo "SET(NETPBM_INCLUDE_DIR ${stdenv.lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake echo "INCLUDE(FindPackageHandleStandardArgs)" >> cmake/FindNETPBM.cmake echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake ''; diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index c7d2f49406b7..71bf0160a1e1 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; configureFlags = [ - "--with-rgbtxt=${netpbm}/share/netpbm/misc/rgb.txt" + "--with-rgbtxt=${netpbm.out}/share/netpbm/misc/rgb.txt" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 15cecf3d71e9..8546c4e8182a 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,17 +1,34 @@ -{ stdenv, pkgconfig, glib, libxml2, expat, - fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, - ApplicationServices, - python27, libpng ? null, - fetchFromGitHub, - autoreconfHook, - gtk-doc, - gobject-introspection, +{ stdenv +, pkgconfig +, glib +, libxml2 +, expat +, fftw +, orc +, lcms +, imagemagick +, openexr +, libtiff +, libjpeg +, libgsf +, libexif +, ApplicationServices +, python27 +, libpng ? null +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, gtk-doc +, gobject-introspection +, }: stdenv.mkDerivation rec { pname = "vips"; version = "8.9.1"; + outputs = [ "bin" "out" "man" "dev" ]; + src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; @@ -24,14 +41,46 @@ stdenv.mkDerivation rec { ''; }; - nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ]; - buildInputs = [ glib libxml2 fftw orc lcms - imagemagick openexr libtiff libjpeg - libgsf libexif python27 libpng expat ] - ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; + patches = [ + # autogen.sh should not run configure + # https://github.com/libvips/libvips/pull/1566 + (fetchpatch { + url = "https://github.com/libvips/libvips/commit/97a92e0e6abab652fdf99313b138bfd77d70deb4.patch"; + sha256 = "0w1sm5wmvfp8svdpk8mz57c1n6zzy3snq0g2f8yxjamv0d2gw2dp"; + }) + ]; + + nativeBuildInputs = [ + pkgconfig + autoreconfHook + gtk-doc + gobject-introspection + ]; + + buildInputs = [ + glib + libxml2 + fftw + orc + lcms + imagemagick + openexr + libtiff + libjpeg + libgsf + libexif + python27 + libpng + expat + ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; + + # Required by .pc file + propagatedBuildInputs = [ + glib + ]; autoreconfPhase = '' - ./autogen.sh + NOCONFIGURE=1 ./autogen.sh ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index c0aa9180aedb..7fa9ac9c9712 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -2,25 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "dust"; - version = "0.4.4"; + version = "0.5.1"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "1qbh9vgdh0xmh4c78fm0rd1sgb01n656p3cr4my7ymsy81ypx9y7"; + sha256 = "1l5fh7yl8mbgahvzfa251cyp8j5awqdl66jblz565b1wb536kig7"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -rf $out/src/test_dir3/ + ''; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07ynz6y1z3rz84662d4rfl2sw1sx46a3k48z8dckr0b3fqs2zj6a"; + cargoSha256 = "1sjzcawyg1xsi4xrx2zwnj8yavzph8k1wgxsffgp55wghzypafwl"; doCheck = false; meta = with stdenv.lib; { description = "du + rust = dust. Like du but more intuitive"; - homepage = https://github.com/bootandy/dust; + homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; maintainers = [ maintainers.infinisil ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index f25c095dade9..a593805b651e 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.3.8"; + version = "1.3.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1b14hm809zy4idg8p2ah1sg4pgzqyy459mlf7rfc2msvf716sicr"; + sha256 = "1ly6afq4badmvs1rsqcai5kyka66n0rzi8857893wjcscppja55a"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index faa5e9d85e81..207492a89449 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kepubify"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "geek1011"; repo = pname; rev = "v${version}"; - sha256 = "168n4xbhjrzwzlhvakmsd0nwqjwgibphkwzq5hcxrk9ywpqpxjad"; + sha256 = "17zhfq1nfdas4k5yzyr82zs3r3mm4n8f907ih1ckx081hy4g7a2p"; }; modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43"; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index c4175f77d055..7829a677b431 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -31,10 +31,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1kdpzbn3353yk7i65hll480fcy16wdvppdr6xgfh06x88xhim4mp"; + cargoSha256 = "1iwd0cad8dp8q5xz2mm7zn1wphr5brkw937dfygc88afj6bv3d68"; doCheck = false; BUILD_REV_COUNT = src.revCount or 1; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 0231d4df9239..603e24916d60 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "06cxkkf3sf84prba65dymr1hg7mwizmsax0dlljh0lcmvlcpzi08"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "046xxxqcf1sdsi9dlilsn0nk36gyca20ck1a70ihj1k9kl7yj8sn"; + cargoSha256 = "1v4rvk6h78797wshw3m0qabb7g4i4mbj1vs5d41izgb0swnzk4vy"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 32db897ae0ff..6c334db1ede8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200122"; + name = "parallel-20200222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi"; + sha256 = "077b72h2d191bmsb78fmzcynxj5mi5v3axmwwxz1d1q8xhv756r6"; }; nativeBuildInputs = [ makeWrapper ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { it possible to use output from GNU Parallel as input for other programs. ''; - homepage = https://www.gnu.org/software/parallel/; + homepage = "https://www.gnu.org/software/parallel/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pSub vrthra ]; diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index a5ce018545a7..264631120068 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,33 +1,55 @@ -{ - mkDerivation, fetchFromGitHub, lib, - extra-cmake-modules, kdoctools, wrapGAppsHook, - baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework +{ mkDerivation +, fetchFromGitHub +, lib +, extra-cmake-modules +, kdoctools +, wrapGAppsHook +, baloo +, karchive +, kconfig +, kcrash +, kfilemetadata +, kinit +, kirigami2 +, knewstuff +, plasma-framework }: -let +mkDerivation rec { pname = "peruse"; - version = "1.2.20180816"; - -in mkDerivation { - name = "${pname}-${version}"; + version = "1.2.20200208"; # The last formal release from 2016 uses kirigami1 which is deprecated src = fetchFromGitHub { - owner = "KDE"; - repo = pname; - rev = "f50027c6c9c680c4e2ce1dba4ec43364e661e7a3"; - sha256 = "1217fa6w9ryh499agcc67mnp8k9dah4r0sw74qzsbk4p154jbgch"; + owner = "KDE"; + repo = pname; + rev = "4a1b3f954d2fe7e4919c0c5dbee1917776da582e"; + sha256 = "1s5yy240x4cvrk93acygnrp5m10xp7ln013gdfbm0r5xvd8xy19k"; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - - propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami2 knewstuff plasma-framework ]; - - pathsToLink = [ "/etc/xdg/peruse.knsrc"]; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + baloo + karchive + kconfig + kcrash + kfilemetadata + kinit + kirigami2 + knewstuff + plasma-framework + ]; + + pathsToLink = [ "/etc/xdg/peruse.knsrc" ]; meta = with lib; { - homepage = "https://peruse.kde.org"; description = "A comic book reader"; + homepage = "https://peruse.kde.org"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index bdb86cbb8020..b9a59dffae7a 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "9.2.1"; + version = "9.4.0"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "00c5xgyn34psj538zrzql16z16532c9444vc5asg7qhrcylpqpk7"; + sha256 = "108h3zs7p9vmb56dwlw7wicv9z4kxbndl82075sx4c12rzrmssi9"; }; buildInputs = [ php ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-Source, Automated Benchmarking"; - homepage = https://www.phoronix-test-suite.com/; + homepage = "https://www.phoronix-test-suite.com/"; maintainers = with maintainers; [ davidak ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 34a6cb03d8bb..0e9df5350f90 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.1"; + version = "1.2020.2"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "02a55na86561fnxf6pk0cpg13mx8qr7pvigyp65rqks0f9ygj9ga"; + sha256 = "1wvlhy76h1bxwjj8r48ixypch1bj9m9721rbawayj8v0hpyr1an4"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Draw UML diagrams using a simple and human readable text description"; - homepage = http://plantuml.sourceforge.net/; + homepage = "http://plantuml.sourceforge.net/"; # "plantuml -license" says GPLv3 or later license = licenses.gpl3Plus; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 338452e213cf..9d1fcb897891 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.36.1"; + version = "0.37.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1ip6jfnlw0maabvihzbmmka453njnw1yf7hq3fd89l6dx57315m5"; + sha256 = "17jgb8fp6zarsnl1hm2y24h0xb0w2w6m61k8g3ww3r4fm8yj649v"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "16wsd8z4cfb5pplwfvwgi5qawwv8c0aa220wnvphplmgz8cpq35r"; + cargoSha256 = "01qzwk3q1f6pmyqsq5gnczdjm3157ja2zlrahw5bd5vmy929l5gq"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 88d437e56af6..eca80cbcadf3 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ pkgconfig openssl ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1gh5w6zzrvjk60bqaf355fagijy723rvmqjh4laksd96pmzdfwn9"; + cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; meta = with stdenv.lib; { description = "Utility for easy management of Tensorflow containers"; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 68527ebebb47..4e0e9193fe7d 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "wakatime"; - version = "13.0.4"; + version = "13.0.7"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "11np3cc5ha785vlmknk7vr7spgk2nw0wls0li60vfpvggbv0r4j6"; + sha256 = "1rnapzaabg962wxrmfcq9lxz0yyqd3mxqbx3dq1ih4w33lf4fi8d"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index e2c5bd744e53..d9ea0648ebe4 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "1j3l4v9iqhidn1b6vx86px9hz5wbsbgj3zy2jzwf9204k5sfv715"; + sha256 = "0gzqc75wjm3yj81rm03zkp5lvsmlhhp79qlz85yyan1gcz5spdb6"; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '0.6'" "version: '${version}'" - ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; buildInputs = [ wayland-protocols ] ++ stdenv.lib.optional stdenv.isLinux libseccomp; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 776b41ac1aaf..d6b1b423ae2f 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -i src/form.c -e '21i#include <stdlib.h>' # there is no point to bring in the whole netpbm package just for this file - install -Dm644 ${netpbm}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt + install -Dm644 ${netpbm.out}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt ''; postAutoreconf = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1fc8acdda2cd..151e520e5d1a 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.02.16"; + version = "2020.03.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb"; + sha256 = "01hk00nbxxa81yajkbv65nv5amwyavhjs127xkyqqcrq6ws3z92w"; }; nativeBuildInputs = [ makeWrapper ]; @@ -54,8 +54,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://rg3.github.io/youtube-dl/; - repositories.git = https://github.com/rg3/youtube-dl.git; + homepage = "https://rg3.github.io/youtube-dl/"; description = "Command-line tool to download videos from YouTube.com and other sites"; longDescription = '' youtube-dl is a small, Python-based command-line program diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index e42de87f58be..1cee7ecdc218 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "1c4lndrr7xndgp60zcdjqpciwibm9sjwwrd3921fyz4jg44g76zy"; + sha256 = "0vg2fkjksjysm5ckdlfswg8w7f52wkh417l7k96hghg9ni4yz575"; }; - cargoSha256 = "1jnkfiyp5mlwm6bn7i66g5vbbrhps2avlmbilip4346m2j8qc2qv"; + cargoSha256 = "1cyra3mqxpi3m1gqrc5dmjykpsw6swq695dsqirhgb6qxcclxw7p"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index eeb69417dc7f..2c97e1a17dc0 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -18,10 +18,7 @@ in rustPlatform.buildRustPackage rec { sha256 = "1a3gqxj6d1shv3w0v9m8x2xr0bvcynchy778yqalxkc3x4vr0nbn"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "06nh99cvg3y4f98fs0j5bkidzq6fg46wk47z5jfzz5lf72ha54lk"; + cargoSha256 = "1k6mffcs9g0z5lh8hpflyharx6653cs1f2rjpldab0fc5fjmjfza"; buildInputs = [ sqlite ]; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 38fdab358c90..a0e2b8e01cc1 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -11,6 +11,8 @@ python3Packages.buildPythonApplication rec { sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0"; }; + outputs = [ "out" "doc" "man" ]; + propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; dontUseSetuptoolsCheck = true; patches = [ ./strip-venv.patch ]; @@ -22,6 +24,62 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; + postInstall = '' + # install completions + install -Dm555 \ + extras/httpie-completion.bash \ + $out/share/bash-completion/completions/http.bash + install -Dm555 \ + extras/httpie-completion.fish \ + $out/share/fish/vendor_completions.d/http.fish + + mkdir -p $man/share/man/man1 + + docdir=$doc/share/doc/httpie + mkdir -p $docdir/html + + cp AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst $docdir + + # helpfully, the readme has a `no-web` class to exclude + # the parts that are not relevant for offline docs + + # this one build link was not marked however + sed -e 's/^|build|//g' -i README.rst + + toHtml() { + ${docutils}/bin/rst2html5 \ + --strip-elements-with-class=no-web \ + --title=http \ + --no-generator \ + --no-datestamp \ + --no-source-link \ + "$1" \ + "$2" + } + + toHtml README.rst $docdir/html/index.html + toHtml CHANGELOG.rst $docdir/html/CHANGELOG.html + toHtml CONTRIBUTING.rst $docdir/html/CONTRIBUTING.html + + # change a few links to the local files + substituteInPlace $docdir/html/index.html \ + --replace \ + 'https://github.com/jakubroztocil/httpie/blob/master/CHANGELOG.rst' \ + "CHANGELOG.html" \ + --replace \ + 'https://github.com/jakubroztocil/httpie/blob/master/CONTRIBUTING.rst' \ + "CONTRIBUTING.html" + + ${docutils}/bin/rst2man \ + --strip-elements-with-class=no-web \ + --title=http \ + --no-generator \ + --no-datestamp \ + --no-source-link \ + README.rst \ + $man/share/man/man1/http.1 + ''; + # the tests call rst2pseudoxml.py from docutils preCheck = '' export PATH=${docutils}/bin:$PATH diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index d1a73f1c148b..548f0e97be99 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.11.0"; + version = "1.12.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "03ljyam0027w412vmi4gc0bp9c2xfmcspi676qck8cvvzg4gf736"; + sha256 = "1ndyiw4c2s8m0xds4ff87rdpixhbma5v2g420w3gfc1p7alhqz66"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { meta = { description = "Client for PPP+SSL VPN tunnel services"; - homepage = https://github.com/adrienverge/openfortivpn; + homepage = "https://github.com/adrienverge/openfortivpn"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix index 9b1ee7a9f799..b560f2768ad7 100644 --- a/pkgs/tools/networking/stubby/default.nix +++ b/pkgs/tools/networking/stubby/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchFromGitHub, getdns, libtool, m4, file , doxygen -, autoreconfHook, automake, check, libbsd, libyaml, darwin }: +{ stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake }: stdenv.mkDerivation rec { pname = "stubby"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "getdnsapi"; repo = pname; rev = "v${version}"; - sha256 = "164gm5cbnq785s78bqmbsgxrxkq8hw930xwkxxzi1f6jgz928dnf"; + sha256 = "04izd1v4fv9l7r75aafkrp6svczbx4cvv1vnfyx5n9105pin11mx"; }; - nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ]; + nativeBuildInputs = [ cmake libyaml ]; - buildInputs = [ doxygen getdns automake file check ] + buildInputs = [ doxygen getdns ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; meta = with stdenv.lib; { @@ -25,10 +24,10 @@ stdenv.mkDerivation rec { queries sent from a client machine (desktop or laptop) to a DNS Privacy resolver increasing end user privacy. Stubby is developed by the getdns team. -''; - homepage = https://dnsprivacy.org/wiki/x/JYAT; + ''; + homepage = "https://dnsprivacy.org/wiki/x/JYAT"; downloadPage = "https://github.com/getdnsapi/stubby"; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars ehmry ]; license = licenses.bsd3; platforms = platforms.all; - }; + }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index eed14a129785..29af4a90cb90 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -10,6 +10,7 @@ let common = { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz + , bash, coreutils, gzip, gnutar , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , jq, libarchive, rustc, cargo , busybox-sandbox-shell @@ -30,6 +31,7 @@ common = is20 = lib.versionAtLeast version "2.0pre"; is24 = lib.versionAtLeast version "2.4pre"; + isExactly23 = lib.versionAtLeast version "2.3" && lib.versionOlder version "2.4"; VERSION_SUFFIX = suffix; @@ -64,7 +66,7 @@ common = preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. # https://github.com/NixOS/nixpkgs/issues/45462 - if is20 then '' + lib.optionalString is20 '' mkdir -p $out/lib cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib rm -f $out/lib/*.a @@ -72,9 +74,21 @@ common = chmod u+w $out/lib/*.so.* patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} - '' else '' - configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") - ''; + '' + + # For Nix-2.3, patch around an issue where the Nix configure step pulls in the + # build system's bash and other utilities when cross-compiling + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly23) '' + mkdir tmp/ + substitute corepkgs/config.nix.in tmp/config.nix.in \ + --subst-var-by bash ${bash}/bin/bash \ + --subst-var-by coreutils ${coreutils}/bin \ + --subst-var-by bzip2 ${bzip2}/bin/bzip2 \ + --subst-var-by gzip ${gzip}/bin/gzip \ + --subst-var-by xz ${xz}/bin/xz \ + --subst-var-by tar ${gnutar}/bin/tar \ + --subst-var-by tr ${coreutils}/bin/tr + mv tmp/config.nix.in corepkgs/config.nix.in + ''; configureFlags = [ "--with-store-dir=${storeDir}" @@ -87,6 +101,7 @@ common = "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" + "BDW_GC_LIBS=\"-lgc -lgccpp\"" ] ++ lib.optionals (is20 && stdenv.isLinux) [ "--with-sandbox-shell=${sh}/bin/busybox" ] diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 284ee2cab21b..9a8a283d799d 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.1.1"; + version = "5.2.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "06rhnmk59was7dd5pd4czlrwqvmh02l9gka9561dkpl6w3j6814a"; + sha256 = "1gq5s202zlf6z6fd4qwbgzmddrzj50js3kzyln63xh0svc3sgfvl"; }; patches = [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 3095142d3629..e46da9ca9b6a 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20191211223501.15bbb94c23"; + versionSuffix = "20200225210944.9845113a89"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.1.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.2.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "1frmk4ldmcz9rkl5bpsinzzwh39vavww67lsklln76xmkm3nacvq"; + sha256 = "183vkwm12frdy50z6gyb1mffn3w8jvxxj472868af813r0n1akl5"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 3105cba5a344..2b6479198c97 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, openssl, static ? false }: +{ stdenv, lib, fetchurl, openssl, fetchpatch, static ? false }: let pkgname = "ipmitool"; @@ -12,19 +12,31 @@ stdenv.mkDerivation { sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m"; }; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/plugins/ipmi_intf.c --replace "s6_addr16" "s6_addr" - ''; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/i/ipmitool/1.8.18-6/debian/patches/0120-openssl1.1.patch"; + sha256 = "1xvsjxb782lzy72bnqqnsk3r5h4zl3na95s4pqn2qg7cic2mnbfk"; + }) + # Fix build on non-linux systems + (fetchpatch { + url = "https://github.com/ipmitool/ipmitool/commit/5db314f694f75c575cd7c9ffe9ee57aaf3a88866.patch"; + sha256 = "01niwrgajhrdhl441gzmw6v1r1yc3i8kn98db4b6smfn5fwdp1pa"; + }) + ]; buildInputs = [ openssl ]; - preConfigure = '' - configureFlagsArray=( - --infodir=$out/share/info - --mandir=$out/share/man - ${if static then "LDFLAGS=-static --enable-static --disable-shared" else "--enable-shared"} - ) - ''; + configureFlags = [ + "--infodir=${placeholder "out"}/share/info" + "--mandir=${placeholder "out"}/share/man" + ] ++ stdenv.lib.optionals static [ + "LDFLAGS=-static" + "--enable-static" + "--disable-shared" + ] ++ stdenv.lib.optionals (!static) [ + "--enable-shared" + ]; + makeFlags = stdenv.lib.optional static "AM_LDFLAGS=-all-static"; dontDisableStatic = static; @@ -32,7 +44,7 @@ stdenv.mkDerivation { description = ''Command-line interface to IPMI-enabled devices''; license = licenses.bsd3; homepage = https://sourceforge.net/projects/ipmitool/; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 2da76cce0cdd..077e1326f208 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -2,13 +2,13 @@ , IOKit ? null , ApplicationServices ? null }: let - version = "7.0"; + version = "7.1"; - dbrev = "4883"; - drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; + dbrev = "5033"; + drivedbBranch = "RELEASE_7_0_DRIVEDB"; driverdb = fetchurl { url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "07x3haz65jyhj579h4z17v6jkw6bbyid34442gl4qddmgv2qzvwx"; + sha256 = "029j118lwiazn56vg6d3i7ayv73wrpv1fypw3ff4nd4hgs2mlcrg"; name = "smartmontools-drivedb.h"; }; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; - sha256 = "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5"; + sha256 = "0imqb7ka4ia5573w8rnpck571pjjc9698pdjcapy9cfyk4n4swrz"; }; patches = [ ./smartmontools.patch ]; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { description = "Tools for monitoring the health of hard drives"; homepage = https://www.smartmontools.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ peti ]; + maintainers = with maintainers; [ peti Frostman ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index ec7e724d1fc3..391e7543eca5 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { --replace "psselect" "${psutils}/bin/psselect" '' + stdenv.lib.optionalString (netpbm != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ - --replace "pnmcut" "${netpbm}/bin/pnmcut" \ - --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \ - --replace "pnmtopng" "${netpbm}/bin/pnmtopng" + --replace "pnmcut" "${stdenv.lib.getBin netpbm}/bin/pnmcut" \ + --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \ + --replace "pnmtopng" "${stdenv.lib.getBin netpbm}/bin/pnmtopng" substituteInPlace tmac/www.tmac \ - --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \ - --replace "pngtopnm" "${netpbm}/bin/pngtopnm" \ - --replace "@PNMTOPS_NOSETPAGE@" "${netpbm}/bin/pnmtops -nosetpage" + --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \ + --replace "pngtopnm" "${stdenv.lib.getBin netpbm}/bin/pngtopnm" \ + --replace "@PNMTOPS_NOSETPAGE@" "${stdenv.lib.getBin netpbm}/bin/pnmtops -nosetpage" ''; buildInputs = [ ghostscript psutils netpbm perl ]; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 585c183a81cb..e273105a14a5 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -18,17 +18,19 @@ , ibus , json-glib , pantheon +, libwnck3 +, xorg }: stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "096xj7n1ypr8ss8mbwd1hyypvmzw5lc0hjlj2d1x8hbjljldfd13"; + sha256 = "0cnx7snw3h7p77fhihvqxb6bgg4s2ffvjr8nbymb4bnqlg2a7v97"; }; nativeBuildInputs = [ @@ -52,6 +54,8 @@ stdenv.mkDerivation rec { dbus ibus json-glib + libwnck3 + xorg.libXtst pantheon.granite pantheon.elementary-gtk-theme pantheon.elementary-icon-theme diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 2a126ac5c839..d5ede51ba0c3 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.32"; + name = "hevea-2.33"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "1s4yqphfcr1pf5mcj5c84mvmd107k525iiym5jdwsxz0ka0ccmfy"; + sha256 = "0115bn6n6hhb08rmj0m508wjcsn1mggiagqly6s941pq811wxymb"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd5584881f87..bfbcbf194151 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -62,9 +62,7 @@ in inherit (lib) lowPrio hiPrio appendToName makeOverridable; - # Applying this to an attribute set will cause nix-env to look - # inside the set for derivations. - recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; + inherit (lib) recurseIntoAttrs; # This is intended to be the reverse of recurseIntoAttrs, as it is # defined now it exists mainly for documentation purposes, but you @@ -72,7 +70,7 @@ in # the Attrs which is useful for testing massive changes. Ideally, # every package subset not marked with recurseIntoAttrs should be # marked with this. - dontRecurseIntoAttrs = x: x; + inherit (lib) dontRecurseIntoAttrs; stringsWithDeps = lib.stringsWithDeps; @@ -929,6 +927,8 @@ in gjs = callPackage ../development/libraries/gjs { }; + glances = python3Packages.callPackage ../applications/system/glances { }; + glasgow = with python3Packages; toPythonApplication glasgow; gucci = callPackage ../tools/text/gucci { }; @@ -4062,7 +4062,7 @@ in pixd = callPackage ../tools/misc/pixd { }; hey = callPackage ../tools/networking/hey { }; - + hhpc = callPackage ../tools/misc/hhpc { }; hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; @@ -4263,9 +4263,7 @@ in ipget = callPackage ../applications/networking/ipget { }; - ipmitool = callPackage ../tools/system/ipmitool { - openssl = openssl_1_0_2; - }; + ipmitool = callPackage ../tools/system/ipmitool {}; ipmiutil = callPackage ../tools/system/ipmiutil {}; @@ -4309,6 +4307,8 @@ in jazzy = callPackage ../development/tools/jazzy { }; + jc = with python3Packages; toPythonApplication jc; + jd = callPackage ../development/tools/jd { }; jd-gui = callPackage ../tools/security/jd-gui { }; @@ -5216,6 +5216,8 @@ in nat-traverse = callPackage ../tools/networking/nat-traverse { }; + navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; }; + nawk = callPackage ../tools/text/nawk { }; nbd = callPackage ../tools/networking/nbd { }; @@ -9445,6 +9447,8 @@ in pipewire = callPackage ../development/libraries/pipewire {}; + pyradio = callPackage ../applications/radio/pyradio {}; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; @@ -9766,7 +9770,16 @@ in bam = callPackage ../development/tools/build-managers/bam {}; - bazel = callPackage ../development/tools/build-managers/bazel { + bazel = callPackage ../development/tools/build-managers/bazel/bazel-latest { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk8; + buildJdkName = "jdk8"; + runJdk = jdk11_headless; + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; + + bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk8; @@ -11383,7 +11396,6 @@ in frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; libjack2 = if stdenv.isDarwin then null else libjack2; - libvmaf = if stdenv.isDarwin then null else libvmaf; libmodplug = if stdenv.isDarwin then null else libmodplug; openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; @@ -12648,9 +12660,7 @@ in libgpiod = callPackage ../development/libraries/libgpiod { }; - libgpod = callPackage ../development/libraries/libgpod { - inherit (pkgs.pythonPackages) mutagen; - }; + libgpod = callPackage ../development/libraries/libgpod { }; libgssglue = callPackage ../development/libraries/libgssglue { }; @@ -13509,6 +13519,8 @@ in neardal = callPackage ../development/libraries/neardal { }; + neatvnc = callPackage ../development/libraries/neatvnc { }; + neon = callPackage ../development/libraries/neon { }; neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { @@ -15244,7 +15256,7 @@ in clickhouse = callPackage ../servers/clickhouse { # clickhouse doesn't build on llvm8. - inherit (llvmPackages_7) clang-unwrapped lld llvm; + inherit (llvmPackages_7) clang-unwrapped lld lldClang llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -17945,6 +17957,8 @@ in sierra-gtk-theme = callPackage ../data/themes/sierra { }; + snowblind = callPackage ../data/themes/snowblind { }; + solarc-gtk-theme = callPackage ../data/themes/solarc { }; soundfont-fluid = callPackage ../data/soundfonts/fluid { }; @@ -18742,6 +18756,7 @@ in djview4 = pkgs.djview; dmenu = callPackage ../applications/misc/dmenu { }; + dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { }; dmensamenu = callPackage ../applications/misc/dmensamenu { inherit (python3Packages) buildPythonApplication requests; @@ -18787,6 +18802,8 @@ in dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; + drawing = callPackage ../applications/graphics/drawing { }; + drawio = callPackage ../applications/graphics/drawio {}; drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; @@ -21074,6 +21091,8 @@ in plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; + plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; + plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; @@ -21177,6 +21196,8 @@ in qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; + qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; + qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {}; garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; @@ -22221,6 +22242,8 @@ in wayv = callPackage ../tools/X11/wayv {}; + wayvnc = callPackage ../applications/networking/remote/wayvnc { }; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; @@ -22880,6 +22903,18 @@ in airstrike = callPackage ../games/airstrike { }; + alephone = callPackage ../games/alephone { ffmpeg = ffmpeg_2; }; + alephone-durandal = callPackage ../games/alephone/durandal { }; + alephone-eternal = callPackage ../games/alephone/eternal { }; + alephone-evil = callPackage ../games/alephone/evil { }; + alephone-infinity = callPackage ../games/alephone/infinity { }; + alephone-marathon = callPackage ../games/alephone/marathon { }; + alephone-pheonix = callPackage ../games/alephone/pheonix { }; + alephone-red = callPackage ../games/alephone/red { }; + alephone-rubicon-x = callPackage ../games/alephone/rubicon-x { }; + alephone-pathways-into-darkness = + callPackage ../games/alephone/pathways-into-darkness { }; + alienarena = callPackage ../games/alienarena { }; amoeba = callPackage ../games/amoeba { }; @@ -23803,7 +23838,7 @@ in drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; - impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { }; + impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; @@ -23822,6 +23857,8 @@ in mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; }; + gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { }; + hsetroot = callPackage ../tools/X11/hsetroot { }; imwheel = callPackage ../tools/X11/imwheel { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 471810235399..15bd1d616770 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1229,7 +1229,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_10 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.10.nix { }); - ocamlPackages_latest = ocamlPackages_4_09; + ocamlPackages_latest = ocamlPackages_4_10; ocamlPackages = ocamlPackages_4_07; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 903d4e40f54b..316be1531529 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -532,6 +532,21 @@ let }; }; + Applify = buildPerlPackage { + pname = "Applify"; + version = "0.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.21.tar.gz"; + sha256 = "e34bc64c12c42369af6db7d17e3e20059b9d97ed50f8e487bf610008525eb84d"; + }; + meta = { + homepage = "https://github.com/jhthorsen/applify"; + description = "Write object oriented scripts with ease"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + Appperlbrew = buildPerlModule { pname = "App-perlbrew"; version = "0.88"; @@ -9708,10 +9723,10 @@ let JSONValidator = buildPerlPackage { pname = "JSON-Validator"; - version = "3.18"; + version = "3.23"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-3.18.tar.gz; - sha256 = "a62474311b57c0a01ad06a5e340ec10d3723d74fd019304c769ffc7a61b5a47a"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-3.23.tar.gz"; + sha256 = "1fzy2z7mkg5vgcjvykh5ay8yg6q496wi14x9wp5hc9agplsq7f0s"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; @@ -13120,6 +13135,11 @@ let url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz; sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406"; }; + + postPatch = '' + ln -s --force ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt lib/Mozilla/CA/cacert.pem + ''; + meta = { description = "Mozilla's CA cert bundle in PEM format"; license = stdenv.lib.licenses.mpl20; @@ -14058,6 +14078,22 @@ let }; }; + OpenAPIClient = buildPerlPackage rec { + pname = "OpenAPI-Client"; + version = "0.24"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-0.24.tar.gz"; + sha256 = "2420a2d1a9bc24a644c9ba12d77f1252ac2209ef0ac5a432153fe49c840faf28"; + }; + propagatedBuildInputs = [ JSONValidator MojoliciousPluginOpenAPI ]; + meta = { + homepage = "https://github.com/jhthorsen/openapi-client"; + description = "A client for talking to an Open API powered server"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + OpenGL = buildPerlPackage rec { pname = "OpenGL"; version = "0.70"; @@ -19276,6 +19312,20 @@ let buildInputs = [ FileFindRule TestPod TestPodCoverage ]; }; + TextLorem = buildPerlModule { + pname = "Text-Lorem"; + version = "0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADEOLA/Text-Lorem-0.3.tar.gz"; + sha256 = "64bb636fb21213101a646b414ecbdc1b55edf905cbcdc7f5d24774ec5061fe2d"; + }; + meta = { + description = "Generate random Latin looking text"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + TestManifest = buildPerlPackage { pname = "Test-Manifest"; version = "2.021"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5903b535f602..50bf1ae5dbfc 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -74,12 +74,12 @@ let }; composer = mkDerivation rec { - version = "1.9.1"; + version = "1.9.3"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "04a1fqxhxrckgxw9xbx7mplkzw808k2dz4jqsxq2dy7w6y80n88z"; + sha256 = "VRZVwvyB9BBlCPQrvEsk6r00sCKxO8Hn2WQr9IPQp9Q="; }; dontUnpack = true; @@ -441,12 +441,12 @@ let }; phpstan = mkDerivation rec { - version = "0.12.4"; + version = "0.12.14"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "1h386zsbfw9f1r00pjbvj749q1fg5q22sgrnx7rqjrnwmbl5mh36"; + sha256 = "JAq1/+bVhTgKRR7oFusqZ/yBOYewaOM38ZoiCjirsTg="; }; phases = [ "installPhase" ]; @@ -536,12 +536,12 @@ let }; psalm = mkDerivation rec { - version = "3.7.2"; + version = "3.9.3"; pname = "psalm"; src = pkgs.fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "0mcxlckycvpxxc6h0x0kdidbq2l4m3xws1v3kdf797js234x0vjx"; + sha256 = "KHm2n06y/yxN5B2rCVxT5ja7HxkyxAMsjZ5HLb3xr4M="; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53b7eba5f30c..74f2112f0ec4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -187,7 +187,7 @@ in { argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; - aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2 poetry; }; + aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2; }; arviz = callPackage ../development/python-modules/arviz { }; @@ -803,8 +803,12 @@ in { janus = callPackage ../development/python-modules/janus { }; + jc = callPackage ../development/python-modules/jc { }; + jira = callPackage ../development/python-modules/jira { }; + jsonpath = callPackage ../development/python-modules/jsonpath { }; + junit-xml = callPackage ../development/python-modules/junit-xml { }; junitparser = callPackage ../development/python-modules/junitparser { }; @@ -879,6 +883,8 @@ in { mpi = pkgs.openmpi; }; + python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; + msal = callPackage ../development/python-modules/msal { }; msal-extensions = callPackage ../development/python-modules/msal-extensions { }; @@ -947,6 +953,8 @@ in { osmnx = callPackage ../development/python-modules/osmnx { }; + osmpythontools = callPackage ../development/python-modules/osmpythontools { }; + outcome = callPackage ../development/python-modules/outcome {}; ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { @@ -975,6 +983,8 @@ in { pdfx = callPackage ../development/python-modules/pdfx { }; + pushover-complete = callPackage ../development/python-modules/pushover-complete { }; + pyicloud = callPackage ../development/python-modules/pyicloud { }; pyperf = callPackage ../development/python-modules/pyperf { }; @@ -2775,6 +2785,8 @@ in { gtimelog = callPackage ../development/python-modules/gtimelog { }; + gtts = callPackage ../development/python-modules/gtts { }; + gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; @@ -3718,7 +3730,7 @@ in { git-sweep = callPackage ../development/python-modules/git-sweep { }; - glances = callPackage ../development/python-modules/glances { }; + glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 github3_py = callPackage ../development/python-modules/github3_py { }; @@ -3926,6 +3938,8 @@ in { ifaddr = callPackage ../development/python-modules/ifaddr { }; + ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; + imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; imageio = callPackage ../development/python-modules/imageio { }; @@ -4884,7 +4898,7 @@ in { protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; - protobuf = pkgs.protobuf; + protobuf = pkgs.protobuf3_8; }; psd-tools = callPackage ../development/python-modules/psd-tools { }; @@ -6645,6 +6659,7 @@ in { zerobin = callPackage ../development/python-modules/zerobin { }; tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; + tensorflow-estimator_1_15_1 = callPackage ../development/python-modules/tensorflow-estimator/1_15_1.nix { }; tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; @@ -6663,7 +6678,7 @@ in { cudatoolkit = pkgs.cudatoolkit_10; cudnn = pkgs.cudnn_cudatoolkit_10; nccl = pkgs.nccl_cudatoolkit_10; - openssl = pkgs.openssl_1_0_2; + openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; }; |