diff options
272 files changed, 5330 insertions, 2802 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index bde2aaca2ee..d305001a5c1 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -153,6 +153,11 @@ in mkLicense lset) ({ free = false; }; + capec = { + fullName = "Common Attack Pattern Enumeration and Classification"; + url = "https://capec.mitre.org/about/termsofuse.html"; + }; + clArtistic = { spdxId = "ClArtistic"; fullName = "Clarified Artistic License"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6093288ec03..4618badb1dd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1197,6 +1197,12 @@ email = "sivaraman.balaji@gmail.com"; name = "Balaji Sivaraman"; }; + balodja = { + email = "balodja@gmail.com"; + github = "balodja"; + githubId = 294444; + name = "Vladimir Korolev"; + }; baloo = { email = "nixpkgs@superbaloo.net"; github = "baloo"; @@ -10406,6 +10412,12 @@ fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; }]; }; + sirseruju = { + email = "sir.seruju@yandex.ru"; + github = "sirseruju"; + githubId = 74881555; + name = "Fofanov Sergey"; + }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; @@ -10501,6 +10513,13 @@ githubId = 4477729; name = "Sergey Mironov"; }; + smitop = { + name = "Smitty van Bodegom"; + email = "me@smitop.com"; + matrix = "@smitop:kde.org"; + github = "Smittyvb"; + githubId = 10530973; + }; sna = { email = "abouzahra.9@wright.edu"; github = "s-na"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 700ad741c00..023f0f57a9b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -57,6 +57,11 @@ </listitem> <listitem> <para> + KDE Plasma now finally works on Wayland. + </para> + </listitem> + <listitem> + <para> bash now defaults to major version 5. </para> </listitem> @@ -1106,6 +1111,23 @@ Superuser created successfully. functionality. </para> </listitem> + <listitem> + <para> + <literal>services.xserver.displayManager.defaultSession = "plasma5"</literal> + does not work anymore, instead use either + <literal>"plasma"</literal> for the Plasma X11 + session or <literal>"plasmawayland"</literal> for + the Plasma Wayland sesison. + </para> + </listitem> + <listitem> + <para> + <literal>boot.kernelParams</literal> now only accepts one + command line parameter per string. This change is aimed to + reduce common mistakes like <quote>param = 12</quote>, which + would be parsed as 3 parameters. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> @@ -1513,6 +1535,25 @@ Superuser created successfully. release notes</link> for changes and upgrade instructions. </para> </listitem> + <listitem> + <para> + The <literal>systemd.network</literal> module has gained + support for the FooOverUDP link type. + </para> + </listitem> + <listitem> + <para> + The <literal>networking</literal> module has a new + <literal>networking.fooOverUDP</literal> option to configure + Foo-over-UDP encapsulations. + </para> + </listitem> + <listitem> + <para> + <literal>networking.sits</literal> now supports Foo-over-UDP + encapsulation. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index f92721e2fc7..658f3b59da6 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -346,6 +346,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `opencv2` no longer includes the non-free libraries by default, and consequently `pfstools` no longer includes OpenCV support by default. Both packages now support an `enableUnfree` option to re-enable this functionality. - `services.xserver.displayManager.defaultSession = "plasma5"` does not work anymore, instead use either `"plasma"` for the Plasma X11 session or `"plasmawayland"` for the Plasma Wayland sesison. +- `boot.kernelParams` now only accepts one command line parameter per string. This change is aimed to reduce common mistakes like "param = 12", which would be parsed as 3 parameters. + ## Other Notable Changes {#sec-release-21.11-notable-changes} @@ -441,3 +443,9 @@ In addition to numerous new and upgraded packages, this release has the followin - Three new options, [xdg.mime.addedAssociations](#opt-xdg.mime.addedAssociations), [xdg.mime.defaultApplications](#opt-xdg.mime.defaultApplications), and [xdg.mime.removedAssociations](#opt-xdg.mime.removedAssociations) have been added to the [xdg.mime](#opt-xdg.mime.enable) module to allow the configuration of `/etc/xdg/mimeapps.list`. - Kopia was upgraded from 0.8.x to 0.9.x. Please read the [upstream release notes](https://github.com/kopia/kopia/releases/tag/v0.9.0) for changes and upgrade instructions. + +- The `systemd.network` module has gained support for the FooOverUDP link type. + +- The `networking` module has a new `networking.fooOverUDP` option to configure Foo-over-UDP encapsulations. + +- `networking.sits` now supports Foo-over-UDP encapsulation. diff --git a/nixos/modules/programs/evince.nix b/nixos/modules/programs/evince.nix index 473fddb09d0..c033230afb1 100644 --- a/nixos/modules/programs/evince.nix +++ b/nixos/modules/programs/evince.nix @@ -4,7 +4,9 @@ with lib; -{ +let cfg = config.programs.evince; + +in { # Added 2019-08-09 imports = [ @@ -22,6 +24,13 @@ with lib; enable = mkEnableOption "Evince, the GNOME document viewer"; + package = mkOption { + type = types.package; + default = pkgs.evince; + defaultText = literalExpression "pkgs.evince"; + description = "Evince derivation to use."; + }; + }; }; @@ -31,11 +40,11 @@ with lib; config = mkIf config.programs.evince.enable { - environment.systemPackages = [ pkgs.evince ]; + environment.systemPackages = [ cfg.package ]; - services.dbus.packages = [ pkgs.evince ]; + services.dbus.packages = [ cfg.package ]; - systemd.packages = [ pkgs.evince ]; + systemd.packages = [ cfg.package ]; }; diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix index 6c60daf21f9..06ce374b199 100644 --- a/nixos/modules/programs/git.nix +++ b/nixos/modules/programs/git.nix @@ -20,7 +20,7 @@ in }; config = mkOption { - type = types.attrs; + type = with types; attrsOf (attrsOf anything); default = { }; example = { init.defaultBranch = "main"; diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index c7c9871cfec..f7383b2023a 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -96,9 +96,8 @@ let }; } cfg.extraConfig; - configFile = pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; + configFile = pkgs.runCommandLocal "config.toml" { + nativeBuildInputs = [ pkgs.remarshal ]; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \ diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix index 01e420db389..ef829a1b7d0 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix @@ -61,6 +61,11 @@ in serviceConfig = { # rtl-sdr udev rules make supported USB devices +rw by plugdev. SupplementaryGroups = "plugdev"; + # rtl_433 needs rw access to the USB radio. + PrivateDevices = lib.mkForce false; + DeviceAllow = lib.mkForce "char-usb_device rw"; + RestrictAddressFamilies = [ "AF_NETLINK" ]; + ExecStart = let matchers = (map (m: "--channel_matcher '${m.name},${toString m.channel},${m.location}'" diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index e4f31c3a939..2eacd87ae6f 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -144,6 +144,8 @@ in ''; }; + caddy.enable = mkEnableOption "Whether to enablle caddy reverse proxy to expose jitsi-meet"; + prosody.enable = mkOption { type = bool; default = true; @@ -322,6 +324,42 @@ in }; }; + services.caddy = mkIf cfg.caddy.enable { + enable = mkDefault true; + virtualHosts.${cfg.hostName} = { + extraConfig = + let + templatedJitsiMeet = pkgs.runCommand "templated-jitsi-meet" {} '' + cp -R ${pkgs.jitsi-meet}/* . + for file in *.html **/*.html ; do + ${pkgs.sd}/bin/sd '<!--#include virtual="(.*)" -->' '{{ include "$1" }}' $file + done + rm config.js + rm interface_config.js + cp -R . $out + cp ${overrideJs "${pkgs.jitsi-meet}/config.js" "config" (recursiveUpdate defaultCfg cfg.config) cfg.extraConfig} $out/config.js + cp ${overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig ""} $out/interface_config.js + cp ./libs/external_api.min.js $out/external_api.js + ''; + in '' + handle /http-bind { + header Host ${cfg.hostName} + reverse_proxy 127.0.0.1:5280 + } + handle /xmpp-websocket { + reverse_proxy 127.0.0.1:5280 + } + handle { + templates + root * ${templatedJitsiMeet} + try_files {path} {path} + try_files {path} /index.html + file_server + } + ''; + }; + }; + services.jitsi-videobridge = mkIf cfg.videobridge.enable { enable = true; xmppConfigs."localhost" = { diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 10969a373bb..112f493b811 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -219,6 +219,7 @@ in ] config.environment.pantheon.excludePackages); programs.evince.enable = mkDefault true; + programs.evince.package = pkgs.pantheon.evince; programs.file-roller.enable = mkDefault true; # Settings from elementary-default-settings diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 46f2e3fec04..4a9da939451 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -83,7 +83,10 @@ in }; boot.kernelParams = mkOption { - type = types.listOf types.str; + type = types.listOf (types.strMatching ''([^"[:space:]]|"[^"]*")+'' // { + name = "kernelParam"; + description = "string, with spaces inside double quotes"; + }); default = [ ]; description = "Parameters added to the kernel command line."; }; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 51e105bf627..662dfe2db98 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -250,6 +250,16 @@ let (assertRange "ERSPANIndex" 1 1048575) ]; + sectionFooOverUDP = checkUnitConfig "FooOverUDP" [ + (assertOnlyFields [ + "Port" + "Encapsulation" + "Protocol" + ]) + (assertPort "Port") + (assertValueOneOf "Encapsulation" ["FooOverUDP" "GenericUDPEncapsulation"]) + ]; + sectionPeer = checkUnitConfig "Peer" [ (assertOnlyFields [ "Name" @@ -919,6 +929,18 @@ let ''; }; + fooOverUDPConfig = mkOption { + default = { }; + example = { Port = 9001; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionFooOverUDP; + description = '' + Each attribute in this set specifies an option in the + <literal>[FooOverUDP]</literal> section of the unit. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> for details. + ''; + }; + peerConfig = mkOption { default = {}; example = { Name = "veth2"; }; @@ -1449,6 +1471,10 @@ let [Tunnel] ${attrsToSection def.tunnelConfig} '' + + optionalString (def.fooOverUDPConfig != { }) '' + [FooOverUDP] + ${attrsToSection def.fooOverUDPConfig} + '' + optionalString (def.peerConfig != { }) '' [Peer] ${attrsToSection def.peerConfig} diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 79624ec7072..e8e2de090b3 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -466,6 +466,39 @@ let ''; }); + createFouEncapsulation = n: v: nameValuePair "${n}-fou-encap" + (let + # if we have a device to bind to we can wait for its addresses to be + # configured, otherwise external sequencing is required. + deps = optionals (v.local != null && v.local.dev != null) + (deviceDependency v.local.dev ++ [ "network-addresses-${v.local.dev}.service" ]); + fouSpec = "port ${toString v.port} ${ + if v.protocol != null then "ipproto ${toString v.protocol}" else "gue" + } ${ + optionalString (v.local != null) "local ${escapeShellArg v.local.address} ${ + optionalString (v.local.dev != null) "dev ${escapeShellArg v.local.dev}" + }" + }"; + in + { description = "FOU endpoint ${n}"; + wantedBy = [ "network-setup.service" (subsystemDevice n) ]; + bindsTo = deps; + partOf = [ "network-setup.service" ]; + after = [ "network-pre.target" ] ++ deps; + before = [ "network-setup.service" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + path = [ pkgs.iproute2 ]; + script = '' + # always remove previous incarnation since show can't filter + ip fou del ${fouSpec} >/dev/null 2>&1 || true + ip fou add ${fouSpec} + ''; + postStop = '' + ip fou del ${fouSpec} || true + ''; + }); + createSitDevice = n: v: nameValuePair "${n}-netdev" (let deps = deviceDependency v.dev; @@ -486,7 +519,12 @@ let ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ ${optionalString (v.ttl != null) "ttl ${toString v.ttl}"} \ - ${optionalString (v.dev != null) "dev \"${v.dev}\""} + ${optionalString (v.dev != null) "dev \"${v.dev}\""} \ + ${optionalString (v.encapsulation != null) + "encap ${v.encapsulation.type} encap-dport ${toString v.encapsulation.port} ${ + optionalString (v.encapsulation.sourcePort != null) + "encap-sport ${toString v.encapsulation.sourcePort}" + }"} ip link set "${n}" up ''; postStop = '' @@ -530,6 +568,7 @@ let // mapAttrs' createVswitchDevice cfg.vswitches // mapAttrs' createBondDevice cfg.bonds // mapAttrs' createMacvlanDevice cfg.macvlans + // mapAttrs' createFouEncapsulation cfg.fooOverUDP // mapAttrs' createSitDevice cfg.sits // mapAttrs' createVlanDevice cfg.vlans // { diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 225f9dc67fc..ccfd7fd4132 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -47,6 +47,9 @@ in } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; + }) ++ flip mapAttrsToList cfg.fooOverUDP (n: { local, ... }: { + assertion = local == null; + message = "networking.fooOverUDP.${n}.local is not supported by networkd."; }); networking.dhcpcd.enable = mkDefault false; @@ -194,6 +197,23 @@ in macvlan = [ name ]; } ]); }))) + (mkMerge (flip mapAttrsToList cfg.fooOverUDP (name: fou: { + netdevs."40-${name}" = { + netdevConfig = { + Name = name; + Kind = "fou"; + }; + # unfortunately networkd cannot encode dependencies of netdevs on addresses/routes, + # so we cannot specify Local=, Peer=, PeerPort=. this looks like a missing feature + # in networkd. + fooOverUDPConfig = { + Port = fou.port; + Encapsulation = if fou.protocol != null then "FooOverUDP" else "GenericUDPEncapsulation"; + } // (optionalAttrs (fou.protocol != null) { + Protocol = fou.protocol; + }); + }; + }))) (mkMerge (flip mapAttrsToList cfg.sits (name: sit: { netdevs."40-${name}" = { netdevConfig = { @@ -207,7 +227,17 @@ in Local = sit.local; }) // (optionalAttrs (sit.ttl != null) { TTL = sit.ttl; - }); + }) // (optionalAttrs (sit.encapsulation != null) ( + { + FooOverUDP = true; + Encapsulation = + if sit.encapsulation.type == "fou" + then "FooOverUDP" + else "GenericUDPEncapsulation"; + FOUDestinationPort = sit.encapsulation.port; + } // (optionalAttrs (sit.encapsulation.sourcePort != null) { + FOUSourcePort = sit.encapsulation.sourcePort; + }))); }; networks = mkIf (sit.dev != null) { "40-${sit.dev}" = (mkMerge [ (genericNetwork (mkOverride 999)) { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 313b0fac7da..4e20ec11846 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -10,6 +10,8 @@ let hasVirtuals = any (i: i.virtual) interfaces; hasSits = cfg.sits != { }; hasBonds = cfg.bonds != { }; + hasFous = cfg.fooOverUDP != { } + || filterAttrs (_: s: s.encapsulation != null) cfg.sits != { }; slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) @@ -823,6 +825,71 @@ in }); }; + networking.fooOverUDP = mkOption { + default = { }; + example = + { + primary = { port = 9001; local = { address = "192.0.2.1"; dev = "eth0"; }; }; + backup = { port = 9002; }; + }; + description = '' + This option allows you to configure Foo Over UDP and Generic UDP Encapsulation + endpoints. See <citerefentry><refentrytitle>ip-fou</refentrytitle> + <manvolnum>8</manvolnum></citerefentry> for details. + ''; + type = with types; attrsOf (submodule { + options = { + port = mkOption { + type = port; + description = '' + Local port of the encapsulation UDP socket. + ''; + }; + + protocol = mkOption { + type = nullOr (ints.between 1 255); + default = null; + description = '' + Protocol number of the encapsulated packets. Specifying <literal>null</literal> + (the default) creates a GUE endpoint, specifying a protocol number will create + a FOU endpoint. + ''; + }; + + local = mkOption { + type = nullOr (submodule { + options = { + address = mkOption { + type = types.str; + description = '' + Local address to bind to. The address must be available when the FOU + endpoint is created, using the scripted network setup this can be achieved + either by setting <literal>dev</literal> or adding dependency information to + <literal>systemd.services.<name>-fou-encap</literal>; it isn't supported + when using networkd. + ''; + }; + + dev = mkOption { + type = nullOr str; + default = null; + example = "eth0"; + description = '' + Network device to bind to. + ''; + }; + }; + }); + default = null; + example = { address = "203.0.113.22"; }; + description = '' + Local address (and optionally device) to bind to using the given port. + ''; + }; + }; + }); + }; + networking.sits = mkOption { default = { }; example = literalExpression '' @@ -882,6 +949,44 @@ in ''; }; + encapsulation = with types; mkOption { + type = nullOr (submodule { + options = { + type = mkOption { + type = enum [ "fou" "gue" ]; + description = '' + Selects encapsulation type. See + <citerefentry><refentrytitle>ip-link</refentrytitle> + <manvolnum>8</manvolnum></citerefentry> for details. + ''; + }; + + port = mkOption { + type = port; + example = 9001; + description = '' + Destination port for encapsulated packets. + ''; + }; + + sourcePort = mkOption { + type = nullOr types.port; + default = null; + example = 9002; + description = '' + Source port for encapsulated packets. Will be chosen automatically by + the kernel if unset. + ''; + }; + }; + }); + default = null; + example = { type = "fou"; port = 9001; }; + description = '' + Configures encapsulation in UDP packets. + ''; + }; + }; }); @@ -1116,7 +1221,8 @@ in boot.kernelModules = [ ] ++ optional hasVirtuals "tun" ++ optional hasSits "sit" - ++ optional hasBonds "bonding"; + ++ optional hasBonds "bonding" + ++ optional hasFous "fou"; boot.extraModprobeConfig = # This setting is intentional as it prevents default bond devices diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 77b43d9d843..aef04a510ab 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -109,6 +109,23 @@ in { ''; }; + qemuOvmfPackage = mkOption { + type = types.package; + default = pkgs.OVMF; + defaultText = literalExpression "pkgs.OVMF"; + example = literalExpression "pkgs.OVMFFull"; + description = '' + OVMF package to use. + ''; + }; + qemuSwtpm = mkOption { + type = types.bool; + default = false; + description = '' + Allows libvirtd to use swtpm to create an emulated TPM. + ''; + }; + extraOptions = mkOption { type = types.listOf types.str; default = [ ]; @@ -161,6 +178,10 @@ in { assertion = config.security.polkit.enable; message = "The libvirtd module currently requires Polkit to be enabled ('security.polkit.enable = true')."; } + { + assertion = builtins.elem "fd" cfg.qemuOvmfPackage.outputs; + message = "The option 'virtualisation.libvirtd.qemuOvmfPackage' needs a package that has an 'fd' output."; + } ]; environment = { @@ -218,8 +239,8 @@ in { done ${optionalString cfg.qemuOvmf '' - ln -s --force ${pkgs.OVMF.fd}/FV/${ovmfFilePrefix}_CODE.fd /run/${dirName}/nix-ovmf/ - ln -s --force ${pkgs.OVMF.fd}/FV/${ovmfFilePrefix}_VARS.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${cfg.qemuOvmfPackage.fd}/FV/${ovmfFilePrefix}_CODE.fd /run/${dirName}/nix-ovmf/ + ln -s --force ${cfg.qemuOvmfPackage.fd}/FV/${ovmfFilePrefix}_VARS.fd /run/${dirName}/nix-ovmf/ ''} ''; @@ -243,7 +264,8 @@ in { ] ++ cfg.extraOptions); path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images - ++ optional vswitch.enable vswitch.package; + ++ optional vswitch.enable vswitch.package + ++ optional cfg.qemuSwtpm pkgs.swtpm; serviceConfig = { Type = "notify"; diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index e482223436f..7110187e8d7 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -383,5 +383,18 @@ import ./make-test-python.nix ({ pkgs, ... }: { docker.succeed( "tar -tf ${examples.exportBash} | grep '\./bin/bash' > /dev/null" ) + + with subtest("Ensure bare paths in contents are loaded correctly"): + docker.succeed( + "docker load --input='${examples.build-image-with-path}'", + "docker run --rm build-image-with-path bash -c '[[ -e /hello.txt ]]'", + "docker rmi build-image-with-path", + ) + docker.succeed( + "${examples.layered-image-with-path} | docker load", + "docker run --rm layered-image-with-path bash -c '[[ -e /hello.txt ]]'", + "docker rmi layered-image-with-path", + ) + ''; }) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 8b947ddf0cf..647c8942b37 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -380,12 +380,57 @@ let router.wait_until_succeeds("ping -c 1 192.168.1.3") ''; }; + fou = { + name = "foo-over-udp"; + nodes.machine = { ... }: { + virtualisation.vlans = [ 1 ]; + networking = { + useNetworkd = networkd; + useDHCP = false; + interfaces.eth1.ipv4.addresses = mkOverride 0 + [ { address = "192.168.1.1"; prefixLength = 24; } ]; + fooOverUDP = { + fou1 = { port = 9001; }; + fou2 = { port = 9002; protocol = 41; }; + fou3 = mkIf (!networkd) + { port = 9003; local.address = "192.168.1.1"; }; + fou4 = mkIf (!networkd) + { port = 9004; local = { address = "192.168.1.1"; dev = "eth1"; }; }; + }; + }; + systemd.services = { + fou3-fou-encap.after = optional (!networkd) "network-addresses-eth1.service"; + }; + }; + testScript = { ... }: + '' + import json + + machine.wait_for_unit("network.target") + fous = json.loads(machine.succeed("ip -json fou show")) + assert {"port": 9001, "gue": None, "family": "inet"} in fous, "fou1 exists" + assert {"port": 9002, "ipproto": 41, "family": "inet"} in fous, "fou2 exists" + '' + optionalString (!networkd) '' + assert { + "port": 9003, + "gue": None, + "family": "inet", + "local": "192.168.1.1", + } in fous, "fou3 exists" + assert { + "port": 9004, + "gue": None, + "family": "inet", + "local": "192.168.1.1", + "dev": "eth1", + } in fous, "fou4 exists" + ''; + }; sit = let node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; - firewall.enable = false; useDHCP = false; sits.sit = { inherit remote; @@ -400,8 +445,30 @@ let }; in { name = "Sit"; - nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; }; - nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; }; + # note on firewalling: the two nodes are explicitly asymmetric. + # client1 sends SIT packets in UDP, but accepts only proto-41 incoming. + # client2 does the reverse, sending in proto-41 and accepting only UDP incoming. + # that way we'll notice when either SIT itself or FOU breaks. + nodes.client1 = args@{ pkgs, ... }: + mkMerge [ + (node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; } args) + { + networking = { + firewall.extraCommands = "iptables -A INPUT -p 41 -j ACCEPT"; + sits.sit.encapsulation = { type = "fou"; port = 9001; }; + }; + } + ]; + nodes.client2 = args@{ pkgs, ... }: + mkMerge [ + (node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; } args) + { + networking = { + firewall.allowedUDPPorts = [ 9001 ]; + fooOverUDP.fou1 = { port = 9001; protocol = 41; }; + }; + } + ]; testScript = { ... }: '' start_all() diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index f791ad51bf9..4830476af2c 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cmake, pkg-config, alsa-lib ? null, fftwFloat, fltk13 -, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null +, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null , libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null , qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }: @@ -21,7 +21,7 @@ mkDerivation rec { alsa-lib fftwFloat fltk13 - fluidsynth_1 + fluidsynth lame libgig libjack2 diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index cd24bec3035..870584d357e 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { version = "1.3.0.1"; src = fetchFromGitHub { - rev = version; - repo = "mimic1"; owner = "MycroftAI"; + repo = "mimic1"; + rev = version; sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id"; }; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index a0adc22af7b..10418c418f6 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.9.2"; + version = "21.10.2"; name = "${pname}-${version}"; suffix = { @@ -18,9 +18,9 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | rg ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-mgip818sGkrKwF4v2mj/JeTNxBoj7DgdNPoxZ8sp8OvojHB2sa0hm4YXfrzAdPf8CP6d5ChUmwccQyYilGUiOQ=="; - x86_64-linux = "sha512-f02m8Q6ITYhIXH1FS2BA/QYYsdtxklDDNYBXBarj8b1kA+yhDFZ3VL9vy+nZNdPQHQ2yMQreDzpcToXBQ67XyQ=="; + sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' + aarch64-linux = "sha512-+qXN9cQk1u18ZzeMecPNfhkTTsw61iM/IJYksPJl9+zx2AKldv9tAFUnnmKZ65LabiaIXI+emN185SRRcaOndw=="; + x86_64-linux = "sha512-WpiG8VOEODqsQ1/jERiEEGwVqR0zbMqERGjOysEVYorA0p3xZyl7OSpWOSWaUjPBZpQtJIBdqhSXeoSRcvfJgg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix index c0fb5680461..0d9028e59fc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix @@ -7,13 +7,13 @@ trivialBuild rec { pname = "apheleia"; - version = "0.pre+unstable=2021-08-08"; + version = "1.1.2+unstable=2021-10-03"; src = fetchFromGitHub { owner = "raxod502"; repo = pname; - rev = "8e022c67fea4248f831c678b31c19646cbcbbf6f"; - hash = "sha256-Put/BBQ7V423C18UIVfaM17T+TDWtAxRZi7WI8doPJw="; + rev = "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd"; + hash = "sha256-QwGlCdHBll16mbfQxGw1EORZFUxYCZSt8ThYTTGjRpo="; }; buildInputs = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 8d6ba3540bd..7eb9f12a5a0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -369,10 +369,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.0.2.tar"; - sha256 = "07m832kn4d6njfz21qfmh12gzd35d17v29pqlxfq9v03cazww4lr"; + url = "https://elpa.gnu.org/packages/boxy-1.0.4.tar"; + sha256 = "0cwzjyj8yjg13b63va6pnj01m6kc5g3zx69c9w2ysl2wk24zn6dz"; }; packageRequires = [ emacs ]; meta = { @@ -380,18 +380,18 @@ license = lib.licenses.free; }; }) {}; - boxy-headlines = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }: + boxy-headings = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { - pname = "boxy-headlines"; - ename = "boxy-headlines"; - version = "1.0.2"; + pname = "boxy-headings"; + ename = "boxy-headings"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headlines-1.0.2.tar"; - sha256 = "1j8j2vc318mb4i116qs9zj6cvkiy1fips09mkzj6lqr25qk5fi31"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.0.tar"; + sha256 = "021w4ic028jsq7vxz1jgnfny9dymcz6v112b3b3nwyw3g3dnc62f"; }; - packageRequires = [ boxy emacs ]; + packageRequires = [ boxy emacs org ]; meta = { - homepage = "https://elpa.gnu.org/packages/boxy-headlines.html"; + homepage = "https://elpa.gnu.org/packages/boxy-headings.html"; license = lib.licenses.free; }; }) {}; @@ -666,10 +666,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.11.tar"; - sha256 = "14zjhsfhq5g9257maivyzpj5qxi1kprcsdk1qalwybyylyb4q4kk"; + url = "https://elpa.gnu.org/packages/consult-0.12.tar"; + sha256 = "0xcr7jki9m30hppy24z74nrw7xv5nahm1yrjilcck32mxfkrc69x"; }; packageRequires = [ emacs ]; meta = { @@ -696,10 +696,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.11"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.11.tar"; - sha256 = "1sf7ll25ry7vwff4bvqgdh84zviqj6wifmqdb2z8hf12awz63icz"; + url = "https://elpa.gnu.org/packages/corfu-0.13.tar"; + sha256 = "0psvkxr7fjqq7gkqdzl0ma367zjlxgixk563vpv9hmwfwymddyyb"; }; packageRequires = [ emacs ]; meta = { @@ -1086,10 +1086,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.5.tar"; - sha256 = "1p2chzj5hnaiqhammvdp82ck5pi6h1rl9r782zaqxrhrqsp3vg09"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.6.tar"; + sha256 = "0amr1s1q5w4513qw31qsr8gpsfgj5b2j7qn017rmwbaf1mj0k6z0"; }; packageRequires = [ emacs seq ]; meta = { @@ -1146,10 +1146,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20211006"; + version = "20211011"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20211006.tar"; - sha256 = "08z9q5y46fqm7r1gwiv0ir2hcybwfrvh0b7pxsrppjs1gvclyazn"; + url = "https://elpa.gnu.org/packages/eev-20211011.tar"; + sha256 = "1a71qam6z5s3zl7fvxpsnabbqxh8a7llm1524nxs2353pb6ksfra"; }; packageRequires = [ emacs ]; meta = { @@ -1325,6 +1325,21 @@ license = lib.licenses.free; }; }) {}; + erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "erc"; + ename = "erc"; + version = "5.4.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/erc-5.4.1.tar"; + sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/erc.html"; + license = lib.licenses.free; + }; + }) {}; ergoemacs-mode = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -2084,16 +2099,16 @@ license = lib.licenses.free; }; }) {}; - kiwix = callPackage ({ elpaBuild, elquery, emacs, fetchurl, lib, request }: + kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: elpaBuild { pname = "kiwix"; ename = "kiwix"; - version = "1.1.0"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kiwix-1.1.0.tar"; - sha256 = "1clp0q34bs395d0hrqdyvm9ds665hgf5qrdiqa14k31h4lbv2wsn"; + url = "https://elpa.gnu.org/packages/kiwix-1.1.4.tar"; + sha256 = "1ls11a7fc6d4gj85g8m09r95fvc4ppc0k0fs28d1hzybmgl89rgl"; }; - packageRequires = [ elquery emacs request ]; + packageRequires = [ emacs request ]; meta = { homepage = "https://elpa.gnu.org/packages/kiwix.html"; license = lib.licenses.free; @@ -2268,10 +2283,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.8.tar"; - sha256 = "0afry11i7kgfa0q83p63hmahl7jzsqhn4sl1rnkjy98pnikwv9kd"; + url = "https://elpa.gnu.org/packages/marginalia-0.9.tar"; + sha256 = "0jnw9ys7p2rhi7sx2wxi3xs95ryg9vr34xb2jdfiz0p1xv04a300"; }; packageRequires = [ emacs ]; meta = { @@ -2577,14 +2592,29 @@ license = lib.licenses.free; }; }) {}; + nano-agenda = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "nano-agenda"; + ename = "nano-agenda"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nano-agenda-0.1.tar"; + sha256 = "1bylgd4ly6dybpg66ndgsmgs5w0y5ymfq3s2pbwjnl46fnrmggz0"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nano-agenda.html"; + license = lib.licenses.free; + }; + }) {}; nano-modeline = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-modeline-0.1.tar"; - sha256 = "10hnxgjp56dqydf39mbn9zmwwvnwzi89lwnam5k3x6d6p2cnfgcx"; + url = "https://elpa.gnu.org/packages/nano-modeline-0.2.tar"; + sha256 = "13m8j8jnd33wwv1siv6frzdbs7bhspg859sflq58vimv444zjzac"; }; packageRequires = [ emacs ]; meta = { @@ -2596,10 +2626,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.2"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.2.tar"; - sha256 = "0kcirnl1fg9kvavw8aq9l16jv4rrxv5w62i7wrsjn7np697sm0s6"; + url = "https://elpa.gnu.org/packages/nano-theme-0.2.1.tar"; + sha256 = "0m98kq40dhbrn55x4bp2x5d5j1gps4y7z4086mgnj8wr1y3w8kdl"; }; packageRequires = [ emacs ]; meta = { @@ -2791,16 +2821,16 @@ license = lib.licenses.free; }; }) {}; - org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }: + org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.1.tar"; - sha256 = "0rklzp32v30ndyqli3fjcsqvvpiz3klsz26b7zn2bai2ldx6016s"; + url = "https://elpa.gnu.org/packages/org-real-1.0.4.tar"; + sha256 = "0bn9vyx74lki2nggzir02mcrww94dnqpbkryjr7a4i6am0ylf705"; }; - packageRequires = [ boxy emacs ]; + packageRequires = [ boxy emacs org ]; meta = { homepage = "https://elpa.gnu.org/packages/org-real.html"; license = lib.licenses.free; @@ -3020,10 +3050,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.8.0.tar"; - sha256 = "05q2zr661bn2h6pdvyv3apdajfxnsx0rb0n5np8cg98a7gw4zyxd"; + url = "https://elpa.gnu.org/packages/project-0.8.1.tar"; + sha256 = "1x3zkbjsi04v5ny3yxqrb75vcacrj9kxmpm9mvkp0n07j5g34f68"; }; packageRequires = [ emacs xref ]; meta = { @@ -3095,10 +3125,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.27.1"; + version = "0.28"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.27.1.el"; - sha256 = "0jygl2w8x73v22w0rzq75i2hnm3f46dzgg5x1ckz720nznvwwkka"; + url = "https://elpa.gnu.org/packages/python-0.28.tar"; + sha256 = "1pvhsdjla1rvw223h7irmbzzsrixnpy1rsskiq9xmkpkc688b6pm"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3546,10 +3576,10 @@ elpaBuild { pname = "shelisp"; ename = "shelisp"; - version = "0.9.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shelisp-0.9.1.el"; - sha256 = "15z8rpx8nhx53q77z5fqcpww255di80lb5mm28mnn2myalrr8b59"; + url = "https://elpa.gnu.org/packages/shelisp-1.0.0.tar"; + sha256 = "05r26gy1ajl47ir0yz5gn62xw2f31vdq04n3r8ywlzxbqyvzlc0d"; }; packageRequires = []; meta = { @@ -3561,10 +3591,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.1.tar"; - sha256 = "1dmi7fn4g55va5ljpyswr3dpgj471747kkdixfyp8zpsbhvr5yf6"; + url = "https://elpa.gnu.org/packages/shell-command+-2.3.1.tar"; + sha256 = "0g8pcrkkh3bxcxxbasnz834gi3pvhlkpf011fvmlhwzswypcyqmy"; }; packageRequires = [ emacs ]; meta = { @@ -4574,10 +4604,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.2.2.tar"; - sha256 = "14kdy8blhs6lwg349l9lmv0bbpybgi9nsg2iic3v87j4jyi41ljm"; + url = "https://elpa.gnu.org/packages/xref-1.3.0.tar"; + sha256 = "0bw2cbxmjavzhmpd9gyl41d4c201p535jrfz3b7jb5zw12jdnppl"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 2ee92e251bf..3f5dd795ccb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -198,8 +198,6 @@ railgun = callPackage ./railgun { }; - rec-mode = callPackage ./rec-mode { }; - structured-haskell-mode = self.shm; sv-kalender = callPackage ./sv-kalender { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index be3c69e1140..ac2fdc4b373 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -155,14 +155,29 @@ license = lib.licenses.free; }; }) {}; + flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "flymake-kondor"; + ename = "flymake-kondor"; + version = "0.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.0.tar"; + sha256 = "0fn9vnrqy5nmv07jv2ry0xs90rkb92qhrh7j5pdikw7zykcwlbdd"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-kondor.html"; + license = lib.licenses.free; + }; + }) {}; geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.16"; + version = "0.18"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.16.tar"; - sha256 = "1mhngb1ik3qsc3w466cs61rbz3nn08ag29m5vfbd6adk60xmhnfk"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.18.tar"; + sha256 = "131j4f82hl4pqj07qsl1f2dz4105v5fyll3bc97ggayzvrdiy58i"; }; packageRequires = [ emacs ]; meta = { @@ -330,10 +345,10 @@ elpaBuild { pname = "git-commit"; ename = "git-commit"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/git-commit-3.2.1.tar"; - sha256 = "1jndc8ppj4r2s62idabygj4q0qbpk4gwifn8jrd6pa61d7dlvp28"; + url = "https://elpa.nongnu.org/nongnu/git-commit-3.3.0.tar"; + sha256 = "0lp6r4w1k0idvfc2h0chlplap2i4x2slva9cw3iw1rhhxbcvlmdx"; }; packageRequires = [ dash emacs transient with-editor ]; meta = { @@ -416,6 +431,21 @@ license = lib.licenses.free; }; }) {}; + haskell-tng-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, popup }: + elpaBuild { + pname = "haskell-tng-mode"; + ename = "haskell-tng-mode"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar"; + sha256 = "1dndnxb9bdjnixyl09025065wdrk0h8q721rbwvransq308fijwy"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html"; + license = lib.licenses.free; + }; + }) {}; highlight-parentheses = callPackage ({ elpaBuild , emacs , fetchurl @@ -560,10 +590,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-3.2.1.tar"; - sha256 = "0yyf16605bp5q8jl2vbljxx04ja0ljvs775dnnawlc3mvn13zd9n"; + url = "https://elpa.nongnu.org/nongnu/magit-3.3.0.tar"; + sha256 = "0ihrds45z12z155c1y7haz1mxc95w6v4rynh0izm159xhz44121z"; }; packageRequires = [ dash @@ -582,10 +612,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-3.2.1.tar"; - sha256 = "1ppinys8rfa38ac8grcx16hlaw33p03pif4ya6bbw280kq8c73rv"; + url = "https://elpa.nongnu.org/nongnu/magit-section-3.3.0.tar"; + sha256 = "08ac10vips6f2gy4x4w2wkz2ki3q0d6dhynkmlpdinsdmgagziny"; }; packageRequires = [ dash emacs ]; meta = { @@ -657,10 +687,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.1"; + version = "0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-contrib-0.1.tar"; - sha256 = "07hzywvgj11wd21dw4lbkvqv32da03407f9qynlzgg1qa7wknm2k"; + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.3.tar"; + sha256 = "0fqhyby7624drskfsasgvzyxbgjb42rd6vw8l6xgb3h22kaprl0q"; }; packageRequires = [ emacs org ]; meta = { @@ -683,6 +713,21 @@ license = lib.licenses.free; }; }) {}; + popup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "popup"; + ename = "popup"; + version = "0.5.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/popup-0.5.8.tar"; + sha256 = "1amwxsymzvzmj8696fa6i0cqx4ac581rvr4dwkri7akkr7amh3yh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/popup.html"; + license = lib.licenses.free; + }; + }) {}; projectile = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "projectile"; @@ -841,10 +886,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.0.tar"; - sha256 = "1pfp1nvq2gny6kbiq3q0dcms0ysw43zq0aayfwqdj0llkf025dfp"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.1.tar"; + sha256 = "0f87bjgva0iv818bh2dqvc1svrwh5zm134jpxcmvmzr1yqazx4qp"; }; packageRequires = [ emacs seq ]; meta = { @@ -882,6 +927,21 @@ license = lib.licenses.free; }; }) {}; + vc-fossil = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "vc-fossil"; + ename = "vc-fossil"; + version = "20210928"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/vc-fossil-20210928.tar"; + sha256 = "0n4h1cj1336mv5cswq0139bkry5gnv4hrrwzd4bqhrxp5kbhqa5y"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-fossil.html"; + license = lib.licenses.free; + }; + }) {}; web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "web-mode"; @@ -916,10 +976,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.4.tar"; - sha256 = "032i954rzn8sg1qp6vjhz6j8j1fl6mpvhfnmd3va8k9q9m27k4an"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.5.tar"; + sha256 = "0bri6jr99133k9w0d754rw2f6hgjzndczngfw2lf2rvxks448krm"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix deleted file mode 100644 index 8cb560fde53..00000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, trivialBuild -, recutils -}: - -trivialBuild { - pname = "rec-mode"; - - inherit (recutils) version src; - - postUnpack = '' - sourceRoot="$sourceRoot/etc" - ''; - - meta = recutils.meta // { - description = "A major mode for editing rec files"; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 663510d92e6..5b2372f634f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1878,25 +1878,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20211006, - 1629 + 20211011, + 725 ], "deps": [ "consult" ], - "commit": "ccf486a902cd573d79b43ca61a4ba855fd056567", - "sha256": "07zhp5a4bfi7nyjsr84a7yp9rasn9yk08m445iwjcrjxxy230qlg" + "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", + "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "consult" ], - "commit": "be08c4ec49681474cbebaf0957568f27e42c4b3c", - "sha256": "0lpqpy33bmsh84ib1i278sr8ldn8y9ydqdikch1xi56via4ic2x2" + "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", + "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" } }, { @@ -1962,8 +1962,8 @@ "annotation", "eri" ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "070d0c841788d3a09e4557d92fd954bb1b6a7e9e", + "sha256": "055cyxcanmj29yphvw7g6k022bj8gs19xrhamxm4xii7bwbd5imv" }, "stable": { "version": [ @@ -2344,20 +2344,20 @@ "deps": [ "flycheck" ], - "commit": "0508d5a0e6e18cd6e489506d98730a9aaa6541a2", - "sha256": "1fn12zdsdn0ssj88ziyqw97ibkzvvql90dxf0x1a02mjqzkqviif" + "commit": "bddc1dc5757bd6ef308f21ed70811281a2ad5298", + "sha256": "1vpsddfjxpvylq70r7ip6c0iaqn10jdkxmwd93r1zzkxg30hzsf3" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], "deps": [ "flycheck" ], - "commit": "ef9b4d4653c95388b9e0b242bc24fea9922cfcbb", - "sha256": "0w6p5qy3cdlngrn1nv79gbgv97idkpxmw47xfcw8fn615wa5j9q4" + "commit": "bddc1dc5757bd6ef308f21ed70811281a2ad5298", + "sha256": "1vpsddfjxpvylq70r7ip6c0iaqn10jdkxmwd93r1zzkxg30hzsf3" } }, { @@ -2476,14 +2476,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20210728, - 2119 + 20211009, + 2207 ], "deps": [ "all-the-icons" ], - "commit": "96500418541b7376cd0b3e4583b9509c0dd92b27", - "sha256": "0sn5jxmhdpnnjn8x99vc9m9d31kw9alkkdr0xc345aa0ssjlkf6f" + "commit": "a0f34d68cc12330ab3992a7521f9caa1de3b8470", + "sha256": "18dd37p1vh8ixc2q07jqwzpc82qq31m89nzps192pdgkfffhdp8r" } }, { @@ -2495,13 +2495,13 @@ "unstable": { "version": [ 20211007, - 1405 + 1729 ], "deps": [ "all-the-icons" ], - "commit": "46ca70416391c1bf3a2b148c4a636dee249aa1b3", - "sha256": "1b2w6bkdc5f02xhgvl37gh7x0d2vjl6kdwnxh87qwscd68mc11qy" + "commit": "5e9b097f9950cc9f86de922b07903a4e5fefc733", + "sha256": "0p09rdq97hshg9gaivsqz9zvi2ba2p1a2ja1i8z6f896xv5jqs98" }, "stable": { "version": [ @@ -3246,8 +3246,8 @@ 20200914, 644 ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "070d0c841788d3a09e4557d92fd954bb1b6a7e9e", + "sha256": "055cyxcanmj29yphvw7g6k022bj8gs19xrhamxm4xii7bwbd5imv" }, "stable": { "version": [ @@ -3567,11 +3567,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20211004, - 527 + 20211014, + 612 ], - "commit": "48c66a669523d45de7e066d42933c1c7ca965bf4", - "sha256": "07hf143fzwnxj6a0l9yhy5s48zdsmlbmfjwy73pqbqfpi16739s2" + "commit": "30616b0924d85a99ca381f21d4717cb6eccc9f95", + "sha256": "09jb6xagdiyr0qvigsr4ij9kqgmm3qrq37z1djrh1r95qlq9b6wf" }, "stable": { "version": [ @@ -3599,6 +3599,30 @@ } }, { + "ename": "apheleia", + "commit": "74ef92045e0f64b34cdb1ca686c9159b0623e61f", + "sha256": "0dmjvj7gw8qd8vh9m8ibs5pqgs63f5pv02686k97sawbkav7mg1r", + "fetcher": "github", + "repo": "raxod502/apheleia", + "unstable": { + "version": [ + 20211003, + 1818 + ], + "commit": "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd", + "sha256": "16j6lcqlsn1qy6nr82aq9hamkr0h6mnc9l5pk5x5v5n1s44sa0a3" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "53ac964e53e75b9a35a7bd173f23290d0f42d95c", + "sha256": "0f2dqid4h0psdyx3p18c7xn7nf8zr6y4qq98yvyjfbwq5lcjk4rn" + } + }, + { "ename": "apib-mode", "commit": "dc2ebb04f975d8226a76260895399c937d6a1940", "sha256": "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb", @@ -3658,11 +3682,11 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20201213, - 1118 + 20211014, + 2319 ], - "commit": "8c0c20b6896bba65c7f6cfe0a21e22b21a12c5f9", - "sha256": "1pr2qpvwfmqd0qysbdvaz0r0y7zznifridy0jyd8lwkddyi8jypf" + "commit": "9d1937af52cd8ecfeec27185644ea8cbf0dc1c08", + "sha256": "1kzvqxz0m2lgcm0whb121g1580vi7bvk4fj780d5xqqqlv0091a0" } }, { @@ -5579,8 +5603,8 @@ "avy", "embark" ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -7053,15 +7077,15 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20211002, - 1322 + 20211014, + 2143 ], "deps": [ "bibtex-completion", "parsebib" ], - "commit": "e84804e6f88747d39b36d9d18765ac0de99e95f5", - "sha256": "0ll6p81ijfrmivy0x4z07zyfgnw43x1l6y2rhlj9g3jrp2jrcwlx" + "commit": "b96728a7ccaa578360f7275bb01080c28bebd216", + "sha256": "17mif19zax6xhx0qbiwimfq1q3m18rka28nv6c9x5g3l6f0hby4i" }, "stable": { "version": [ @@ -8329,11 +8353,11 @@ "repo": "topikettunen/brutal-emacs", "unstable": { "version": [ - 20211007, - 926 + 20211014, + 2212 ], - "commit": "0d7d3133b80a2f37abcc67daf608c418e6372543", - "sha256": "19775jb6dknplafmy0gishi25x5i3rzfi096v6i069kwnn8g0wch" + "commit": "ce00e434baec93bdf846195516f083190edf3662", + "sha256": "0ax0qy597xknrqg8bp4sf7ag4nl7pdlgg1zicfis25xbdanyg9ar" } }, { @@ -8587,30 +8611,30 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210927, - 1513 + 20211008, + 1508 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", - "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" + "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", + "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" }, "stable": { "version": [ 0, 3, - 2 + 3 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", - "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" + "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", + "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" } }, { @@ -9775,8 +9799,8 @@ 20210707, 2310 ], - "commit": "d47d5871e2bce25aaab117cea3cdb7a41d9b0822", - "sha256": "1l3c8wpzif1cw94rdrj7ds6dp6av3yk44gxpv2nknq3gvx49n3av" + "commit": "cd6587efb64f58dc0e542f08734c875b93e63968", + "sha256": "094flwbwvvdr8asx5wgr07gbxz4n3fxb8ywbg13f69c9wagk6rkp" }, "stable": { "version": [ @@ -9886,11 +9910,11 @@ "repo": "fritzgrabo/cascading-dir-locals", "unstable": { "version": [ - 20210221, - 1516 + 20211013, + 1955 ], - "commit": "53967a3f4b2ac742ab8fd6b639c87cbb0229d5f8", - "sha256": "0pvvwxi7qbbg9h9hax6ispz69h0wk4c0adc26dyj1a2dpdxz2r5p" + "commit": "345d4b70e837d45ee84014684127e7399932d5e6", + "sha256": "160ay9rf1s4hm9xmmsd7z0mkhqrj9wpm8dpd49hhibcng8hv6z6a" } }, { @@ -10464,8 +10488,8 @@ 20171115, 2108 ], - "commit": "c2ab9b7ca6e0f23cfa359d69aba11f146bffa64d", - "sha256": "1ipyjli65sm09rns4yjmj92mrzs8gwgqspviz05df3rfw731b42c" + "commit": "ffa981bace8ab7dc1166c335b4b906b3bc0c6d32", + "sha256": "0ly2mnxpr27axvr4rxrk9a45jl0frfp190i86azd3sb9fj2klvq7" }, "stable": { "version": [ @@ -10583,16 +10607,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20211006, - 1711 + 20211013, + 1802 ], "deps": [ "dash", "posframe", "s" ], - "commit": "894d889a68a482d369010fe25da16c75f13f7cdb", - "sha256": "1698nnchw0i8xmar0v2lccn418w7snd3l0jarklk0xh33dq2klzr" + "commit": "c1f639d7bfd3e728cf85dbe224b06a4be76158f4", + "sha256": "1bic67769xvjdhinq88jqxnb4dql8gssmnx1wvrl69338zjqqjzg" }, "stable": { "version": [ @@ -11255,8 +11279,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20211003, - 947 + 20211013, + 2024 ], "deps": [ "clojure-mode", @@ -11267,8 +11291,8 @@ "sesman", "spinner" ], - "commit": "2b8bde358063e782771f2f12bdf32374d68a7174", - "sha256": "13x1wdxra3qqrsmxw1dqvc5d54za08yz4q4faprajs82h94vkifd" + "commit": "0a9d0ef429e76ee36c34e116c4633c69cea96c67", + "sha256": "06hzm7dpb7gsdrbxn3v3zjdci6qdm6mcnm7f03bgij3qcjg0isky" }, "stable": { "version": [ @@ -11537,8 +11561,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20211005, - 1943 + 20211014, + 1115 ], "deps": [ "dash", @@ -11549,8 +11573,8 @@ "s", "string-inflection" ], - "commit": "34e66583d95a8d80fb5b9f2960f3382ca0e6d3ab", - "sha256": "0y5apy2r657pzszgsc6vbxfy0l9qgxrwz2r4kj76fah4mf9g251b" + "commit": "c8ff95862823cdff067e8cc9bb7f5ef537e8f1d9", + "sha256": "1dqs5slpd9i8dj6fgryg46zabd6c134qrdq8dkj1i5n0k17ni0h1" }, "stable": { "version": [ @@ -11616,11 +11640,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210929, - 1422 + 20211010, + 1654 ], - "commit": "442a840a96e7103ef1873ffa253f8a83c79b2eec", - "sha256": "1xwb7vp5a576n8cfjixqpgyiiaqq1lv4d21pxda4yn4mvk4cjfa4" + "commit": "047aece5a6d8e1ed267e542c53f5f013293fce21", + "sha256": "09szz5m8gw3j86c3pd449wghrff1zbs1nxypbxxagry59kvsdxkf" }, "stable": { "version": [ @@ -12564,17 +12588,19 @@ 20210104, 1831 ], - "commit": "24fb43e3e757ad963082d9e92362242efb6ad265", - "sha256": "0amg5677g9ik40nsr2p2icny8vh7hw98gmp97ysz7if4yw928zd6" + "commit": "c5ae200d94333600117fc93e50c66bdd50994bbc", + "sha256": "0pay9ly2vzjb69a1aah1h6jkmixhrkps31i3mgk8frxyanlgjkgd" }, "stable": { "version": [ 3, - 21, - 3 + 22, + 0, + -1, + 1 ], - "commit": "7612abd52f192a13848a4d74191633a008892449", - "sha256": "1sg0vishbwhyxvw9p8vaqbfyaqaybv4bdkb32448irgsi382jp7w" + "commit": "167060303b6d9ffb56b2785cec0f7e363f0876c6", + "sha256": "0zaw4zjxsrjfm4rajqlh4wff158crbxyjpajbmh4yckd3gnz1swr" } }, { @@ -12726,11 +12752,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210925, - 1531 + 20211014, + 738 ], - "commit": "031f726941994d4a98649631eceeebb44b515b1b", - "sha256": "1rdrzrflnvskv41jg92zl5l99m3rzh1a7gwm325bmmi5fvsgsndd" + "commit": "68148cfc1f0723e554a09cbae4c732cfc348ecfd", + "sha256": "07y8ry0rwlxqdw39fi2maw114yyga8yzlbrxypw6irhnpm8mscjw" } }, { @@ -14070,30 +14096,30 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20210924, - 1159 + 20211015, + 1239 ], "deps": [ "company", "ht", "s" ], - "commit": "371d32ae7b488f76905fe98f3063ae30a72010fd", - "sha256": "1r3l2z6lagfj5piibph3n9lsb8fl3w5l8q6qg9z4fqfqrl9xclxi" + "commit": "493fe05fa81ba680fd44c5d05256a2ae788dabbe", + "sha256": "0fysg6fc20z8ymay27g6s1b3jcq0ndfcv5wynwjdfgvv2f5aay6z" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "company", "ht", "s" ], - "commit": "4d6d56a8b92af72aa3b1e0af1a7e7add965bf468", - "sha256": "1yr050zgygjvhwjmm2yd5p889y24vars90cr4pyqc4zhmgzrdkw5" + "commit": "ea577f13d0a47b6efbe2974a5a347a87d27c0c42", + "sha256": "1g6p5868qb2001ippdcnsscsm15d1fwl0iyilq7jk3ys68j30pr3" } }, { @@ -15004,16 +15030,16 @@ "repo": "Alexander-Miller/company-shell", "unstable": { "version": [ - 20170518, - 541 + 20211013, + 1725 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "52f3bf26b74adc30a275f5f4290a1fc72a6876ff", - "sha256": "0nv8vwmqgdb33cl1wfdbmncbrpfdciid48f6w8vmw39ks53i2z32" + "commit": "a77f4de75912aa87314cde92c603b831d5050246", + "sha256": "1mh93l6xn9frfvw86vbvs1fz544c7ylja118iaccfl42gr2ypsw9" }, "stable": { "version": [ @@ -15745,19 +15771,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20211007, - 848 + 20211014, + 1752 ], - "commit": "1af9ad3483f2ad2e52d03db3c1ee9bf6074a9669", - "sha256": "0wyz72579la8j5qd1xlwnpnpwr9z03yb8ckl081f4n9s6g4rb4qf" + "commit": "3715f7378bf1ea54af3878d118da1222bbf4bfa0", + "sha256": "1a3zg2nv2i2lgyvzn7l2y6d65s2jcrsmkz7j92gdv9zgmg4dbw7w" }, "stable": { "version": [ 0, - 11 + 12 ], - "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", - "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" + "commit": "ebb62563127a4b9442148372f897efb7baef61d2", + "sha256": "1bzlqn7k5akhyl763q29853yh5s8rmk6y1ncmy3am940wfypxjic" } }, { @@ -15775,8 +15801,8 @@ "company", "consult" ], - "commit": "9cd7987ebbcc7411404799639a88f24b690d8e16", - "sha256": "1djfb3dwg9yjx4kz37n1dd7i5pr9ks27c951yfijjhqcfr9m97aw" + "commit": "914c51c7d983e36869dd27bf21c80a8cac96a41f", + "sha256": "1wpq468mqzjq1c9ixks4hqik9yhli2p31x7mfmfqx3lw5rnc74cy" } }, { @@ -15787,15 +15813,15 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20210917, - 435 + 20211007, + 2352 ], "deps": [ "consult", "project" ], - "commit": "d3bb96abb5ccca29f4b04c6f623818386167a2b2", - "sha256": "1pqzc45g5db69nx5vq3qm48i47f3gjrdkq81pnh705vh4q7qgpky" + "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", + "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" } }, { @@ -15813,8 +15839,8 @@ "consult", "eglot" ], - "commit": "28a09cc839a9010df1a00a55528697ab34e1b259", - "sha256": "0vfr9cj2xzkpias7p25bl1yjbykg1lpphmn4a3p3sdmyh32zjy2s" + "commit": "f93c571dc392a8b11d35541bffde30bd9f411d30", + "sha256": "1jqg6sg6iaqxpfn7symiy221mg9sn4y1rn0l1rw9rj9xmcnng7s0" }, "stable": { "version": [ @@ -16009,8 +16035,8 @@ "consult", "yasnippet" ], - "commit": "9700eacab1ae7cabfacf1504db1b695b28a780b8", - "sha256": "1jzac2k9wx5wirz1m89a7fyhk4bi4vjfhlvkp618999dbfcqdx2q" + "commit": "bf6b496e00cecfd6475ebaa374a0c7c407963a8a", + "sha256": "0wgighq6r2vn9nxnisx7ci6xrxcpzhn19vaqs5xp2ig2gsm1andp" } }, { @@ -16103,6 +16129,36 @@ } }, { + "ename": "conventional-changelog", + "commit": "edbcd5c7d573bb4cb83260cd312144e707bfe897", + "sha256": "0bwyla7v8jvdm1xysg25fv0srpsn5wpi4dzqv6gz22z6rz4l3mp5", + "fetcher": "github", + "repo": "liuyinz/emacs-conventional-changelog", + "unstable": { + "version": [ + 20211012, + 1322 + ], + "deps": [ + "transient" + ], + "commit": "ba6285674d12d1eab6624ebf7a3bae7e72d56f99", + "sha256": "13l3h3akismyfgsw1l47df56lx3myr1zjqimhfzcl1jk4qg2579q" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "deps": [ + "transient" + ], + "commit": "ba6285674d12d1eab6624ebf7a3bae7e72d56f99", + "sha256": "13l3h3akismyfgsw1l47df56lx3myr1zjqimhfzcl1jk4qg2579q" + } + }, + { "ename": "copy-as-format", "commit": "42fe8a2113d1c15701abe7a7e0a68e939c3d789b", "sha256": "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k", @@ -16528,14 +16584,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210930, - 1140 + 20211010, + 1332 ], "deps": [ "counsel" ], - "commit": "dc7b9f9b381dffd19c79cb7ee53b79034590d309", - "sha256": "1zmx7vfi02c8k9wnbsmka5yx3ci8fv9wl8r0cc28jn40vgrivn8c" + "commit": "98860e5981b07952b5c15361cdb996741e5842c5", + "sha256": "056zqa9rq32vrmqq7i1yi37l5ypjdk2dgcd0yl9wlcl339cdzwsq" }, "stable": { "version": [ @@ -17195,11 +17251,11 @@ "repo": "kijimaD/create-link", "unstable": { "version": [ - 20210601, - 1327 + 20211014, + 1617 ], - "commit": "b2c24f42f2fae63433787150f77b397d69ce0e5b", - "sha256": "1c0smqhc87fzg7db20k92k938p8dkqiig59krwylkqgagsi7hbg4" + "commit": "e765b1067ced891a90ba0478af7fe675cff9b713", + "sha256": "1nr5dsbmhn9bs0v0h6v7d8a0pkgg859cm677nz7br2xaibdz0z47" }, "stable": { "version": [ @@ -18199,8 +18255,8 @@ 20190111, 2150 ], - "commit": "72c18e73679fc3b74d2acd037b4de2cbfff25257", - "sha256": "1ks9sr3r0kx7yi6dbwas6ncd9pn0ncgd9mqhriw5zxyd9c0b92ch" + "commit": "c129b15e8ee249a33ca9a5dc82a3defe509ad5c0", + "sha256": "0lg75np90niwj2ajqvla8s4dsgg8jr8k5bhgqsry6v6kx549rzvs" }, "stable": { "version": [ @@ -18407,8 +18463,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20211005, - 2006 + 20211013, + 1936 ], "deps": [ "bui", @@ -18420,8 +18476,8 @@ "posframe", "s" ], - "commit": "a225e73026f28b67f1837e80497fe3ec641373f4", - "sha256": "1bv19jpgk4h6rk8kzfnf29m4xpa8s2wgljqy4im184jhl4x2qg3c" + "commit": "1cddcedf9ab57a2c14a5ec50b6907b866920f42e", + "sha256": "0g67m40y4giill6sild7d9iaz5dis666wlxpcdl89vyvj2ys8hqd" }, "stable": { "version": [ @@ -21265,26 +21321,26 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20210419, - 1851 + 20211011, + 1804 ], "deps": [ "dash" ], - "commit": "4b94393a9adf677c7c037215e233eef5fbca553d", - "sha256": "14whrhi6hgzadrw9z9k2sh2800483xs1h611avz4x68c8d2jfj5k" + "commit": "bd161f38621d1a9e4d70c9bafab9b7e3520f00b2", + "sha256": "0cf5npgksl9a03mnfdhfdhlf46gr9qz9adjxz3dbckq9b1vl0dfc" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "dash" ], - "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576", - "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d" + "commit": "bd161f38621d1a9e4d70c9bafab9b7e3520f00b2", + "sha256": "0cf5npgksl9a03mnfdhfdhlf46gr9qz9adjxz3dbckq9b1vl0dfc" } }, { @@ -22040,8 +22096,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210930, - 556 + 20211011, + 824 ], "deps": [ "dash", @@ -22051,8 +22107,8 @@ "tablist", "transient" ], - "commit": "e1c0c99047a9835b8751b1d9f544ef0bc16c77a9", - "sha256": "0y54fg1i84k8avb9wnbn77wfl935z6d84xrqd7af13pdwndl2jjm" + "commit": "9d845e1eaed663ccc811c0a9ede3b3c61859e9e4", + "sha256": "01rnsyqrxvyc3kbfa4nmvxqxw261sc9b6jhqsnx14s3qfhy9w51l" }, "stable": { "version": [ @@ -22276,11 +22332,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20210923, - 1515 + 20211014, + 244 ], - "commit": "fe7ec7cf99608412073d2d68885577b9135a94ac", - "sha256": "1kjv2sh9pcmvciay1y6kp5k9lqm3mqm90qqlwh5g844bc5p7dgbh" + "commit": "6e20848a2786e8e9a5fecf27b6f29a7954635ff7", + "sha256": "1wdk4m117x9vidin1n5kr8a33znf08r4j096pnqhwm5axq5s3ciz" } }, { @@ -22413,16 +22469,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20211001, - 1049 + 20211013, + 644 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "257b9cd6deae367d0a167f0b634d39deb846aef6", - "sha256": "07i3rnrqwl99zpmrbhq0mq5p6l4jzkchg515hn6m8n04slfai59d" + "commit": "56876e64d92fa1aa2d569831a126e1a26ce06849", + "sha256": "1vpqa95ibw5srisrypfnmf3rkkspiq7crk72yf3sghpcancl7b50" }, "stable": { "version": [ @@ -22466,14 +22522,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210916, - 2120 + 20211011, + 1314 ], "deps": [ "cl-lib" ], - "commit": "e716ddbb882a3a06744faa74decb2fea1569c921", - "sha256": "02gp36hbmxcadp4567mnsj29b2ql9favhdcr9sm4pyp9bszm75ns" + "commit": "3e6f5d9ce129ac6fc0f466eb6f5518593625578f", + "sha256": "1ar9nb67hppqhbdl6l6mv1y6zl48mcdl91bmsc49bjpzp9a38y5b" }, "stable": { "version": [ @@ -23129,8 +23185,8 @@ 20210909, 1010 ], - "commit": "64f3f710e7238bab9164e75b3fe2e7d17918e6e3", - "sha256": "1jwrcxjld82xs97vx9s5laamg8l4s5hpz314x3rvcb5q6mrd7h07" + "commit": "87a2d25e56caf65600e9d3f647bcb4999556ecb4", + "sha256": "0g7vwfcbv88kbsxz7qzwj7wdxf88ir22wwlglxryaf5249fzzln5" }, "stable": { "version": [ @@ -23895,14 +23951,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210930, - 1217 + 20211014, + 1059 ], "deps": [ "parsebib" ], - "commit": "63b0700eefc982276002ae8d618e8a7fa1f68732", - "sha256": "14qiy68q60na9llh81kj3n4bqxn0car1431sdmfv3jjv2h176qv0" + "commit": "b829aac34b90471cb53960ac0c0186603d032946", + "sha256": "0fp2nbr3zrq62mj83qwfh7x358mpkicphh9ha0yq64pd6a4l0ivd" }, "stable": { "version": [ @@ -24604,11 +24660,19 @@ "repo": "suntsov/efar", "unstable": { "version": [ - 20210604, - 503 + 20211014, + 728 + ], + "commit": "1823b9301f552a6944a42f49a0a136a2861ffb88", + "sha256": "0fvdybwda6p09frlij7imqljmnlpa16p03wv45f6w1gsi4akqzy8" + }, + "stable": { + "version": [ + 1, + 23 ], - "commit": "afc19e212a6f1227b5747b42407226b8222f92c5", - "sha256": "04ld4sk52hm6w4bqlsfd5b1633nb7waf0cmm6rpkgidnzlwv4fxm" + "commit": "a9ff16e8994f525086e72d1e6a827e5fe90d1326", + "sha256": "0wv351ajzdy1srsbfmg33az2fdns96zc1jxygxfyzja0y2r9q065" } }, { @@ -24759,8 +24823,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210905, - 1905 + 20211009, + 1931 ], "deps": [ "eldoc", @@ -24769,8 +24833,8 @@ "project", "xref" ], - "commit": "c17bdf6c98d6bf0f1a85f1175556e1038654402f", - "sha256": "10liic4skqd5qr1zw18k0kx50i2m5pa90vc4yypli5c6bpadsyq4" + "commit": "9665359bb6bfb6a96b0c3b307d4abea9fcbff7a5", + "sha256": "154wf1ps7s00vpmdxgj2pw36gcda1w82f5yw0zhl9c7gi05g3xn3" }, "stable": { "version": [ @@ -24920,8 +24984,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210809, - 2101 + 20211012, + 347 ], "deps": [ "anaphora", @@ -24932,8 +24996,8 @@ "websocket", "with-editor" ], - "commit": "0600c286bd7b0812f4908d7df1be279b6b65923f", - "sha256": "0cwqngw05fg8rs6vz65wzji6h4fv2smp7xlh1xjbw03nrrz41bc2" + "commit": "e354ea77c29e8c20b6b1a9ee00d86e6a9512bc0d", + "sha256": "1ny4gjawwsq7gx1ih7f37p24pyyjv9jbp702v1sl6wfnk6r7ll9c" }, "stable": { "version": [ @@ -25382,11 +25446,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210524, - 1611 + 20211011, + 158 ], - "commit": "64545671174f9ae307c0bd0aa9f1304d04236421", - "sha256": "10hjqva6xpilnsfsi8z7w3mjmii4hzf53cmccv1w3076ccvcpq62" + "commit": "f4a45e47e58414da0984f9ac1328be207a897ba9", + "sha256": "1s1i665a3bknjchg47jsaxydmmq4fqyb59i18np7w0zhhzzpjxxs" } }, { @@ -25886,26 +25950,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210925, - 2 + 20211008, + 2330 ], "deps": [ "elfeed" ], - "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", - "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" + "commit": "973b337d7104a7adb519b7b74a91fc21f8757731", + "sha256": "16a0whgx47irgp3p17xwdwfiaylrv85f26dynh5ba2sy7l0d0irq" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "elfeed" ], - "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", - "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" + "commit": "d97c813d472b68c977569b14761c242cb33345e1", + "sha256": "1drgv16555cyn7w6g44z23yhi1i0cy1b9h1ri3lz6h814px0wj0z" } }, { @@ -26160,15 +26224,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20210615, - 1624 + 20211009, + 1531 ], "deps": [ "dash", "s" ], - "commit": "fdde21e34b1272783d566d8230b5ed2dc4749048", - "sha256": "15g3xp3w8lrshjf812c8v50y396zx7107fcyc59kljhsc257j62y" + "commit": "c06aec4486c034d0d4efae98cb7054749f9cc0ec", + "sha256": "0dhflhgc1px9kj2bhv9m646ab08a6qjcqdd1a6wd5psj047bkj9p" }, "stable": { "version": [ @@ -26236,11 +26300,11 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20211005, - 1542 + 20211013, + 1408 ], - "commit": "e44d5bfd68d735c4d93df9d2ae8e78ed9cb52d31", - "sha256": "0f0q6mn7zxwpsnln3k15911kskfp0gf1vyn2mdlzx13ql616a3r1" + "commit": "907ef434a0ce0f94dbd0c77f09bdfcdc779bca73", + "sha256": "0sri7m0n0wafc9dyffi5myvv2vawkfwx6lgmfrj7kikbds0l5s4c" }, "stable": { "version": [ @@ -26629,11 +26693,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20211007, - 915 + 20211008, + 1217 ], - "commit": "02fade7fc9a6b642359552694cc7bed95132cf18", - "sha256": "0428hhz57gb0sfxzfa34zm7c4m1njglc27sq9mbdmma8hk9by91p" + "commit": "81e107a26924747c10c671882032d341ca6d77c4", + "sha256": "1psvfqk71bi9p5mq99r2ihpk4h80sb7p8398fg2zb33a3j3g52b7" }, "stable": { "version": [ @@ -27216,8 +27280,8 @@ "deps": [ "emacsql" ], - "commit": "50aa9bdd76b0d18bf80526cff13a69fe306ee29c", - "sha256": "1jzvvsvi8jm2ws3y49nmpmwd3zlvf8j83rl2vwizd1aplwwdnmd6" + "commit": "209fd0c2649db0c7532e543ec12e7ba881a3325c", + "sha256": "0zr56gwn8rcgvaa9halhfxpxnn0x6yqc66z6r7vqzx5jbj7d6q46" }, "stable": { "version": [ @@ -27336,11 +27400,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211004, - 1250 + 20211013, + 119 ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -27359,15 +27423,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210829, - 1334 + 20211012, + 1921 ], "deps": [ "consult", "embark" ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -27534,16 +27598,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210911, - 2031 + 20211013, + 1353 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "c42fab572846b1dd76d82c5293ccfb6ee2c45991", - "sha256": "1jb4di2v1fxjd7qw8mjwzqpr3j8jcbli4jx7236b7kmcid9zfds7" + "commit": "f0da8453ae94aec630ad5b3395d6bc882ef0ae57", + "sha256": "098lx63narp2drx0bq6bni20z0mi6nwr80cb4gc358ry7zy4m9rn" }, "stable": { "version": [ @@ -28885,15 +28949,14 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20210402, - 1642 + 20211012, + 142 ], "deps": [ - "cl-lib", - "undo-tree" + "cl-lib" ], - "commit": "f9d6e3f7d99b877a63fa6f5ab61e6ba05a7075c8", - "sha256": "0xw99i47mmry205aps4mha1ninnnzir652s7jh81fdsys8y5j7w1" + "commit": "3f961db491f572b7f0637e09fd113c43a1061617", + "sha256": "1519y2q6mqvjncd8axdimajb12z7xmzmgxr8c021iq8s2ikf65bs" }, "stable": { "version": [ @@ -28940,8 +29003,8 @@ 20200914, 644 ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "d281edeac893db140ab2a0ec9f42a4c1dd2efecb", + "sha256": "089z3mgpgsb7gx6v7ysmvi8nc2fzbhd72av1yh2m4lc1alxw711a" }, "stable": { "version": [ @@ -28964,8 +29027,8 @@ 20210315, 1640 ], - "commit": "818bfab3463cf5f289a4d7be5a77667d673207d8", - "sha256": "0ab8g4p4ak49pzbigcn69657v19wx34v66hl8rqiwd9gmwji0d74" + "commit": "e782c0305e2fcdff0b9ea9c2b365878e602df04a", + "sha256": "1vfy86wsv8mx1w7lawxp7h7lc7iyqn9jsddi8006f8ccqsndbbzc" }, "stable": { "version": [ @@ -29826,11 +29889,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20211006, - 2210 + 20211011, + 2049 ], - "commit": "5691859d4edc4387165e561a2a06527c85e795ec", - "sha256": "1ja7ppw65n20kjfnij71fxf5nnvbdly4hk74wmdhvsr220vkc90n" + "commit": "569dca1f4ff939a93c7be97c34577666d9af8b3a", + "sha256": "086nl0486l28n1zmw9jxqh63d7bqanzlqwh9nm4a4aw1fyjy7pda" }, "stable": { "version": [ @@ -29994,15 +30057,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20211001, - 1717 + 20211009, + 55 ], "deps": [ "csv-mode", "ess" ], - "commit": "9be3d4566426264acea459f24428e1d0c868c6fe", - "sha256": "1bs2awcmmxzcdhqlyizgrhxgrgh80jl8a6jbkk5zspl838cq4n39" + "commit": "6fd97a89c73815672de7df21d1ecd362a66126b5", + "sha256": "1vbq9xnspbmykbz4axrxskfsb30bzcnfkymiyfy82shb65r53fn4" }, "stable": { "version": [ @@ -30421,15 +30484,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20211006, - 1559 + 20211011, + 2205 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "ebae35360c9be4828b7a9069396bd6a5ef3e9fdf", - "sha256": "0nq7sw7j6nwv44ynhgr6jjkxvlg0cy4ps77y12q9f4g0nx6sj5ga" + "commit": "44f75e93c6db89de882a0eb1d8bcc7c4ebb8e94e", + "sha256": "12r45djpmdhf4ygc9wdxj1jmxwcag300a8skfhkpiqimapnm8k5k" }, "stable": { "version": [ @@ -30573,28 +30636,28 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20210818, - 1228 + 20211011, + 1752 ], "deps": [ "evil", "evil-snipe" ], - "commit": "db01118a76112c61b7617aa44aa8c438d8f1871f", - "sha256": "15ihz0wwc7gzqsmzbrr48zzh3rw3bmbf2ghnhcy13pdq42wridcv" + "commit": "05c023740f3d95805533081894bfd87f06401af5", + "sha256": "1fnzrwr53h18wp4wkb834j39xg8bv7yqcmilb41bc81npfmi2mn1" }, "stable": { "version": [ 2, - 1, - 0 + 2, + 1 ], "deps": [ "evil", "evil-snipe" ], - "commit": "7844079b47f47bb1dc24c885b0ac2e67524fa960", - "sha256": "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2" + "commit": "05c023740f3d95805533081894bfd87f06401af5", + "sha256": "1fnzrwr53h18wp4wkb834j39xg8bv7yqcmilb41bc81npfmi2mn1" } }, { @@ -30623,15 +30686,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20211003, - 1458 + 20211007, + 1722 ], "deps": [ "annalist", "evil" ], - "commit": "bc5a02ed8572e7d40d04a78f17abc08061dfc37e", - "sha256": "1y5sw51k86sravaspmyg4j0986yldfsyl21cwcr9cvapsp46ba52" + "commit": "6709c1ec4118c8721df43ea6708ae45ebbc01fd3", + "sha256": "1wcjrqvirymwfn0f5sv8axw7ycfjff3h0x5f1cadakbpa96jrc9g" }, "stable": { "version": [ @@ -31324,11 +31387,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210719, - 1305 + 20211014, + 455 ], - "commit": "6bc41317ba4b8710d713a62e1b78047c3cc2d2d5", - "sha256": "14s2zrl2rpnqpfp647naa80qzb2x4c6jflvs1nhxsvn43s0gdfj9" + "commit": "63baf2d1c796edd11bbec5fe1dee711173d4155d", + "sha256": "0kk9l9wvvb40hric4wdzvccp98mbipln7ah9h8grl5ayb9kw6xxg" }, "stable": { "version": [ @@ -31363,14 +31426,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20210808, - 1424 + 20211011, + 103 ], "deps": [ "evil" ], - "commit": "8ce0066fa4889c9a43db5917d116baa9497837b7", - "sha256": "04dls5fmr4a8b8j3802nm0cf4rngr01bgpsa25rgdq1cdv9x9zb6" + "commit": "08f0c1ee93b8a563770eaefaf21ab9087fca7bdb", + "sha256": "0pcacrfvvk6ra9dgq84fdcsh5ziwk78k8dmr2c442fvr2lzch4yn" }, "stable": { "version": [ @@ -31949,8 +32012,8 @@ "deps": [ "evil" ], - "commit": "ebae35360c9be4828b7a9069396bd6a5ef3e9fdf", - "sha256": "0nq7sw7j6nwv44ynhgr6jjkxvlg0cy4ps77y12q9f4g0nx6sj5ga" + "commit": "44f75e93c6db89de882a0eb1d8bcc7c4ebb8e94e", + "sha256": "12r45djpmdhf4ygc9wdxj1jmxwcag300a8skfhkpiqimapnm8k5k" }, "stable": { "version": [ @@ -32141,15 +32204,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20211001, - 1457 + 20211008, + 1630 ], "deps": [ "evil", "tree-sitter" ], - "commit": "5b8dd1d1803e69dc7e7812841df6bfe772396f43", - "sha256": "0r4q1cn0wv7g8krmp8a3pflq1bfz9hp69wz0pzgvlnag55zmavps" + "commit": "ebde473af5a484959cda97483453d855c7bab89b", + "sha256": "1x30il32l57pmqiqj872z83w1v7g87scsaaspn05i4wd8x7y30qp" } }, { @@ -33260,19 +33323,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210602, - 1952 + 20211013, + 1554 ], - "commit": "cb8803355e20812d84195b1b7c9b0578c3262e68", - "sha256": "0wx2k9262p712aasn3ha8si250yzhcqz513apna8lp5gri2rxsg8" + "commit": "3c13ae4d694025207ba7eb43f174f90bb49395d4", + "sha256": "1iv9i1j39wj29y86z49yyw1a22wgyafdybjizmji60hi7x4r66az" }, "stable": { "version": [ 2, - 20 + 21 ], - "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", - "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" + "commit": "3c13ae4d694025207ba7eb43f174f90bb49395d4", + "sha256": "1iv9i1j39wj29y86z49yyw1a22wgyafdybjizmji60hi7x4r66az" } }, { @@ -33391,14 +33454,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20211006, - 842 + 20211015, + 1502 ], "deps": [ "s" ], - "commit": "4deddb48b5c9798bdb68a341a9cd23056b4fb2c4", - "sha256": "0vsfjk912n24j46ivlkfw8vlqi913qnvy8hixfcf13f68ak8cbav" + "commit": "d6913c8a8dff0711d3e3dc42ba1b63fb0a39ece5", + "sha256": "1pk7mfmfzxi1saaq2g76bgps9w4gcdbj1ck74hkhiv5a166w3fi8" } }, { @@ -33888,15 +33951,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20211006, - 2239 + 20211008, + 2353 ], "deps": [ "dash", "helm" ], - "commit": "65ec7d5c10115f3670b7488825922494e749d34a", - "sha256": "0hwimg57lwny3n2jz0m224blbhrjdd3qjfa5xmcvwsnw5lp54i48" + "commit": "1f0bcf009bf124c213d64dd2726061db6af981b5", + "sha256": "1wsqddl48shi2815zmx609g39bpc9kn28hv26vpjljap8qxpxpzw" } }, { @@ -34201,8 +34264,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20210919, - 929 + 20211015, + 937 ], "deps": [ "async", @@ -34213,8 +34276,8 @@ "s", "transient" ], - "commit": "77421f62e6e616ada9d6ee1bb2b7a920aeb51726", - "sha256": "12089lm3h70igfxasvjw8ccm1iag0p3159w2pn661awnv9nplwl0" + "commit": "21a492d3e67e5e3ab59b75107d345142a4c3ac02", + "sha256": "02n3h2zvdf24jxmcpp0cjcfba54cs0isymcd4k4j68zywszwzp36" }, "stable": { "version": [ @@ -36468,8 +36531,8 @@ "flycheck", "keg" ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -39407,8 +39470,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20211006, - 2025 + 20211014, + 1707 ], "deps": [ "closql", @@ -39421,14 +39484,14 @@ "transient", "yaml" ], - "commit": "8264234db61b8a7f427b972aaef6235f9f6a13fa", - "sha256": "0fw2v05bxjkya78jms7n3jdzf04plr1piwh9z92an7421m7mjkdj" + "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", + "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], "deps": [ "closql", @@ -39438,10 +39501,11 @@ "let-alist", "magit", "markdown-mode", - "transient" + "transient", + "yaml" ], - "commit": "e7d0d759440492549db331f3c39c3cc62880118f", - "sha256": "0j28vc0q1h36pk0y2nidnlsc2y7n0vpfrd8civiv1zp8z0jwfyc9" + "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", + "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" } }, { @@ -39476,15 +39540,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210929, - 2019 + 20211011, + 1029 ], "deps": [ "inheritenv", "language-id" ], - "commit": "772beb9acc3152cce10767ebba545c7af52b76e4", - "sha256": "1k70lrkbrj7g071nknqili0lga971fdyn52fzgjb8qwgr90j9fmp" + "commit": "88e095ab6f8eee9537ffad23f068ebbdee3cea31", + "sha256": "1z1sar005454b8lnfwmnnncpsdli13g4b1f2hvwl8c5w4z30n4g9" }, "stable": { "version": [ @@ -39621,26 +39685,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211007, - 846 + 20211015, + 607 ], "deps": [ "seq" ], - "commit": "f672b9af16184597747424543b87cbc6910e8ab8", - "sha256": "0xx67c8vbnqzdcyfsqv725xxj493hd9b3p3bqzl6an7v75v6bpi1" + "commit": "f370f8f2e57805b94ab61ea6997ad31e13f81f5c", + "sha256": "0ghxg54n09syxfnngiiil3hf1m566ajxkwi051i0m3pwfqcg6nwa" }, "stable": { "version": [ 3, 5, - 1 + 3 ], "deps": [ "seq" ], - "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", - "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" + "commit": "16bc2a6a817b53ed3306a3ff3cebd271e7bf8746", + "sha256": "13k84dzjar67fa1ixicl6h8gxzblszd0ik8vi11bvipysgp3j3ws" } }, { @@ -39702,15 +39766,14 @@ "repo": "alphapapa/frame-purpose.el", "unstable": { "version": [ - 20201219, - 1340 + 20211011, + 1518 ], "deps": [ - "dash", - "dash-functional" + "dash" ], - "commit": "b4a259fa077671e2dcf33d11b42955c91e395b8b", - "sha256": "033vbvv4rrjbsfw0bbhhzx2754r96vy9h4n1y8jmxrqzs9wi5mmq" + "commit": "7d498147445cc0afb87b922a8225d2e163e5ed5a", + "sha256": "03qalcx8hbf6r0jmh7hf1r4san13fbgaaabcs4c50cam7kdv525r" }, "stable": { "version": [ @@ -41172,6 +41235,25 @@ } }, { + "ename": "gemini-write", + "commit": "e97c45cafc44a4b2f08e577325e375c6312f6557", + "sha256": "039rdjsyx9lw7lh21ps84agm1rpinbylzlks6iv1h5pn341s67nd", + "fetcher": "git", + "url": "https://alexschroeder.ch/cgit/gemini-write", + "unstable": { + "version": [ + 20211009, + 2110 + ], + "deps": [ + "elpher", + "gemini-mode" + ], + "commit": "7e1fe7d4f2c65c0854eb571edc78e5a45d7078de", + "sha256": "0p1ch44w7sn73p87a7k47drgdj4sam961arfr4k0ii4fny54cyip" + } + }, + { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", "sha256": "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc", @@ -41179,14 +41261,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20210918, - 1525 + 20211008, + 1651 ], "deps": [ "cl-lib" ], - "commit": "a78da8f74fddb84412b98b9a8c881af4dce7ab24", - "sha256": "11rx5i0fmigjydpm2w4gwgrsf74a4xa856i17i6056mw1sjsjwaq" + "commit": "26f1d4c4e258c40e6b70ce831a04800c914f29b3", + "sha256": "16rjsmmhjjx4mch1aygrxqj3pr5c4xxqzf21qvr6s4c9yk6ayx1f" } }, { @@ -41412,11 +41494,11 @@ "repo": "leoliu/ggtags", "unstable": { "version": [ - 20190320, - 2208 + 20211008, + 528 ], - "commit": "1c43705753e639b34b58c9bf961a80b6610a7109", - "sha256": "15hv3d4wc32nidi0pl73i2v673s2lipzsy8llqy6asls2y268qgz" + "commit": "1442ab8c7f02d246f14150207534fba4a42201ba", + "sha256": "0bibr36b9cxxx5qgi27srfj21mv272npy5w1krrgmn0521qd07w1" }, "stable": { "version": [ @@ -41947,22 +42029,22 @@ }, { "ename": "git-commit", - "commit": "2571aed58ce9c4df998588cbcffdde704f4dce54", - "sha256": "171spbjdgnphv1d108y2ivf09yaqfpg61sjc7gs62cwld4krk4l6", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "0j4z9pmkbn366gqc9521dix5g5capqw4r6prjfxc6g0vlnzan30g", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211006, - 1626 + 20211010, + 1635 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -42059,8 +42141,8 @@ 20211002, 2345 ], - "commit": "c7fd6010ae223a1acde42260302b0be1ec11bdc3", - "sha256": "1r3pssix4g23adxxq5jf2v51dnk65xj4xr0zs31jnm5xj9z0qx1v" + "commit": "c1e51865eb26739052035177846f53476c8605da", + "sha256": "00rldkgmrjzr8nc3mngfh4vjscsdswqfqzrdwxmwmc0m3kx2yppz" }, "stable": { "version": [ @@ -42696,8 +42778,8 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20211003, - 1704 + 20211011, + 1933 ], "deps": [ "a", @@ -42706,8 +42788,8 @@ "ghub", "s" ], - "commit": "4d91dd6c56be1ae2b93b6b9e50c73f657cc461b6", - "sha256": "1j3qd7i1pjirzjfar29m6iyngj75jn13b08ba56mapp37jkzgavk" + "commit": "2a24e75dfc2d9f37789ff60b4c10deb7c96f3f88", + "sha256": "1mahd3kg5rr6jf1x3ixjvhgkv9c8fq8mxvikrmpjciari05sd58y" } }, { @@ -43370,11 +43452,11 @@ "repo": "lokedhs/gnu-apl-mode", "unstable": { "version": [ - 20210907, - 223 + 20211012, + 1139 ], - "commit": "f66273ba34a6f1d2bbb39bec9a6b4e38dc8d48f1", - "sha256": "1540z31hkz4mg9kkxkl7ii1pz1hy446j23r42la1qbchif6q0zpz" + "commit": "5d998206a963f2205dc6c4eddb41fb34187cb527", + "sha256": "1yzyq8k770j78f2gkkr1n1d5jpdfmj9l3w40pjd7fmn94xg3qw9a" } }, { @@ -43742,26 +43824,26 @@ "repo": "benma/go-dlv.el", "unstable": { "version": [ - 20200713, - 1202 + 20211015, + 816 ], "deps": [ "go-mode" ], - "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", - "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" + "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", + "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "go-mode" ], - "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", - "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" + "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", + "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" } }, { @@ -44239,19 +44321,19 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20211007, - 1403 + 20211014, + 1322 ], - "commit": "ae83654b4cdd752047674232290e7ca5c566748f", - "sha256": "07bjzs0w8b0spcksa2v5h20cnb8dvya1840xnagrpvcb1qfa49sk" + "commit": "ce730f126a63eae77bc9585f75fe1dce968d9a2f", + "sha256": "1r4x1v5j67k7idsy6vidc367kn2iznwdmlhx6h6lpnqv0l36n6py" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "27d9218aa10dc361aa89f666f91aea7fdfb43d1f", - "sha256": "0jgicsv8102pk340fn122w0hbhvac2nqcpr16lj7ccjg44qmnrdw" + "commit": "b3174e09a03954b1423c4ea2f2936f9fcd94f381", + "sha256": "054l7m9slhznpfkixrnk6n5h8rc9x7gjsahizxvkd73q0jvgqxgn" } }, { @@ -44864,14 +44946,14 @@ "magit-popup", "s" ], - "commit": "d6bd701aca21e3481213fc3769c5b220a2215826", - "sha256": "0irmk67zh0w890vy0cljqb6mcykimkjdjw410nlhl8hmvzykx5yn" + "commit": "086bb561d0544da01690d1028e6fd23c7c943573", + "sha256": "1ad9q4rv7c13ls1c9z5vdshcj8y6723phlkpzgq0aicw9fxvi36m" }, "stable": { "version": [ 0, - 26, - 1 + 27, + 0 ], "deps": [ "dash", @@ -44879,8 +44961,8 @@ "magit-popup", "s" ], - "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", - "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" + "commit": "086bb561d0544da01690d1028e6fd23c7c943573", + "sha256": "1ad9q4rv7c13ls1c9z5vdshcj8y6723phlkpzgq0aicw9fxvi36m" } }, { @@ -45646,11 +45728,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210617, - 1028 + 20211008, + 1720 ], - "commit": "7efb041b826f15b10aa9cfb67b971fdc41064980", - "sha256": "175gfhi1621pclwvhbz2a8rramfb47v353x5hxjys1b0p848yk1l" + "commit": "856d66a65a75fd9906c47a930a8ee584bdef4077", + "sha256": "1w4qcvmkwqz0kmzrqidrlr6mga8fi6khwdq2w5nzr31g915n2cv0" }, "stable": { "version": [ @@ -46011,11 +46093,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20210923, - 2359 + 20211015, + 1752 ], - "commit": "b5c7121a4a6e67c7e90bb6d8363936e50876093f", - "sha256": "0iccr1sjkbaw4lb3dja9bgyix6gwknvbmkk7xdn3misphl0fvnk1" + "commit": "e530afd2e42bc560b3236cebeabdeaef0e33faca", + "sha256": "10x8k19sf4jgbwxl0akzm3s47z8h78r83yb7512l62s2an3wi2g7" } }, { @@ -46962,16 +47044,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211007, - 1355 + 20211013, + 727 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "d8e433cac4ec2c594740f6d040e5fbfdec7a0bb5", - "sha256": "1hs3psdb69vc16jg49mnfy89gvhhc21ci9q3v8kjk0f26gvh5k6j" + "commit": "a86bcc99dcd45cd898a497715b4333d118a3c6f2", + "sha256": "0bf3cx7w11h7dwjys3gb62p8mfl586qnf86jlsrzhvsg0dm56b5f" }, "stable": { "version": [ @@ -47870,14 +47952,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211004, - 1655 + 20211013, + 445 ], "deps": [ "async" ], - "commit": "d8e433cac4ec2c594740f6d040e5fbfdec7a0bb5", - "sha256": "1hs3psdb69vc16jg49mnfy89gvhhc21ci9q3v8kjk0f26gvh5k6j" + "commit": "a86bcc99dcd45cd898a497715b4333d118a3c6f2", + "sha256": "0bf3cx7w11h7dwjys3gb62p8mfl586qnf86jlsrzhvsg0dm56b5f" }, "stable": { "version": [ @@ -49500,26 +49582,26 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20211004, - 857 + 20211013, + 430 ], "deps": [ "helm" ], - "commit": "11d9f8ca48f2ae638250b61ad8d7ef3741b07fbb", - "sha256": "1y0wqr8ic78n5a3fl205r9ss34lqm5mggncwxl240fckyzf2ibgq" + "commit": "ae2202fbbbe11873ad4b393a6959da50ac250c1e", + "sha256": "01j41pidn8aipz1c0x17p88rzr15bg7ij5fr1q2kf8qhky07xfvx" }, "stable": { "version": [ 1, 9, - 2 + 3 ], "deps": [ "helm" ], - "commit": "563f664df4076ec214035c8c1f8cee47841565de", - "sha256": "07jgkc8csnc2hcg4csy07zy3wjbm4fbk4lqiy82rdlxp1vad25vi" + "commit": "312392b786a7ea322914b60760e2693b53772ad6", + "sha256": "1bqk0z6zd3aza7ibb8h0ghya5kid4m6z01gs7jf4sr6p49rzp7hd" } }, { @@ -50004,8 +50086,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201213, - 837 + 20211011, + 1519 ], "deps": [ "dash", @@ -50014,8 +50096,8 @@ "org-recent-headings", "s" ], - "commit": "5da516a1586675992c0122ed32978c18dda06318", - "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" + "commit": "97418d581ea030f0718794e50b005e9bae44582e", + "sha256": "1y11rlnhi36lzhc1cagninv6hlcwbvj88xfr0g0xzpbzy7hys021" } }, { @@ -51555,14 +51637,25 @@ "repo": "brotzeit/helm-xref", "unstable": { "version": [ - 20201004, - 1817 + 20211013, + 1538 + ], + "deps": [ + "helm" + ], + "commit": "9764eabd50c40b009073c7ef64e3a71d0d066d0b", + "sha256": "0v0wm1x11r1h9p139c5rl0r4s5q6092bmwrsnr2140ddbq34mnvy" + }, + "stable": { + "version": [ + 1, + 0 ], "deps": [ "helm" ], - "commit": "23f1174cfca7667d95828dcd388c655a4a9c877d", - "sha256": "0v0lkabpi1n4hgnp28jk19f7b78yk93ssm0gr0fr25yqx5zskdnk" + "commit": "9764eabd50c40b009073c7ef64e3a71d0d066d0b", + "sha256": "0v0wm1x11r1h9p139c5rl0r4s5q6092bmwrsnr2140ddbq34mnvy" } }, { @@ -54240,11 +54333,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20211007, - 308 + 20211011, + 557 ], - "commit": "ca48999554e720d20be46f194f69919fb2894a82", - "sha256": "10n6fnxnsg6xmgj07h172g9sqwqwldp6cw31zrylgirz5nk3vn4r" + "commit": "0916be7075e792773440c3bdb5cf9c153691846b", + "sha256": "0817y99zm1x01nya6lnhby96da2w9kivw4p59bbaxm7hi0ycrsfz" }, "stable": { "version": [ @@ -57628,14 +57721,14 @@ "repo": "alexmurray/ivy-xref", "unstable": { "version": [ - 20211006, - 1043 + 20211008, + 1103 ], "deps": [ "ivy" ], - "commit": "45df80767104dd8f4fe957156c82f1d8b77d64d5", - "sha256": "1c0k1in2hpfwfd7m5r8623d58kxsrfl6pwpgdrkk3077vdgbwiip" + "commit": "a82e8e117d2dd62c28b6a3e3d6e4cfb11c0bda38", + "sha256": "0h4cnhfqgrzm63kfrlz2mhgsk20jkcq18gjx9pvbbhhg59xvvnaj" } }, { @@ -59094,28 +59187,26 @@ "repo": "joshwnj/json-mode", "unstable": { "version": [ - 20190123, - 422 + 20211011, + 630 ], "deps": [ - "json-reformat", "json-snatcher" ], - "commit": "0e819e519ae17a2686e0881c4ca51fa873fa9b83", - "sha256": "0m4i6b5qmakdc0h8npsyajdp06jq03cb1c5rkj6x0khnjw9fv2fl" + "commit": "eedb4560034f795a7950fa07016bd4347c368873", + "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" }, "stable": { "version": [ 1, - 7, + 8, 0 ], "deps": [ - "json-reformat", "json-snatcher" ], - "commit": "9ba01b868a6b138feeff82b9eb0abd331d29325f", - "sha256": "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy" + "commit": "eedb4560034f795a7950fa07016bd4347c368873", + "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" } }, { @@ -60060,15 +60151,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20211007, - 1037 + 20211014, + 318 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "7fc3bb521cdb691067838acf756ce4579b727d9b", - "sha256": "0vgahjgdvggg2scif18msw8ddsbkdxw988j2ki5ipclil9qfz8h4" + "commit": "fd6f154ac96309ff56220c595f80e9126ec566c6", + "sha256": "1a8fy48xg4bbz3qf9dxvxh8xhvig5w8wkdvy9prn5fd456bn58hj" }, "stable": { "version": [ @@ -60210,14 +60301,14 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20210226, - 2246 + 20211008, + 1702 ], "deps": [ "cl-lib" ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -60231,8 +60322,8 @@ 20200601, 333 ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -60360,8 +60451,8 @@ 20200226, 2129 ], - "commit": "1ee67f3f8977d95785e021f7896685de1979137e", - "sha256": "0cv0naq2g8z52vgf1p4mb55ww30bp2kpj1jp5cjnql1hxsvbx0mm" + "commit": "6d31fcf78a1ab1841f735dfb5cbd2bf6b2ed25db", + "sha256": "19cszpr5m6j5xj18wl4myn7ifw27rrwbmhd0wcsds28b4czw2mhm" } }, { @@ -60893,8 +60984,8 @@ 20210318, 2106 ], - "commit": "9a1794e8c3e020252f7e41bc2d6ed78c461a69b0", - "sha256": "0yqgq71kfi68iy1f90yxlg0iar3z88ngs166s5rwp3m2yal9fdan" + "commit": "6430e1356248313f5cdd3a96c8861b17b12c0be7", + "sha256": "01rzf8v9psihzpg0s5ar2svkxccmb32ypwsms3863c67ag9d9818" }, "stable": { "version": [ @@ -60914,26 +61005,26 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210909, - 30 + 20211013, + 1558 ], "deps": [ "request" ], - "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", - "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" + "commit": "cb843349c10b1a492ceb59da20bfcef3ef02f4b5", + "sha256": "08dkxjrpdy3i6j0zgfa7bqdk8cykjfzybrfwrrf9848fxy96n4pb" }, "stable": { "version": [ 1, 1, - 3 + 4 ], "deps": [ "request" ], - "commit": "7d6039fa5d5d7561f42c4c2a93c698468ed34e70", - "sha256": "0g99qkch22ws3d8qwp91v0mysjh295bag1ak3bdl8q7rl015p9ik" + "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", + "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" } }, { @@ -61269,8 +61360,8 @@ "transient", "with-editor" ], - "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", - "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" + "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", + "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" }, "stable": { "version": [ @@ -61304,8 +61395,8 @@ "evil", "kubernetes" ], - "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", - "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" + "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", + "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" }, "stable": { "version": [ @@ -61530,8 +61621,8 @@ 20211005, 1517 ], - "commit": "6609581a58ae9c0124de785b056f4f5bbcec3b61", - "sha256": "12bav2dd0q6b47sxnqfv6ibrhzd6i74wwqz7zvm7lp9s4mpqscsa" + "commit": "3ef4c22982119674861ed61e3302ac3e0f05be2b", + "sha256": "0m05qyy0w5k9ycb2ywv222cy99brw2d1gmcan6b4311r04fv9k70" }, "stable": { "version": [ @@ -61580,16 +61671,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210520, - 1737 + 20211008, + 1231 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "2aeeb4cf1dcdc47ada963634731dde0b7a9e4948", - "sha256": "189mmxxdwyc8w94rqpg7f4hd0fhk973mrszvlw92xpca1i9825cq" + "commit": "933a1b37b86685bb1f2df2a2185741b0d21aaa78", + "sha256": "0mxsqf78y4chm4yyxbfz69p56m3n35c5sv4agdwg6griaf0s5f59" } }, { @@ -62314,8 +62405,8 @@ 20211003, 1412 ], - "commit": "a3cf051632d48d95eb0d3bafb6f79d61170c0755", - "sha256": "14j9c3i1vv5wq240j2q7b818cg1xm425nnhncrawizajj4wk2ri3" + "commit": "ac6ef9cbd39f7d9ac0019e28da09aad5bc2cfae5", + "sha256": "1gsv9yir8l53qfz280ji7307vawrifxx80g7bb5kyq7s0k5zfsan" } }, { @@ -62947,20 +63038,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20210303, - 1751 + 20211011, + 954 ], - "commit": "2eeb1dabf6b3105561233250063abf1d066a0df3", - "sha256": "13rb8wf8lihqwnpzbzxx5wzxv0qayix0qgjg2540mfsgzgsy7rd3" + "commit": "972179180b6a09791737b1af75a6f653a7146047", + "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" }, "stable": { "version": [ 0, - 26, + 27, 0 ], - "commit": "d48098c6724bc0a62170c2f9ff73c792c71c8452", - "sha256": "15vvpa4jqqxv8vffq86dh44qn0lij7hv6mbgizwz9bssbq1cdgsb" + "commit": "d5d3a30e724a4ba2d5a96b51180e1fd907e57d32", + "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" } }, { @@ -62971,15 +63062,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20210715, - 839 + 20211015, + 511 ], "deps": [ "fringe-helper", + "ht", "indicators" ], - "commit": "97494f705c0208ccc8dd51d8c0366cb2bd5f228e", - "sha256": "023kx8v7phaw3why3zkh1q7n6igqb0zgf37zkli6gi8y4spzlbns" + "commit": "c78bbb33c1f120da517ccd11f0681321bca17647", + "sha256": "114afr2b41yk60s4r1068nambkhj19k6pn6dn2v94i4gbq8p37bb" }, "stable": { "version": [ @@ -63111,14 +63203,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20210926, - 1333 + 20211008, + 1652 ], "deps": [ "avy" ], - "commit": "4326da5617e5d04715538536b93c44a085f5dad1", - "sha256": "024cyywz38bpb9szqjnnc0pjrl7cxi7k59bbgpa740r7713qybs4" + "commit": "83cd0489b16f013647d0507ef20905a0a91db433", + "sha256": "0kwaia6i0asr7yqcw1anzq6lf93357cc1fphkvp0llbmxizmkzb3" } }, { @@ -63213,6 +63305,30 @@ } }, { + "ename": "liquidmetal", + "commit": "9aa2004e04ef2f1fbfdd722b271c7cdcbdc8ad10", + "sha256": "0f7xp490nd4ff43pi5g911hsbcvlxzj5wx26b6lflhhnljkh5fsv", + "fetcher": "github", + "repo": "jcs-elpa/liquidmetal", + "unstable": { + "version": [ + 20211004, + 1429 + ], + "commit": "e42baf790629cc3a7310194c4f00d9dafa34f933", + "sha256": "1p3bgfcp1pqilmc4jxs3y182mcddrqd7m0l9b2k2wbdcar1fphpf" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "commit": "32ddd9b52875a6fa403104ed271e15d86d215463", + "sha256": "1czyiy26wxkxc2lbrrblz8hzpf8p71fyp4hh63vsdf2fyimyl1cw" + } + }, + { "ename": "liso-theme", "commit": "27b849f3a41a5ae3d497cef02a95c92fd479b93b", "sha256": "014a71dnhnr0dr36sl2h8ffp6il9nasij31ahqz0bjgn4r16s5gy", @@ -63315,8 +63431,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210914, - 1209 + 20211014, + 1136 ], "deps": [ "ace-window", @@ -63325,8 +63441,8 @@ "iedit", "zoutline" ], - "commit": "9568ee1aa5ac12e0ed03b9904b77c7a5bc4bb2e2", - "sha256": "1ysprqpha2nxf3zak0lssls66asfl95qn58q90k57p1hpf0qbs06" + "commit": "8ddcf0c8f69e2a669f197c50a701dc6aea74d7c5", + "sha256": "1z9z8225bb5ih9bf2d0nzwl6258wk327dky91z247jddv5mzj4m5" }, "stable": { "version": [ @@ -63763,8 +63879,8 @@ 20210701, 1955 ], - "commit": "aa92fa4aa2e41acb45bc697187036407f953ab03", - "sha256": "0x2s1xvdgmw7w6dr1kfvybqfwq6i1mvn2ijwbzi2sil8l5hb73a6" + "commit": "a1a02199a73e0d4edf50f977203eb40a1797e366", + "sha256": "0k2ya743k6ghkxnx0pyb3brsrbx8a31il62bj01ax4p17gq1w902" }, "stable": { "version": [ @@ -64514,8 +64630,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210929, - 1620 + 20211009, + 2036 ], "deps": [ "dap-mode", @@ -64525,14 +64641,14 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "38906bb3e69c16b3e8d328fd6ae764f1d4369b9f", - "sha256": "03ppi015i1fkq30vx401x4fny3jz6msqzy5lg5jyqrym3s6gfml7" + "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", + "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" }, "stable": { "version": [ 1, 20, - 0 + 1 ], "deps": [ "dap-mode", @@ -64542,8 +64658,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "1a839dcdedac47c90b4f82f456fea0a7cacf2940", - "sha256": "0m1bccpamxvasimdg6pq28lnbwy2v2xnzjradbl93x7c2drsvnik" + "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", + "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" } }, { @@ -64946,8 +65062,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20211006, - 1954 + 20211013, + 1655 ], "deps": [ "dash", @@ -64957,8 +65073,8 @@ "markdown-mode", "spinner" ], - "commit": "237363939b2630a807261f31614ac98fad29b785", - "sha256": "1x436jki9wqxjzp2j1p0kx8waw71glxbfh8zlcw31nyiwk7znb4i" + "commit": "b5d9b3b2c8638e223ba1524c76c16d0f616d73ce", + "sha256": "07ngkr86zgpi7xp1h9nx68gwpfvk5ffdk69m0mb4xn2zkjpd2d58" }, "stable": { "version": [ @@ -65292,16 +65408,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20211003, - 402 + 20211009, + 1545 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "69880741041d5c61abcef941d06234f7cbd545b0", - "sha256": "05awyfzwgzv8d3qjpmaxrkgxhh7njfqj72lkxlij6l5snng24bgz" + "commit": "d08c5528ba0a63433a466c2fa1265ec3250fcef1", + "sha256": "0p12arjl03y2ax8b6g36ppnb1qqkkc2pvv415wsgxydqias775mq" }, "stable": { "version": [ @@ -65806,14 +65922,14 @@ }, { "ename": "magit", - "commit": "4158066a2c75cf0bff128bd2dc1073472c32b1f4", - "sha256": "1hrh90qd47s6q6grr6rp2y7kfqq8bzhdfpyq2saihrric91s1rqz", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "0n327xp6zdyp5bbqr84qp0f779qqv6jrlr2kaf00whkgp59g5kf4", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211005, - 1646 + 20211011, + 1635 ], "deps": [ "dash", @@ -65822,8 +65938,8 @@ "transient", "with-editor" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -66157,21 +66273,21 @@ }, { "ename": "magit-libgit", - "commit": "0580362be495894c61b99b7efb4cfa435cc0dd72", - "sha256": "0fi3w2f79qn3hf5rw5jp8128xbk5r0xwwwb56zcjn2na02dynfb1", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "1hh7d1ii3aw9ghmidc6pifaa0ci230vm17sadl3xlq7snpghlrhi", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ 20211004, - 1955 + 1956 ], "deps": [ "libgit", "magit" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -66326,20 +66442,20 @@ }, { "ename": "magit-section", - "commit": "92cab05cc5ba4153be97648d6fcd95417871e9c7", - "sha256": "1v9g8y9r0lmp54hgaxgjqr3x86l7cz4wvrrjbpij7aai40ddqdp3", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "13dxx1rjpj465h1ns2nki7wfsmnfh9m1gzlm49jkka38iwnqr81j", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211004, - 1955 + 20211012, + 1845 ], "deps": [ "dash" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -67134,19 +67250,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20211006, - 724 + 20211012, + 1606 ], - "commit": "c9444d790d75c7cfaab1046570a05125f62576f0", - "sha256": "0si3wiacczqychsfc0dppnmwrcgjsb1n7rh555nn5jk1hsl0a0j5" + "commit": "9cd762b6c3f2714375f47993e9a6384d3bc16ebf", + "sha256": "05w8c4rlbdbiwpwirkpnkixifjki6rfgcz8myh0i4kyb1ayfrq2c" }, "stable": { "version": [ 0, - 8 + 9 ], - "commit": "b65d66e9301f9a0e3012568ca6721ae4ec276ebc", - "sha256": "1d6xbidxcxd5gxs5cjxbx1i1wdcmgdnn3hh7fxz0sgf1gaxyp5kv" + "commit": "37e24b798afca98da0d0364dde3fa63a42c5853e", + "sha256": "19l3fwh6phd17rssxk30v2380bs04x7w6cb3hjy4mx7vkc7w6ymv" } }, { @@ -67769,20 +67885,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20210917, - 1715 + 20211013, + 611 ], - "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", - "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" + "commit": "f6b608db585231eee231d5473edcf4183bb678fe", + "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" }, "stable": { "version": [ 0, - 6, - 1 + 7, + 0 ], - "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", - "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" + "commit": "f6b608db585231eee231d5473edcf4183bb678fe", + "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" } }, { @@ -68677,8 +68793,8 @@ 20210131, 2152 ], - "commit": "88516546fa25f3a629dc6729403328b6edc29109", - "sha256": "080m42ck7gdaa545vra02gkvx0prav43xspp5hwhx30mzkb77n5m" + "commit": "e9791ff92c27bc7df18f238a29f05fc164da2f51", + "sha256": "1j7ni3qjcy0fikzhhm4xwwwskdm6qnb1c1kshh8xrd9c06kmfrv7" }, "stable": { "version": [ @@ -69683,15 +69799,15 @@ "repo": "damon-kwok/modern-sh", "unstable": { "version": [ - 20210917, - 748 + 20211015, + 335 ], "deps": [ "eval-in-repl", "hydra" ], - "commit": "1905cc0c5fe7a306abb4e862c36f00471ce9d0cf", - "sha256": "1xmv6wkbrra3prdm2s3c6hjw5fzp082w15mha60638i3rfmj6sm8" + "commit": "e88d83958ab43e17b9763b3220e0dde862b49a83", + "sha256": "0x2j9i3kns5w9b6bklvmf077dbc5mdim3f4l68nbl0l6kcmlb68k" } }, { @@ -69741,11 +69857,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20211007, - 1358 + 20211015, + 456 ], - "commit": "86ce981066010f4f17de567546ed7151ce5aa4cc", - "sha256": "1934i9is9fdsgv20cp8v8g5jmi9gh51mq3mvg5qzizixslwp8pcv" + "commit": "5ea090b223e8a83f7f3800a96bd4ed3ac9d62230", + "sha256": "1dw6v1sz3b8xf28ly17vsf9j5r9ylwd1p1hz26c05zf9dygiwp45" }, "stable": { "version": [ @@ -70376,8 +70492,8 @@ 20210306, 1053 ], - "commit": "7a2decc75a4b9b1e08ed994c0e675b21e2b0f81a", - "sha256": "06zgjibyd8j0mnyf6cymrb5qhl26kg64z5jizrh2p841wija426v" + "commit": "aa48b23dcf92ea1d85d8e8dbca8c0a0c37e159f8", + "sha256": "181l8l2bihvsg3y652qhfjza5vp0irwdc6q6h1bl8zj0by66p859" }, "stable": { "version": [ @@ -71298,14 +71414,14 @@ "repo": "zevlg/multitran.el", "unstable": { "version": [ - 20210701, - 2153 + 20211008, + 826 ], "deps": [ "cl-lib" ], - "commit": "c34536186088f29d4e85631825e7c6d557a8d0fa", - "sha256": "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx" + "commit": "3a3f3561dba816f580cc21526d4f7a231a30bb51", + "sha256": "1s3iavcbbbb4rf70qay4maf7fvfm8i69smyxl2771vb7dj5fjk48" }, "stable": { "version": [ @@ -72522,11 +72638,11 @@ "repo": "danielsz/newspeak-mode", "unstable": { "version": [ - 20210913, - 1029 + 20211011, + 1425 ], - "commit": "4bfef8f834b021d65cf6f920b02c082a719a302f", - "sha256": "1ng024c5qw38p9qlmldh9r08wcvivs17vw2kl8y17z6d233xrgnw" + "commit": "7ae89edd0f72c2dc005933fada5ddaf48ec97dd6", + "sha256": "0fnl27phpmdgg3ja2jpm846x1pq47fqi3yjngxr32fag86hjamvw" } }, { @@ -72751,11 +72867,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20210929, - 2219 + 20211014, + 1848 ], - "commit": "e5d12e26bc98f99b3b1e4b5af452f3079a98e0ff", - "sha256": "0i02r2kvji7dkmkr5waix7bjzlqrjxmvbx53k3ywb9268pi9yv2j" + "commit": "b9e383b4fcc7a3232f9943aed29586a760602a1d", + "sha256": "1kmcpndqh4072nkkji2vxd2br0wyp4ih3b7r4rx90mrimpdvcbrm" } }, { @@ -73487,17 +73603,18 @@ 20210920, 2339 ], - "commit": "3e2e724d53a1dce3ba00a20c71b2e6f735678136", - "sha256": "0hx8l131qwy5cmxii22lhr48lnwni2i7sd025h12gjala6z78jfz" + "commit": "0f196b5659c8a66af4357fee3d4b3a169044472d", + "sha256": "0h068mfry2gllr8gy836a7i8zpkd6bqljnwfcm7yssfv3flrw3z3" }, "stable": { "version": [ 0, - 33, - 2 + 34, + -1, + 0 ], - "commit": "3c60a25c6dcc4d594b66c0f8acd3e84b82a6f42d", - "sha256": "0cqwvs8035rcnwjl92wx0gi4idnfq93n1k04gf19s0609409kbxw" + "commit": "0f196b5659c8a66af4357fee3d4b3a169044472d", + "sha256": "0h068mfry2gllr8gy836a7i8zpkd6bqljnwfcm7yssfv3flrw3z3" } }, { @@ -75364,8 +75481,8 @@ 20210923, 1348 ], - "commit": "3e4d68c726ff8f1baf04ee8076be57d712d2373e", - "sha256": "17r5k0kyvmmnj8g0zqhar0y0zm06q7rqjq4bd1n1cvr5f1zp9gg1" + "commit": "aa673e27f6d7cbc882ab6109cfbcca2ba0864507", + "sha256": "0xv9hmj7girdb4c1xqlk5nj4snhvl34yaz7k28jny50frkszvfca" }, "stable": { "version": [ @@ -75558,26 +75675,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210915, - 1404 + 20211015, + 1032 ], "deps": [ "org-re-reveal" ], - "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", - "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" + "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", + "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" }, "stable": { "version": [ 3, - 24, + 25, 0 ], "deps": [ "org-re-reveal" ], - "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", - "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" + "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", + "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" } }, { @@ -76565,14 +76682,14 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20210214, - 917 + 20211010, + 958 ], "deps": [ "async" ], - "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a", - "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja" + "commit": "50292af50d275846baa28e52d94eb8ef69c8d00b", + "sha256": "0n0divfnk4635aanjm0b3swdjkcj4qxr0x95q05pdlb67s6lfp5d" }, "stable": { "version": [ @@ -77490,8 +77607,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210805, - 2225 + 20211007, + 1843 ], "deps": [ "alert", @@ -77499,8 +77616,8 @@ "request", "request-deferred" ], - "commit": "db3072adc3f1a57c7a459a3ee911a40db0fc6a8e", - "sha256": "02jfcgl8schra7ir89ajzvnyc9ql208vfasa3qm27vr3yyxvykaj" + "commit": "8b6df4b727339e3933c68045e104b6b1d99816f7", + "sha256": "0gkdh32cfmqbmvvqd67i2x9i1fm5yfmhw6i5yvrb9swsl24kv194" }, "stable": { "version": [ @@ -78909,28 +79026,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20211005, - 1608 + 20211008, + 1310 ], "deps": [ "htmlize", "org" ], - "commit": "36d0973c6c3110a71bc27f8464f4d4b6a798e467", - "sha256": "146hnd1jd9j2bgpn951k7m8kh6ncvcfqvvs4rdhmsk1w426ah5vb" + "commit": "33d226ff707a31804ff3e6ba22416c3f0b463ad7", + "sha256": "0hi8lq9rj6i2m14dh75dzq7lq41i4f6qj4xbp2b8krqw6mk9xg7z" }, "stable": { "version": [ 3, 12, - 0 + 1 ], "deps": [ "htmlize", "org" ], - "commit": "36d0973c6c3110a71bc27f8464f4d4b6a798e467", - "sha256": "146hnd1jd9j2bgpn951k7m8kh6ncvcfqvvs4rdhmsk1w426ah5vb" + "commit": "33d226ff707a31804ff3e6ba22416c3f0b463ad7", + "sha256": "0hi8lq9rj6i2m14dh75dzq7lq41i4f6qj4xbp2b8krqw6mk9xg7z" } }, { @@ -78973,18 +79090,17 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201213, - 747 + 20211011, + 1519 ], "deps": [ "dash", - "dash-functional", "frecency", "org", "s" ], - "commit": "5da516a1586675992c0122ed32978c18dda06318", - "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" + "commit": "97418d581ea030f0718794e50b005e9bae44582e", + "sha256": "1y11rlnhi36lzhc1cagninv6hlcwbvj88xfr0g0xzpbzy7hys021" }, "stable": { "version": [ @@ -79014,8 +79130,8 @@ "deps": [ "org" ], - "commit": "093c1726ffe4358d60fbb97c1bcf01b785827098", - "sha256": "004g7av1dx3i25lr0r33dd2ch4i9r5mcgjh7gjm6rj6nbyh1gqhb" + "commit": "5662cc897ab1533b39e3e93b2150dacbe699d591", + "sha256": "0fq8ns5f0k9mg9dz1w778jp0icpjkx62fa3a51yrsqisycl3cl6y" }, "stable": { "version": [ @@ -79052,8 +79168,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210913, - 1445 + 20211008, + 1334 ], "deps": [ "bibtex-completion", @@ -79068,8 +79184,8 @@ "pdf-tools", "s" ], - "commit": "8c503e61681a39cfb104793b35f2f7b801c6830f", - "sha256": "1pz4gwi8gwlbnxa003hk2k0arzic8700xsj0bhpnh2d0zarghcj0" + "commit": "9556a6c9639f6b32124ec2b8059975b0538625c2", + "sha256": "0g7ldyxy1p5r2xrw51h0h4r3kcxncvfb5c0dfaw174r0g2vw4j5d" }, "stable": { "version": [ @@ -79216,8 +79332,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20211003, - 557 + 20211013, + 1624 ], "deps": [ "dash", @@ -79227,8 +79343,8 @@ "magit-section", "org" ], - "commit": "54d17cc50f03f22ca44f4d88f7e589a00c59d05c", - "sha256": "1j2nv3c424x88riqy3m0kb9qinpa15ixrpzqa0zizcnx2dj4iqmn" + "commit": "e9299297f9cc1aafda62deb8af7957dc8d56dc04", + "sha256": "0cg8kywg8qwr3079k2863gmlpjns6s61r38pc0p4iys1ry02bgxm" }, "stable": { "version": [ @@ -80071,11 +80187,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20210915, - 335 + 20211009, + 1707 ], - "commit": "571ff333084dad83a535becfc1fdd601ead2da02", - "sha256": "0k1lg3rc6x6alxhjwggh3fdlmpbx8qni8d6qakp6i1ba7459d0mj" + "commit": "27f8bb6a9676e1c0b500e75799e3b5c37a9156af", + "sha256": "0751qlg8xxwx7mldgdry1gfrarvhzg2smjzxd3382i6j63mpala9" }, "stable": { "version": [ @@ -80731,15 +80847,15 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20211006, - 1626 + 20211010, + 2105 ], "deps": [ "org", "seq" ], - "commit": "657d655caf408283cc1c6fcf437f33b25166244b", - "sha256": "1y2lav5dk67k4yy67kc0hxyd46x9mdg0kkzmc4sw5vvr9jgjk1in" + "commit": "05df4989c987dece40a450bd5cfbbd6cda0f2e7a", + "sha256": "184hag1kjbzfc7k7c1nd1y9w3gimgxjgkkyqawjzv00sph3mnvd4" }, "stable": { "version": [ @@ -81952,8 +82068,8 @@ "ox-gfm", "s" ], - "commit": "e79c4c4429f64fe61cfa673dcd33273bba30f9db", - "sha256": "153sr1pnnlglzmsz9kx8d8h604j01anf85n57pdz2dnbh6wr2wak" + "commit": "4adf97dd195f0a777b952b97888b77cdd9479629", + "sha256": "0yxzhgjkipy632jhw83l8cz5s7727m87sj6ldpzdh57w1abklidq" } }, { @@ -82131,14 +82247,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210902, - 1452 + 20211010, + 357 ], "deps": [ "org" ], - "commit": "624dee4ee2300315eb1a32b17e8831ce6677fc72", - "sha256": "1n49iwrfzxx9ad399sm5q1phzlv5890i3vacxci6hpmi26bnqb89" + "commit": "d99311fc5be0a7f0acf2ce9ae2d012a651e1c31d", + "sha256": "1ayqi6s4ympskn7iklk2kplnciryfr32yq3r6zm6x091vlayck69" } }, { @@ -83470,20 +83586,20 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20210930, - 540 + 20211013, + 453 ], - "commit": "fcebf650759929256ec9c4bb83b677240622be8a", - "sha256": "15aar5fsci2y8hy045ypdrig4z4kqrd8318im3yzyyf40y1xrz1d" + "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", + "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" }, "stable": { "version": [ 1, 0, - 4 + 6 ], - "commit": "5809ae74cd7f5217ae29dc3bae2dba4c1c2c855a", - "sha256": "15aar5fsci2y8hy045ypdrig4z4kqrd8318im3yzyyf40y1xrz1d" + "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", + "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" } }, { @@ -83494,28 +83610,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20210930, - 1615 + 20211013, + 452 ], "deps": [ "map", "parseclj" ], - "commit": "b00eb42a1c10f19ba0f6ff5f8cb9e3ac05285dbf", - "sha256": "1drlhsnqvqyxdw8k9dlfjnzqxgx1m5kpda1cjkanz1s0jq1dxgcl" + "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", + "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" }, "stable": { "version": [ 1, 0, - 4 + 6 ], "deps": [ "map", "parseclj" ], - "commit": "3b1bea14257fe2acd067b6644e0d916cfaa806ba", - "sha256": "1cz2bgaddlrcqzra8q50yh90rdl0kpyf5js2vxccdsq6ngr8bnmv" + "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", + "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" } }, { @@ -86018,11 +86134,11 @@ "repo": "thomasluquet/playerctl.el", "unstable": { "version": [ - 20210411, - 1442 + 20211014, + 856 ], - "commit": "41564d453c9f936a4ce2699afacc6d1dff974f1c", - "sha256": "0fbnfxhfyam5zvf2ild5bxq489dnpyrzclnfwq0lhzgswjj70hw6" + "commit": "4c3a6132616fd28f902590bf6e63332e6055492b", + "sha256": "18b59kcni6xp46r8lkwb8baz2mic9n4zyndib10dvfs6gwjmas2p" } }, { @@ -86996,8 +87112,8 @@ "repo": "ponylang/ponylang-mode", "unstable": { "version": [ - 20210118, - 1325 + 20211015, + 331 ], "deps": [ "company-ctags", @@ -87009,8 +87125,8 @@ "yafolding", "yasnippet" ], - "commit": "d3b108338219ff275e4ed2c67a2c5f2ce334bb94", - "sha256": "0klpwchiaqrg9gclpbc4ya4kkf33bl6h7khp1b4pjx6zg28qk8ih" + "commit": "1abf04bc8f4f09a6add4b587c7cf5ca23735e7c0", + "sha256": "1iv04dj2nc9cyyslhir7aj5sligwan1yyclsiarn86lik7b9lmwn" }, "stable": { "version": [ @@ -87087,11 +87203,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20211003, - 1054 + 20211011, + 435 ], - "commit": "918306c2afbb09e92f7cc704ddbabe9701bef6f8", - "sha256": "1rk9lzcjhkqvaxjgwj0gsfwnzh9q1kmlwiy1jvp3wzi81j42zdf2" + "commit": "6a2ddcb35432afb56f32e11518c2b6ae7795e8c0", + "sha256": "0sv8bi34fbg0awi8maah5fs13s0wmzbvalq13z2zx9ybb8ivrsfi" }, "stable": { "version": [ @@ -88176,11 +88292,11 @@ "repo": "fritzgrabo/project-mode-line-tag", "unstable": { "version": [ - 20210615, - 1825 + 20211013, + 1954 ], - "commit": "ed6adf9287d2aa526d85451623f1aa281cfa7e0a", - "sha256": "0xryvjsb2r4rj22wgjpixa31kg4sp7xww63hldnf7c1cvcc9g305" + "commit": "e411432a33cd82f8a9ff95471c91e9fe1833841c", + "sha256": "03aiv70shxhcjcldahny7xxclnqdw5bf37f8496dxmzz0zx0v98j" } }, { @@ -88693,11 +88809,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210918, - 2238 + 20211013, + 1911 ], - "commit": "38ae8fdf23f37af71b8a4f9717ba48c52653db63", - "sha256": "1x5d0rki2lsyg85srldwg34jaiq14l1nw58bab74n7xhp426pvyw" + "commit": "fd04605af1b07684da522c32d83ac346050926bb", + "sha256": "017j3vcwlg6k2h76wbads6jxmnmxj19g4c42zs3mi2vwqhfvgdqx" }, "stable": { "version": [ @@ -88797,11 +88913,11 @@ "repo": "google/protobuf", "unstable": { "version": [ - 20200619, - 1742 + 20211013, + 1726 ], - "commit": "b7cc13068dc198e480271e98b53cbeed195e9d05", - "sha256": "1lfy5p2akjnmpssc92jfx5j88q53s35338zhsafc2k4s650dc4f2" + "commit": "c01cd6ec794fd91b316cb236663c81eefa1efa4e", + "sha256": "1rqsg37dxglxddipfpph5xv6mlsh73hgy66vlirrvcs0ijiyjj8g" }, "stable": { "version": [ @@ -89212,11 +89328,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20210928, - 703 + 20211011, + 1529 ], - "commit": "a076d32f281d2984c6072461d034688c41eae3c1", - "sha256": "106qvdspwahyahd4my5wby02ffykbwb04ahlqcrbdapw6aflnv19" + "commit": "825952d0a4a1d5eebf849280ffd4e1e44e1a847c", + "sha256": "1w3iz542v83n6vc4j0nhqmkp21h0m42rqgp6648jlx7q0n4qmdz6" } }, { @@ -89876,8 +89992,8 @@ 20210411, 1931 ], - "commit": "c4ed76d3948afdb0176835c1fa6eb48f54bfd54f", - "sha256": "0m9ksp59bl9lkhrzgkjivnwkl3lv5lgg1zhs47q2gc0sl66xrknz" + "commit": "ab775f6f4507a1f0cd9dab0fd027c2f08be06928", + "sha256": "0js9addqxk2dchgrjnz2wdxxp7sszq95zvga8j1igihx7w83xp7f" }, "stable": { "version": [ @@ -90157,11 +90273,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210930, - 836 + 20211013, + 1620 ], - "commit": "c0ca60e1a83c635d96a76d36e912904e6d0e3446", - "sha256": "1c7w6bl9lccx96i9vyrxg714lwmfhdd3lar5rvf4k6an0vifqzc8" + "commit": "e92d0e800b494c1dfcca109154a6b7eb6fad0e4e", + "sha256": "1lxi1iwckpfk6966sgcdj3sz9bcbylsm3nqv9wbbzkqbjlyd28y4" }, "stable": { "version": [ @@ -90312,11 +90428,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20210527, - 829 + 20211014, + 707 ], - "commit": "045ff9476dac26086a04538d9b7ba186aa8f0fd1", - "sha256": "1y5jqqqh0df75qydw3h7rx24pv5z628ci8ymdksn5khl1qp5041x" + "commit": "31ea715f2164dd611e7fc77b26390ef3ca93509b", + "sha256": "1708xh2sq7xvs4z5zkik9ircxvzimhzi6phc2j43fvvxgglcgrk5" }, "stable": { "version": [ @@ -90382,12 +90498,10 @@ "stable": { "version": [ 1, - 1, - -2, 1 ], - "commit": "eb2d5bad076b17a8c431200be7357460a7d3c088", - "sha256": "1y7xd2lr88z47s70xaxkd9zl3aqna2d87ad2ism3ywncb1sqmd24" + "commit": "76de0de6449031ef5dd3e73ea4ab820e0d58a0e2", + "sha256": "1b7z3nxwrgkw1p7dp6ibsvhvpyl2m881w9yr9qcmdrkf78cqlpvx" } }, { @@ -90803,11 +90917,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20211005, - 1559 + 20211015, + 1650 ], - "commit": "46df4d9ecbaa7da1f48e55e5769d05e4ffdbd8b1", - "sha256": "0c4h86vxv9gwq7cy4jd446zxnp7kbkfj9h58m29i1hhwz056pk6j" + "commit": "46bb0bf29f6b2fb571374e1aaf4252bf5f54281f", + "sha256": "0hkshj2kf23pqnmwc6d1glcg7my402qqngcn4iliy89rp56xdgqs" } }, { @@ -93387,8 +93501,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20210723, - 1236 + 20211014, + 548 ], "deps": [ "cl-lib", @@ -93396,8 +93510,8 @@ "popup", "posframe" ], - "commit": "1d9bcc6dad4182e9b6a5839f8261b260e57be2fc", - "sha256": "157hndsslfxyi4n927y67shnk2xwhwz0idxwkdhcd4zl9jjzwpqr" + "commit": "b296856c21d32e700005110328fb6a1d48dcbf8d", + "sha256": "1x3v18hwxj56zhn4437nklyni4d3chk84c82a8y1z1flcayjipvy" }, "stable": { "version": [ @@ -94430,8 +94544,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210830, - 1944 + 20211014, + 2241 ], "deps": [ "dash", @@ -94444,8 +94558,8 @@ "spinner", "xterm-color" ], - "commit": "804ebfe0295a6bf37870e06f84a8d35f55c9f1a6", - "sha256": "0ya7l8yfbax74lrwvcr3lxaffb238m3yk8y37msvsk1pvwcjfkr7" + "commit": "4f25042b12a782c0acd87fc436de2a1a9140322e", + "sha256": "1aq79dijx62y1h8g5kgdbi5xh4w6wdq47m6g5w64c0rr2igziixg" } }, { @@ -94934,8 +95048,8 @@ 20200830, 301 ], - "commit": "dc045a7670c3f6a6b7c59cf38fd58d980c70e0f4", - "sha256": "1yhfa2f5yrhq9wbq5mshd1cnwks9pwx27isbi1v6gp32lzfwi1jq" + "commit": "dd7f6c0256ccfbd1e6efa6c06b9a12ef3565c29c", + "sha256": "0b5rkj75yxhcdbl7zy008g1n7lwivpnaz78434wb1ljn3l0s56yi" } }, { @@ -96825,8 +96939,8 @@ 20210924, 445 ], - "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", - "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" + "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", + "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" } }, { @@ -99270,6 +99384,36 @@ } }, { + "ename": "soccer", + "commit": "5111fad0a1dfc8b1e2254ace7907e5ce1be038ca", + "sha256": "1gzfqfgzfwkj85mxzrz83i13v6jrqldcbzcwfcz6bg49agh244bk", + "fetcher": "github", + "repo": "md-arif-shaikh/soccer", + "unstable": { + "version": [ + 20211015, + 934 + ], + "deps": [ + "dash" + ], + "commit": "8547a36789be66ac32caf4c80a330e7bdf9bb5dd", + "sha256": "0kddpbha5mlih9rmygkxqm8gs9719ics749p18p2np02pvka3x06" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "dash" + ], + "commit": "c486cad32f07db9bd55af08c6b4a6bb0cd481d67", + "sha256": "0gsd4mi1nddxn4z9jayi0fhn3bvk9rpj6615ssb5426k0zfhwjsz" + } + }, + { "ename": "socyl", "commit": "774b3006f5b6b781594257f1d9819068becbbcc1", "sha256": "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz", @@ -100200,11 +100344,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20211007, - 305 + 20211008, + 106 ], - "commit": "4e7ad5c5efadee670e29fa009c9026222a5bd3e3", - "sha256": "1m9biqvahmdigdf2iz3c2vns0jhrjsr60q444q9aa7l7k509lf35" + "commit": "f38bebefea9d23c2bd4293ecf7100211c1410cd4", + "sha256": "0wvg4c1z5y62icagfwl2vb329jprf6si804726mqka92zj4nnn77" } }, { @@ -101216,8 +101360,8 @@ 20200606, 1308 ], - "commit": "689689adb35f984f9fd833a6b92d4bf50ac565b3", - "sha256": "1iighf4kx2azakrqjf4s08nnsafzp6bh66d15qd68k5z1lkgljsl" + "commit": "ef629fd74c5d963f5b68507179896169a34a078e", + "sha256": "1wnx8s8cabg8zja0w0cvk6jfsqbkgbszdx624v1bl6g5iiv2im1j" }, "stable": { "version": [ @@ -101727,14 +101871,14 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210909, - 1003 + 20211008, + 1439 ], "deps": [ "transient" ], - "commit": "a4eb0da98a3909d301a7c07ae2e64197f8db22a0", - "sha256": "1pwy3h7k8y8hwb2dhpcx22sc5qzyk22r6hvvs4yd2gyjd4lw77vi" + "commit": "de3d4539dd8dd33c9b9d1a982cfc47c452c612de", + "sha256": "0xhggrjq3f9wq5aq69ib2bny36295aw678avgdib2vp1bf9xd73n" }, "stable": { "version": [ @@ -102037,11 +102181,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20210222, - 1037 + 20211011, + 607 ], - "commit": "839f579fa881467149e77d0e096a4a4a6c5d9878", - "sha256": "18hhl6x3xg5lykfq01iw2p03lj248x7rqaygq8nj64hbw46nzn0v" + "commit": "282acf8c01c37899955afe3dc32d9cbfb18065e2", + "sha256": "1kjnc7nl5kshy8wjppvjzavv94h4ynwas610g1xqbzfbpirsnz2p" } }, { @@ -102290,26 +102434,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20210925, - 430 + 20211009, + 635 ], "deps": [ "seq" ], - "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", - "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" + "commit": "babe36ca93e72c34b2a3856d8fac7e3fc9884f21", + "sha256": "133r7isdnz7r7y7pbf239928kjmk9ps2i8zqnxnma9zcmncw88ld" }, "stable": { "version": [ 8, 4, - 0 + 1 ], "deps": [ "seq" ], - "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", - "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" + "commit": "babe36ca93e72c34b2a3856d8fac7e3fc9884f21", + "sha256": "133r7isdnz7r7y7pbf239928kjmk9ps2i8zqnxnma9zcmncw88ld" } }, { @@ -102621,16 +102765,16 @@ "repo": "bgwines/symbol-navigation-hydra", "unstable": { "version": [ - 20211003, - 1859 + 20211010, + 2353 ], "deps": [ "auto-highlight-symbol", "hydra", "multiple-cursors" ], - "commit": "2744210b04fb8f5ee8c7948f5f36c8b2df1ea76d", - "sha256": "1a3gv2jpax1y5k1p7kmns9gnd7paqbllnm0gbmzxkh8p7yc0lrak" + "commit": "b3b1257e676514d93cd2d71a10a485bf00b5375f", + "sha256": "0ic6i589y8g41mpi9vzsd76rzcskxaxicfwwpw8d9g44p8zfghfz" } }, { @@ -103104,11 +103248,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20210525, - 2204 + 20211013, + 1942 ], - "commit": "2196e76cb6f11e6ae0f35ac8259dfb755ea60336", - "sha256": "1xifgdwqpf0ccmdxhdr9zxzqsa769984xs4343v657171f53flz4" + "commit": "d0d51ecbc5929eb7752b387c5bdfe4d879e78224", + "sha256": "1p3ikc776mr18r5py0sw098ahsj9w45ikqns4wbgr2fsjmgcgksr" } }, { @@ -103119,14 +103263,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210615, - 1915 + 20211013, + 2012 ], "deps": [ "s" ], - "commit": "a2e456097322d0b1cfdb7aa37c32a628bcca3bf0", - "sha256": "19ni9bl34hzmqsb9wiznbghw67m7g9zz3z5m3wgndn9zsj37ccka" + "commit": "a0389d87d2e793055dd74ae85b4593aa1d2720fd", + "sha256": "040nl3yn0vfhk5nbll2jpxz7qcjf8kdlkzqa44lz0gvc6d9414yv" } }, { @@ -103137,11 +103281,11 @@ "repo": "fritzgrabo/tab-bar-lost-commands", "unstable": { "version": [ - 20210215, - 1412 + 20211013, + 1945 ], - "commit": "e587cdb5d6d2c8d509c43db4b5bb285415916c4e", - "sha256": "1bnpcfh0lzjz4f1lbj2jqz7ly6d3bv8jhi4lxr5pj3g21437xf4y" + "commit": "989e03dc3d1057264b21b9a5d241fcba86cd297a", + "sha256": "047261v8nvi67h9yils2f1jilmbxc55n31v98qlqxmf56jkzz158" } }, { @@ -103588,28 +103732,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20211007, - 616 + 20211014, + 927 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "dcf5f041d30f5dd407e54f014f281e368d755529", - "sha256": "02d34p14yjqvaypirmr63h1vldmsvzpgkm0c18q2gfxbki6bj9f5" + "commit": "744d3698dd27a58822b2edcd4fe9689a701d0c37", + "sha256": "1hciz2anrjjrm1nw1j657zgglg4ggf9pkzby96a41s7l6d1qi10a" }, "stable": { "version": [ 0, 7, - 30 + 31 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "26fee82fac70d55ade55381b475e865d99dde496", - "sha256": "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9" + "commit": "c07f310552643dfeb6bed98860bd63b965baf262", + "sha256": "05j82796s4k3yr0igl6hir3p8qj0cw66vvhbpbcy28d6q9v9vjjz" } }, { @@ -104694,18 +104838,18 @@ 20200212, 1903 ], - "commit": "dd17e81e813e8e6604b870be0e1ba547ac9fa1dc", - "sha256": "1961wkf50w6qyqdqdnplhjhzqs40m76kflg9vbybr0gqz23abspc" + "commit": "9e70d608bf5f80e8ec0132953b91b7fa3d30ca26", + "sha256": "0x7hsy9v2py8b5i7pn8v5xymgjg8rixkmsxaxvvsbmr771blpkqm" }, "stable": { "version": [ 2021, 10, - 4, + 11, 0 ], - "commit": "6563eeda0cbcc599e0b9fffb665759e5b159b8ec", - "sha256": "1kmcnffdpl44bx80m1ybrssfqbgalw8x00gs9zqnfbyaqcxf0mqr" + "commit": "77016aea52af2156be7c8ebde55b821fe46b7849", + "sha256": "1lmh733m0anfny0izi2lc5njqaqdvr2z96lqfkyzsf0ln73ipb9b" } }, { @@ -104761,8 +104905,8 @@ "deps": [ "haskell-mode" ], - "commit": "991d5c7d1b53bc1b51b44e0560b9074ffdfd941c", - "sha256": "1sy74xi8j8v1bxc1y65j9f4bjhdbc2ym6n70zll9czzqa34g600g" + "commit": "5bc0b35756ab14af950aafa5f3d76bae568d3095", + "sha256": "13pryqrqk1y9qb5h2pg45hi62w17xnzrlrg471b6ga9r4zwn8vfz" }, "stable": { "version": [ @@ -105010,11 +105154,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210925, - 1118 + 20210930, + 1521 ], - "commit": "ed7f90d74d87e629dded6bfe0de2d04a856c5d61", - "sha256": "0lfj2ncygp7fzxcw1kswh75zhx5cdkdyrpd7ms4dfk8j8h7ra09j" + "commit": "e7655e95ad48418a3784de4e8a7dc45ed69540ed", + "sha256": "05bdavm4a1d0p176b8cnipv6byxlchbbp1fcma67ly5px4wxn0ld" }, "stable": { "version": [ @@ -105779,11 +105923,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210920, - 1038 + 20211013, + 2148 ], - "commit": "57942fe961d261360e61a72e47c676172ba7963f", - "sha256": "0d8mnvjbwnghh2yz7ys8r9395cy69mx5wjsm2kg8msi4kgk6yfjj" + "commit": "45975c24e1ab08bb32e9bdc06f5c5efe7c256e16", + "sha256": "0prx06z35fdvwbn1k18khw74phvfsa64pfsh4kpyihldj2k5f69j" }, "stable": { "version": [ @@ -106163,8 +106307,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211006, - 1837 + 20211015, + 1613 ], "deps": [ "ace-window", @@ -106176,14 +106320,14 @@ "pfuture", "s" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "ace-window", @@ -106195,8 +106339,8 @@ "pfuture", "s" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106214,21 +106358,21 @@ "all-the-icons", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106239,28 +106383,28 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210927, - 1735 + 20211007, + 1608 ], "deps": [ "evil", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "evil", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106271,26 +106415,26 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210630, - 1953 + 20211011, + 1824 ], "deps": [ "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106301,30 +106445,30 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210906, - 1653 + 20211010, + 1005 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106343,22 +106487,22 @@ "persp-mode", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106377,22 +106521,22 @@ "perspective", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106410,21 +106554,21 @@ "projectile", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "projectile", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -108385,11 +108529,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20211006, - 1337 + 20211008, + 454 ], - "commit": "b55e265735cb89f384ae51d903a59cda3e52509a", - "sha256": "1xa0p3q5n96rp85knj686argg2yx6302i9g9rc50zrc43lznvgl9" + "commit": "e6e3dd50fb7e3b20e38db555950b2f417a12c993", + "sha256": "0iri2836zxadqdvivkmm0rz2ai4wxb1khnfxjmk8k8q274w1lslf" } }, { @@ -108468,15 +108612,15 @@ "repo": "damon-kwok/v-mode", "unstable": { "version": [ - 20210608, - 629 + 20211015, + 309 ], "deps": [ "dash", "hydra" ], - "commit": "3afbd72180417ada6aeeec861081495aca962124", - "sha256": "0is9hdh8w87l9x84ihhcd040z8m7cy2321q2rmbfmpffaaja90cl" + "commit": "a5f39031a3391d0044c716425eb28645af51c79c", + "sha256": "0k0100fxhhzfyl2pcsrwblj1h7j0x9fzfnpcxqd751yvwihgrsb6" } }, { @@ -109594,11 +109738,11 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20210419, - 857 + 20211014, + 2141 ], - "commit": "bd78372bd3d8f3e90508e1eb0c9d1a53948dcc2b", - "sha256": "18ynnvz7an3bg33pd4fhkk0y85j2v48bgxny163ya6nbk0xp074s" + "commit": "2df643827a4fd82b732ea93042916c61078d4206", + "sha256": "1j8x044s4xzmfmqrsabim9gv435scj2yhym3f3p9bf5vq5ds2smj" }, "stable": { "version": [ @@ -110160,11 +110304,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210923, - 2248 + 20211009, + 252 ], - "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", - "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" + "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", + "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" } }, { @@ -110385,16 +110529,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20210629, - 1252 + 20211008, + 1118 ], "deps": [ "apel", "flim", "semi" ], - "commit": "769699d60aa033049804083b459ee562b82db77e", - "sha256": "0mgl28xsvc0421pysy6hh0hymr0li8iayaa330r41cbqsk3gz4nw" + "commit": "92ded1534ce7143f379b92a4029db275f3e22ee8", + "sha256": "0ai48j19dpyny1mmf81wjwmr5i5i5rnaj4d5n0hfchs4dcng0xrq" } }, { @@ -111921,11 +112065,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20211001, - 2220 + 20211015, + 1917 ], - "commit": "0c37fea45603257435294e2e01a403627da23abe", - "sha256": "1pynm4ng4rki2b2ka5dz01p66ygghk69mldsfbxs81d52jqfnx8f" + "commit": "8d52f933e50624c7bca3880f57297ac17ba4ac2d", + "sha256": "0k0k7mbsizsbgyjb92qj9hp5f2jbwbkzmfbxjhbmniw87q1flmmp" }, "stable": { "version": [ @@ -112241,8 +112385,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210913, - 1123 + 20211014, + 1207 ], "deps": [ "ace-link", @@ -112250,8 +112394,8 @@ "swiper", "zoutline" ], - "commit": "238b7c89229e4b56b36e81f06a2a49488940212a", - "sha256": "06qlkxkdq316habdxvhyyrf6d25i9pdxwjc4dmk3l83sg61rlg79" + "commit": "d22146bae521d4eeefd0bc2d95c7b64796760faa", + "sha256": "1vakix6pdv4ssmwzw7p7iaprp5kyiqjiw8gpi41hn7l3dsgmi4iq" }, "stable": { "version": [ @@ -112670,11 +112814,15 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210925, - 1643 + 20211008, + 707 ], - "commit": "0e834f351733fcae07e1cbd1a47d6330f17a8d74", - "sha256": "1gs5iynyljvjcwxjgvm7xj4zjk5ca59bpxgm016lmxkmdnr68fy5" + "commit": "eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://github.com/xahlee/xah-css-mode/archive/eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba.tar.gz': Couldn't resolve host name (6); retrying in 269 ms\nerror: unable to download 'https://github.com/xahlee/xah-css-mode/archive/eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba.tar.gz': HTTP error 404\n" + ] } }, { @@ -112685,11 +112833,15 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20211001, - 1536 + 20211008, + 717 ], - "commit": "bfd1d20e39d80ff00d3aefdf18c711df0685b022", - "sha256": "1v2i56ny5isvkdgac663g8c67r632fvvz6hkcyyy0fv9l0rzdmsl" + "commit": "de43714d9d4993b744afc4829d2f29ad1e806342", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nerror: unable to download 'https://github.com/xahlee/xah-elisp-mode/archive/de43714d9d4993b744afc4829d2f29ad1e806342.tar.gz': HTTP error 404\n" + ] } }, { @@ -112715,11 +112867,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210919, - 1355 + 20211009, + 1810 ], - "commit": "de9df16b79ec7e2caa81d7d53c8312a54bd52100", - "sha256": "13n4h58nqlxyfjwz4lq32lig73imvq4jk87w72j8cin5hgvnsv30" + "commit": "de43f45e5adc5342937a9bb66f5d00b2c02c16a7", + "sha256": "01wj3ii4lacns3ly8f0812sc53spvkqkwf9g7nqyda1laxqsgnic" } }, { @@ -112745,11 +112897,15 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20210925, - 1653 + 20211008, + 659 ], - "commit": "d99cce539d82cb4f0e10b7c02b5500561b13ff09", - "sha256": "07mlhsxhb3l3xawlvzx76jy4z6q52znjapmpj47w8hllnaibmhmy" + "commit": "f9c3fda86930bebf718da6e39649500be5628cc5", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nerror: unable to download 'https://github.com/xahlee/lookup-word-on-internet/archive/f9c3fda86930bebf718da6e39649500be5628cc5.tar.gz': HTTP error 404\n" + ] } }, { @@ -114691,14 +114847,14 @@ "repo": "schmir/zimports.el", "unstable": { "version": [ - 20200809, - 2035 + 20211011, + 2059 ], "deps": [ "projectile" ], - "commit": "4067b20a2ea25327504b0a42f443903728aa7966", - "sha256": "01ljp3cpslkmp8kxm24ayp5jlg6r431vpk6dm1b9ylr4x4p1klgx" + "commit": "76cf76bdc871cb0454a6fc555aeb1aa94f1b6e57", + "sha256": "1vx4j9n5q4gmc63lk1l4gbz5j5qn2423cyfibqcbynkkbwgas11z" } }, { @@ -115010,30 +115166,30 @@ "repo": "fvdbeek/emacs-zotero", "unstable": { "version": [ - 20211006, - 2051 + 20211008, + 2207 ], "deps": [ "ht", "oauth", "s" ], - "commit": "e63eba9deed272e4d8f4426949b9a5743db3c511", - "sha256": "0266hxdsi74pp2l5higyrqg8hdrmda2x1l63c4yi2x1w351i4jlb" + "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", + "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "ht", "oauth", "s" ], - "commit": "15eb7a8d099c93440f0a8920499633103f00fc83", - "sha256": "13mrssrkcjrrpc470rjpb3mwjfdsyvr4i8niqza54rzk0zxj2m95" + "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", + "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" } }, { diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index db2d36e338f..05ee956e467 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -242,12 +242,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0knl0ca15cj0nggyfhd7s0szxr2vp7xvvp3nna3mplssfn59zf9d"; /* updated by script */ + sha256 = "09qbzkxyk435s4n04s12ncjyri024wj9pwz8wgjjsswpfa69dhr5"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.4"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "18dammsvd43x8cx0plzwgankmzfv7j79z0nsdagd540v99c2r2v3"; /* updated by script */ + sha256 = "1vj9ihzw07bh30ngy8mj027ljq9zzd904k61f8jbfpw75vknh8f6"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.2.2"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0ayqvyd24klafm09kls4fdp2acqsvh0zhm4wsrmrshlpmdqd5vjk"; /* updated by script */ + sha256 = "1n0yrk05xv4pard82b6z349ksiw8k75s9525pnpa2ny1ay1klhdg"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1af43c51ryvqc7c9r3kz2266j0nvz50xw1vhfjbd74c3ycj8a1zz"; /* updated by script */ + sha256 = "166rhssyizn40rlar7ym7gkwz2aawp58qqvrs60w3cwwvjvb0bjq"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1257a9d9h3ybdsnm74jmgzp1rfi1629gv9kr0w2nhmxj7ghhbx4w"; /* updated by script */ + sha256 = "1d0kk2yydrbzvdy6dy9jqr182panidmbf2hy80gvi5ph2r5rv1qd"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -307,13 +307,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.1.3"; /* updated by script */ - versionMajorMinor = "2021.1"; /* updated by script */ + version = "2021.2.1"; /* updated by script */ + versionMajorMinor = "2021.2"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "0w1nchaa2d3z3mdp43mvifnbibl1ribyc98dm7grnwvrqk72pabf"; /* updated by script */ + sha256 = "1yawjc5xwga1mmlsl3068ml532941mq08i9ji3dhj1nwdkyav2jz"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -321,12 +321,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1iqnq38d71wbl1iqhqr5as1802s53m3220vq4g42mdjgdj296bdk"; /* updated by script */ + sha256 = "1avcm4fnkn0jkw85s505yz5kjbxzk038463sjdsca04pv5yhsdp0"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -334,12 +334,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1z59yvk3wrqn0c9581vvv62wxf4fyybha426ipyqml8c405z27y4"; /* updated by script */ + sha256 = "0s9kk3n5ac6lvqi2yw9gvvm45865jchiwyrs8pq2dgdkgaligrjv"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -347,12 +347,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0sh9kdr53dhhq171p9lmsvci3qzlds4vzyqx12mzfvfs7svri1w2"; /* updated by script */ + sha256 = "0mgmmf926n3ipr8fxn6f9hsa5vkil8yrw5qlixi8nwnx7chmkp56"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -360,12 +360,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1b5ih6q8kyds8px7gldfz1m9ap3kk27yswwxy1735c83094l2nlm"; /* updated by script */ + sha256 = "17xx8mz3dr5iqlr0lsiy8a6cxz3wp5vg8z955cdv0hf8b5rncqfa"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -373,12 +373,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "09blnm6han2rmdvjbr1va081zndzvjr1i0m3njaiwcb9rf2axm32"; /* updated by script */ + sha256 = "0bbq5ya1dxrgaqqqsc4in4rgv7v292hww3bb0vpzwz6dmc2jly1i"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -386,12 +386,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.2.1"; /* updated by script */ + version = "2021.2.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "12i9f5sw02gcgviflfs6gwmnxvzhgmm4v4447am0syl4nq8nyv1s"; /* updated by script */ + sha256 = "1a3vlqza9nbc4a2qxrzdckmq003zx1db9dy7wx462amc8sbh6v92"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index d338a5b961c..3ccdd70c455 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -42,7 +42,7 @@ let src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; - rev = version; + rev = "v${version}"; sha256 = "sha256-9c1bNsf8kJjpcZ2cMV/pPNtXQkFOntX29a1cdnXpllE="; }; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 0e501135a98..1fec32d9f70 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.2.2"; # When updating also update fetchedMavenDeps.sha256 + version = "21.2.3"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "6FQd7UGX19Ez/updybia/tzl+9GYyPPzPGFsV67Enq0="; + sha256 = "0xu/uMMloCUuhKs392kn6qJzlobDNuvwlHGdS/gGAB8="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "VHOIK6sOAP+O9HicUiE2avLcppRzocPUf1XIcyuGw30="; + outputHash = "7Sm1hAoi5xc4MLONOD8ySLLkpao0qmlMRRva/8zR210="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 3ff33a14f2e..797dfe504ca 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-b5029032/Hubstaff-1.6.2-b5029032.sh"; - version = "1.6.2-b5029032"; - sha256 = "1q3gimg6bcpdnm1fkn1vq3b6shwgi6y84bixisyfcva5px7dmi4s"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-328c666b/Hubstaff-1.6.2-328c666b.sh"; + version = "1.6.2-328c666b"; + sha256 = "0fmlblw19qk9s9xsl0dl705cnns825wrlc7navii4bvbsn6ycl5v"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 38513937d01..bd35d44b7cc 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -121,4 +121,16 @@ in buildFHSUserEnv { ln -sf ${lutris-unwrapped}/share/applications $out/share ln -sf ${lutris-unwrapped}/share/icons $out/share ''; + + meta = { + inherit (lutris-unwrapped.meta) + homepage + description + platforms + license + maintainers + broken; + + mainProgram = "lutris"; + }; } diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 952a7b00d08..435bbda24d0 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -2,47 +2,51 @@ , stdenv , fetchFromGitHub , gtk4 -, gtksourceview +, hicolor-icon-theme , json-glib , libadwaita , libgee , meson , ninja , nix-update-script -, pantheon , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "notejot"; - version = "3.1.5"; + version = "3.2.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-wsHQvN+sqAMs1QldiRoc9JlF4d54JFqNkqC+lyuHC7M="; + hash = "sha256-WyW1tGhO3+OykNa8BRavi93cBMOSBJw0M+0bwQHJOjU="; }; + patches = [ + # build: use gtk4-update-icon-cache + # https://github.com/lainsce/notejot/pull/307 + ./use-gtk4-update-icon-cache.patch + ]; + nativeBuildInputs = [ meson ninja - vala pkg-config python3 - wrapGAppsHook + vala + wrapGAppsHook4 ]; + buildInputs = [ gtk4 - gtksourceview + hicolor-icon-theme json-glib libadwaita libgee - pantheon.elementary-icon-theme - pantheon.granite ]; postPatch = '' @@ -50,6 +54,10 @@ stdenv.mkDerivation rec { patchShebangs build-aux/post_install.py ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/lainsce/notejot"; description = "Stupidly-simple sticky notes applet"; @@ -57,8 +65,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; }; - - passthru.updateScript = nix-update-script { - attrPath = pname; - }; } diff --git a/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch new file mode 100644 index 00000000000..9431c43cef6 --- /dev/null +++ b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch @@ -0,0 +1,20 @@ +diff --git a/build-aux/post_install.py b/build-aux/post_install.py +index 1278304..fface6d 100644 +--- a/build-aux/post_install.py ++++ b/build-aux/post_install.py +@@ -2,11 +2,13 @@ + import os + import subprocess + +-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') ++install_prefix = os.environ['MESON_INSTALL_PREFIX'] ++icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor') ++schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas') + + if not os.environ.get('DESTDIR'): + print('Compiling gsettings schemas…') + subprocess.call(['glib-compile-schemas', schemadir], shell=False) + + print('Rebuilding desktop icons cache...') +- subprocess.call(['gtk-update-icon-cache', '/usr/share/icons/hicolor/'], shell=False) ++ subprocess.call(['gtk4-update-icon-cache', '-qtf', icondir], shell=False) diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/applications/misc/ttyper/default.nix index 664bf9ba725..c3001c3337c 100644 --- a/pkgs/applications/misc/ttyper/default.nix +++ b/pkgs/applications/misc/ttyper/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ttyper"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "max-niederman"; repo = pname; rev = "v${version}"; - sha256 = "1fsb77ky92fyv3ll6zrbxbd69gm85xnc6bivj7sc3sv5cxhgr7a5"; + sha256 = "sha256-9vcoK2mFEivTSZE3KoQRHUr3AfQ/aN5eWP//Jagw3gU="; }; - cargoSha256 = "1sqdql0kfr1vsww6hkrp7yjlzx0mnhfma51z699hkx9c492sf1wk"; + cargoSha256 = "sha256-VzO32b5oAoXR/Ei9up00XRM63I5kuG68TeX4KBCXIdo="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 77ff11b9862..f8dbc9c65e4 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "1.8.9"; + version = "2.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-1cU9HdPXrJ4ibSjOitO8iJfMIaGub/jjlb2lssYFfcU="; + sha256 = "sha256-MIFgNUuuneIIkPRVRarbx6UMoB/3sdJtKvbacUnwHX8="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ec4d9da93bc..a9331041ddd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,6 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl +, epoxy # postPatch: , glibc # gconv + locale @@ -151,6 +152,8 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl + ] ++ optionals (chromiumVersionAtLeast "96") [ + epoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] diff --git a/pkgs/applications/networking/cluster/helm/plugins/default.nix b/pkgs/applications/networking/cluster/helm/plugins/default.nix index edd19a25f9b..342fd9e686a 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -2,10 +2,12 @@ { - helm-diff = callPackage ./helm-diff.nix {}; + helm-diff = callPackage ./helm-diff.nix { }; - helm-s3 = callPackage ./helm-s3.nix {}; + helm-git = callPackage ./helm-git.nix { }; - helm-secrets = callPackage ./helm-secrets.nix {}; + helm-s3 = callPackage ./helm-s3.nix { }; + + helm-secrets = callPackage ./helm-secrets.nix { }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix new file mode 100644 index 00000000000..05ded10444b --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, findutils +, git +, gnugrep +, gnused +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "helm-git"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "aslafy-z"; + repo = pname; + rev = "v${version}"; + sha256 = "0hvycqibmlw2zw3nm8rn73v5x1zcgm2jrfdlljbvc1n4n5vnzdrg"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # NOTE: helm-git is comprised of shell scripts. + dontBuild = true; + + installPhase = '' + install -dm755 $out/helm-git + install -m644 -Dt $out/helm-git plugin.yaml + cp helm-git helm-git-plugin.sh $out/helm-git/ + + patchShebangs $out/helm-git/helm-git{,-plugin.sh} + wrapProgram $out/helm-git/helm-git \ + --prefix PATH : ${lib.makeBinPath [ coreutils findutils git gnugrep gnused ]} + + runHook postInstall + ''; + + meta = with lib; { + description = "The Helm downloader plugin that provides GIT protocol support"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix new file mode 100644 index 00000000000..a41c3c0ad35 --- /dev/null +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -0,0 +1,44 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kn"; + version = "0.26.0"; + + src = fetchFromGitHub { + owner = "knative"; + repo = "client"; + rev = "v${version}"; + sha256 = "sha256-hquxv1BluR535WvMtJlVyP7JuARDNGDjPAbdSSj2juo="; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/kn" ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-X knative.dev/client/pkg/kn/commands/version.Version=v${version}" + "-X knative.dev/client/pkg/kn/commands/version.VersionEventing=v${version}" + "-X knative.dev/client/pkg/kn/commands/version.VersionServing=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd kn \ + --bash <($out/bin/kn completion bash) \ + --zsh <($out/bin/kn completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/kn version | grep ${version} > /dev/null + ''; + + meta = with lib; { + description = "The Knative client kn is your door to the Knative world. It allows you to create Knative resources interactively from the command line or from within scripts"; + homepage = "https://github.com/knative/client"; + changelog = "https://github.com/knative/client/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index d882e3cd2de..7cc11b1af60 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -111,7 +111,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - x86_64-linux + ruby DEPENDENCIES krane diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 1c52f56437c..e07b9b88ddc 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.33.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FvgB0jG6PEvhrT9Au/Uv9XSgKx+zNw8zETpg2dJ6QX4="; + sha256 = "sha256-DCum3vCrN530Z0VW0WEoLtjN+kre/mU9O+sJxckZgfc="; }; vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0="; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 32413346310..e9c85450f40 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.138"; + version = "3.1.139"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "0xjcvq7c6rrgqw8cfcfl7af122lm428cqz3v6ssxi595qxq1rg44"; + sha256 = "0gnj89q5mv5qiy6zsp85sswmwzm0y73nffjj3vrccx5lmxd955nv"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 81967bcbe2b..7be5d62312d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let --set LC_MESSAGES "${spellcheckerLanguage}"''); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.19.0"; # Please backport all updates to the stable channel. + version = "5.20.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0avns5axcfs8x9sv7hyjxi1cr7gag00avfj0h99wgn251b313g1a"; + sha256 = "0a57gajxjqkp7zcmjc3iiys06b7v53nd81gkwrsfn2gmshihlzkd"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index d169e1fdea6..04f1732f7a5 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alpine"; - version = "2.24"; + version = "2.25"; src = fetchurl { url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz"; - sha256 = "1vxw19nx10y7nx01d9i6gah2f3y5r2idbq56l13bdqi91bx9y6k5"; + sha256 = "0xppxhcbafq9qa1rns5zl0n238gai08xhvcf2as0nx7nh84ib2k5"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 354ab024c6d..d0575b60653 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "alpha-0.7.1"; + version = "alpha-0.7.2"; src = fetchgit { url = "https://git.meli.delivery/meli/meli.git"; rev = version; - sha256 = "00iai2z5zydx9bw0ii0n6d7zwm5rrkj03b4ymic0ybwjahqzvyfq"; + sha256 = "sha256-cbigEJhX6vL+gHa40cxplmPsDhsqujkzQxe0Dr6+SK0="; }; - cargoSha256 = "1r54a51j91iv0ziasjygzw30vqqvqibcnwnkih5xv0ijbaly61n0"; + cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc="; cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 50b3b66f15d..23b636458c9 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,27 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, fetchpatch +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: stdenv.mkDerivation rec { - version = "20210205"; + version = "20211015"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY="; + sha256 = "sha256-ObYeh9Q/WZ1N60pxR2LoDNCU8rP4tQt/oIxnqALqMhs="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-32055.patch"; - url = "https://github.com/neomutt/neomutt/commit/fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc.patch"; - sha256 = "0bb7gisjynq3w7hhl6vxa469h609bcz6fkdi8vf740pqrwhk68yn"; - }) - ]; - buildInputs = [ cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 7c9a697243b..15688d383b3 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.9.0.5150"; + version = "2.9.1.5500"; src = fetchurl { url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "0nf68x840p30yng4fh1nlyiqg40z0rkcv0lskpz8dd4pj1iw5jjs"; + sha256 = "0h4dclxr6kmhmx318wvxz36lhyqw84q0mg4c6di6p230mp8b1l4v"; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index b3a38905531..f319b419fbb 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , meson @@ -6,25 +7,24 @@ , vala , pkg-config , desktop-file-utils -, pantheon , python3 , glib , gtk4 , json-glib , libadwaita , libgee -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "khronos"; - version = "3.5.9"; + version = "3.6.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "sha256-3FatmyANB/tNYSN2hu5IVkyCy0YrC3uA2d/3+5u48w8="; + sha256 = "sha256-AETyVCBUuBzHwDgTkGRIokFYwcmXrb/F85J5GEIu4dE="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -43,12 +43,14 @@ stdenv.mkDerivation rec { json-glib libadwaita libgee - pantheon.granite ]; postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py + # https://github.com/lainsce/khronos/pull/75 + substituteInPlace build-aux/post_install.py \ + --replace 'gtk-update-icon-cache' 'gtk4-update-icon-cache' ''; passthru = { diff --git a/pkgs/applications/science/misc/openmodelica/combined/default.nix b/pkgs/applications/science/misc/openmodelica/combined/default.nix index 459a325111e..0c2220b7ea2 100644 --- a/pkgs/applications/science/misc/openmodelica/combined/default.nix +++ b/pkgs/applications/science/misc/openmodelica/combined/default.nix @@ -24,7 +24,7 @@ symlinkJoin { description = "An open-source Modelica-based modeling and simulation environment intended for industrial and academic usage"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix index 94029fead48..088fa83b7d9 100644 --- a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix +++ b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (pkg // { inherit omtarget postPatch preAutoreconf configureFlags configurePhase preBuild makeFlags installFlags; src = fetchgit (import ./src-main.nix); - version = "1.17.0"; + version = "1.18.0"; nativeBuildInputs = getAttrDef "nativeBuildInputs" [ ] pkg ++ [ autoconf automake libtool cmake autoreconfHook ]; diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix index c31b23d2f94..1ab8d9390db 100644 --- a/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix +++ b/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix @@ -1,7 +1,7 @@ { url = "https://github.com/OpenModelica/OpenModelica/"; - rev = "08fd3f9144235f209a4ed7602bfadb32b1823628"; - sha256 = "0clgqk9ilnr43iyl5sdzwfzqpnw9amfy1npdgkpgm1wfnsvz6xrw"; + rev = "49be4faa5a625a18efbbd74cc2f5be86aeea37bb"; + sha256 = "0klqiy4sdizl1djb9hb0arcvfcjz2mmnakrjx81mmxcbr8yq2016"; fetchSubmodules = true; } -# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.17.0' --fetch-submodules +# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.18.0' --fetch-submodules diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix index b49c0f0f60c..39591eceb40 100644 --- a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix @@ -55,7 +55,7 @@ mkOpenModelicaDerivation ({ description = "Modelica compiler from OpenModelica suite"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } // lib.optionalAttrs isCross { diff --git a/pkgs/applications/science/misc/openmodelica/omedit/default.nix b/pkgs/applications/science/misc/openmodelica/omedit/default.nix index b0cc530ba37..b24a43f702b 100644 --- a/pkgs/applications/science/misc/openmodelica/omedit/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omedit/default.nix @@ -32,7 +32,7 @@ mkOpenModelicaDerivation rec { description = "A Modelica connection editor for OpenModelica"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix index 006daf18812..a89b73eb866 100644 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix @@ -31,7 +31,7 @@ mkOpenModelicaDerivation { including Modelica Standard Library"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix index c91addf7804..dff5ee78936 100644 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix @@ -1,83 +1,81 @@ [ - { url = "https://github.com/modelica-3rdparty/AdvancedNoise.git"; rev = "5ce57acd279dadd0d25b76a6b02d3f9e9d061246"; sha256 = "07jjbj0y6bak269md3xniqb5lgc33m92ar5qixqxj5yxdjaahfs2"; fetchSubmodules = true; } - { url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "b00e01d911e2e54e148f24e36ee387a8b457d89c"; sha256 = "1sljddxkx208nill0975sz9b1xd701n97aia4wxihr140dgs4dgb"; fetchSubmodules = true; } - { url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "v0.4.0"; sha256 = "0dw34mjq29n55xh51g1c9a9d0d8gbpn16gj309dfxn4v2hbnfvzx"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/AlgebraTestSuite.git"; rev = "b937e1a7f447138c59abec9b2092f84f16bf02e8"; sha256 = "0406inasx61dk7vcnziiyhxkna7g61a5hn0znnbxj817hz6q11zn"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ApproxSpline.git"; rev = "28420f5c1a88c9cd069defbd8c05e4a78a090675"; sha256 = "07gpyi2brj5zpvrlsnflqjnhbrgxvpqbdshp8lp4lh9mnj5jv95d"; fetchSubmodules = true; } - { url = "https://github.com/OpenModelica/BioChem.git"; rev = "v1.0.2"; sha256 = "037bvj2lqrslg8k5r0rjgdzccslj9bj25b55k4g440vabm5p05qm"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256 = "0yrkk708v4bvf423xb4zgpmnaj8qhq5primdg758ayddgli23wa9"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "c2f564ae284726a2df6252a8561856691681572b"; sha256 = "01c2i2rlry7b4a6f2skkvzphcrfg5a2waxv4i7zgx5q275fg06i1"; fetchSubmodules = true; } - { url = "https://github.com/EDF-TREE/BuildSysPro.git"; rev = "v3.3.0"; sha256 = "1cvcany3q9p1xndarxa2d8mmqxdnqk22476q8l61nayz5qy25x61"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/BuildingControlLib.git"; rev = "v1.0.0"; sha256 = "0ckdxway0m755mbrl94k4458sijzgknlzsrf7xs5bjymxchm8r2m"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/BuildingSystems.git"; rev = "1e07bb475b921a4eedc6155c5310d1f9f3ef7550"; sha256 = "1xg831vqh6zw88cxxcb3sjgz44l7ygsgxddl05fp6xvz5sjpfcna"; fetchSubmodules = true; } - { url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v6.0.0"; sha256 = "0rnnk1clji0myzr7adggki6knbl6v8381vwnqgiz8mkxbmzdwm4f"; fetchSubmodules = true; } - { url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v7.0.0"; sha256 = "04n04pp4zvyg8n8h7h79c3wyk7lmn940mh7qzs0lv76g1ybypnlz"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "5645573fced862430b7b598b4d7ec1a39c7aa0fa"; sha256 = "1kh7kpmjfz55pb8553srlnrh8l00nw21xf5mjzh7nx9b1rndnmyg"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/DeployStructLib.git"; rev = "v1.0"; sha256 = "1k4zw9lnd0javw4zigxc15l58yf7xdz36b7808g65qxy89w6ksr2"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/DisHeatLib.git"; rev = "b11f53379c122870a52f2da9b1705d2c911cd21d"; sha256 = "1vm96a4z0b40r0nisxrrzyvan4yphjdkx4ad655phva2636xb5rr"; fetchSubmodules = true; } - { url = "https://github.com/AHaumer/DriveControl.git"; rev = "b7233fd97a92867bb4ec2c3647c7f7e888398644"; sha256 = "0nyp1n8wrkjzfypsmjjzac0g9p4wbc1cxxr040fj20bqdg9l3h1b"; fetchSubmodules = true; } - # A broken one. The revision is lost. - # { url = "https://github.com/AHaumer/EMOTH.git"; rev = "fa890c8c2781f0c0b2f8efe955ed8a27875dd9ac"; sha256 = ""; fetchSubmodules = true; } - { url = "https://github.com/christiankral/ElectroMechanicalDrives.git"; rev = "v2.2.0"; sha256 = "0012phmn1y9fgpph45lwbjk0yhm5czidf2z6khm8lddvk93wf31b"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "v2.5.0"; sha256 = "19dsyq1mk5vl54fqaffzqafm5w94l011cy7pg16c7i933dbqnkki"; fetchSubmodules = true; } - { url = "https://github.com/modelica/ExternalMedia.git"; rev = "159518edd538b64e28cd70983a9cc47730323cc4"; sha256 = "0qjd5fk65bln3s1jhs0cqcv54c22m6x2akbmxj09y4x0lkd1kgqn"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ExternalMemoryLib.git"; rev = "6488d5815bda23c665123baa916789e283e16d2c"; sha256 = "06y1i5w690b3b9x23nzls8y67fl7yd7bn4xl5j0dmyi4qx33aqda"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/FMITest.git"; rev = "a67a276083f4010b249802ad8fc70dc30c09adfd"; sha256 = "0mg8jlvlwql2nsjiy7c3rdibv73bkfk149ac0450d5pc0hfn9mln"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/FailureModes.git"; rev = "v1.2.1"; sha256 = "1z8bwrld1rkydgssab5gnrd76frrbky8qxi1lvlaf2jidj6bzn1l"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "v0.6.6"; sha256 = "0a08yyrbg4a49s0bgqgyds6pidx9xr47yspvl9bdak1mq34qibip"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/FeedDriveLibrary.git"; rev = "1.0.1"; sha256 = "15fi9dj6zgl0fr90cwxqjbpphj0dwrrmk74hf25j6zd85w2ycqdz"; fetchSubmodules = true; } - { url = "https://github.com/DLR-SR/FractionalOrder.git"; rev = "99918820e346c362c3ad52d782c8215e5deeac4c"; sha256 = "1pycss6fqh86frfdbdfffjhaz09fz1558f9azgckhf8drx6ry1qs"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Greenhouses-Library.git"; rev = "89ae0e8097eb0751abce2013d304fa5f9c09b885"; sha256 = "1q77xj6aysqsn3d7kjmcq7dihbw18iqm35ifzdi75xgf3cgwla4f"; fetchSubmodules = true; } - { url = "https://github.com/christiankral/HanserModelica.git"; rev = "v1.1.0"; sha256 = "0zwkrhg2y42m18p4z51izrickiv1vikgz0z7fpjia4dbppckav8i"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "3b4a4bca94d388744b2d045344ea2f9b0b4d405b"; sha256 = "17fzpan89075vb5vbhw5ylgxcdsmj2vjnmmka7cgzh06izb69nvh"; fetchSubmodules = true; } - { url = "https://github.com/ibpsa/modelica-ibpsa.git"; rev = "v3.0.0"; sha256 = "0xwgfndlw76zfmiiqadl85l9na9igsqlmfcawx526sdw2lhhgics"; fetchSubmodules = true; } - { url = "https://github.com/open-ideas/IDEAS.git"; rev = "v2.1.0"; sha256 = "0xp0zg6ib5536d5vl361lsn5w5faqdf6djhcmfxns629wjima8rn"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "v1.1.0"; sha256 = "1nvgx94iy1pws0768anrl7ssjlzslb5mbp21j7xvf6wpqfmj0npc"; fetchSubmodules = true; } - { url = "https://github.com/christiankral/KeyWordIO.git"; rev = "v0.9.0"; sha256 = "10kvj6zn2r6m3403ja8nkkxbfcchkz0pfk3g70ibr76zivxb5nim"; fetchSubmodules = true; } - { url = "https://github.com/FishSim/LibRAS.git"; rev = "fca9de50a484a2213f3ca1b39e275c237c471688"; sha256 = "0w1c87sifq8klq0f2l70qxjrlvahyxy1cx9rln80rni4d427yc1k"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "v1.0"; sha256 = "1crj60i5f33l9pgip0xbv6ankcga7px0644cj7c2wnzn1fjmn2k8"; fetchSubmodules = true; } - { url = "https://github.com/looms-polimi/MEV.git"; rev = "v1.0.1"; sha256 = "1a7ih9lc01wzaq8a8aznggpi4aqnczyzq49q5hc4fqvmfwl7l0j3"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ModPowerSystems.git"; rev = "df3afce27d5e935c4111f392275744a655abe216"; sha256 = "1b1fikm92lv6gj82imka3hxbjwv04i4h33y69yhcxdpqa6z6hm4z"; fetchSubmodules = true; } - { url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "614a148f61c1ab5d6788d8c11197803132ec7c2f"; sha256 = "0fg0pbahybx3srv5npk8pw49k23kaw2ns6c00f15iy93mvfrmfsk"; fetchSubmodules = true; } - { url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "34fe8cf3c7127ae09ca5f41e26b48fb6044e1e34"; sha256 = "0yz82k9dsp9d1jxqgxcm27fw1jz718km43qfginmgg0m9kfh2336"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Modelica-Arduino.git"; rev = "v0.1.0"; sha256 = "1n34dksqhrn1synv2mp2ifk4dxyhp15f5v1jb1b3dbw9n19951qb"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Modelica-GNU_ScientificLibrary.git"; rev = "9235ab28bdd7f0fe3e7abba48af53d73332858ec"; sha256 = "168g9gg12lfa863ifs41bnx6yd0yyjnal6986dgpm51dj5arw6id"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Modelica-MVEM.git"; rev = "v1.0.1"; sha256 = "1p68691dnl06lgwm4bl9g036brn4vl7m5x3gq4rxc291339frixk"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ModelicaADS.git"; rev = "v1.0.1"; sha256 = "0fhxrl07d7v3wa79d30psm1gxydc0p7s2akfirdx6dai0633skp9"; fetchSubmodules = true; } - { url = "https://github.com/xogeny/ModelicaBook.git"; rev = "v0.6.0"; sha256 = "0yqbll6p738yvpi1x11cjngpz2glda07mljrkjlm23p7l53x63dc"; fetchSubmodules = true; } - { url = "https://github.com/modelica-compliance/compliance.git"; rev = "8a91e75d8a26acc4de30fc0e5d5e9db83c970bd6"; sha256 = "1cym1wlgsvfrryq8zqzzrgs4wam1l7pc20q07hk3d615nhq21lg6"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ModelicaDFR.git"; rev = "37a441934d05330cf3d13e9ec551954d27eca84c"; sha256 = "13rpcs8cl9x15vi655150zmhmg1iaxpzvxrl3rqif46zpl5dhlj2"; fetchSubmodules = true; } - { url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "v1.8.2"; sha256 = "16c0p9zn0qrraz59ivinibmikdd251plm1vqngznzhksjwvz6bja"; fetchSubmodules = true; } - { url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "v2.3.5"; sha256 = "0rzicynqgayydxqynnairxk7ybg4alv1xnfz8cgkrpicl2g9bacg"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Modelica_Requirements.git"; rev = "a427b5cb7997e9036c577d219e6b8a5d0c28389a"; sha256 = "1ihx46kifnfi9kw1g8nmd9sarl766whbzdk6a44alczsya4gg45k"; fetchSubmodules = true; } - { url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "c8350276bfd945086962cf4150ba941b9c57ed13"; sha256 = "12ad7fpjy50ky3lvl65r9d5xvlzvw5yqdnbp4rsgl3qw7s3wrmja"; fetchSubmodules = true; } - { url = "https://github.com/jwindahlModelon/MultiPhaseMixtureMedia.git"; rev = "0bda0c58af6384f8e0edf7aa7520afb369af3e38"; sha256 = "11bqm69504bh4h05dxlwdmjfxwls06mr49cz47kl8jmrygkfi4i2"; fetchSubmodules = true; } - { url = "https://github.com/OpenIPSL/OpenIPSL.git"; rev = "v1.5.0"; sha256 = "09xrcz0rdxdy220ki5zyl7920y0a4lg24p0aibna4ad15vszhhwj"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Optimisers.git"; rev = "e33c69edaad6dad8029167b0ca00533964a6fe37"; sha256 = "0hcxsrr2n4fzaxdjvgvqayz38kpfk86cclvg5pzcfmjc5bznb8bs"; fetchSubmodules = true; } - { url = "https://github.com/lochel/PNlib.git"; rev = "ab9b6b8527c0c78140365e7b105ae469d4954a64"; sha256 = "0y7bfbnvzv9bnz4v8wvmy42dji3cqpy5b2fmd2jj0rhlzs1infzh"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/PVSystems.git"; rev = "v0.6.2"; sha256 = "0vcgvdaqfbn46lpzk0kvsif3d55wf8yzhkbdpf5zv04kv7zw25w9"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/PhotoVoltaics.git"; rev = "v1.6.0"; sha256 = "0zqx77z217iln3vfxn2v3c2jl0jz5kgcd96ylvimjnwr30mxr09n"; fetchSubmodules = true; } - { url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "v2.3.1"; sha256 = "0nxfw63m278gaff18zz29n2s1vk4kwdbv2qvbjmcq86fl1i5b3bg"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Physiomodel.git"; rev = "v1.0.0"; sha256 = "1sdhv5qgjqv3zdq57pkkrh04ainwv9n5zqd8mb9a3ybjmwdjf6f9"; fetchSubmodules = true; } - { url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "55224a9e76de8aa7f708236bd4d7dee624ecba50"; sha256 = "0hf7vi44adss86x5ahk5if7bdjgw773d8mb3d8ianq12g8azycyd"; fetchSubmodules = true; } - { url = "https://github.com/PowerGrids/PowerGrids.git"; rev = "v1.0.0"; sha256 = "06bx8mqvmizhfwg99djdfgh2mblc4wzmg0zq4ilrp586jwfninmz"; fetchSubmodules = true; } - { url = "https://github.com/modelica/PowerSystems.git"; rev = "v1.0.0"; sha256 = "1xwhwich7gi6vl33zl2r78xdjklchgkjcnvww6390j20l1wjznkn"; fetchSubmodules = true; } - { url = "https://github.com/modelica/PowerSystems.git"; rev = "7369976265a9d7b62097340aba5e463c62cc5061"; sha256 = "1f0h148v2g057l6ixf646d8ymsx1jzqn14xlram8h62la2k6nmvw"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "v1.0.2"; sha256 = "0ch4la04hm059ii5wzph9gsbvqhnfqrvvpqi57qn27bm10c4la0m"; fetchSubmodules = true; } - { url = "https://github.com/casella/ScalableTestSuite.git"; rev = "v1.11.5"; sha256 = "0bhj1q9b8d29nrbr253zszy1w1yvyizvyr3law1pqjj6mhbqmg4i"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "3bf82ba5d3f31b4a0ae05f99ae690037358e153e"; sha256 = "1swka7d58wkg5pqv59lqgfi7gv6rg5vra4j6r76pn9czx9ddal8w"; fetchSubmodules = true; } - { url = "https://github.com/SolarTherm/SolarTherm.git"; rev = "d80fc335d1fa5d1628c45c2e73204bcb8a614b21"; sha256 = "18d8cqlh0ic2yfcxzkz0ar9z19486z9x4sc7c9mpggxib28p39aa"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/Soltermica.git"; rev = "9f7224bd89335f95dffe1ccdaa094df5a3279fdf"; sha256 = "1bif3cnwjas6x7b8ahwkm7dbrqrfdqwwa26zmdc6zrpfncl3kqd0"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "2f6bd9382c5aac2aff9148cd9113a418767734b6"; sha256 = "0ii2mj6ngwjir3gzyad8wsj86pvd6wzal91nz2y7gzwj1djchb3x"; fetchSubmodules = true; } - { url = "https://github.com/thom-marx/ThermalSeparation.git"; rev = "ffa0495ba829ecab105be4bfb3b7652625ec9c03"; sha256 = "1czm97bcrpp2jv0a0kd31a929wqlrlzdhdxvyy4w499dn20jzv1l"; fetchSubmodules = true; } - { url = "https://github.com/casella/ThermoPower.git"; rev = "82d21eba0d330005899dd50a6a0ceb7d09c4caeb"; sha256 = "0n83b40hjisy7lpnbz692947d2q3hw5hk4rak7fg0w5dbm4i719p"; fetchSubmodules = true; } - { url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5"; sha256 = "12fsf0xxxc1ja6vmm9ff85f8j5sg1lb7w4g57s2w3fkf4d3a7d0c"; fetchSubmodules = true; } - { url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "5cef9acb4dedf8af6f4638a4448f08a544ebd30b"; sha256 = "0ihnz1s4rs42yis9zym9nw29ia2lqz2yx2wblc50p6f221w7q78s"; fetchSubmodules = true; } - { url = "https://github.com/lenaRB/VVDRlib.git"; rev = "eae4981674642eddffc7f2aa3690320fcaddee0e"; sha256 = "0qxxk2xlas5mqyc1h8ndic208qj1sm5mr5y8664kv3py7i8jdqi4"; fetchSubmodules = true; } - { url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "v1.2.5"; sha256 = "044k17cpc88wprrvw03p6crm6dy6x9a6xj5104d5nln71lqz5sdq"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "v2.1.0"; sha256 = "1dxr4m9j7b5266daj4klbrhvnkqr73sximdw9bk9v5qf0s28li99"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/WindPowerPlants.git"; rev = "v1.2.0"; sha256 = "1lyrqwsb6sm1wc7vlj72zk5cpjhhzh27fviiqayddqy2b903xish"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/ipsl.git"; rev = "v1.1.1"; sha256 = "1w2iah8c5d8n01wmxydjk0rrcxh88g8yjy2zmv403azcccq7byzp"; fetchSubmodules = true; } - { url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "v2.5.0"; sha256 = "1pd5xf5bgz010lryv8bj6lvlfqn9p184csiffwj8icx7rycnlcqb"; fetchSubmodules = true; } - { url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "58a83b5b36f267613de4676c95163489b1ddc2e7"; sha256 = "0wf6dn64d2psv9b3xg5227vzpk109r3dqzi4m2wwhrilaxs3v004"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/AdvancedNoise.git"; rev = "5ce57acd279dadd0d25b76a6b02d3f9e9d061246"; sha256 = "07jjbj0y6bak269md3xniqb5lgc33m92ar5qixqxj5yxdjaahfs2"; fetchSubmodules = true; } +{ url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "65e49ddf5c935846888a61aa303e52c909619079"; sha256 = "18xn8j3x3j4x9bpjgqnq0b6p3yzzsg5n62fv1ldqbbjcmi0vimd5"; fetchSubmodules = true; } +{ url = "https://github.com/RWTH-EBC/AixLib.git"; rev = "v0.4.0"; sha256 = "0dw34mjq29n55xh51g1c9a9d0d8gbpn16gj309dfxn4v2hbnfvzx"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/AlgebraTestSuite.git"; rev = "b937e1a7f447138c59abec9b2092f84f16bf02e8"; sha256 = "0406inasx61dk7vcnziiyhxkna7g61a5hn0znnbxj817hz6q11zn"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ApproxSpline.git"; rev = "28420f5c1a88c9cd069defbd8c05e4a78a090675"; sha256 = "07gpyi2brj5zpvrlsnflqjnhbrgxvpqbdshp8lp4lh9mnj5jv95d"; fetchSubmodules = true; } +{ url = "https://github.com/OpenModelica/BioChem.git"; rev = "v1.0.2"; sha256 = "037bvj2lqrslg8k5r0rjgdzccslj9bj25b55k4g440vabm5p05qm"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256 = "0yrkk708v4bvf423xb4zgpmnaj8qhq5primdg758ayddgli23wa9"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "834fb3519ca8f89efe268582d39d00a7c3991150"; sha256 = "1iwqh4kr36wgxc0gci63gdgbqln2sap1w4bkydk1vkss2s302lg4"; fetchSubmodules = true; } +{ url = "https://github.com/EDF-TREE/BuildSysPro.git"; rev = "v3.3.0"; sha256 = "1cvcany3q9p1xndarxa2d8mmqxdnqk22476q8l61nayz5qy25x61"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/BuildingControlLib.git"; rev = "v1.0.0"; sha256 = "0ckdxway0m755mbrl94k4458sijzgknlzsrf7xs5bjymxchm8r2m"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/BuildingSystems.git"; rev = "c3070d48015ee75c1577f349cb388a498bef7270"; sha256 = "0r876wm6f1xx4cli1lqlylpl3zgaddmy06hcafbnzry9j38vbz4y"; fetchSubmodules = true; } +{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v6.0.0"; sha256 = "0rnnk1clji0myzr7adggki6knbl6v8381vwnqgiz8mkxbmzdwm4f"; fetchSubmodules = true; } +{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "v7.0.0"; sha256 = "04n04pp4zvyg8n8h7h79c3wyk7lmn940mh7qzs0lv76g1ybypnlz"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "5645573fced862430b7b598b4d7ec1a39c7aa0fa"; sha256 = "1kh7kpmjfz55pb8553srlnrh8l00nw21xf5mjzh7nx9b1rndnmyg"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/DeployStructLib.git"; rev = "v1.0"; sha256 = "1k4zw9lnd0javw4zigxc15l58yf7xdz36b7808g65qxy89w6ksr2"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/DisHeatLib.git"; rev = "b11f53379c122870a52f2da9b1705d2c911cd21d"; sha256 = "1vm96a4z0b40r0nisxrrzyvan4yphjdkx4ad655phva2636xb5rr"; fetchSubmodules = true; } +{ url = "https://github.com/AHaumer/DriveControl.git"; rev = "b7233fd97a92867bb4ec2c3647c7f7e888398644"; sha256 = "0nyp1n8wrkjzfypsmjjzac0g9p4wbc1cxxr040fj20bqdg9l3h1b"; fetchSubmodules = true; } +{ url = "https://github.com/christiankral/ElectroMechanicalDrives.git"; rev = "v2.2.0"; sha256 = "0012phmn1y9fgpph45lwbjk0yhm5czidf2z6khm8lddvk93wf31b"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "v2.5.0"; sha256 = "19dsyq1mk5vl54fqaffzqafm5w94l011cy7pg16c7i933dbqnkki"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/ExternalMedia.git"; rev = "6138312c96142ff3c01190147e6277991bfa2fca"; sha256 = "1d9g2hbdvgz13j7kdi1kglkkllj9f00x3dwdp5piyypvs464jsn5"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ExternalMemoryLib.git"; rev = "6488d5815bda23c665123baa916789e283e16d2c"; sha256 = "06y1i5w690b3b9x23nzls8y67fl7yd7bn4xl5j0dmyi4qx33aqda"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/FMITest.git"; rev = "a67a276083f4010b249802ad8fc70dc30c09adfd"; sha256 = "0mg8jlvlwql2nsjiy7c3rdibv73bkfk149ac0450d5pc0hfn9mln"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/FailureModes.git"; rev = "v1.2.1"; sha256 = "1z8bwrld1rkydgssab5gnrd76frrbky8qxi1lvlaf2jidj6bzn1l"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "v0.6.6"; sha256 = "0a08yyrbg4a49s0bgqgyds6pidx9xr47yspvl9bdak1mq34qibip"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/FeedDriveLibrary.git"; rev = "1.0.1"; sha256 = "15fi9dj6zgl0fr90cwxqjbpphj0dwrrmk74hf25j6zd85w2ycqdz"; fetchSubmodules = true; } +{ url = "https://github.com/DLR-SR/FractionalOrder.git"; rev = "99918820e346c362c3ad52d782c8215e5deeac4c"; sha256 = "1pycss6fqh86frfdbdfffjhaz09fz1558f9azgckhf8drx6ry1qs"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Greenhouses-Library.git"; rev = "89ae0e8097eb0751abce2013d304fa5f9c09b885"; sha256 = "1q77xj6aysqsn3d7kjmcq7dihbw18iqm35ifzdi75xgf3cgwla4f"; fetchSubmodules = true; } +{ url = "https://github.com/christiankral/HanserModelica.git"; rev = "v1.1.0"; sha256 = "0zwkrhg2y42m18p4z51izrickiv1vikgz0z7fpjia4dbppckav8i"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "3b4a4bca94d388744b2d045344ea2f9b0b4d405b"; sha256 = "17fzpan89075vb5vbhw5ylgxcdsmj2vjnmmka7cgzh06izb69nvh"; fetchSubmodules = true; } +{ url = "https://github.com/ibpsa/modelica-ibpsa.git"; rev = "v3.0.0"; sha256 = "0xwgfndlw76zfmiiqadl85l9na9igsqlmfcawx526sdw2lhhgics"; fetchSubmodules = true; } +{ url = "https://github.com/open-ideas/IDEAS.git"; rev = "v2.1.0"; sha256 = "0xp0zg6ib5536d5vl361lsn5w5faqdf6djhcmfxns629wjima8rn"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "v1.1.0"; sha256 = "1nvgx94iy1pws0768anrl7ssjlzslb5mbp21j7xvf6wpqfmj0npc"; fetchSubmodules = true; } +{ url = "https://github.com/christiankral/KeyWordIO.git"; rev = "v0.9.0"; sha256 = "10kvj6zn2r6m3403ja8nkkxbfcchkz0pfk3g70ibr76zivxb5nim"; fetchSubmodules = true; } +{ url = "https://github.com/FishSim/LibRAS.git"; rev = "fca9de50a484a2213f3ca1b39e275c237c471688"; sha256 = "0w1c87sifq8klq0f2l70qxjrlvahyxy1cx9rln80rni4d427yc1k"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "v1.0"; sha256 = "1crj60i5f33l9pgip0xbv6ankcga7px0644cj7c2wnzn1fjmn2k8"; fetchSubmodules = true; } +{ url = "https://github.com/looms-polimi/MEV.git"; rev = "v1.0.1"; sha256 = "1a7ih9lc01wzaq8a8aznggpi4aqnczyzq49q5hc4fqvmfwl7l0j3"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ModPowerSystems.git"; rev = "df3afce27d5e935c4111f392275744a655abe216"; sha256 = "1b1fikm92lv6gj82imka3hxbjwv04i4h33y69yhcxdpqa6z6hm4z"; fetchSubmodules = true; } +{ url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "4a91d52248b0f17415bba1d58881fc730bd94215"; sha256 = "19caxz6hvlrsls3b2387a24zwwnykbb138jpb42gwpy8jlh93yzi"; fetchSubmodules = true; } +{ url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git"; rev = "cab27240a4a3ed4ea137226f056bbc0d79543f7a"; sha256 = "06y911i2hs7hg4ykhb8wngvxhwnaww8rsakwa7ssd047a7glzsb0"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Modelica-Arduino.git"; rev = "v0.1.0"; sha256 = "1n34dksqhrn1synv2mp2ifk4dxyhp15f5v1jb1b3dbw9n19951qb"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Modelica-GNU_ScientificLibrary.git"; rev = "9235ab28bdd7f0fe3e7abba48af53d73332858ec"; sha256 = "168g9gg12lfa863ifs41bnx6yd0yyjnal6986dgpm51dj5arw6id"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Modelica-MVEM.git"; rev = "v1.0.1"; sha256 = "1p68691dnl06lgwm4bl9g036brn4vl7m5x3gq4rxc291339frixk"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ModelicaADS.git"; rev = "v1.0.1"; sha256 = "0fhxrl07d7v3wa79d30psm1gxydc0p7s2akfirdx6dai0633skp9"; fetchSubmodules = true; } +{ url = "https://github.com/xogeny/ModelicaBook.git"; rev = "v0.6.0"; sha256 = "0yqbll6p738yvpi1x11cjngpz2glda07mljrkjlm23p7l53x63dc"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-compliance/compliance.git"; rev = "8a91e75d8a26acc4de30fc0e5d5e9db83c970bd6"; sha256 = "1cym1wlgsvfrryq8zqzzrgs4wam1l7pc20q07hk3d615nhq21lg6"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ModelicaDFR.git"; rev = "37a441934d05330cf3d13e9ec551954d27eca84c"; sha256 = "13rpcs8cl9x15vi655150zmhmg1iaxpzvxrl3rqif46zpl5dhlj2"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "v1.8.2"; sha256 = "16c0p9zn0qrraz59ivinibmikdd251plm1vqngznzhksjwvz6bja"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "v2.3.5"; sha256 = "0rzicynqgayydxqynnairxk7ybg4alv1xnfz8cgkrpicl2g9bacg"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Modelica_Requirements.git"; rev = "a427b5cb7997e9036c577d219e6b8a5d0c28389a"; sha256 = "1ihx46kifnfi9kw1g8nmd9sarl766whbzdk6a44alczsya4gg45k"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "c8350276bfd945086962cf4150ba941b9c57ed13"; sha256 = "12ad7fpjy50ky3lvl65r9d5xvlzvw5yqdnbp4rsgl3qw7s3wrmja"; fetchSubmodules = true; } +{ url = "https://github.com/jwindahlModelon/MultiPhaseMixtureMedia.git"; rev = "0bda0c58af6384f8e0edf7aa7520afb369af3e38"; sha256 = "11bqm69504bh4h05dxlwdmjfxwls06mr49cz47kl8jmrygkfi4i2"; fetchSubmodules = true; } +{ url = "https://github.com/OpenIPSL/OpenIPSL.git"; rev = "v1.5.0"; sha256 = "09xrcz0rdxdy220ki5zyl7920y0a4lg24p0aibna4ad15vszhhwj"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Optimisers.git"; rev = "e33c69edaad6dad8029167b0ca00533964a6fe37"; sha256 = "0hcxsrr2n4fzaxdjvgvqayz38kpfk86cclvg5pzcfmjc5bznb8bs"; fetchSubmodules = true; } +{ url = "https://github.com/lochel/PNlib.git"; rev = "059545d48dd9ceeccfa3b4e47689ec8dd334dcd8"; sha256 = "1a0hxkgsi4klw9c8zav1dy2p1c85ald29gx82hfacwv55xl9f127"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/PVSystems.git"; rev = "v0.6.2"; sha256 = "0vcgvdaqfbn46lpzk0kvsif3d55wf8yzhkbdpf5zv04kv7zw25w9"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/PhotoVoltaics.git"; rev = "v1.6.0"; sha256 = "0zqx77z217iln3vfxn2v3c2jl0jz5kgcd96ylvimjnwr30mxr09n"; fetchSubmodules = true; } +{ url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "v2.3.1"; sha256 = "0nxfw63m278gaff18zz29n2s1vk4kwdbv2qvbjmcq86fl1i5b3bg"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Physiomodel.git"; rev = "v1.0.0"; sha256 = "1sdhv5qgjqv3zdq57pkkrh04ainwv9n5zqd8mb9a3ybjmwdjf6f9"; fetchSubmodules = true; } +{ url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "55224a9e76de8aa7f708236bd4d7dee624ecba50"; sha256 = "0hf7vi44adss86x5ahk5if7bdjgw773d8mb3d8ianq12g8azycyd"; fetchSubmodules = true; } +{ url = "https://github.com/PowerGrids/PowerGrids.git"; rev = "v1.0.0"; sha256 = "06bx8mqvmizhfwg99djdfgh2mblc4wzmg0zq4ilrp586jwfninmz"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/PowerSystems.git"; rev = "v1.0.0"; sha256 = "1xwhwich7gi6vl33zl2r78xdjklchgkjcnvww6390j20l1wjznkn"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/PowerSystems.git"; rev = "f0721333f4875143565147a7d043bee1c300873b"; sha256 = "0gbvx0gzf3akb0w7yvdxfq2y4ps91cy5b93iwnvnw7652x716813"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "v1.0.2"; sha256 = "0ch4la04hm059ii5wzph9gsbvqhnfqrvvpqi57qn27bm10c4la0m"; fetchSubmodules = true; } +{ url = "https://github.com/casella/ScalableTestSuite.git"; rev = "v1.11.5"; sha256 = "0bhj1q9b8d29nrbr253zszy1w1yvyizvyr3law1pqjj6mhbqmg4i"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "3bf82ba5d3f31b4a0ae05f99ae690037358e153e"; sha256 = "1swka7d58wkg5pqv59lqgfi7gv6rg5vra4j6r76pn9czx9ddal8w"; fetchSubmodules = true; } +{ url = "https://github.com/SolarTherm/SolarTherm.git"; rev = "203fb5af3b95c731c7fcbe2833d51fd420e80796"; sha256 = "1bh4y4igzd0k59xm8j14p52gnlbwkiwwy6bhhyarpr361yrchn33"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/Soltermica.git"; rev = "9f7224bd89335f95dffe1ccdaa094df5a3279fdf"; sha256 = "1bif3cnwjas6x7b8ahwkm7dbrqrfdqwwa26zmdc6zrpfncl3kqd0"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "2f6bd9382c5aac2aff9148cd9113a418767734b6"; sha256 = "0ii2mj6ngwjir3gzyad8wsj86pvd6wzal91nz2y7gzwj1djchb3x"; fetchSubmodules = true; } +{ url = "https://github.com/thom-marx/ThermalSeparation.git"; rev = "ffa0495ba829ecab105be4bfb3b7652625ec9c03"; sha256 = "1czm97bcrpp2jv0a0kd31a929wqlrlzdhdxvyy4w499dn20jzv1l"; fetchSubmodules = true; } +{ url = "https://github.com/casella/ThermoPower.git"; rev = "650be2c8cbd5abc3535e92b865e509073afc8aeb"; sha256 = "08ijrx8xw43dadz5s3kiwa17ax9faq2wyq9gm0vlz9ddbkj0hcaq"; fetchSubmodules = true; } +{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5"; sha256 = "12fsf0xxxc1ja6vmm9ff85f8j5sg1lb7w4g57s2w3fkf4d3a7d0c"; fetchSubmodules = true; } +{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "5cef9acb4dedf8af6f4638a4448f08a544ebd30b"; sha256 = "0ihnz1s4rs42yis9zym9nw29ia2lqz2yx2wblc50p6f221w7q78s"; fetchSubmodules = true; } +{ url = "https://github.com/lenaRB/VVDRlib.git"; rev = "eae4981674642eddffc7f2aa3690320fcaddee0e"; sha256 = "0qxxk2xlas5mqyc1h8ndic208qj1sm5mr5y8664kv3py7i8jdqi4"; fetchSubmodules = true; } +{ url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "v1.2.5"; sha256 = "044k17cpc88wprrvw03p6crm6dy6x9a6xj5104d5nln71lqz5sdq"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "v2.1.0"; sha256 = "1dxr4m9j7b5266daj4klbrhvnkqr73sximdw9bk9v5qf0s28li99"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/WindPowerPlants.git"; rev = "v1.2.0"; sha256 = "1lyrqwsb6sm1wc7vlj72zk5cpjhhzh27fviiqayddqy2b903xish"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/ipsl.git"; rev = "v1.1.1"; sha256 = "1w2iah8c5d8n01wmxydjk0rrcxh88g8yjy2zmv403azcccq7byzp"; fetchSubmodules = true; } +{ url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "v2.5.0"; sha256 = "1pd5xf5bgz010lryv8bj6lvlfqn9p184csiffwj8icx7rycnlcqb"; fetchSubmodules = true; } +{ url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "58a83b5b36f267613de4676c95163489b1ddc2e7"; sha256 = "0wf6dn64d2psv9b3xg5227vzpk109r3dqzi4m2wwhrilaxs3v004"; fetchSubmodules = true; } ] diff --git a/pkgs/applications/science/misc/openmodelica/omparser/default.nix b/pkgs/applications/science/misc/openmodelica/omparser/default.nix index fcf5acd29ee..cbf8f2255e7 100644 --- a/pkgs/applications/science/misc/openmodelica/omparser/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omparser/default.nix @@ -22,7 +22,7 @@ mkOpenModelicaDerivation rec { suite"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omplot/default.nix b/pkgs/applications/science/misc/openmodelica/omplot/default.nix index 7edc4b6efb2..51ab89407f4 100644 --- a/pkgs/applications/science/misc/openmodelica/omplot/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omplot/default.nix @@ -28,7 +28,7 @@ mkOpenModelicaDerivation rec { description = "Plotting tool for OpenModelica-generated results files"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omshell/default.nix b/pkgs/applications/science/misc/openmodelica/omshell/default.nix index 2f8c5203c07..3c39d62f92d 100644 --- a/pkgs/applications/science/misc/openmodelica/omshell/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omshell/default.nix @@ -34,7 +34,7 @@ mkOpenModelicaDerivation rec { description = "Interactive OpenModelica session shell"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix index 448cdee6c26..d91d427a077 100644 --- a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix @@ -20,7 +20,7 @@ mkOpenModelicaDerivation rec { description = "The OpenModelica FMI & SSP-based co-simulation environment"; homepage = "https://openmodelica.org"; license = licenses.gpl3Only; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ balodja smironov ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 4126eabed2e..849965e15f5 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.17.1"; + version = "2.17.2"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-ZVwMfjlKga47oXf6g/P2IAMu6Fcuj8BbRahniTZXmTg="; + sha256 = "sha256-JfT0jW6aUZAYESQI0tFfnITFv20Jk7DWbvz8Ipt4t1Y="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 96358383047..176efb79954 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -18,6 +18,8 @@ , gtk4 , gst_all_1 , libadwaita +, appstream-glib +, libsoup }: stdenv.mkDerivation rec { @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + appstream-glib desktop-file-utils # for update-desktop-database glib gobject-introspection @@ -53,6 +56,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-ugly gtk4 libadwaita + libsoup wayland wayland-protocols ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3a613f26ae6..ce9a72aebf9 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate fluidsynth wayland wayland-protocols ncurses srt - ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 + ] ++ optional (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) live555 ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ]) ++ optional jackSupport libjack2 @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64) then live555 else null; + LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) then live555 else null; # vlc depends on a c11-gcc wrapper script which we don't have so we need to # set the path to the compiler diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index d8b6dfc2efa..54378dbe13d 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -2,6 +2,7 @@ , csmSupport ? false, seabios ? null , secureBoot ? false , httpSupport ? false +, tpmSupport ? false }: assert csmSupport -> seabios != null; @@ -30,9 +31,10 @@ edk2.mkDerivation projectDscPath { hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; buildFlags = - lib.optional secureBoot "-DSECURE_BOOT_ENABLE=TRUE" + lib.optional secureBoot "-D SECURE_BOOT_ENABLE=TRUE" ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] - ++ lib.optionals httpSupport [ "-DNETWORK_HTTP_ENABLE=TRUE" "-DNETWORK_HTTP_BOOT_ENABLE=TRUE" ]; + ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] + ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; postPatch = lib.optionalString csmSupport '' cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 05e468a7322..1afab167308 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "18.0"; + version = "19.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "0k9gclkba2bhmyqhyigjgfgcnqpg16v3yczhh08ljxmbrsbs02ig"; + sha256 = "0h3varacv9696mih8zrz3fp6xa8hxxvwzkrslhpf9ilcjs1bjihd"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "086ldzb1rbbrzjbklay4nvhc18ipyxi9gnp56f06393zvfbhc5dl"; + cargoSha256 = "015r9m9fr634ppn4qy0b8w1khjlxsv3wbpf3s7crmklzy57wakxl"; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix new file mode 100644 index 00000000000..3ce3d9a880f --- /dev/null +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "docker-compose"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "compose"; + rev = "v${version}"; + sha256 = "sha256-6OjA3f6c9s/86UPxy9EqLIc/0ZuW6UhKyQdkM7YoTsU="; + }; + + vendorSha256 = "sha256-6h36TZmo0RvB3YzZRmsrs2Fbl+8zPTuL9LxWkuNgRqw="; + + doCheck = false; + installPhase = '' + install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose + ''; + + meta = with lib; { + description = "Docker CLI plugin to define and run multi-container applications with Docker"; + license = licenses.asl20; + maintainers = [ maintainers.babariviere ]; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 24bd7a1339a..8345b2b42d7 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -8,16 +8,16 @@ rec { , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? true + , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool - , sqlite, iproute2, lvm2, systemd, docker-buildx + , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp , nixosTests - , clientOnly ? !stdenv.isLinux + , clientOnly ? !stdenv.isLinux, symlinkJoin }: let docker-runc = runc.overrideAttrs (oldAttrs: { @@ -117,6 +117,10 @@ rec { ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; }); + + plugins = optionals buildxSupport [ docker-buildx ] + ++ optionals composeSupport [ docker-compose_2 ]; + pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in buildGoPackage ((optionalAttrs (!clientOnly) { @@ -141,14 +145,14 @@ rec { ]; buildInputs = optionals (!clientOnly) [ sqlite lvm2 btrfs-progs systemd libseccomp - ] ++ optionals (buildxSupport) [ docker-buildx ]; + ] ++ plugins; postPatch = '' patchShebangs man scripts/build/ substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - '' + optionalString buildxSupport '' + '' + optionalString (plugins != []) '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ - ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} + "${pluginsRef}/libexec/docker/cli-plugins" ''; # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 47fd99c12f8..a42b025bc7f 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -37,6 +37,11 @@ let + inherit (lib) + escapeShellArgs + toList + ; + mkDbExtraCommand = contents: let contentsList = if builtins.isList contents then contents else [ contents ]; @@ -402,7 +407,7 @@ rec { preMount = lib.optionalString (contents != null && contents != [ ]) '' echo "Adding contents..." - for item in ${toString contents}; do + for item in ${escapeShellArgs (map (c: "${c}") (toList contents))}; do echo "Adding $item..." rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/ done diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 9f6823a5878..141c2ba0ea4 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -553,4 +553,16 @@ rec { # Example export of the bash image exportBash = pkgs.dockerTools.exportImage { fromImage = bash; }; + + build-image-with-path = buildImage { + name = "build-image-with-path"; + tag = "latest"; + contents = [ pkgs.bashInteractive ./test-dummy ]; + }; + + layered-image-with-path = pkgs.dockerTools.streamLayeredImage { + name = "layered-image-with-path"; + tag = "latest"; + contents = [ pkgs.bashInteractive ./test-dummy ]; + }; } diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 327b7fa2ca5..57069fadbc5 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, google-fonts }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "inconsolata"; + version = "unstable-2021-01-19"; - inherit (google-fonts) src version; + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a"; + sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; + }; installPhase = '' - install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf + install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf ''; meta = with lib; { diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 00de4f6760c..c0f65ab7ead 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2021-07-14"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2"; + sha256 = "0qbbg0hcdda7apk892b8nhbrsvji12nv97ss7lv412xwcmxsj9fp"; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index f33fa2db546..42979c8c81b 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "04a9c56w4hm8lwa8hzy5lwj4yli19gzy5wp5iinsm61qas9xgy69"; + sha256 = "01p1g0gy6d1c8aa9y7inhn6zhm0qy0fzmwlniiv07h15g32appvd"; }; sourceRoot = "."; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 809b45a0fda..1eb6a5f39e6 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "11.1"; + version = "11.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0jzjrx21i9bny4117nlwkrvjc4cg2w6r42ra66hxzaazcs9hvny2"; + sha256 = "1krfjk76yjyzsxkhymc1dpy3y7ykawdxzwb282wgbb480dpg8s05"; }; buildInputs = [ diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index c158cc8a00c..83764e3c8bc 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-07-27"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "17x4lqlv6whx8vg0c1nm89j7671l033apn4alqyhjb9qx5w2fa43"; + sha256 = "12dwmgq0kadjfky5bjm62vwgdlw3nmrrhqqs5iw15w0pn3mbmd5c"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 1a3a67f0d78..617ef1cc38f 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -47,9 +47,11 @@ stdenv.mkDerivation rec { }; patches = lib.optionals withPantheon [ + # Make this respect dark mode settings from Pantheon # https://github.com/elementary/browser - ./dark-style.patch - ./navigation-buttons.patch + # The patch currently differs from upstream (updated for epiphany 40 and 41). + ./pantheon-dark-style.patch + ./pantheon-navigation-buttons.patch ]; nativeBuildInputs = [ @@ -95,7 +97,9 @@ stdenv.mkDerivation rec { p11-kit sqlite webkitgtk - ] ++ lib.optional withPantheon pantheon.granite; + ] ++ lib.optionals withPantheon [ + pantheon.granite + ]; # Tests need an X display mesonFlags = [ diff --git a/pkgs/desktops/gnome/core/epiphany/dark-style.patch b/pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch index 56ac5c1e5b2..56ac5c1e5b2 100644 --- a/pkgs/desktops/gnome/core/epiphany/dark-style.patch +++ b/pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch diff --git a/pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch b/pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch index b7b3b620535..b7b3b620535 100644 --- a/pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch +++ b/pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 39eb0338332..45812dbc901 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -30,6 +30,7 @@ , gsettings-desktop-schemas , gnome-desktop , dbus +, pantheon , python3 , texlive , t1lib @@ -40,6 +41,7 @@ , supportMultimedia ? true # PDF multimedia , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps +, withPantheon ? false }: stdenv.mkDerivation rec { @@ -53,6 +55,13 @@ stdenv.mkDerivation rec { sha256 = "lautDW/urJVg2zq4C6fF6rsf3xyg47PJMzmvBUU6JNg="; }; + patches = lib.optionals withPantheon [ + # Make this respect dark mode settings from Pantheon + # https://github.com/elementary/evince + # The patch currently differs from upstream (updated for evince 41). + ./pantheon-dark-style.patch + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py @@ -96,9 +105,18 @@ stdenv.mkDerivation rec { poppler t1lib texlive.bin.core # kpathsea for DVI support - ] ++ lib.optional supportXPS libgxps - ++ lib.optionals supportMultimedia (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); + ] ++ lib.optionals supportXPS [ + libgxps + ] ++ lib.optionals supportMultimedia (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]) ++ lib.optionals withPantheon [ + pantheon.granite + ]; mesonFlags = [ "-Dnautilus=false" @@ -128,8 +146,8 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.gnome.members; + maintainers = teams.gnome.members ++ teams.pantheon.members; }; } diff --git a/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch b/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch new file mode 100644 index 00000000000..5e1ef67b08c --- /dev/null +++ b/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch @@ -0,0 +1,86 @@ +diff --git a/meson.build b/meson.build +index bcb69cf7..4a18c08c 100644 +--- a/meson.build ++++ b/meson.build +@@ -162,6 +162,7 @@ gmodule_dep = dependency('gmodule-2.0') + gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req_version) + gtk_dep = dependency('gtk+-3.0', version: gtk_req_version) + gthread_dep = dependency('gthread-2.0', version: glib_req_version) ++granite_dep = dependency('granite') + # Keep the version here synchronised with subprojects/libhandy.wrap + hdy_dep = dependency('libhandy-1', version: hdy_req_version, fallback: ['libhandy', 'libhandy_dep']) + +diff --git a/shell/ev-application.c b/shell/ev-application.c +index e704bda2..d705328c 100644 +--- a/shell/ev-application.c ++++ b/shell/ev-application.c +@@ -30,6 +30,7 @@ + #include <glib/gi18n.h> + #include <glib/gstdio.h> + #include <gtk/gtk.h> ++#include <granite.h> + #include <handy.h> + #ifdef GDK_WINDOWING_X11 + #include <gdk/gdkx.h> +@@ -176,7 +177,7 @@ ev_spawn (const char *uri, + + g_string_append_printf (cmd, " %s", path); + g_free (path); +- ++ + /* Page label */ + if (dest) { + switch (ev_link_dest_get_dest_type (dest)) { +@@ -940,6 +941,20 @@ ev_application_migrate_config_dir (EvApplication *application) + g_free (old_accels); + } + ++static void ++ev_application_set_prefers_color_scheme () ++{ ++ GtkSettings* gtk_settings = gtk_settings_get_default (); ++ GraniteSettings* granite_settings = granite_settings_get_default (); ++ ++ g_object_set ( ++ gtk_settings, ++ "gtk-application-prefer-dark-theme", ++ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK, ++ NULL ++ ); ++} ++ + static void + ev_application_startup (GApplication *gapplication) + { +@@ -992,6 +1007,7 @@ ev_application_startup (GApplication *gapplication) + + EvApplication *application = EV_APPLICATION (gapplication); + const gchar **it; ++ GraniteSettings* granite_settings = granite_settings_get_default (); + + g_application_set_resource_base_path (gapplication, "/org/gnome/evince"); + +@@ -999,6 +1015,11 @@ ev_application_startup (GApplication *gapplication) + + hdy_init (); + ++ ev_application_set_prefers_color_scheme (); ++ ++ g_signal_connect (granite_settings, "notify::prefers-color-scheme", ++ G_CALLBACK(ev_application_set_prefers_color_scheme), NULL); ++ + for (it = action_accels; it[0]; it += g_strv_length ((gchar **)it) + 1) + gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]); + } +diff --git a/shell/meson.build b/shell/meson.build +index 7cbc48f2..a3089b13 100644 +--- a/shell/meson.build ++++ b/shell/meson.build +@@ -52,6 +52,7 @@ sources += gnome.compile_resources( + deps = [ + gdk_pixbuf_dep, + gnome_desktop_dep, ++ granite_dep, + hdy_dep, + libevmisc_dep, + libevproperties_dep, diff --git a/pkgs/desktops/gnome/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix index 2881cc7e50f..245a5229343 100644 --- a/pkgs/desktops/gnome/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -1,9 +1,13 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, autoconf-archive -, appstream-glib +, substituteAll +, fetchpatch +, meson +, ninja , pkg-config , wrapGAppsHook +, desktop-file-utils , libcanberra , gst_all_1 , vala @@ -11,43 +15,54 @@ , gom , sqlite , libxml2 -, autoreconfHook , glib , gobject-introspection , libpeas -, gnome-shell , gsettings-desktop-schemas -, adwaita-icon-theme , gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-pomodoro"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { - owner = "codito"; + owner = "gnome-pomodoro"; repo = "gnome-pomodoro"; rev = version; - sha256 = "sha256-im66QUzz6PcX0vkf4cN57ttRLB4KKPFky1pwUa4V7kQ="; + sha256 = "sha256-USzLHoBM0QbBPtbTzJJY02cOSDtmlxPGYhMj7M1FJic="; }; + patches = [ + # Our glib setup hooks moves GSettings schemas to a subdirectory to prevent conflicts. + # We need to patch the build script so that the extension can find them. + (substituteAll { + src = ./fix-schema-path.patch; + inherit pname version; + }) + + # Fix error reporting code. + # https://github.com/gnome-pomodoro/gnome-pomodoro/pull/591 + (fetchpatch { + url = "https://github.com/gnome-pomodoro/gnome-pomodoro/commit/133bd62f15653856d9705b66188b42c20d81719e.patch"; + sha256 = "A20K+57A6/lYH2Buri2+wrCQgz6EGBdYg2xQbHPSkYc="; + }) + ]; + nativeBuildInputs = [ - appstream-glib - autoconf-archive - autoreconfHook + meson + ninja gettext gobject-introspection libxml2 pkg-config vala wrapGAppsHook + desktop-file-utils ]; buildInputs = [ - adwaita-icon-theme glib - gnome-shell gom gsettings-desktop-schemas gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch b/pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch new file mode 100644 index 00000000000..0750d01f867 --- /dev/null +++ b/pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch @@ -0,0 +1,40 @@ +diff --git a/data/meson.build b/data/meson.build +index 5e4ce69..982b3c9 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -31,7 +31,7 @@ i18n.merge_file( + + install_data( + 'org.gnome.pomodoro.gschema.xml', +- install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', ++ install_dir: gschema_dir, + ) + + subdir('icons') +diff --git a/meson-post-install.sh b/meson-post-install.sh +index bf4013a..c87fba4 100644 +--- a/meson-post-install.sh ++++ b/meson-post-install.sh +@@ -7,7 +7,7 @@ datadir="${prefix}/$1" + # want/need us to do the below + if [ -z "${DESTDIR}" ]; then + echo "Compiling GSchema..." +- glib-compile-schemas "${datadir}/glib-2.0/schemas" ++ glib-compile-schemas "${datadir}/gsettings-schemas/@pname@-@version@/glib-2.0/schemas" + + echo "Updating icon cache..." + gtk-update-icon-cache -f -t "${datadir}/icons/hicolor" +diff --git a/meson.build b/meson.build +index 09857a1..a07d27c 100644 +--- a/meson.build ++++ b/meson.build +@@ -40,7 +40,8 @@ add_project_arguments( + ) + + # We are going to use these variables later on for the plugins +-gschema_dir = get_option('prefix') / get_option('datadir') / 'glib-2.0' / 'schemas' ++nix_package_name = '@pname@' + '-' + '@version@' ++gschema_dir = get_option('prefix') / get_option('datadir') / 'gsettings-schemas' / nix_package_name / 'glib-2.0' / 'schemas' + plugin_libdir = get_option('prefix') / get_option('libdir') / meson.project_name() / 'plugins' + extension_dir = get_option('prefix') / get_option('datadir') / 'gnome-shell' / 'extensions' / 'pomodoro@arun.codito.in' + diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index b3b5409f6a0..668638c1bfe 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -71,6 +71,8 @@ lib.makeScope pkgs.newScope (self: with self; { epiphany = pkgs.epiphany.override { withPantheon = true; }; + evince = pkgs.evince.override { withPantheon = true; }; + sideload = callPackage ./apps/sideload { }; #### DESKTOP diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index bb08b113ad5..b46dee899a3 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -19,12 +19,15 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--cc=cc" + "--cc=$CC" + "--ar=$AR" "--crtprefix=${lib.getLib stdenv.cc.libc}/lib" "--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include" "--libpaths=${lib.getLib stdenv.cc.libc}/lib" # build cross compilers "--enable-cross" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "--config-musl" ]; preConfigure = '' diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index 57a1beead49..4c571f483e1 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.12"; } + { cases = [ (range "8.10" "8.14") "1.12.0" ]; out = "1.12"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index 65af999d08f..6ed8e114d80 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -8,10 +8,11 @@ with lib; mkCoqDerivation rec { defaultVersion = with versions; switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (isEq "8.13") (isEq "1.12") ]; out = "1.0.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.14") (isEq "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; + release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; propagatedBuildInputs = [ mathcomp-algebra ]; diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix index 4d3859a77df..8c44e34e3ed 100644 --- a/pkgs/development/embedded/fpga/trellis/default.nix +++ b/pkgs/development/embedded/fpga/trellis/default.nix @@ -31,6 +31,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" + # TODO: should this be in stdenv instead? + "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; preConfigure = '' @@ -39,6 +41,12 @@ in stdenv.mkDerivation rec { cd libtrellis ''; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/ecppack $out/share/trellis/misc/basecfgs/empty_lfe5u-85f.config /tmp/test.bin + ''; + meta = with lib; { description = "Documentation and bitstream tools for Lattice ECP5 FPGAs"; longDescription = '' @@ -49,7 +57,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/YosysHQ/prjtrellis"; license = licenses.isc; - maintainers = with maintainers; [ q3k thoughtpolice emily ]; + maintainers = with maintainers; [ q3k thoughtpolice emily rowanG077 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix b/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix index 846d6a045a9..e9b6bdf83c7 100644 --- a/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix +++ b/pkgs/development/interpreters/bqn/dzaima-bqn/default.nix @@ -8,31 +8,34 @@ stdenv.mkDerivation rec { pname = "dbqn" + lib.optionalString buildNativeImage "-native"; - version = "0.pre+unstable=2021-10-05"; + version = "0.pre+date=2021-10-08"; src = fetchFromGitHub { owner = "dzaima"; repo = "BQN"; - rev = "c31ceef52bbf380e747723f5ffd09c5f006b21c5"; - sha256 = "1nzqgwpjawcky85mfrz5izs9lfb3aqlm96dc8syrxhgg20xrziwx"; + rev = "0001109a1c5a420421b368c79d34b1e93bfe606e"; + hash = "sha256-riHHclTLkrVbtzmcz9ungAIc7kaoFHS77+SNatsfNhc="; }; nativeBuildInputs = [ - makeWrapper jdk + makeWrapper ]; dontConfigure = true; + postPatch = '' + patchShebangs --build ./build8 + ''; + buildPhase = '' runHook preBuild - patchShebangs --build ./build8 ./build8 '' + lib.optionalString buildNativeImage '' native-image --report-unsupported-elements-at-runtime \ - -H:CLibraryPath=${lib.getLib jdk}/lib \ - -J-Dfile.encoding=UTF-8 -jar BQN.jar dbqn + -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ + -jar BQN.jar dbqn '' + '' runHook postBuild ''; diff --git a/pkgs/development/interpreters/dzaima-apl/default.nix b/pkgs/development/interpreters/dzaima-apl/default.nix index 95631158438..d061a6cb9cd 100644 --- a/pkgs/development/interpreters/dzaima-apl/default.nix +++ b/pkgs/development/interpreters/dzaima-apl/default.nix @@ -8,30 +8,34 @@ stdenv.mkDerivation rec { pname = "dapl" + lib.optionalString buildNativeImage "-native"; - version = "0.2.0+unstable=2021-06-30"; + version = "0.2.0+date=2021-10-16"; src = fetchFromGitHub { owner = "dzaima"; repo = "APL"; - rev = "28b3667beb23c6472266bb2b6eb701708fa421c6"; - hash = "sha256-2kM9XDMclxJNOZngwLvoDQG23UZQQ6ePK/j215UumCg="; + rev = "5eb0a4205e27afa6122096a25008474eec562dc0"; + hash = "sha256-UdumMytqT909JRpNqzhYPuKPw644m/vRUsEbIVF2a7U="; }; nativeBuildInputs = [ - makeWrapper jdk + makeWrapper ]; dontConfigure = true; + postPatch = '' + patchShebangs --build ./build + ''; + buildPhase = '' runHook preBuild - patchShebangs --build ./build ./build '' + lib.optionalString buildNativeImage '' native-image --report-unsupported-elements-at-runtime \ - -H:CLibraryPath=${lib.getLib jdk}/lib -jar APL.jar dapl + -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ + -jar APL.jar dapl '' + '' runHook postBuild ''; diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix new file mode 100644 index 00000000000..38f34023301 --- /dev/null +++ b/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -0,0 +1,203 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, wrapGAppsHook +, readline +, ncurses +, zlib +, gsl +, openmp +, graphicsmagick +, fftw +, fftwFloat +, fftwLongDouble +, proj +, shapelib +, expat +, udunits +, eigen +, pslib +, eccodes +, glpk +, libpng +, plplot +, libtiff +, libgeotiff +, libjpeg + # We enable it in hdf4 and use libtirpc as a dependency here from the passthru + # of hdf4 +, enableLibtirpc ? stdenv.isLinux +, libtirpc +, python3 +, enableMPI ? (stdenv.isLinux || stdenv.isDarwin) + # Choose MPICH over OpenMPI because it currently builds on AArch and Darwin +, mpi + # Unfree optional dependency for hdf4 and hdf5 +, enableSzip ? false +, szip +, enableHDF4 ? true +, hdf4 +, hdf4-forced ? null +, enableHDF5 ? true + # HDF5 format version (API version) 1.10 and 1.12 is not fully compatible + # Specify if the API version should default to 1.10 + # netcdf currently depends on hdf5 with `usev110Api=true` + # If you wish to use HDF5 API version 1.12 (`useHdf5v110Api=false`), + # you will need to turn NetCDF off. +, useHdf5v110Api ? true +, hdf5 +, hdf5-forced ? null +, enableNetCDF ? true +, netcdf +, netcdf-forced ? null +, plplot-forced ? null + # wxWidgets is preferred over X11 for this project but we only have it on Linux + # and Darwin. Also, we use the wxWidgets dependency here from the passthru of + # plplot. +, enableWX ? (stdenv.isLinux || stdenv.isDarwin) + # X11: OFF by default for platform consistency. Use X where WX is not available +, enableXWin ? (!stdenv.isLinux && !stdenv.isDarwin) +}: + +let + hdf4-custom = + if hdf4-forced != null + then hdf4-forced + else + hdf4.override { + uselibtirpc = enableLibtirpc; + szipSupport = enableSzip; + inherit szip; + }; + hdf5-custom = + if hdf5-forced != null + then hdf5-forced + else + hdf5.override { + usev110Api = useHdf5v110Api; + mpiSupport = enableMPI; + inherit mpi; + szipSupport = enableSzip; + inherit szip; + }; + netcdf-custom = + if netcdf-forced != null + then netcdf-forced + else + netcdf.override { + hdf5 = hdf5-custom; + }; + enablePlplotDrivers = enableWX || enableXWin; + plplot-with-drivers = + if plplot-forced != null + then plplot-forced + else + plplot.override { + inherit + enableWX + enableXWin + ; + }; +in +stdenv.mkDerivation rec { + pname = "gnudatalanguage"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = pname; + repo = "gdl"; + rev = "v${version}"; + sha256 = "sha256-Y9LVRaWjQqpWqjNngxB406PE/rl/9S8rs0u0CK5ivUA="; + }; + + buildInputs = [ + readline + ncurses + zlib + gsl + openmp + graphicsmagick + fftw + fftwFloat + fftwLongDouble + proj + shapelib + expat + mpi + udunits + eigen + pslib + eccodes + glpk + libpng + libtiff + libgeotiff + libjpeg + hdf4-custom + hdf5-custom + netcdf-custom + plplot-with-drivers + ] ++ lib.optional enableXWin plplot-with-drivers.libX11 + ++ lib.optional enableWX plplot-with-drivers.wxWidgets + ++ lib.optional enableMPI mpi + ++ lib.optional enableLibtirpc hdf4-custom.libtirpc + ++ lib.optional enableSzip szip; + + propagatedBuildInputs = [ + (python3.withPackages (ps: with ps; [ numpy ])) + ]; + + nativeBuildInputs = [ + cmake + ] ++ lib.optional enableWX wrapGAppsHook; + + cmakeFlags = lib.optional (!enableHDF4) "-DHDF=OFF" + ++ [ (if enableHDF5 then "-DHDF5DIR=${hdf5-custom}" else "-DHDF5=OFF") ] + ++ lib.optional (!enableNetCDF) "-DNETCDF=OFF" + ++ lib.optional (!enablePlplotDrivers) "-DINTERACTIVE_GRAPHICS=OFF" + ++ lib.optional (!enableWX) "-DWXWIDGETS=OFF" + ++ lib.optional enableSzip "-DSZIPDIR=${szip}" + ++ lib.optionals enableXWin [ "-DX11=ON" "-DX11DIR=${plplot-with-drivers.libX11}" ] + ++ lib.optionals enableMPI [ "-DMPI=ON" "-DMPIDIR=${mpi}" ]; + + doCheck = true; + + # Opt-out unstable tests + # https://github.com/gnudatalanguage/gdl/issues/482 + # https://github.com/gnudatalanguage/gdl/issues/1079 + # https://github.com/gnudatalanguage/gdl/issues/460 + preCheck = '' + checkFlagsArray+=("ARGS=-E 'test_tic_toc.pro|test_byte_conversion.pro|test_bytscl.pro|test_call_external.pro'") + ''; + + passthru = { + hdf4 = hdf4-custom; + hdf5 = hdf5-custom; + netcdf = netcdf-custom; + plplot = plplot-with-drivers; + python = python3; + inherit + enableMPI + mpi + useHdf5v110Api + enableSzip + enableWX + enableXWin + ; + }; + + meta = with lib; { + description = "Free incremental compiler of IDL"; + longDescription = '' + GDL (GNU Data Language) is a free/libre/open source incremental compiler + compatible with IDL (Interactive Data Language) and to some extent with PV-WAVE. + GDL is aimed as a drop-in replacement for IDL. + ''; + homepage = "https://github.com/gnudatalanguage/gdl"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ShamrockLee ]; + platforms = platforms.all; + mainProgram = "gdl"; + }; +} diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index a780e6ba49f..de61714f242 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -16,7 +16,8 @@ let overrides = packageOverrides; }; -plat = if stdenv.isLinux then "linux" +plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" + else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" else if stdenv.isDarwin then "macosx" else if stdenv.hostPlatform.isMinGW then "mingw" else if stdenv.isFreeBSD then "freebsd" diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 899dafde76f..ef3ba58e7e2 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aml"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "0mxmzlhiv88hm4sf8kyawyrml8qy1xis019hdyb5skl9g95z9yyf"; + sha256 = "1m911n3rd41ch4yk3k9k1lz29xp3h54k6jx122abq5kmngy9znqw"; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix index a16885ab254..f22f81c8770 100644 --- a/pkgs/development/libraries/argtable/default.nix +++ b/pkgs/development/libraries/argtable/default.nix @@ -1,22 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake }: stdenv.mkDerivation rec { pname = "argtable"; - version = "3.1.5"; - srcVersion = "v${version}.1c1bb23"; + version = "3.2.1"; + srcVersion = "v${version}.52f24e5"; src = fetchFromGitHub { owner = "argtable"; repo = "argtable3"; rev = srcVersion; - sha256 = "sha256-sL6mnxsuL1K0DY26jLF/2Czo0RxHYJ3xU3VyavISiMM="; + hash = "sha256-HFsk91uJXQ0wpvAQxP4/yZwRQx9kLH7KgB3Y/+zcZC0="; }; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + postPatch = '' patchShebangs tools/build ''; @@ -37,4 +42,7 @@ stdenv.mkDerivation rec { platforms = with platforms; all; }; } -# TODO [ AndersonTorres ]: a NixOS test suite +# TODO: a NixOS test suite +# TODO: multiple outputs +# TODO: documentation +# TODO: build both shared and static libs diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix new file mode 100644 index 00000000000..5969de54682 --- /dev/null +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-auth"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-auth"; + rev = "v${version}"; + sha256 = "120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 library implementation of AWS client-side authentication"; + homepage = "https://github.com/awslabs/aws-c-auth"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 6f3df977efa..d0bcfc90108 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index ae47959dd3a..c927ca53336 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.9"; + version = "0.6.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bnKIL51AW+0T87BxEazXDZElYqiwOUHQVEDKOCUzsbM="; + sha256 = "sha256-JEaRB0k6zyk5UKuB2hEZUAsnp2SuI9mrok/EvwclUJk="; }; nativeBuildInputs = [ cmake ]; @@ -23,10 +23,20 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; + # aws-c-common misuses cmake modules, so we need + # to manually add a MODULE_PATH to its consumers + setupHook = ./setup-hook.sh; + # Prevent the execution of tests known to be flaky. - preCheck = '' + preCheck = let + ignoreTests = [ + "promise_test_multiple_waiters" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839 + ]; + in '' cat <<EOW >CTestCustom.cmake - SET(CTEST_CUSTOM_TESTS_IGNORE promise_test_multiple_waiters) + SET(CTEST_CUSTOM_TESTS_IGNORE ${toString ignoreTests}) EOW ''; diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/development/libraries/aws-c-common/setup-hook.sh new file mode 100644 index 00000000000..e670f7cf852 --- /dev/null +++ b/pkgs/development/libraries/aws-c-common/setup-hook.sh @@ -0,0 +1,5 @@ +addAwsCCommonModuleDir() { + cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}" +} + +postHooks+=(addAwsCCommonModuleDir) diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix new file mode 100644 index 00000000000..9d885278ff0 --- /dev/null +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-common +, cmake +}: + +stdenv.mkDerivation rec { + pname = "aws-c-compression"; + version = "0.2.14"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-compression"; + rev = "v${version}"; + sha256 = "0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-common + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of huffman encoding/decoding"; + homepage = "https://github.com/awslabs/aws-c-compression"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index b6468a8dae0..24cb52d61a6 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix new file mode 100644 index 00000000000..0bde86d674b --- /dev/null +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-http"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-http"; + rev = "v${version}"; + sha256 = "1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of the HTTP/1.1 and HTTP/2 specifications"; + homepage = "https://github.com/awslabs/aws-c-http"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 012d96fca4d..1ff28dccc9e 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.5"; + version = "0.10.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+H6dUKgpgXG1fh8r6k7TpVFMBso4G762zRfLAZD+Nss="; + sha256 = "sha256-8v38NN9qrgdrshMx3l2wLrl7l77HjsW2GPu8IwkclJQ="; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix new file mode 100644 index 00000000000..92e5ad44b87 --- /dev/null +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, ninja +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-mqtt"; + version = "0.7.8"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-mqtt"; + rev = "v${version}"; + sha256 = "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of the MQTT 3.1.1 specification"; + homepage = "https://github.com/awslabs/aws-c-mqtt"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix new file mode 100644 index 00000000000..514fdee1d4e --- /dev/null +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-auth +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-s3"; + version = "0.1.27"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-s3"; + rev = "v${version}"; + sha256 = "sha256-GtBUC5cKMN9rd5GQbYoipVvxrUCCNKbb5vhHUGQpeH8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-auth + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 library implementation for communicating with the S3 service"; + homepage = "https://github.com/awslabs/aws-c-s3"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 75b26695e2f..9042dc56154 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix new file mode 100644 index 00000000000..68414931e41 --- /dev/null +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-auth +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-event-stream +, aws-c-http +, aws-c-io +, aws-c-mqtt +, aws-c-s3 +, aws-checksums +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-crt-cpp"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-crt-cpp"; + rev = "v${version}"; + sha256 = "0ijvyg3hrh1d0npca62syz8qy6nkqh90fq54cqyln0p333z16q52"; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace '-Werror' "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + aws-c-auth + aws-c-cal + aws-c-common + aws-c-compression + aws-c-event-stream + aws-c-http + aws-c-io + aws-c-mqtt + aws-c-s3 + aws-checksums + s2n-tls + ]; + + cmakeFlags = [ + "-DBUILD_DEPS=OFF" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C++ wrapper around the aws-c-* libraries"; + homepage = "https://github.com/awslabs/aws-crt-cpp"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 69cb1cc22ae..d58fabfd5ea 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib +, aws-crt-cpp , aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -17,15 +18,23 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.8.130"; + version = "1.9.121"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs="; + sha256 = "sha256-VQpWauk0tdJ1QU0HmtdTwQdKbiAuTTXXsUo2cqpqmdU="; }; + postPatch = '' + # Includes aws-c-auth private headers, so only works with submodule build + rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # TestRandomURLMultiThreaded fails + rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp + ''; + # FIXME: might be nice to put different APIs in different outputs # (e.g. libaws-cpp-sdk-s3.so in output "s3"). outputs = [ "out" "dev" ]; @@ -33,6 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ + aws-crt-cpp curl openssl zlib ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 69e16a8922a..09a407fc3bc 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,27 +5,29 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.8"; + version = "2.9.9"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "sha256-nEICs1oAIXu6/5O4R3mbwig1OY+HDIWWeQjrcYnCwT0="; + hash = "sha256-DWyqVN7v+j2XCArv4jmrD45XKWMNhd2DddJHH3gQWQY="; }; + outputs = [ "out" "doc" ]; + installPhase = '' runHook preInstall + install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples install -m 644 CImg.h $out/include/ cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ cp README.txt $doc/share/doc/cimg/ + runHook postInstall ''; - outputs = [ "out" "doc" ]; - meta = with lib; { homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch index 407811736f8..e0b6df19589 100644 --- a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch +++ b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch @@ -7,7 +7,7 @@ index 9e885070..d02eeb8c 100644 "--unshare-net", "--unshare-pid", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", +- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", + "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "/run/current-system", "/run/current-system", "--ro-bind", validate_icon, validate_icon, diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 97410fda0d3..40e07c59074 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -49,18 +49,19 @@ , dconf , gsettings-desktop-schemas , librsvg +, makeWrapper }: stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.10.2"; + version = "1.12.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2xUnOdBy+P8pnk6IjYljobRTjaexDguGUlvkOPLh3eQ="; + sha256 = "df1eb464f9142c11627f99f04f6a5c02c868bbb145489b8902cb6c105e774b75"; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ @@ -90,25 +91,19 @@ stdenv.mkDerivation rec { # Patch taken from gtk-doc expression. ./respect-xml-catalog-files-var.patch - # Don’t hardcode flatpak binary path in launchers stored under user’s profile otherwise they will break after Flatpak update. - # https://github.com/NixOS/nixpkgs/issues/43581 - ./use-flatpak-from-path.patch - - # Hardcode flatpak binary path for flatpak-spawn. - # When calling the portal’s Spawn command with FLATPAK_SPAWN_FLAGS_CLEAR_ENV flag, - # it will clear environment, including PATH, making the flatpak run fail. - # https://github.com/flatpak/flatpak/pull/4174 - (fetchpatch { - url = "https://github.com/flatpak/flatpak/commit/495449daf6d3c072519a36c9e4bc6cc1da4d31db.patch"; - sha256 = "gOX/sGupAE7Yg3MVrMhFXzWHpFn+izVyjtkuPzIckuY="; - }) - # Nix environment hacks should not leak into the apps. # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. ./validate-icon-pixbuf.patch + + # Tests don't respect the FLATPAK_BINARY override that was added, this is a workaround. + # https://github.com/flatpak/flatpak/pull/4496 (Can be removed once included). + (fetchpatch { + url = "https://github.com/flatpak/flatpak/commit/96dbe28cfa96e80b23fa1d8072eb36edad41279c.patch"; + sha256 = "1jczk06ymfs98h3nsg245g0jwxvml7wg2x6pb7mrfpsdmrpz2czd"; + }) ]; nativeBuildInputs = [ @@ -189,7 +184,14 @@ stdenv.mkDerivation rec { in '' patchShebangs buildutil patchShebangs tests - PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler + PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Use flatpak from PATH in exported assets (e.g. desktop files). + --set FLATPAK_BINARY flatpak + ) ''; passthru = { diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch deleted file mode 100644 index 84534b7bc53..00000000000 --- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c -index 52b222ea..9489441f 100644 ---- a/common/flatpak-dir.c -+++ b/common/flatpak-dir.c -@@ -6956,7 +6956,7 @@ export_desktop_file (const char *app, - - new_exec = g_string_new (""); - g_string_append_printf (new_exec, -- FLATPAK_BINDIR "/flatpak run --branch=%s --arch=%s", -+ "flatpak run --branch=%s --arch=%s", - escaped_branch, - escaped_arch); - -@@ -8290,8 +8290,8 @@ flatpak_dir_deploy (FlatpakDir *self, - error)) - return FALSE; - -- bin_data = g_strdup_printf ("#!/bin/sh\nexec %s/flatpak run --branch=%s --arch=%s %s \"$@\"\n", -- FLATPAK_BINDIR, escaped_branch, escaped_arch, escaped_app); -+ bin_data = g_strdup_printf ("#!/bin/sh\nexec flatpak run --branch=%s --arch=%s %s \"$@\"\n", -+ escaped_branch, escaped_arch, escaped_app); - if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data), NULL, FALSE, - G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) - return FALSE; -diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh -index d1682344..5e2b9a97 100755 ---- a/tests/test-bundle.sh -+++ b/tests/test-bundle.sh -@@ -67,7 +67,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files - assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export - assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop - # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" - assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png - assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png - -diff --git a/tests/test-run.sh b/tests/test-run.sh -index fecb756e..64043281 100644 ---- a/tests/test-run.sh -+++ b/tests/test-run.sh -@@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files - assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export - assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop - # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" - assert_has_file $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini - assert_file_has_content $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini "^DefaultDisabled=true$" - assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png diff --git a/pkgs/development/libraries/libressl/CVE-2021-41581.patch b/pkgs/development/libraries/libressl/CVE-2021-41581.patch new file mode 100644 index 00000000000..24479256719 --- /dev/null +++ b/pkgs/development/libraries/libressl/CVE-2021-41581.patch @@ -0,0 +1,53 @@ +Based on upstream https://github.com/openbsd/src/commit/62ceddea5b1d64a1a362bbb7071d9e15adcde6b1 +with paths switched to apply to libressl-portable and CVS header +hunk removed. + +--- a/crypto/x509/x509_constraints.c ++++ b/crypto/x509/x509_constraints.c +@@ -339,16 +339,16 @@ + if (c == '.') + goto bad; + } +- if (wi > DOMAIN_PART_MAX_LEN) +- goto bad; + if (accept) { ++ if (wi >= DOMAIN_PART_MAX_LEN) ++ goto bad; + working[wi++] = c; + accept = 0; + continue; + } + if (candidate_local != NULL) { + /* We are looking for the domain part */ +- if (wi > DOMAIN_PART_MAX_LEN) ++ if (wi >= DOMAIN_PART_MAX_LEN) + goto bad; + working[wi++] = c; + if (i == len - 1) { +@@ -363,7 +363,7 @@ + continue; + } + /* We are looking for the local part */ +- if (wi > LOCAL_PART_MAX_LEN) ++ if (wi >= LOCAL_PART_MAX_LEN) + break; + + if (quoted) { +@@ -383,6 +383,8 @@ + */ + if (c == 9) + goto bad; ++ if (wi >= LOCAL_PART_MAX_LEN) ++ goto bad; + working[wi++] = c; + continue; /* all's good inside our quoted string */ + } +@@ -412,6 +414,8 @@ + } + if (!local_part_ok(c)) + goto bad; ++ if (wi >= LOCAL_PART_MAX_LEN) ++ goto bad; + working[wi++] = c; + } + if (candidate_local == NULL || candidate_domain == NULL) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index fb362ebbad2..d70672f63ac 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,8 +1,16 @@ -{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch +{ stdenv +, fetchurl +, lib +, cmake +, cacert +, fetchpatch , buildShared ? !stdenv.hostPlatform.isStatic }: let + ldLibPathEnvName = if stdenv.isDarwin + then "DYLD_LIBRARY_PATH" + else "LD_LIBRARY_PATH"; generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec { pname = "libressl"; @@ -42,6 +50,15 @@ let substituteInPlace ./tls/tls_config.c --replace '"/etc/ssl/cert.pem"' '"${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; + doCheck = true; + preCheck = '' + export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName} + export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)" + ''; + postCheck = '' + export ${ldLibPathEnvName}=$PREVIOUS_${ldLibPathEnvName} + ''; + outputs = [ "bin" "dev" "out" "man" "nc" ]; postFixup = '' @@ -66,5 +83,15 @@ in { libressl_3_2 = generic { version = "3.2.5"; sha256 = "1zkwrs3b19s1ybz4q9hrb7pqsbsi8vxcs44qanfy11fkc7ynb2kr"; + patches = [ + ./CVE-2021-41581.patch + ]; + }; + libressl_3_4 = generic { + version = "3.4.0"; + sha256 = "1lhn76nd59p1dfd27b4636zj6wh3f5xsi8b3sxqnl820imsswbp5"; + patches = [ + ./CVE-2021-41581.patch + ]; }; } diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index d24078b91a2..71109775722 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -8,8 +8,7 @@ }: let - mpiSupport = hdf5.mpiSupport; - mpi = hdf5.mpi; + inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { pname = "netcdf"; version = "4.8.0"; # Remove patch mentioned below on upgrade @@ -44,8 +43,7 @@ in stdenv.mkDerivation rec { buildInputs = [ hdf5 curl mpi ]; passthru = { - mpiSupport = mpiSupport; - inherit mpi; + inherit mpiSupport mpi; }; configureFlags = [ diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index c3f46d8e31e..0263ef3096d 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -13,6 +13,7 @@ , gflags , protobuf , config +, ocl-icd , enableJPEG ? true , libjpeg @@ -313,6 +314,8 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2688dde9ed5..ca44788a289 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -75,6 +75,7 @@ let aarch64-darwin = "./Configure darwin64-arm64-cc"; x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + riscv64-linux = "./Configure linux64-riscv64"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index 05f12d0148b..92d74cab93b 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib +, stdenv +, fetchurl +, cmake +, enableWX ? false +, wxGTK31, wxmac +, enableXWin ? false +, libX11 +}: -stdenv.mkDerivation rec { +let + wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK31); +in stdenv.mkDerivation rec { pname = "plplot"; version = "5.15.0"; @@ -11,6 +21,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional enableWX wxWidgets + ++ lib.optional enableXWin libX11; + + passthru = { + inherit + enableWX + wxWidgets + enableXWin + libX11 + ; + }; + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_TEST=ON" ]; doCheck = true; diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix new file mode 100644 index 00000000000..62608e390f8 --- /dev/null +++ b/pkgs/development/libraries/qcoro/default.nix @@ -0,0 +1,38 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, libpthreadstubs +, qtbase +}: + +mkDerivation rec { + pname = "qcoro"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "danvratil"; + repo = "qcoro"; + rev = "v${version}"; + sha256 = "09543hpy590dndmlxmcm8c58m97blhaii4wbjr655qxdanhhxgzi"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + qtbase + libpthreadstubs + ]; + + meta = with lib; { + description = "Library for using C++20 coroutines in connection with certain asynchronous Qt actions"; + homepage = "https://github.com/danvratil/qcoro"; + license = licenses.mit; + maintainers = with maintainers; [ smitop ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 8e99ca1be35..68e81866e1e 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.8"; + version = "1.1.9"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "13h2cw8drq7xn3v8fbpxrlsl8zq3fs8gd2pc1pv28ahr9qqjz1gc"; + sha256 = "188fh4l8wda1y9vxa9asbk8nw35gyapw7gyn4w2p2qspdjhi5mnq"; }; meta = with lib; { diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 2ad169f2a3f..1ce6f267210 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, openssl +}: stdenv.mkDerivation rec { pname = "s2n-tls"; @@ -11,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4="; }; + patches = [ + # Fix FindLibCrypto paths (https://github.com/aws/s2n-tls/pull/3067) + (fetchpatch { + url = "https://github.com/aws/s2n-tls/commit/bda649524402be4018c44bff07f6c64502a351ec.patch"; + sha256 = "02jmxsrd506vhjzlrgh1p2z1f1sn4v8klks25zisiykyqkyaczkv"; + }) + ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev"]; @@ -26,8 +39,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). postInstall = '' - substituteInPlace $out/lib/s2n/cmake/shared/s2n-targets.cmake \ - --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + # Glob for 'shared' or 'static' subdir + for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do + substituteInPlace "$f" \ + --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + done ''; meta = with lib; { diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index b122a3121e4..82237ef1434 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-r/qA3ux4kh+GM15vw/GLgK7+z0JPaldV6fL6DrBxDt8="; }; + dontAddWafCrossFlags = true; + nativeBuildInputs = [ pkg-config python3 wafHook ]; meta = with lib; { diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 820c577908a..dee53bd3b2a 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + ''; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ pcre ]; propagatedBuildInputs = [ serd ]; + dontAddWafCrossFlags = true; meta = with lib; { homepage = "http://drobilla.net/software/sord"; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 39ac21b7ad6..fc0ba54cbe7 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , gettext , meson , ninja @@ -44,6 +45,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit asciidoc; }) + ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ + # Upstream: https://gitlab.gnome.org/GNOME/tracker/-/issues/332 + (fetchpatch { + name = "i686-test.patch"; + url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/af707181a2c492a794daec7ce3f3062d67ffd9dc.patch"; + sha256 = "sha256-KOdkTy79w3oiQILrPG00UVrv+VBjAk4Y868I8jtifqk="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/color/default.nix b/pkgs/development/ocaml-modules/color/default.nix new file mode 100644 index 00000000000..84d2f11d862 --- /dev/null +++ b/pkgs/development/ocaml-modules/color/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchurl +, buildDunePackage +, gg +}: + +buildDunePackage rec { + pname = "color"; + version = "0.2.0"; + + useDune2 = true; + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/anuragsoni/color/releases/download/${version}/color-${version}.tbz"; + sha256 = "0wg3a36i1a7fnz5pf57qzbdghwr6dzp7nnxyrz9m9765lxsn65ph"; + }; + + propagatedBuildInputs = [ + gg + ]; + + meta = with lib; { + description = "Converts between different color formats"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://github.com/anuragsoni/color"; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index cf72397057d..942d69e5919 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -22,13 +22,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; inherit pname; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "mirage"; repo = pname; rev = "v${version}"; - sha256 = "0w3x2wfd04qr6mci4cp1gfqw33yysp8gamgkpgbgwslr0skryiq5"; + sha256 = "sha256:1mbyjzwcs64n7i3xkkyaxgl3r46drbl0gkqf3fqgm2kh3q03638l"; }; postUnpack = '' @@ -55,15 +55,6 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - preBuild = '' - # perform substitutions, so opam isn't needed - for flags in flags/cflags.tmp flags/libs.tmp; do - substitute "$flags.in" "$flags" \ - --replace "%{prefix}%" "$out" \ - --replace "%{ocaml-freestanding:lib}%" "$out/lib" - done - ''; - installPhase = '' runHook preInstall ./install.sh "$out" diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch b/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch index 43141b1472a..45f271ec0f2 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch @@ -22,43 +22,6 @@ Date: Thu Mar 18 01:07:49 2021 +0100 nice bonus). The Makefile needs no fix since the target ocaml/Makefile won't be built if it's already present. -diff --git a/Makefile b/Makefile -index b07b8c6..a68b31d 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,6 +2,12 @@ - - include Makeconf - -+ifneq ($(shell command -v opam),) -+ # only set if opam is available and PKG_CONFIG_PATH isn't -+ # already set in the environment or on the command line -+ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig -+endif -+ - FREESTANDING_LIBS=openlibm/libopenlibm.a \ - ocaml/runtime/libasmrun.a \ - nolibc/libnolibc.a -@@ -73,8 +79,7 @@ flags/libs.tmp: flags/libs.tmp.in - opam config subst $@ - - flags/libs: flags/libs.tmp Makeconf -- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \ -- pkg-config $(PKG_CONFIG_DEPS) --libs >> $< -+ pkg-config $(PKG_CONFIG_DEPS) --libs >> $< - awk -v RS= -- '{ \ - sub("@@PKG_CONFIG_EXTRA_LIBS@@", "$(PKG_CONFIG_EXTRA_LIBS)", $$0); \ - print "(", $$0, ")" \ -@@ -84,8 +89,7 @@ flags/cflags.tmp: flags/cflags.tmp.in - opam config subst $@ - - flags/cflags: flags/cflags.tmp Makeconf -- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \ -- pkg-config $(PKG_CONFIG_DEPS) --cflags >> $< -+ pkg-config $(PKG_CONFIG_DEPS) --cflags >> $< - awk -v RS= -- '{ \ - print "(", $$0, ")" \ - }' $< >$@ diff --git a/configure.sh b/configure.sh index 4d154ed..c254f7b 100755 --- a/configure.sh diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 47a70940e92..9094b1c780c 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.4.0"; + version = "0.4.1"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "1dzpgpvjvss4mk2kp1s9g1gg0d008pbmfdsi9b98q9fax9syk725"; + sha256 = "sha256-E7sX+N6d5Otwp1AbdPCnQJ2YT/k89+6kMJDLt8U2Dsg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index 3f2ee2fee3e..fea1956e331 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -3,18 +3,19 @@ , async-timeout , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , slixmpp }: buildPythonPackage rec { pname = "aioharmony"; - version = "0.2.7"; - disabled = !isPy3k; + version = "0.2.8"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aej8xC0Bsy6ip7IwO6onp55p6afkz8yZnz14cCExSPA="; + sha256 = "0adf08955810a227db489556dc3ca808e4f825a00183f613797856114c2a2a47"; }; propagatedBuildInputs = [ @@ -26,7 +27,10 @@ buildPythonPackage rec { # aioharmony does not seem to include tests doCheck = false; - pythonImportsCheck = [ "aioharmony.harmonyapi" "aioharmony.harmonyclient" ]; + pythonImportsCheck = [ + "aioharmony.harmonyapi" + "aioharmony.harmonyclient" + ]; meta = with lib; { homepage = "https://github.com/ehendrix23/aioharmony"; diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix new file mode 100644 index 00000000000..2b3bc08d1d9 --- /dev/null +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -0,0 +1,73 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, freezegun +, poetry-core +, pyjwt +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pytz +, titlecase +, types-pytz +}: + +buildPythonPackage rec { + pname = "aioridwell"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "0kzxh1igncql1rwh12n42qahlc94z0fsd344d1vgni50jg7i34v7"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pyjwt + pytz + titlecase + ]; + + checkInputs = [ + aresponses + freezegun + pytest-aiohttp + pytest-asyncio + pytestCheckHook + types-pytz + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'titlecase = "^2.3"' 'titlecase = "*"' \ + --replace 'pytz = "^2021.3"' 'pytz = "*"' + ''; + + disabledTestPaths = [ + # Ignore the examples directory as the files are prefixed with test_ + "examples/" + ]; + + pythonImportsCheck = [ + "aioridwell" + ]; + + meta = with lib; { + description = "Python library for interacting with Ridwell waste recycling"; + homepage = "https://github.com/bachya/aioridwell"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index 9d919becd43..acf106ab3c6 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.1.2"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "1gyvisccx25py85wwwlljai5qa20jvwyvacgrgkk1h18dkc262fw"; + sha256 = "1pamfc2l95s1q86jvmbp17chjy129gk01kwy8xm88d2ijy8s1caq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/airthings/default.nix b/pkgs/development/python-modules/airthings-cloud/default.nix index 21525941cb2..ca80f38c899 100644 --- a/pkgs/development/python-modules/airthings/default.nix +++ b/pkgs/development/python-modules/airthings-cloud/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - pname = "airthings"; + pname = "airthings-cloud"; version = "0.0.1"; format = "setuptools"; diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index a508e7b2711..9ea36507945 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "annexremote"; - version = "1.4.5"; + version = "1.6.0"; # use fetchFromGitHub instead of fetchPypi because the test suite of # the package is not included into the PyPI tarball @@ -17,7 +17,7 @@ buildPythonPackage rec { rev = "v${version}"; owner = "Lykos153"; repo = "AnnexRemote"; - sha256 = "0r5chdk2aiqcz7z8r8m1j657cz79f6bbv96xdmhj4m5fiqn672if"; + sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 5afd91f52f3..4c2fd7e6c64 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -59,6 +59,11 @@ buildPythonPackage rec { "tests/sspi_stub.py" ]; + disabledTests = [ + # No PIN set + "TestSKAuthCTAP2" + ]; + pythonImportsCheck = [ "asyncssh" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index a2434a9cb62..031c696f020 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.10.1"; + version = "3.10.2"; disabled = pythonOlder "3.7"; format = "flit"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D8XaBny/m6dXMz6k/FhVX/5t8guNdJsfiX4cVQV4VIY="; + sha256 = "sha256-vjOhfEsAldTjROFUer1SgEX1KxnNM/WwtLsCB9ZV1WM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 62f383c5678..c60122ff180 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3cb1b0e28f420232d894d89665d5c0c8241b99e56d806171f4faf5cdfec08ae1"; + sha256 = "c0357c62223fefcfc7a7565389dbd4db900623bf10eccf2bc8e87586ec59b38d"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index bad63d287be..9136ed0a4eb 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "69035c81f280fac5fa9c55f87be3a359b264853727486e3568818bb43988080e"; + sha256 = "3faaecb645e3b2300648a4a452458ec0e31e13d9dc928e710992e43ef4694205"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index d8e8f45d7cc..a89e803220d 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "23.0.0"; + version = "23.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1eb26b965ba4049ddcf10d4f25818725fc03c491c3be76537d0d74ceb1146b04"; + sha256 = "49dbb0f51006d557cbd0b22999cb9ecf3eabc2be46d96efcc6d651c6b33754b3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 8454d4463f4..c2c4e6328d5 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "1.1.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "433ad8e83bd8df4abc5af47a0e3a7a4515f79931db4036f2bccd65b5a9e88bfb"; + sha256 = "df14272a1835f743d1889f901e972ed6ec9ea9d6f8966ba2865bf10306a621cc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix index 9651d7289a9..35634b1e241 100644 --- a/pkgs/development/python-modules/bond-api/default.nix +++ b/pkgs/development/python-modules/bond-api/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "bond-api"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "prystupa"; repo = "bond-api"; rev = "v${version}"; - sha256 = "0v3bwbpn98fjm8gza2k7fb7w5ps3982kfvbck5x0fh2xq2825b80"; + sha256 = "0s7an6kbib1immrbwrh4pzj812zwf8kj3kgky5k3qwxzrj0iv6ak"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braceexpand/default.nix b/pkgs/development/python-modules/braceexpand/default.nix new file mode 100644 index 00000000000..c5e711bb804 --- /dev/null +++ b/pkgs/development/python-modules/braceexpand/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "braceexpand"; + version = "0.1.7"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version pname; + sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "braceexpand" ]; + + meta = with lib; { + description = "Bash-style brace expansion for Python"; + homepage = "https://github.com/trendels/braceexpand"; + changelog = "https://github.com/trendels/braceexpand/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index 2418d282ce0..dc1e4f37f3c 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "broadlink"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "bfd1ff007d0d1187c17ae52be938afc8137fbd1ed6a794426e975df10d167571"; + sha256 = "c66b3e4a097d6549f0fcc9ccdf289bd88f73f647ad9449e1c4e2958301ad1b04"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index d4d52b9b03b..d15f28e475c 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,25 +1,44 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, lz4, keyring, pbkdf2, pycryptodome, pyaes}: +{ lib +, fetchPypi +, buildPythonPackage +, isPy3k +, lz4 +, keyring +, pbkdf2 +, pycryptodome +, pyaes +}: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.12.1"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "72c1e6aa6a98adab3a6797b889664bdbfddc287474dd8e774da37a854ec32185"; + sha256 = "9f8e5ddf5a6641a1fdca12d82b0923777ba59a988b68c9bcf358bfb7c42ef25b"; }; disabled = !isPy3k; - propagatedBuildInputs = [ lz4 keyring pbkdf2 pyaes pycryptodome ]; + propagatedBuildInputs = [ + lz4 + keyring + pbkdf2 + pyaes + pycryptodome + ]; # No tests implemented doCheck = false; + pythonImportsCheck = [ + "browser_cookie3" + ]; + meta = with lib; { description = "Loads cookies from your browser into a cookiejar object"; - maintainers = with maintainers; [ borisbabic ]; homepage = "https://github.com/borisbabic/browser_cookie3"; - license = licenses.gpl3; + license = licenses.gpl3Only; + maintainers = with maintainers; [ borisbabic ]; }; } diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index 75d4f38b2c3..648ec29520b 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bytecode"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vstinner"; repo = pname; rev = version; - sha256 = "sha256-CEfDoJ+JlnxLLVnSxv7bEN891tmwG9zAvtT8GNvp8JU="; + sha256 = "sha256-aY19qMYW7KziiXVY3lxdnHk7OCAJaNh+aTvlQyJWmDw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index fceab5088e9..6dbb3f91d1e 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.5"; + version = "0.4.6"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = version; - sha256 = "0s446jji3c9x1gw0lsb03giir91cnv6dgh4nzxg9mc1rm9wy7gzw"; + sha256 = "sha256-TFUOsfQ1QxdpmRUJPoHMCuCpmYpQodLkP5EVXKm+qsw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index 09987ddb3bf..f286cd4a7f0 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cucumber-tag-expressions"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "4ef4e0513d4c26d42299ffed010ed5e24125b87fc64de2e74b979d4a84c8f522"; + sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"; }; checkInputs = [ pytest pytest-html ]; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index ae635b3058a..2facff6c840 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub , sqlalchemy , aiocontextvars -, isPy27 +, aiopg +, pythonOlder , pytestCheckHook , pymysql , asyncpg @@ -13,42 +14,48 @@ buildPythonPackage rec { pname = "databases"; - version = "0.5.2"; - disabled = isPy27; + version = "0.5.3"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-OfBb78lKnAxPhyy2j4TzEZWBzbw64brTQcxuOPoW9pk="; + sha256 = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; }; propagatedBuildInputs = [ - aiocontextvars - sqlalchemy - ]; - - checkInputs = [ + aiopg aiomysql aiosqlite asyncpg pymysql + sqlalchemy + ] ++ lib.optionals (pythonOlder "3.7") [ + aiocontextvars + ]; + + checkInputs = [ pytestCheckHook ]; disabledTestPaths = [ - # ModuleNotFoundError: No module named 'aiopg' - "tests/test_connection_options.py" # circular dependency on starlette "tests/test_integration.py" # TEST_DATABASE_URLS is not set. "tests/test_databases.py" + "tests/test_connection_options.py" + ]; + + pythonImportsCheck = [ + "databases" ]; meta = with lib; { description = "Async database support for Python"; homepage = "https://github.com/encode/databases"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 2ff5127aef2..79460324e4d 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, environs , fetchFromGitHub , poetry-core , pytest-mock @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "1ln9hlix6rbyajgvwd2lk0i7nshvrbkvj9xx1i0q1z1caly9yl0g"; + sha256 = "sha256-NwG/VbTHoQl3c//vrrhKQ//gyVIGLY2148mgDToiKks="; }; nativeBuildInputs = [ @@ -29,9 +30,10 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook - pytest-vcr + environs pytest-mock + pytest-vcr + pytestCheckHook ]; propagatedBuildInputs = [ @@ -47,7 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "deezer" ]; meta = with lib; { - description = "A friendly Python wrapper around the Deezer API"; + description = "Python wrapper around the Deezer API"; homepage = "https://github.com/browniebroke/deezer-python"; license = licenses.mit; maintainers = with maintainers; [ synthetica ]; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index cc5a1ba01b8..afb9a8fc46c 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.12"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "b3fdb4337b1e54b8a23fe41c62d91648e26249f9fc00e882d1d09e16207aa204"; + sha256 = "0013ebe4904521e2fa28f33591a03a7210304d73363e7eadd7cdcf81c12ba003"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index fdd4bd03b70..fc0d0e0921b 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.1"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08"; + sha256 = "e541a46a0a899ef4778a4708be22e71cac3efacc09a6ff44bc065c5c9194c054"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 5e9492f9041..ee815e53f01 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.13"; + version = "0.5.14"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-Z/5YRvHcZgRuSQnaMbNIT93uSYvRzMWpdMy0M7tD2QI="; + sha256 = "06v9ifpgdfx5v8k8jwqd4y985p27s1wxl7908v3aqxv7203acn7w"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix new file mode 100644 index 00000000000..bc63d577a7e --- /dev/null +++ b/pkgs/development/python-modules/environs/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, dj-database-url +, dj-email-url +, django-cache-url +, fetchFromGitHub +, marshmallow +, pytestCheckHook +, python-dotenv +, pythonOlder +}: + +buildPythonPackage rec { + pname = "environs"; + version = "9.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "sloria"; + repo = pname; + rev = version; + sha256 = "0n0l9jici2d1pck5pf1c96jj3lhw91jki9nsgxzpikvpyvsw7wga"; + }; + + propagatedBuildInputs = [ + marshmallow + python-dotenv + ]; + + checkInputs = [ + dj-database-url + dj-email-url + django-cache-url + pytestCheckHook + ]; + + pythonImportsCheck = [ + "environs" + ]; + + meta = with lib; { + description = "Python modle for environment variable parsing"; + homepage = "https://github.com/sloria/environs"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 0110db18c4c..e40e7e37bbb 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.5") [ typing ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + # Tests fail on Python 3.7 due to importlib using a deprecated interface + doCheck = !(pythonOlder "3.8"); + # fixtures fail to initialize correctly checkPhase = '' py.test tests --ignore=tests/integration/test_checker.py diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 5cb1bac8788..1c4145df14e 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.7.0"; + version = "1.7.1"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = version; - sha256 = "sha256-1HzeNtSqzqr9zyxF1PVWi6QfRupw8huMYmdFI6rzIdY="; + sha256 = "sha256-yrkFtvGXkeHD5hp0Fzz3M1hsuSIt6bQriyUy4NagD0U="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index e3def747f03..34660645b59 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.1.1"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "07z33vid7s8fjwvybyn8357yvs0f6nlhizv1l3qj1bczi3jbdkbh"; + sha256 = "sha256-rTbekdceC5QK0aiySi/4QUwaEoDfTlLrx2t6Kb9bH7U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix new file mode 100644 index 00000000000..ac0ee803858 --- /dev/null +++ b/pkgs/development/python-modules/git-filter-repo/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "git-filter-repo"; + version = "2.33.0"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nxfd5yv8ri7w5pzxclxs0yd317nsdcwvw87ancmdkh69xvx1f2f"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "git_filter_repo" + ]; + + meta = with lib; { + description = "Quickly rewrite git repository history"; + homepage = "https://github.com/newren/git-filter-repo"; + license = with licenses; [ mit /* or */ gpl2Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 9cc1d8252ee..d461392705f 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "0.1.3"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5d1847f44a23a2fba815cbfbe7391a0364fd6a5c088fcd5f5a09d454aad8cc7c"; + sha256 = "3d4fb605d2611586a66d16d02803fcb306331f21351b16497ee8c40753be3a27"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 8891b513421..e781c2127da 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "2.4.2"; + version = "2.5.0"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "1yv84girmqm155yjhhkiy1gdflf62110m2kgjiv4vcsjpy2i6has"; + sha256 = "0zw3ihbzkldwijz9phwivnzwylj30a2a4lknfbwm6vkx78rdrb1a"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 00791ac642f..70b1a1fe527 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.3"; + version = "10.4.0"; src = fetchPypi { inherit pname version; - sha256 = "ca3b0ae45a2c3a811c0dc39153b8a1ea8a5c8f786c56370a41dfd83a5bff2502"; + sha256 = "64fd249a7fcabea60953fc3e7f08da6a85960aca367c04d078b999b7f6fd0246"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index cc7572499da..741fd996ffd 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.11.3"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; + sha256 = "ff3e8675a982f7754359ec598329ba5635014e2bfd51573b9413605849ef314a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix index 1aac6dad012..0e9cb91ded9 100644 --- a/pkgs/development/python-modules/inifile/default.nix +++ b/pkgs/development/python-modules/inifile/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "inifile"; - version = "0.3"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0zgd53czc1irwx6b5zip8xlmyfr40hz2pd498d8yv61znj6lm16h"; + sha256 = "d9e5eb4708ebf13353c4cfce798ad47890a8bcc5fbae04630223d15d79f55e96"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index e3f09860e89..a3d603a13d4 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.0.3"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d6f2ac360f51f5314e690272cb26c454e6deab69ef48a7c650ea760247d1d4db"; + sha256 = "0d6eab99067e935336289c564caab541209ddd5e951a111f604b1ec92c710b84"; }; postPatch = '' diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index cd51661bde0..95981992fea 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "6.7.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "0yi27wzb4q371y4bywi4hz37h4x63wjsyaa2mbx0rgc8xl2wm6yz"; + sha256 = "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 0d8142645e1..ce39ec117ee 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.9.3"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "60e6ce37be064f6e51d02b25da44230ecc9c0b1fdb6f14568c71457d963c1749"; + sha256 = "d3ba82ecf7ab6a48d21dac6697e26504670cc3522b8e5941bd28fb56cf3f6c46"; }; postPatch = '' - substituteInPlace usb1/libusb1.py --replace \ + substituteInPlace usb1/_libusb1.py --replace \ "ctypes.util.find_library(base_name)" \ "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 46306feb936..0bfa586a8ba 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "bd98e3b501b4c24dc127f4ad93e467f42923fe3eefa99e143b5b93158f024395"; + sha256 = "107ae7babbbda2c2f0e07484f0c53cdeb455e9219235f79dc4e1685d7541e505"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 0afd8902d95..1753b0dce8c 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.07.21"; + version = "2021.10.9"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "80ca1db9648e7678f81b373dab04d06025ec6532e68a9be773ddbd159de54e4c"; + sha256 = "907a4a0765ab29ccd1c2247efa0eda7a9bd82d3be3a2ecfdeb9b9e6fbb9aa56e"; }; postPatch = '' diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 61b7c68d53f..2056bbb0b94 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.44"; + version = "1.45"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "v${version}"; - sha256 = "1na3vx10lc41gkk14h6s3fm4bnrd2bwf4qbf1l6bfvhs92b9k111"; + sha256 = "1yx4n4zax103fmjzdiqzw37zibsh68b2p2l5qvgcnx2zrrjd31yl"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mockupdb/default.nix b/pkgs/development/python-modules/mockupdb/default.nix index 341660e1af0..47107f0617b 100644 --- a/pkgs/development/python-modules/mockupdb/default.nix +++ b/pkgs/development/python-modules/mockupdb/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mockupdb"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "130z5g96r52h362qc5jbf1g3gw3irb2wr946xlhgcv9ww9z64cl8"; + sha256 = "d36d0e5b6445ff9141e34d012fa2b5dfe589847aa1e3ecb8d774074962af944e"; }; propagatedBuildInputs = [ pymongo ]; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 17f3ff34ba5..31b29364a7b 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.60"; + version = "1.18.63"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4881fdbb41a74a15076c12285abd925a40e29d9f1b06d92b4d7cb12e8d208ae0"; + sha256 = "cf676b3d36677382429a3ed29e17edfdd342c1879db37868723b2a0761640d62"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 0bc184d138f..eb715c91e50 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.6.4"; + version = "3.6.5"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dd7e8012af25737e6aa7bc26568a319508dca789f13e62afa09798dccc7798b5"; + sha256 = "834d1a8e38496369390be699be9bca4f2a0f2175b50327272b2ec7a98ffda2a0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 9277a4633f1..75eb114ac58 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.5.0"; + version = "1.5.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d0a7cfbb34dd93aff299a5a357f6f259a0a407c0e9136bab8e495a36e3f0846d"; + sha256 = "2c57a9ffe6d462b0ad1ea49ac3ce9ebb3e8d43b2adf653dbe47eaf1b13be3c3b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onetimepass/default.nix b/pkgs/development/python-modules/onetimepass/default.nix new file mode 100644 index 00000000000..220265fbc01 --- /dev/null +++ b/pkgs/development/python-modules/onetimepass/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, six, timecop }: + +buildPythonPackage rec { + pname = "onetimepass"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tadeck"; + repo = pname; + rev = "v${version}"; + sha256 = "0wmv62l3r8r4428gdzyj80lhgadfqvj220khz1wnm9alyzg60wkh"; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + timecop + ]; + + pythonImportsCheck = [ "onetimepass" ]; + + meta = with lib; { + description = "One-time password library for HMAC-based (HOTP) and time-based (TOTP) passwords"; + homepage = "https://github.com/tadeck/onetimepass"; + license = licenses.mit; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index eba416fd356..66e16d7e876 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,15 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.7.1"; - disabled = pythonOlder "3.5"; + version = "4.7.2"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-kZREcjLBSWXGULEKfWiherRCl5UXLOw4f3JFaqs8dXw="; + sha256 = "sha256-v12CL2VR9QAoj44F8V1qw/qflzQ1WRi1cvWn/U/wW/E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 72b0bcfa197..766b7090f90 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.54.0"; + version = "3.55.0"; src = fetchPypi { inherit pname version; - sha256 = "d878893cda2f477c63b5bd0f7f5301f03dd0a81c02554a1f2c5562036369376a"; + sha256 = "86835d1f1a9317ab41aeb1da5e4184975e2306586839d66daf63067c102f8f04"; }; propagatedBuildInputs = [ python-utils ]; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 19fa273c046..6e35cb57358 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.9.1"; + version = "21.10.5"; src = fetchPypi { inherit pname version; - sha256 = "8eef4dbfc97d984e63fd609a3f690d005173ec5342be88d10f67dd507affdf32"; + sha256 = "b347983fb78baab168f4dc4804ab2c59ca5b813bf62f8146dfb5fcb6ab6c8ba2"; }; patches = [ diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix index 6e8b8fef32f..c6b1a7319f3 100644 --- a/pkgs/development/python-modules/pyintesishome/default.nix +++ b/pkgs/development/python-modules/pyintesishome/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyintesishome"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jnimmo"; repo = "pyIntesisHome"; rev = version; - sha256 = "1y1agdr32p7m4dbb6kzchh0vb49gy0rqp8hq9zadwrq2vp70k5sn"; + sha256 = "sha256-+bad3VIoP0sVw0blK9YIot2GfK5de4HTXv5/ipV2Nds="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index b4ff976c8ea..7742a889045 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "1.3"; + version = "1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-zhuXOZIIzh5p0CDOsiUNTqeXDoHFcf1BPg868fc7CIg="; + sha256 = "48dbe6c4929961021cb61e49bb9e0605b54c4b61b9fb9ade51076705a08ecd54"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 40dae5c6997..41babc82175 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.5.3rc1"; + version = "2.5.3"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jynljjTipN/Yx97RSWikcotxCqosNWSDH7GdwcSIiRU="; + sha256 = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4="; }; # Twisted asynchronous version is not supported due to a missing dependency diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 7256749f8de..4173987a7f6 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "221124cbad8e3cf3ed421a4089d80ac5a29d3215e76cb49effc1df887533d2a8"; + sha256 = "7a7df8412b19cfb3596060faf5a8c5d0bf5b3bd504f8efd900fc4e3918c6f882"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 4b7f85482a4..a700a7d1fd6 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynput"; - version = "1.7.3"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "4e50b1a0ab86847e87e58f6d1993688b9a44f9f4c88d4712315ea8eb552ef828"; + sha256 = "16fecc4d1e53a28fb7c669c79e189c3f2cde14a08d6b457c3da07075c82f3b4c"; }; nativeBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index a939caf4970..0655d29f6af 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.4"; + version = "1.5"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "018c20d3983cccfdc9cfed64407d4ba861ef3d64fe324a486f7130431afdefa7"; + sha256 = "04323e63cf57f7ed927fd9bcb1861ef5ecb0d4d7213f2755969d4a1ac3c2de6f"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 5854c45a25f..597702e6d34 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "7.0.7"; + version = "7.1.0"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - sha256 = "sha256-gUaDPm1hq4SZm9beSbfdX0qGEGWGiq13UjchdN1+Kfc="; + sha256 = "sha256-r/qt06YPia8PYhwOeDXk0oK3YvEZ/1kN//+LXj34fmE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix index 943642bfd64..423f87c1f7d 100644 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ b/pkgs/development/python-modules/pytwitchapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytwitchapi"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "v${version}"; - sha256 = "0fq1ky6nbrb47mlznl3vq8m86lqb6p78fvbcy8x3rm3m5zngxnz7"; + sha256 = "0sbzl9a4zxnvnvkmmmfc9c157dgq7y6qfb2cid5nym6jhxkixnqk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 3c7082d0e67..a2f475f3b31 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "vmware"; repo = pname; rev = "v${version}"; - sha256 = "0li6g72ps1vxjzqhz10n02fl6cs069173jd9y4ih5am7vwhrwgpa"; + sha256 = "07jwlbi3k5kvpmgygvpkhsnbdp9m2ndwqxk9k6kyzfszwcbdx4bk"; }; # requires old version of vcrpy diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 3cc833b561e..3acb55377f9 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "19pmjd9z3g9xpbri363lzd0gi1xa06aiyw2wjnxwqmd73x6pw695"; + sha256 = "0s6lakbd8h1pa4lfdj18sm13gpywszgpcns4hz026a4kam787kby"; }; checkInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 32c6cc4f9f1..015ba22781a 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.60.0"; + version = "2.63.0"; src = fetchPypi { inherit pname version; - sha256 = "0fbd43343918137460eb1b563a81fe6de9b51c2ae4be0b844cf198c5567cd82e"; + sha256 = "b4d793217181f4ff1d269aa22e44f82e21a060ec9723301e1ae5e7d9082c76c8"; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index cbd08934115..d85113b50d2 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.4.4"; + version = "1.5.0"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "044ae3bec56f31e18dff8cfa62a2c9c028f4c7fe4c0f761e50761184d3b68eef"; + sha256 = "273a6382cc98a404d20779351cd5bb12e746397fbe18a8e9ccec4ae3c0ffa0e2"; }; postPatch = '' diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index e02da9a07ca..384d7e3902e 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.60.0"; + version = "2.61.0"; src = fetchPypi { inherit pname version; - sha256 = "8966b7793014380f60c6f121ba333d6f333a55818edaf79c8d70464ce0a7a808"; + sha256 = "8131addd3512a22c4c539dda2d869a8f488e06f1b02d1f3a5f0f4848fc56184e"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/svdtools/default.nix b/pkgs/development/python-modules/svdtools/default.nix new file mode 100644 index 00000000000..b02058b8d30 --- /dev/null +++ b/pkgs/development/python-modules/svdtools/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, braceexpand +, click +, pyyaml +, lxml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "svdtools"; + version = "0.1.20"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version pname; + sha256 = "028s1bn50mfpaygf1wc2mvf06s50wqfplqrkhrjz6kx8vzrmwj72"; + }; + + propagatedBuildInputs = [ + braceexpand + click + pyyaml + lxml + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "svdtools" ]; + + meta = with lib; { + description = "Python package to handle vendor-supplied, often buggy SVD files"; + homepage = "https://github.com/stm32-rs/svdtools"; + changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index b7b863101b2..ba90946a974 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "0pb0kgddyzpipa0sqrkwyg1jgh95726irb306lr0pyyg0rsk54k7"; + sha256 = "1f6gbv6pczr5nhk8jmqpskvlffjd4ai4bkrmcj171mwq45vig6xr"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 48fbf84e93a..0b9e6547dee 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -1,24 +1,44 @@ -{ buildPythonPackage, lib, fetchPypi, regex }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, regex +}: buildPythonPackage rec { pname = "titlecase"; version = "2.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9a1595ed9b88f3ce4362a7602ee63cf074e10ac80d1256b32ea1ec5ffa265fa0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ppannuto"; + repo = "python-titlecase"; + rev = "v${version}"; + sha256 = "169ywzn5wfzwyknqavspkdpwbx31nycxsxkl7iywwk71gs1lskkw"; }; - propagatedBuildInputs = [ regex ]; + propagatedBuildInputs = [ + regex + ]; + + checkInputs = [ + pytestCheckHook + ]; - # no tests run - doCheck = false; + pytestFlagsArray = [ + "titlecase/tests.py" + ]; - pythonImportsCheck = [ "titlecase" ]; + pythonImportsCheck = [ + "titlecase" + ]; meta = with lib; { + description = "Python library to capitalize strings as specified by the New York Times"; homepage = "https://github.com/ppannuto/python-titlecase"; - description = "Python Port of John Gruber's titlecase.pl"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index af8ef6d956f..b3e38c86407 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.17.5"; + version = "3.18.0"; src = fetchPypi { inherit pname version; - sha256 = "f719a3f436a09d4a13411c9df1209e61b788dca64c6478fcd68e0ae5c5671283"; + sha256 = "a391d1a9138fe53fe08aeb6aa15ca7f1a188659b9a6c12af5313c55730eccd6c"; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 772ea06ad51..05fb1b2b9f4 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.10"; + version = "2.25.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PhIZiBaM/8+mHv+vSPkOvF7gI/bMUNBMAUTt16ImW2U="; + sha256 = "sha256-snkoTlH2aOOO4S2WZeTXiQifUy3CoL5KFQjKDv2Yup4="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix new file mode 100644 index 00000000000..69d77551fcd --- /dev/null +++ b/pkgs/development/python-modules/versionfinder/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchFromGitHub, GitPython, pytestCheckHook, backoff, requests }: + +buildPythonPackage rec { + pname = "versionfinder"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jantman"; + repo = pname; + rev = version; + sha256 = "16mvjwyhmw39l8by69dgr9b9jnl7yav36523lkh7w7pwd529pbb9"; + }; + + propagatedBuildInputs = [ + GitPython + backoff + ]; + + checkInputs = [ + pytestCheckHook + requests + ]; + + disabledTestPaths = [ + # acceptance tests use the network + "versionfinder/tests/test_acceptance.py" + ]; + + pythonImportsCheck = [ "versionfinder" ]; + + meta = with lib; { + description = "Find the version of another package, whether installed via pip, setuptools or git"; + homepage = "https://github.com/jantman/versionfinder"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 0e0d19e4f40..1542a447a1b 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.7.5"; + version = "0.7.6"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-vC2teem231Lw7cglVc+0M+QbgMgZ23JzTYy7wvnhFI4="; + sha256 = "sha256-Gf3hNCXioaLiQ0fZWPe9PO2YQeId4ZLmWsSZ5WvjSk0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index c04fcf7f0d8..6c40f266f34 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.7"; + version = "0.7.8"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-unxJf//VJc21uM0njirQIOjMrkFR6KXicNrOXKus3lw="; + sha256 = "sha256-fKtG0D256bK1hIcQiLdzCM+IdD/mmcFpcoE3DEFt7r0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index c645cd35903..f287d10ff42 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.32.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0DK6uTbuIVqrfsrTF0tAbx1WnVpc97nE0zuwTcFoBf8="; + sha256 = "1cq84ggp32xx79sgrxyqysqs34lhzyv8jdg7d46d9hdvjcwjb5af"; }; - vendorSha256 = "sha256-ox5Wx/9sJhZq4kFuI/GQlmFzuo5xti8yV+FY0bdR6Ek="; + vendorSha256 = "1ay3vf4dqlbizq98nxz2cgi67ck1c6lw7wi28w56607qzbx0yvmg"; doCheck = false; diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix new file mode 100644 index 00000000000..9e24309d984 --- /dev/null +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, python3 +, rustPlatform +, pkg-config +, glib +, libshumate +, gst_all_1 +, gtk4 +, libadwaita +, llvmPackages +, glibc +, pipewire +, wayland +, wrapGAppsHook4 +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "ashpd-demo"; + version = "0.0.1-alpha"; + + src = + let + share = fetchFromGitHub { + owner = "bilelmoussaoui"; + repo = "ashpd"; + rev = version; + sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; + }; + in + "${share}/ashpd-demo"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc + wrapGAppsHook4 + desktop-file-utils + glib # for glib-compile-schemas + ]; + + buildInputs = [ + glib + gtk4 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libadwaita + pipewire + wayland + libshumate + ]; + + # libspa-sys requires this for bindgen + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + # <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h> + BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + # https://github.com/bilelmoussaoui/ashpd/pull/32 + substituteInPlace build-aux/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Tool for playing with XDG desktop portals"; + homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 40c4e459a2e..095c2e10b57 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.8"; + version = "0.7.0"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Aistr85doKEOD0/uTS/7iRzYggb+hC3njVi4mWt8ndM="; + sha256 = "sha256-Cqbo1L3z3bTDIXZ90GXdAulTpGhWLoTc/kYRNghZ/SE="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -39,10 +39,9 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTestPaths = [ - # dbt is not available yet - "test/core/templaters/dbt_test.py" # Don't run the plugin related tests "test/core/plugin_test.py" + "plugins/sqlfluff-templater-dbt" "plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py" ]; diff --git a/pkgs/development/tools/git-privacy/default.nix b/pkgs/development/tools/git-privacy/default.nix new file mode 100644 index 00000000000..c1765417438 --- /dev/null +++ b/pkgs/development/tools/git-privacy/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, git +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "git-privacy"; + version = "2.1.0"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "EMPRI-DEVOPS"; + repo = pname; + rev = "v${version}"; + sha256 = "0hfy43fip1l81672xfwqrz1jryzkjy7h9f2lyikxgibibil0p444"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + click + git-filter-repo + GitPython + pynacl + setuptools + ]; + + checkInputs = with python3.pkgs; [ + git + pytestCheckHook + ]; + + disabledTests = [ + # Tests want to interact with a git repo + "TestGitPrivacy" + ]; + + pythonImportsCheck = [ + "gitprivacy" + ]; + + meta = with lib; { + description = "Tool to redact Git author and committer dates"; + homepage = "https://github.com/EMPRI-DEVOPS/git-privacy"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 9f9bb882de0..70e127e9000 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.8.1"; + version = "2.9.1"; subPackages = [ "cmd/gosec" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AlADSEekcUH/pCGggKlkBDiIYMe1zsoe9hh6fVUwQVA="; + sha256 = "0q9834siya19gj5ckymymyzkd1yn34b4xg5bvcgd7ckcpky143yw"; }; - vendorSha256 = "sha256-HBwIZfvkL9HSwkD1sZzBM7IJFAjLbCxyc95vqR5TFAg="; + vendorSha256 = "1h0bbkp9g5nzzjm8qkaag54n9nl711ckkjwibb1gb9ciqwsad33l"; doCheck = false; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index a0b9b813f4f..298c55c47e9 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.6"; + version = "0.10.7"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1f31z5isr34acv3nbsdigk3h426vind2zk5qvy44zmb5qmlb15x9"; + outputHash = "0sk4vwpy06smn0k7035bdz0g2y98l8hxmn4v3gijsqaxvnya36x9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/luarocks/3.7.nix b/pkgs/development/tools/misc/luarocks/3.7.nix new file mode 100644 index 00000000000..aa49af753b3 --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/3.7.nix @@ -0,0 +1,82 @@ +{lib, stdenv, fetchFromGitHub +, curl, makeWrapper, which, unzip +, lua +# for 'luarocks pack' +, zip +# some packages need to be compiled with cmake +, cmake +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "luarocks"; + version = "3.7.0"; + + src = fetchFromGitHub { + owner = "luarocks"; + repo = "luarocks"; + rev = "v${version}"; + sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d"; + }; + + patches = [ ./darwin-3.7.0.patch ]; + + postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' + substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' + ''; + + preConfigure = '' + lua -e "" || { + luajit -e "" && { + export LUA_SUFFIX=jit + configureFlags="$configureFlags --lua-suffix=$LUA_SUFFIX" + } + } + lua_inc="$(echo "${lua}/include"/*/)" + if test -n "$lua_inc"; then + configureFlags="$configureFlags --with-lua-include=$lua_inc" + fi + ''; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + buildInputs = [ lua curl which ]; + + postInstall = '' + sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* + for i in "$out"/bin/*; do + test -L "$i" || { + wrapProgram "$i" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ + --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ + --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ + --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" + } + done + + installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash) + installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh) + ''; + + propagatedBuildInputs = [ zip unzip cmake ]; + + # unpack hook for src.rock and rockspec files + setupHook = ./setup-hook.sh; + + # cmake is just to compile packages with "cmake" buildType, not luarocks itself + dontUseCmakeConfigure = true; + + shellHook = '' + export PATH="src/bin:''${PATH:-}" + export LUA_PATH="src/?.lua;''${LUA_PATH:-}" + ''; + + meta = with lib; { + description = "A package manager for Lua"; + license = licenses.mit ; + maintainers = with maintainers; [raskin teto]; + platforms = platforms.linux ++ platforms.darwin; + downloadPage = "http://luarocks.org/releases/"; + updateWalker = true; + }; +} diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch new file mode 100644 index 00000000000..8070af173aa --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch @@ -0,0 +1,24 @@ +diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua +index c5af5a2..1949fdc 100644 +--- a/src/luarocks/core/cfg.lua ++++ b/src/luarocks/core/cfg.lua +@@ -425,7 +425,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home) + defaults.external_lib_extension = "dylib" + defaults.arch = "macosx-"..target_cpu + defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" +- local version = util.popen_read("sw_vers -productVersion") ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@" + version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 + if version >= 10 then + version = 8 +@@ -434,8 +434,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home) + else + defaults.gcc_rpath = false + end +- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" +- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc" ++ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang" ++ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang" + defaults.web_browser = "open" + end + diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index aa49af753b3..c2449de5dd2 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "luarocks"; - version = "3.7.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${version}"; - sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d"; + sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2"; }; - patches = [ ./darwin-3.7.0.patch ]; + patches = [ ./darwin-3.1.3.patch ]; postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index f37815081ee..dbcd49dcfbe 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, makeWrapper, fetchFromGitHub, cctools }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "macdylibbundler"; - version = "20180825"; + version = "1.0.0"; src = fetchFromGitHub { owner = "auriamg"; repo = "macdylibbundler"; - rev = "ce13cb585ead5237813b85e68fe530f085fc0a9e"; - sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; + rev = version; + sha256 = "02w04qvaf9v8yw8bgncx5qj3jx08xdfa855isvq92q27hsb8m8hv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 42a30cce8eb..4fe721d9193 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - hash = "sha256-iXsV7zt190GH0kTMpdmf8xHk4cqtCVwq6LDICmhe5qU="; + sha256 = "sha256-QLrmUlgrys+Bd2hiaPcfDUtn75XdaMhVThsDRq/ijQQ="; }; - cargoHash = "sha256-Yqn6VpAKw93QvkxuwNcYvrQm0C4TfisRDcmFy95/yw8="; + cargoSha256 = "sha256-Xw0/vEL50vc9ktwjTz09160Fo7rXRVgeRo/EnWJ2PH0="; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 26d7063c81f..6c0465c1cf3 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -2,19 +2,22 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "10ml3va6ip501ibaykbhq8282y1j6r8bc8azc1gqxskk5jvfz1jm"; + sha256 = "1a6rmph96s7c8lpmpkizcvdf0x4jlsr5iqi7qjprxqsf6zak2rfg"; }; outputs = [ "out" ]; makeMakerFlags = [ "INSTALLDIRS=vendor" ]; + # Avoid creating perllocal.pod, which contains a timestamp + installTargets = [ "pure_install" ]; + # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS. patchPhase = '' substituteInPlace pg_format \ diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 13339e4dc34..f5de052e0e5 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -3,10 +3,8 @@ , rustPlatform , fetchFromGitHub , libusb1 -, openssl , pkg-config , rustfmt -, Security , AppKit }: @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-f5vUMdyz3vDh2yE0pMKZiknsqTAKkuvTCtlgb6/gaLc="; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index 76f766685ab..da5f019d660 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-OHBxQcXhZkJ1F6xLc7/sPpJhJzuJXb91IUjAtyC3XP8="; + sha256 = "sha256-GRitz9LOdZhbakbLZI2BUfZjqXLrsMK2MQJgixiEHaA="; }; - cargoSha256 = "sha256-LxqxRtMKUKZeuvk1caoYy8rv1bkEOQBM8i5SXMF4GXc="; + cargoSha256 = "sha256-uiANH9HOvy41FiABTTx2D9Rz1z/F7eITc5aiofaMSfI="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock index a51aef852d9..6b50ab4c793 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -30,14 +30,14 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "arrayvec" @@ -105,7 +105,7 @@ checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" dependencies = [ "bstr", "doc-comment", - "predicates 2.0.1", + "predicates 2.0.3", "predicates-core", "predicates-tree", "wait-timeout", @@ -119,7 +119,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -129,12 +129,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - -[[package]] name = "base64" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -158,9 +152,9 @@ checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -197,9 +191,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" [[package]] name = "byteorder" @@ -208,6 +202,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] name = "canvas" version = "0.1.0" dependencies = [ @@ -218,9 +224,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.69" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" [[package]] name = "cfg-if" @@ -251,7 +257,7 @@ dependencies = [ "num-integer", "num-traits 0.2.14", "time 0.1.43", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -268,7 +274,7 @@ checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", - "bitflags 1.2.1", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", @@ -292,11 +298,11 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "console_error_panic_hook" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "wasm-bindgen", ] @@ -309,10 +315,20 @@ dependencies = [ ] [[package]] -name = "const_fn" -version = "0.4.8" +name = "core-foundation" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "crossbeam-channel" @@ -360,24 +376,24 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" +checksum = "aaa3b8db7f3341ddef15786d250106334d4a6c4b0ae4a46cd77082777d9849b9" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2", - "winapi", + "socket2 0.4.2", + "winapi 0.3.9", ] [[package]] name = "curl-sys" -version = "0.4.45+curl-7.78.0" +version = "0.4.49+curl-7.79.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb" +checksum = "e0f44960aea24a786a46907b8824ebc0e66ca06bf4e4978408c7499620343483" dependencies = [ "cc", "libc", @@ -385,7 +401,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -424,12 +440,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -462,6 +472,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] +name = "encoding_rs" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] name = "enum_primitive" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -504,7 +523,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -517,6 +536,12 @@ dependencies = [ ] [[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -542,6 +567,22 @@ dependencies = [ ] [[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.3.2", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] name = "funty" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -549,9 +590,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" +checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" dependencies = [ "futures-channel", "futures-core", @@ -564,9 +605,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" +checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" dependencies = [ "futures-core", "futures-sink", @@ -583,9 +624,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" +checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" [[package]] name = "futures-core-preview" @@ -595,9 +636,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" [[package]] name = "futures-executor" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" +checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" dependencies = [ "futures-core", "futures-task", @@ -606,9 +647,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" +checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" [[package]] name = "futures-lite" @@ -617,14 +658,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ "futures-core", - "pin-project-lite", + "pin-project-lite 0.2.7", ] [[package]] name = "futures-macro" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" +checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" dependencies = [ "autocfg", "proc-macro-hack", @@ -635,21 +676,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" +checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" [[package]] name = "futures-task" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" +checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" [[package]] name = "futures-util" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" +checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" dependencies = [ "autocfg", "futures-channel", @@ -659,7 +700,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite", + "pin-project-lite 0.2.7", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -694,6 +735,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] +name = "gloo" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ce6f2dfa9f57f15b848efa2aade5e1850dc72986b87a2b0752d44ca08f4967" +dependencies = [ + "gloo-console-timer", + "gloo-events", + "gloo-file", + "gloo-timers", +] + +[[package]] +name = "gloo-console-timer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b48675544b29ac03402c6dffc31a912f716e38d19f7e74b78b7e900ec3c941ea" +dependencies = [ + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "088514ec8ef284891c762c88a66b639b3a730134714692ee31829765c5bc814f" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9fecfe46b5dc3cc46f58e98ba580cc714f2c93860796d002eb3527a465ef49" +dependencies = [ + "gloo-events", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-timers" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] name = "guide-supported-types-examples" version = "0.1.0" dependencies = [ @@ -702,6 +797,32 @@ dependencies = [ ] [[package]] +name = "h2" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", + "tracing-futures", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] name = "heck" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -727,10 +848,37 @@ dependencies = [ ] [[package]] +name = "http" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +dependencies = [ + "bytes 1.1.0", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +dependencies = [ + "bytes 0.5.6", + "http", +] + +[[package]] name = "httparse" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" + +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "humansize" @@ -745,6 +893,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] +name = "hyper" +version = "0.13.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +dependencies = [ + "bytes 0.5.6", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project", + "socket2 0.3.19", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" +dependencies = [ + "bytes 0.5.6", + "hyper", + "native-tls", + "tokio", + "tokio-tls", +] + +[[package]] name = "id-arena" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -789,12 +974,37 @@ dependencies = [ ] [[package]] +name = "indexmap" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] name = "inflate" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" [[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipnet" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" + +[[package]] name = "itertools" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -805,9 +1015,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "jpeg-decoder" @@ -820,7 +1030,7 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.52" +version = "0.3.55" dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", @@ -828,6 +1038,12 @@ dependencies = [ ] [[package]] +name = "json" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" + +[[package]] name = "julia_set" version = "0.1.0" dependencies = [ @@ -836,6 +1052,16 @@ dependencies = [ ] [[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -843,9 +1069,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "leb128" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "lexical-core" @@ -854,7 +1080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "ryu", "static_assertions", @@ -862,9 +1088,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.99" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" [[package]] name = "libz-sys" @@ -895,9 +1121,9 @@ checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "memchr" @@ -931,6 +1157,37 @@ dependencies = [ ] [[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] name = "multipart" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -949,6 +1206,35 @@ dependencies = [ ] [[package]] +name = "native-tls" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] name = "no-std" version = "0.1.0" dependencies = [ @@ -1051,11 +1337,11 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "openssl" -version = "0.10.35" +version = "0.10.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -1071,18 +1357,18 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-src" -version = "111.15.0+1.1.1k" +version = "111.16.0+1.1.1l" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" +checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.65" +version = "0.9.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" dependencies = [ "autocfg", "cc", @@ -1108,6 +1394,32 @@ dependencies = [ ] [[package]] +name = "pin-project" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[package]] name = "pin-project-lite" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1121,9 +1433,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" [[package]] name = "png" @@ -1158,9 +1470,9 @@ dependencies = [ [[package]] name = "predicates" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3d91237f5de3bcd9d927e24d03b495adb6135097b001cea7403e2d573d00a9" +checksum = "5c6ce811d0b2e103743eec01db1c50612221f173084ce2f7941053e94b6bb474" dependencies = [ "difflib", "itertools", @@ -1175,12 +1487,12 @@ checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7dd0fd014130206c9352efbdc92be592751b2b9274dff685348341082c6ea3d" +checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" dependencies = [ "predicates-core", - "treeline", + "termtree", ] [[package]] @@ -1221,9 +1533,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" dependencies = [ "unicode-xid", ] @@ -1236,9 +1548,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] @@ -1345,7 +1657,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", ] [[package]] @@ -1377,7 +1689,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1389,10 +1701,45 @@ dependencies = [ ] [[package]] +name = "reqwest" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "base64 0.13.0", + "bytes 0.5.6", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "mime_guess", + "native-tls", + "percent-encoding", + "pin-project-lite 0.2.7", + "serde", + "serde_urlencoded", + "tokio", + "tokio-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] name = "rouille" -version = "3.2.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263ea8c0988dbdd89e679d408eaa5505bb886677e997562646c2e2ba4d2e6db" +checksum = "dfc1bcf3b32bd9ef568402e750404c369ff172a6a34597c858f8ccf5f3bed013" dependencies = [ "base64 0.13.0", "chrono", @@ -1406,7 +1753,7 @@ dependencies = [ "serde_json", "sha1", "threadpool", - "time 0.2.27", + "time 0.3.3", "tiny_http", "url", ] @@ -1419,19 +1766,23 @@ dependencies = [ ] [[package]] -name = "rustc-demangle" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" +name = "rust-webassembly-weather-reports" +version = "0.1.1" +dependencies = [ + "chrono", + "gloo", + "json", + "reqwest", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] [[package]] -name = "rustc_version" -version = "0.2.3" +name = "rustc-demangle" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] name = "ryu" @@ -1462,7 +1813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1484,34 +1835,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "semver" -version = "0.9.0" +name = "security-framework" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ - "semver-parser", + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] -name = "semver-parser" -version = "0.7.0" +name = "security-framework-sys" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "serde" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -1520,10 +1879,22 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.66" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ + "form_urlencoded", "itoa", "ryu", "serde", @@ -1537,34 +1908,36 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "slab" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "socket2" -version = "0.4.1" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ + "cfg-if 1.0.0", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] -name = "sourcefile" -version = "0.1.4" +name = "socket2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +dependencies = [ + "libc", + "winapi 0.3.9", +] [[package]] -name = "standback" -version = "0.2.17" +name = "sourcefile" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] +checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" [[package]] name = "static_assertions" @@ -1573,55 +1946,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1635,9 +1959,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" +checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa" dependencies = [ "clap", "lazy_static", @@ -1646,9 +1970,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.15" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" +checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba" dependencies = [ "heck", "proc-macro-error", @@ -1659,9 +1983,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.74" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" dependencies = [ "proc-macro2", "quote", @@ -1685,7 +2009,7 @@ dependencies = [ "rand", "redox_syscall", "remove_dir_all", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1698,6 +2022,12 @@ dependencies = [ ] [[package]] +name = "termtree" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78fbf2dd23e79c28ccfa2472d3e6b3b189866ffef1aeb91f17c2d968b6586378" + +[[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1722,45 +2052,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi", + "winapi 0.3.9", ] [[package]] name = "time" -version = "0.2.27" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +checksum = "cde1cf55178e0293453ba2cca0d5f8392a922e52aa958aee9c28ed02becc6d03" dependencies = [ - "const_fn", "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", ] [[package]] @@ -1778,9 +2079,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -1803,6 +2104,47 @@ dependencies = [ ] [[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "iovec", + "lazy_static", + "memchr", + "mio", + "pin-project-lite 0.1.12", + "slab", +] + +[[package]] +name = "tokio-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.1.12", + "tokio", +] + +[[package]] name = "toml" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1812,16 +2154,53 @@ dependencies = [ ] [[package]] -name = "treeline" -version = "0.1.0" +name = "tower-service" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + +[[package]] +name = "tracing" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +dependencies = [ + "cfg-if 1.0.0", + "log", + "pin-project-lite 0.2.7", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.43" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02c413315329fc96167f922b46fd0caa3a43f4697b7a7896b183c7142635832" +checksum = "dbaccfa9796293406a02ec790614628c88d0b3246249a620ac1ee7076274716b" dependencies = [ "glob", "lazy_static", @@ -1846,6 +2225,7 @@ version = "0.1.0" dependencies = [ "js-sys", "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", ] @@ -1860,12 +2240,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" @@ -1884,9 +2261,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" @@ -1961,6 +2338,16 @@ dependencies = [ ] [[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1968,7 +2355,7 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.75" +version = "0.2.78" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1984,7 +2371,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.75" +version = "0.2.78" dependencies = [ "bumpalo", "lazy_static", @@ -2005,7 +2392,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "assert_cmd", @@ -2033,7 +2420,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "base64 0.9.3", @@ -2055,7 +2442,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "rayon", @@ -2067,7 +2454,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.25" +version = "0.4.28" dependencies = [ "cfg-if 1.0.0", "futures-channel-preview", @@ -2081,7 +2468,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.75" +version = "0.2.78" dependencies = [ "quote", "trybuild", @@ -2092,7 +2479,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.75" +version = "0.2.78" dependencies = [ "proc-macro2", "quote", @@ -2103,7 +2490,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "rayon", @@ -2124,11 +2511,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.75" +version = "0.2.78" [[package]] name = "wasm-bindgen-test" -version = "0.3.25" +version = "0.3.28" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2154,7 +2541,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.25" +version = "0.3.28" dependencies = [ "proc-macro2", "quote", @@ -2162,7 +2549,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "walrus", @@ -2171,7 +2558,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "walrus", @@ -2179,7 +2566,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "log", @@ -2191,7 +2578,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-webidl" -version = "0.2.75" +version = "0.2.76" dependencies = [ "anyhow", "env_logger", @@ -2255,18 +2642,18 @@ checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" [[package]] name = "wasmparser" -version = "0.80.0" +version = "0.80.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f71b80b8193e50910919e7d1bc956d2b4f42b1cb1fad84bacb59332c16f2cf" +checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" [[package]] name = "wasmprinter" -version = "0.2.28" +version = "0.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48e4f2999b9930e9b037e328357d7d2367e0d8ea6e534be90aeff60976c0452" +checksum = "bf83acd0a74a68f7b96acddc6035af45a09659d53f877b73aa22c816ed3e71e7" dependencies = [ "anyhow", - "wasmparser 0.80.0", + "wasmparser 0.80.2", ] [[package]] @@ -2280,25 +2667,25 @@ dependencies = [ [[package]] name = "wast" -version = "37.0.0" +version = "38.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc7b9a76845047ded00e031754ff410afee0d50fbdf62b55bdeecd245063d68" +checksum = "ae0d7b256bef26c898fa7344a2d627e8499f5a749432ce0a05eae1a64ff0c271" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2cc8d9a69d1ab28a41d9149bb06bb927aba8fc9d56625f8b597a564c83f50" +checksum = "adcfaeb27e2578d2c6271a45609f4a055e6d7ba3a12eff35b1fd5ba147bdf046" dependencies = [ - "wast 37.0.0", + "wast 38.0.1", ] [[package]] name = "web-sys" -version = "0.3.52" +version = "0.3.55" dependencies = [ "js-sys", "wasm-bindgen", @@ -2377,6 +2764,12 @@ dependencies = [ [[package]] name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" @@ -2386,6 +2779,12 @@ dependencies = [ ] [[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2397,7 +2796,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -2407,6 +2806,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] name = "wit-parser" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2499,6 +2907,16 @@ dependencies = [ ] [[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] name = "wyz" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index fba7c979390..9eada274bef 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.75"; + version = "0.2.78"; src = let @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - hash = "sha256-eRAe6/v0Xrtd1d2k6p0WETZ2vkQkiDRZOds7y0DidY0="; + hash = "sha256-1Z5d4gjZUic6Yrd+O8oLWYpJqAYGcByZYP0H1iInXHA="; }; in runCommand "source" { } '' @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-xZrGBRnsBQKvqGkZyU7FQCkx0dHt/hXlrVLSvGKx27k="; + cargoHash = "sha256-RixIEat7EzGzgSQTnPennePpiucmAatrDGhbFSfTajo="; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix new file mode 100644 index 00000000000..51a242a6cfd --- /dev/null +++ b/pkgs/games/ddnet/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, pkg-config +, curl +, freetype +, libGLU +, libnotify +, libogg +, libX11 +, opusfile +, pcre +, python3 +, SDL2 +, sqlite +, wavpack +}: + +stdenv.mkDerivation rec { + pname = "ddnet"; + version = "15.5.4"; + + src = fetchFromGitHub { + owner = "ddnet"; + repo = pname; + rev = version; + sha256 = "sha256-vJMYPaLK2CK+nbojLstXgxqIUaf7jNynpklFgtIpvGM="; + }; + + nativeBuildInputs = [ cmake ninja pkg-config ]; + + buildInputs = [ + curl + freetype + libGLU + libnotify + libogg + libX11 + opusfile + pcre + python3 + SDL2 + sqlite + wavpack + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DAUTOUPDATE=OFF" + "-GNinja" + ]; + + postPatch = '' + substituteInPlace src/engine/shared/storage.cpp \ + --replace /usr/ $out/ + ''; + + meta = with lib; { + description = "A Teeworlds modification with a unique cooperative gameplay."; + longDescription = '' + DDraceNetwork (DDNet) is an actively maintained version of DDRace, + a Teeworlds modification with a unique cooperative gameplay. + Help each other play through custom maps with up to 64 players, + compete against the best in international tournaments, + design your own maps, or run your own server. + ''; + homepage = "https://ddnet.tw"; + license = licenses.asl20; + maintainers = with maintainers; [ sirseruju legendofmiracles ]; + mainProgram = "DDNet"; + }; +} diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix new file mode 100644 index 00000000000..a4b30c572a0 --- /dev/null +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, libX11, freeglut, glew, libXNVCtrl, libXext, lib }: + +stdenv.mkDerivation rec { + pname = "gl-gsync-demo"; + version = "unstable-2020-12-27"; + + src = fetchFromGitHub { + owner = "dahenry"; + repo = "gl-gsync-demo"; + rev = "4fd963a8ad880dc2d846394c8c80b2091a119591"; + sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d"; + }; + + buildInputs = [ libX11 freeglut glew libXNVCtrl libXext ]; + + installPhase = '' + runHook preInstall + + install -D gl-gsync-demo -t $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + license = with licenses; mit; + platforms = platforms.linux; + maintainers = with maintainers; [ atemu ]; + description = "A very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux"; + longDescription = '' + The demo simply draws a vertical bar moving accross the screen at constant speed, but deliberately rendered at a variable frame rate. + + The min and max frame rates can be manually changed at runtime, by step of 10 fps and with a min of 10 fps. + + The demo also allows to toggle V-Sync on/off. + ''; + homepage = "https://github.com/dahenry/gl-gsync-demo"; + }; +} diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index 84e80d7d632..84970d11055 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "julius"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bvschaik"; repo = "julius"; rev = "v${version}"; - sha256 = "0nfdn8n6ywhm69ckz9a1chl5xxiqyaj3l337wadsbppnpscjihrc"; + sha256 = "0w7kmgz9ya0ck9cxhsyralarg7y6ydx4plmh33r4mkxkamlr7493"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index c2714e84962..dda34a113a0 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.1006.1"; + version = "2021.1016.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "zQMXDqWfZ8g4HP3VQgeLogif51vVFLjb+a+7ma7OHIc="; + sha256 = "PaN/+t5qnHaOjh+DfM/Ylw1vESCM3Tejd3li9ml2Z+A="; }; nativeBuildInputs = [ diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index fccef5864a2..d89a24b379e 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -158,9 +158,9 @@ (fetchNuGet { name = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; version = "2021.725.0"; sha256 = "00nvk8kw94v0iq5k7y810sa235lqdjlggq7f00c64c3d1zam4203"; }) (fetchNuGet { name = "ppy.ManagedBass"; version = "3.1.3-alpha"; sha256 = "0qdrklalp42pbyb30vpr7c0kwjablsja0s6xplxxkpfd14y8mzk4"; }) - (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1004.0"; sha256 = "01w8z0pz8b0fpa4qqk22lq1cf5pdic2nwrqyqmcz051yyiglmz3q"; }) + (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1014.0"; sha256 = "0j0b9hhglpqgla82c8yxqangjxqabsc9xb0z1jc6lb7rh854xzli"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; version = "2021.805.0"; sha256 = "004c053s6p7339bfw68lvlyk9jkbw6djkf2d72dz8wam546k8dcl"; }) - (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1004.0"; sha256 = "0wxdb72l7gzxzxyjysm1zshvlf0psaaanaqv2km1j3i37cnag0jp"; }) + (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1015.0"; sha256 = "0h2sb35yajgnfhn9729p9r83m8mwv7r03gd55b07wl8vhzb2r3s5"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; version = "1.0.178"; sha256 = "1bv77rrf3g6zr4bzfrrqqzl0vjj4c8izc0sakckda8dlm6h3gxln"; }) (fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.452-alpha"; sha256 = "0l59cfji8w0x2nrp3m7xvfpw4y7z5dhwsq4wq3wf4r6npwnra0hc"; }) (fetchNuGet { name = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) @@ -358,4 +358,5 @@ (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { name = "TagLibSharp"; version = "2.2.0"; sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; }) ] diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index 43c9af533fa..4edbd70a221 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.5307"; + version = "1.0.5415"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "VsOoW8h7yFgMRVTP6AHs2HOqSwXMnRNgJI8FM/rHp2I="; + sha256 = "XvW+bAuad1IKJPZzVJBkT7vA2BBDFQBvTWtbyK/in6A="; }; dontBuild = true; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d6dd3424832..d2f8e3609a0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-10-11"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "7413dfd3fc386920217fb43e9a517e99d9cf42b8"; - sha256 = "13a4lgkp9z72qf8ag36f7jl1q02z5xi281z62rc1lwg36nj38m92"; + rev = "16898417e68ffb6034b2a6de0c1b25502bd846d8"; + sha256 = "1zyzw8m8bfs3p06nq582pb5lja204xhzkd60bp1wyyq1q5qv9y3v"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -327,6 +327,18 @@ final: prev: meta.homepage = "https://github.com/rbgrouleff/bclose.vim/"; }; + better-escape-nvim = buildVimPluginFrom2Nix { + pname = "better-escape.nvim"; + version = "2021-10-09"; + src = fetchFromGitHub { + owner = "max397574"; + repo = "better-escape.nvim"; + rev = "a644df43e4607df2e645cb7b6f50ede79fffe477"; + sha256 = "1kjc1h35xfqgsqbg00hsvg52wkjskfilxxsxnnlimcsv9v8iadmh"; + }; + meta.homepage = "https://github.com/max397574/better-escape.nvim/"; + }; + BetterLua-vim = buildVimPluginFrom2Nix { pname = "BetterLua.vim"; version = "2020-08-14"; @@ -449,12 +461,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-10-14"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "501fc90dd87ce887d391f08f84b767bff923851a"; - sha256 = "1k5wjy3fw62y3hpqzkkzhig6xk3dvc47akni6i8iwc4jr0mxjx7z"; + rev = "63259154cae7c01a877cd493c7ff53d8bbaf36a8"; + sha256 = "0072yqwcs23j1q5akybc9q933lg3davrbh10rjqs690b8p69rz0p"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -617,12 +629,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-09-30"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "f93a6cf9761b096ff2c28a4f0defe941a6ffffb5"; - sha256 = "02x4jp79lll4fm34x7rjkimlx32gfp2jd1kl6zjwszbfg8wziwmx"; + rev = "accbe6d97548d8d3471c04d512d36fa61d0e4be8"; + sha256 = "1dqx6yrd60x9ncjnpja87wv5zgnij7qmzbyh5xfyslk67c0i6mwm"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -641,12 +653,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-10-06"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "8d88c92dd5a202a996b4caac7284e4ea2f086765"; - sha256 = "0m7wmnanhmvx4ww5xiz6rfjzk3ci10gk4dda8qd87kdiszq1zay7"; + rev = "2b1d31fef79a4c0ff803f6230859faf76e4409f9"; + sha256 = "1l3lyzgwlr7drxzig01by99vrgi7flvrnln3dmy14pg2x56lsbf3"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -665,12 +677,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2021-09-30"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "71fd46be319f96dc35ecda2fb2641a643c1ca3ba"; - sha256 = "08kqzhzx90r06hjbbr5y79bh4xgg4nj73lsam0wcvq6xyjh7qbnn"; + rev = "f788bb17e1de13b49e197b68edb501010b64e975"; + sha256 = "1c21y5vz9afzmx7l0ifv6gc2a6mfmsa8r0igxgyin0jj6ipk5kkl"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -701,12 +713,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2021-10-13"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "9674906f4e3e4a163d4ca9b7accc1057ecf9031f"; - sha256 = "11cs9gzhx856zmsix0dsqbcz38ldizjrbhdq6wi9vzxg2da8wb56"; + rev = "8da7e78e54415753d6b688f96d54290d754f7c6b"; + sha256 = "0s9s2kpfg6mqrl0xdqxl1k17vj4pc433v89i1p5kcrxsydfvdxp3"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -749,12 +761,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-10-01"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "d288ef453066afd1845c17883e26c4d1c9b6a3ae"; - sha256 = "154gblar7qpkfff2n29cg0xjhxgjdg51djgq3qzj9f0fc1bcm68k"; + rev = "ee767ef4db8e5606c8c4edc304a75053ac943804"; + sha256 = "1rv47115xbbsnkzs18bp60advhd3mz16w1aigfxk30cmajfydwvg"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -856,6 +868,18 @@ final: prev: meta.homepage = "https://github.com/wincent/command-t/"; }; + comment-nvim = buildVimPluginFrom2Nix { + pname = "comment.nvim"; + version = "2021-10-17"; + src = fetchFromGitHub { + owner = "numtostr"; + repo = "comment.nvim"; + rev = "a86384dc153e86a9a3cbec1436a8acfa4b07690d"; + sha256 = "043nczs67sa7i2nmmadhrd52d3yzjr1kcm3bgb4q5zig1a7r4dcj"; + }; + meta.homepage = "https://github.com/numtostr/comment.nvim/"; + }; + committia-vim = buildVimPluginFrom2Nix { pname = "committia.vim"; version = "2020-08-27"; @@ -1206,12 +1230,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2021-10-13"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "ed0d013bd2f7932c95dedae108b890663ce5aa30"; - sha256 = "0hm6ca1kh4rqpcy18ijisky5r17m2b5948dvfds02j3jkid5r457"; + rev = "701b2a9b04055d056cd2e3e1f6f6fa555b0c4cb6"; + sha256 = "1q8nqg5dq3m3m884s67yv2i9b8m94myyx56xyw7f3g4b4ivcsyy4"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1520,12 +1544,12 @@ final: prev: diaglist-nvim = buildVimPluginFrom2Nix { pname = "diaglist.nvim"; - version = "2021-10-11"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "onsails"; repo = "diaglist.nvim"; - rev = "794b4f59d05282944599e3efd66c3dc17fe6b8de"; - sha256 = "002i1vhri24cwf76n0302741rlaagss50nv4rz1sass1gvcikmsf"; + rev = "5221d8e4fd5522fb9e81b8131ff714b464dd0bb2"; + sha256 = "0xsm6s8qr5q52hmbhxr0hxhwar5d04gmwzf2ci82scvf85ar9l9g"; }; meta.homepage = "https://github.com/onsails/diaglist.nvim/"; }; @@ -1738,12 +1762,12 @@ final: prev: far-vim = buildVimPluginFrom2Nix { pname = "far.vim"; - version = "2021-02-19"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "e67b1dbe5842b709687c214fea38ca00f0ffe6c6"; - sha256 = "1ljvl7p2k3bgl54srf6kvshqq16qwfa34ppj982fp2bzzal819l1"; + rev = "9b6cc10650128a7830fb92425ad978ae8d6132bc"; + sha256 = "0kyjz4zq9rdyxvrs4l3ficrhpfwb5p01x84x17vcqbrc68kksw04"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -1774,12 +1798,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-10-11"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "470d820354fa2aa6a5a68b7d6205d0d16d8646c5"; - sha256 = "1i8hjb5lgmbhyhzyh0nzkdyc5jkxl5ad737nb8s5xqk1lw59lsas"; + rev = "4ef5e1516395eea731275e0f58b6bfba5c6ac9c1"; + sha256 = "12fci8gkbs3gf7cx68dpczkvsgy7bbax6f5fdl6fbjszpwr96lhw"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1798,12 +1822,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2021-09-19"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "264a73d4df15a9234a4ec74ecd70e9a0b9d45bf7"; - sha256 = "165kac22gmfm8f64rb5xgv8pqap2zh87xvhnd7i1fy34yzj0n514"; + rev = "41197d23b2975fb373b0affc090ff4fe52a7429c"; + sha256 = "0djjik0q4pczw3r6v2xpmww1wv6rw69jxmdpnwfxss2fdpz5a9wl"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1834,12 +1858,12 @@ final: prev: FixCursorHold-nvim = buildVimPluginFrom2Nix { pname = "FixCursorHold.nvim"; - version = "2021-04-16"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "FixCursorHold.nvim"; - rev = "b5158c93563ee6192ce8d903bfef839393bfeccd"; - sha256 = "1y6hv7vl268zbf3bzd72l43jjgi0cq364p15z8ia9jlph1syk9zz"; + rev = "f2572b0163d7b19b4e8a7c76a3eb084921d736de"; + sha256 = "06agspmka503yn75873kk0g5v2m91df1zblsh96gkc4h6wm52liv"; }; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; @@ -2147,12 +2171,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-10-04"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ceb2dcb23f569ce337deb1b1ce7d4a51434cec32"; - sha256 = "0q7a2pa6am99656a07zpnhqlgzjkn9z0jg6lvc45c7mqavl21xis"; + rev = "552f114caeaec4ce97822cb55dfa7c7e5368136b"; + sha256 = "0qdafm3arjf8bcqpvv085dwzbikad3sr3xzvrn3gfa0dsls8pg6q"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2219,12 +2243,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-10-03"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "b04d83414d113aedf2e4beb1dd030f8a909ee8a8"; - sha256 = "0mdkz8hcdvr6f77y9b7zb04sv3xw1v8j4rpim6fxcbg38q267wcp"; + rev = "05c6983e6d6cb6e35367a13eeda1ffb160f48753"; + sha256 = "1qa22gsa62ginkad21bigj8qgbh8h3car598gl59643y2kc7lip3"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2964,12 +2988,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2021-09-20"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "bc14ddcb173d332e62ce3712eb0ca3ac6d9fa59a"; - sha256 = "1sh13m98dni9dspjiwsaafzvg3nlwd41v5ma5achpzla80hzm2h1"; + rev = "5a7b21b0fdafe73719902b9848880fb3eb8500aa"; + sha256 = "0pdswmrmc2nicii5szhig4qnmcx2cks6rc5g7s787cc0c458l98p"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3192,24 +3216,24 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2021-10-12"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "723c5fc3a4d0e772bb2864913196435cf910bbc5"; - sha256 = "1zbm77zkfg006z00mzcv136rqgyfzv7qy4dskcay1sfcr0q8yx1s"; + rev = "5c54258d34b8ae4be70a8fbc09b400eb7be0bee8"; + sha256 = "0gy5c5v80xbgx511xk1zp2scxzmgipwad1zqpsff4grz80vzsa13"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; minsnip-nvim = buildVimPluginFrom2Nix { pname = "minsnip.nvim"; - version = "2021-09-16"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "minsnip.nvim"; - rev = "f145d2d01103eb2e1f895f9baf438f042ad3509e"; - sha256 = "03b20cb4cifrwfsnw2zgpgd9n5wx731ygkg2x2fj5n6hw1klbfzj"; + rev = "ee71cda58f2e5ad6303338f1db3083e59ca35db1"; + sha256 = "1fvz1n6qy3wvn42rmchg58d8l187g52q1ibx757jwrjg6dbaw2xn"; }; meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; @@ -3480,12 +3504,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-09-20"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "cd666d51cb4d03e509039fd35e5744bbf9db431b"; - sha256 = "0q3sdrdi78p09mns9mdpicvhrm8y6n1vna96n0v4yfjknkxa02yw"; + rev = "253dc1d0c7de287440cc5e93c3e60d93cd92f096"; + sha256 = "0xfb4dry3ybv1q2gkqbxkj4y9q6g7hvc4x6z4mvxfks96lcmgrm8"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3780,12 +3804,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2021-10-08"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "48baaa1a7eff50349e42674b2ec6cf8a0d395b75"; - sha256 = "1pna56d7c822w4yqn1dcyb08k28c5w0y9qngdxfqjmkjgp1vcpy6"; + rev = "dfaacec99f03a8412538974e8d6a96a0916a3a5f"; + sha256 = "0hjqbisj9kd181qc6jav43r3jk2qyf79n56mxrjzwb8i5rndlr93"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -3840,12 +3864,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2021-09-27"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "46d9df8bf6535c1bc751a4134fc52ea91068cfaa"; - sha256 = "19b4ix8py8vg2jrzhhzcp69jyl6snplii6bpyaasj5nhhjxslmlq"; + rev = "99941237d7b54831ce31026b2bf48f5af7c3eaa3"; + sha256 = "1z46fkjyhfnaw3x8id7xs2fkglkbbv6sp45zmzg0f1r881dismi2"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3876,12 +3900,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-10-13"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "bd0f8daa3c70d099857e9223f33eec9511b6047c"; - sha256 = "039b475k33pmb9lchbfnr4l0fkghnjr4kyhni4ndznj81ln190fi"; + rev = "f9d3acd1a4e3b7e6d84951754fbdaadb196ae0fd"; + sha256 = "15jk540qb2zwpq3vh31skdl1gn9v6y28vqv9jrw78fjmhrs99lld"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3924,12 +3948,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-10-14"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "db48f0b4837be2bf40ad55860baa686c0e013ac4"; - sha256 = "1ikbamwl7cdihmlg2vnl838mq58z0lqcynn3x5p39wq11dql89lb"; + rev = "7becc6bc9d8baa62eb0dbf65305f8e7f1470ace7"; + sha256 = "1ihz1kci00r93f52fzz5nx9byh7rrax1sknmj9q232z1wv7dxb06"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3984,24 +4008,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-10-13"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "f5393d5bd934428a469f03f5bc225922f8c48367"; - sha256 = "0gss8d5anf94iic60wwnnc8d5msdx17yydb84fbk21h2a9gv8g8b"; + rev = "4ecf2a24265626a2c00427394deb4747c7b9d5dc"; + sha256 = "1p134wb9g2ki0gn7aqhsh64frcx5n00npkcj1lgnzcc4cc95p7d4"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2021-10-03"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "7361b5637930999d01b93b6ab4c45b784fa0618a"; - sha256 = "12xl0dxd341mmbv4lg28s1qlv9xg8vjv79sb9x2dv5g3994jf9q6"; + rev = "977abc8bbf83c5e1c7c476223bcec7b7036c0b5a"; + sha256 = "0jf0kiawhslk5y8h14p9abxsp7iigni6jps3gcirswvxw8clhpxl"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4056,12 +4080,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-10-08"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "385ede69635f5b2eaf48a36d6a4caba6794e508a"; - sha256 = "0pgfagi0fb9ik2ljbbcdyrirbxm87fmf2hybmyycigpw77x8pdv2"; + rev = "fafd7f9a7ab70fd2cb519a98b594859ba4eefcd7"; + sha256 = "11ky72s1vk9bnf6dji913hiifxdvih0a17yljxs03qhnynvlc5p9"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4140,12 +4164,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-10-09"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "0bbfcaf40b8c3fee758eda51e728a5b7aff08412"; - sha256 = "07n8i6ggk4qnhr3zda2qpfvqfnilnnkymak1dw6f0wcjbfqdk8h6"; + rev = "5217443bb675539d87b90133a91a7e36ad1e517d"; + sha256 = "17p3x7s50r5fj1fhzx7nm7hk81h85hihk6svsgp99a1cjys6w9zk"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4176,24 +4200,36 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-10-11"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "3c5d42a433fcb73fa9a2e07647ef02288479b284"; - sha256 = "19s8yczi1vyl8arxmqkiq34y1hmx4ws1d0qrsk6y7jk7dskxyqc5"; + rev = "66223954d7bd7d4358c36d157c25503168d04319"; + sha256 = "0jghq2fkvibilb1zglkckhpmq6dgi1q87fcwpvcv9slk1qlgw19d"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; + nvim-lsp-ts-utils = buildVimPluginFrom2Nix { + pname = "nvim-lsp-ts-utils"; + version = "2021-10-03"; + src = fetchFromGitHub { + owner = "jose-elias-alvarez"; + repo = "nvim-lsp-ts-utils"; + rev = "efa321ad03fbffeca699bc04ca1a59db0c54d16f"; + sha256 = "1bxj37jfcq6vrxpl5cslzmg03aqf2i13i71birvcvlw6n4p3kbbm"; + }; + meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; + }; + nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-10-12"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e4bed57f127310764f08e8b45f1ed3a31c6094e0"; - sha256 = "02m8p0pdmvgm0mk9b5h5smj91fy43gsrp742yn3a49njbm252n8q"; + rev = "9661d267f64a872a451dab0453b2b951e55cef27"; + sha256 = "0hv77ridsxi5n2qibrp9a66kbmlw1c9yl8gpakr1iz2hhazq58x9"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4296,12 +4332,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2021-10-12"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "7f5a49f7c4699bb57635a36869f5149af491e761"; - sha256 = "0yf40ypkvjn1g9brfhhfykhpjqg0x55h8ipxg0mdkmn24gp6n7xb"; + rev = "ec3f10e2116f344d9cc5c9980bddf7819f27d8ae"; + sha256 = "0vwlxghxyc82w2vmn6nylnvhcvr91k9z0szjwn67f8n1bnii2fn7"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4380,12 +4416,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-10-13"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "0943a858aeaef4f06e14a268c276767b3a7da930"; - sha256 = "16l0l88rr2q233xv4jiwj8w8i0d6ql9cn15fbpksf8d1djr2wxia"; + rev = "2bd142b45fbe890d9588a50df3f26212c2b87c80"; + sha256 = "09hcwm10b5rb77rpv0qbwak1x8hhqr0wqnrn118b7768pkqqwka0"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4488,24 +4524,24 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2021-10-13"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "0221cbbd66697d235a7addde172585f0a295cd91"; - sha256 = "06vh7abdzh25151svjsaawh8x0lp1qxc56c11dr9jfgnz1fq4gnv"; + rev = "836551aee06e07dc77ff0aa5dc1de4ace50596a1"; + sha256 = "0s654i6xlk3nkhjdrdmx202f9ig0xby5p9n98ajkhi6wq2yhfr72"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2021-09-25"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "cc8ecccd324ea0d8f07dc54806057806d0aff1d8"; - sha256 = "19jairk59a0f4p34h84sy8ia1qk2bcbwxk5i49vf5gxmi31pjpy4"; + rev = "e86ce939d85576fb7ce6c1c45fd49c8a570c24cc"; + sha256 = "19wq5xg1yvk5153c1b0zbhdzaga0ja45m3zm6a1wqb437wcqdqlx"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -4584,12 +4620,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2021-09-17"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "643afbb7158b77cbd491fd9874a8758d0484255a"; - sha256 = "14dzmavrak99i2ahwwccxcqkkj9a1b7ch9mlmpg56y6y4v65ss1h"; + rev = "d0d32dc5e92564b63ec905a9423984b5d503c24a"; + sha256 = "1h9ql0ryqblnmiksskh4phah1br1gbfc3zyylc8gczppgnxvgq5p"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -4957,12 +4993,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2021-09-09"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "3f522bd7375dc780714c1ebe7fe398f4e45f0e52"; - sha256 = "013n3ci6605qa6dvabg02nhln9s5ahh9gvzh07w3ikvb53wp31h4"; + rev = "6445f9131d872d6bf2236ea301e5d400a96f961d"; + sha256 = "0g60vks084jcajv1rsjnkn4idcwvzfbwqwnpkcw0xh009p71wyjd"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5053,12 +5089,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-10-12"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "21b19674b85178dd7d44751985b8de8389e9eb75"; - sha256 = "06gn4slv9z4jn6l3q31dl8l4j33l5mmn8rx5ddk966dfiq8yvpjw"; + rev = "441e0104648e1bae89e3eac6857590a64f17583d"; + sha256 = "13g6vlg3r49vmzl0q6z2mqwz2p2chcjc74bfgn89c284bjri8x94"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5632,12 +5668,12 @@ final: prev: tagalong-vim = buildVimPluginFrom2Nix { pname = "tagalong.vim"; - version = "2021-08-19"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "6c8c0f4903daed1c11087a014a8bc23ac4334850"; - sha256 = "1vcymd05pacs3ywf4bq20vhn46a3d4hpl2lwcbc5z1cv18iwd3ip"; + rev = "18c010e0f28fea012f537bc1abd468a063c36b9c"; + sha256 = "0qq1saqkk0cd09zppz469idzvl5d0aagq5gw908whz5dd72yl8al"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; @@ -5702,6 +5738,18 @@ final: prev: meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-cheat-nvim = buildVimPluginFrom2Nix { + pname = "telescope-cheat.nvim"; + version = "2021-09-24"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-cheat.nvim"; + rev = "4a58b92fc70af622ddc115f843b0e552ca5bd6ea"; + sha256 = "132drgpak97sbwjma6h7zwflg386xhqmdb3rqvzgxav36p9f0xsw"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/"; + }; + telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; version = "2021-10-13"; @@ -6570,12 +6618,12 @@ final: prev: vim-auto-save = buildVimPluginFrom2Nix { pname = "vim-auto-save"; - version = "2019-03-19"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "907th"; repo = "vim-auto-save"; - rev = "8c1d5dc919030aa712ad7201074ffb60961e9dda"; - sha256 = "0dj45g56n0q4advc9sgch11ghb2h5ahk601gndwy02a0937axjh2"; + rev = "d8ff037621e2351278cf0892ca19ee7ce479e802"; + sha256 = "1z075hb5wi7sv9yha4fxfxakcayymicg6av2gc9skaw8y2sx6jzn"; }; meta.homepage = "https://github.com/907th/vim-auto-save/"; }; @@ -6858,12 +6906,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2021-04-15"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "793d816524934e6553c76437120eea5df8e85a1e"; - sha256 = "174wq1sq862s474bhfq0w8lnmcilq75gf2sdp1hws7wj0fvn10h3"; + rev = "f3a5dc78b94874320cc48543e31de08df20c67af"; + sha256 = "0290wcvg0f3z9bcsd2ykqi5rw9wz60hvkc9ladh2xfrndhw77s2x"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -7530,12 +7578,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-10-13"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "6b3d37338c1f1da03bab16e4614507ab273e3305"; - sha256 = "1bmafcyzg5vhwfphacgm5f2hpcs52ickl3zf56394jdll8gxbn2c"; + rev = "d8e62cea4c57c9284a0d6bc92140deb1a7034a1d"; + sha256 = "0a5yh0w143lvg934pwsln2n34zh7x2d6bxfp9cmw897nl6qlzrdj"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -7590,12 +7638,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-10-12"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2e66b3ad05d85f09d870f82671b8503cf8fa4297"; - sha256 = "0145yrr3cjgzfm9arrs3wqwg3wlban3rpgb5jiwaiavrk2grlwkz"; + rev = "93f41ace7dc068cf89314bcea23bdf8da686407a"; + sha256 = "0hbif3hndmn7jll4w1kci6x3j7379wmpp9rnxg8rlbbnyxl2fpxj"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -9693,12 +9741,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-10-07"; + version = "2021-10-17"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "be519f70ab806c290a7b3d2e38fc22da07834052"; - sha256 = "0d22x0az6ca232x04mvkk9jphn3qfcz24a9wwvz0jdyy3pk8zfbi"; + rev = "c28bef69fdb26825a93ac1e90ca6f5ba19116d88"; + sha256 = "1fg60jfm5bw1m20133vl06nb8z9ckrwqq37jz493xi34j5fymi4w"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9934,12 +9982,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-09-30"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "611bf381c212acfe4811ea085fd353f6f3856d66"; - sha256 = "0cnn4zhlabzi39vq6wg3gkilal8grjgr1zgb0pzi604klyk1gyl8"; + rev = "5fe8ada99a3c711c8db65eb341c3f631043c4a26"; + sha256 = "1vz28llgmjybg2hgxlv6d9q69f7lhj32id531p2hlnhxl49s9jbn"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -10270,12 +10318,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-09-14"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "9ac8044206d32bea4dba34e77b6a3b7b87f65df6"; - sha256 = "0m488cfpl7yszyhgz12binrmxysa05wxypdgy83cdxb0npka20ff"; + rev = "32ddc125ec6f5a07fe59b3ab6b4b5f50093102ee"; + sha256 = "0jis4zxs1fjczyj9c38mbicsnpyvxr4hlxg0292zk6qhmgwd8dd6"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -10402,12 +10450,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-09-22"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "6ff20c655dd5b6f6050a234638d83ee7f65ba164"; - sha256 = "08mg6kcayp8m0vfcvk0afppslkszf7fjskb39b94df0sh7ymkw5p"; + rev = "2797c6c9d5278241a5932b5b31168fe2daa894de"; + sha256 = "1rvnm0xk8s9m6s9aycbzlnxbl8f03c3dqn74qrz5pw0r0vclfsv5"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -10594,12 +10642,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-09-30"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "726a06e0d043e5897ade0624da2ecbbceab53484"; - sha256 = "1swc8bzq5fifjkqxp6svzbipx0akmcj9ars7bxcgagzdndpz117s"; + rev = "3aab9711c06186fc8205e920a82f9e357be66666"; + sha256 = "16wssm6b0fsj45h4354xbwjz02gg0kasw7907hdhi4jyhpnn0xxs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10848,12 +10896,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-10-13"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "347bbf73d980501c4e1705879bcfe49ea0375af1"; - sha256 = "1ywj63kn0i6c8wr7y09vydb9cic2cqpkq5n40xwb0gbqk8n89z2k"; + rev = "69430d7ee6f204e0148102ba9c1b9b31a6315cf8"; + sha256 = "1qqjnhybzf34xmzhhjk5zwv2aly2my51f4r81h54q5xqmkk05sgc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 3fe11c3a2d8..887a0fb1778 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -560,6 +560,10 @@ self: super: { }; }); + telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs (old: { + dependencies = with self; [ sqlite-lua telescope-nvim ]; + }); + telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: { dependencies = with self; [ sqlite-lua telescope-nvim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d10c2b1d2f1..90ec235376e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -290,6 +290,7 @@ josa42/coc-lua josa42/vim-lightline-coc jose-elias-alvarez/minsnip.nvim@main jose-elias-alvarez/null-ls.nvim@main +jose-elias-alvarez/nvim-lsp-ts-utils@main joshdick/onedark.vim@main jpalardy/vim-slime@main jparise/vim-graphql @@ -428,6 +429,7 @@ mattn/emmet-vim mattn/vim-gist mattn/webapi-vim matze/vim-move +max397574/better-escape.nvim maximbaz/lightline-ale MaxMEllon/vim-jsx-pretty mbbill/undotree @@ -517,6 +519,7 @@ norcalli/nvim-terminal.lua norcalli/snippets.nvim ntpeters/vim-better-whitespace numirias/semshi +numtostr/comment.nvim nvie/vim-flake8 nvim-lua/completion-nvim nvim-lua/diagnostic-nvim @@ -525,6 +528,7 @@ nvim-lua/lsp_extensions.nvim nvim-lua/plenary.nvim nvim-lua/popup.nvim nvim-neorg/neorg@main +nvim-telescope/telescope-cheat.nvim nvim-telescope/telescope-dap.nvim nvim-telescope/telescope-frecency.nvim nvim-telescope/telescope-fzf-native.nvim@main diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 89950a51598..4a03c46dce4 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, vscode-utils, extractNuGet -, icu, curl, openssl, lttng-ust, autoPatchelfHook +, icu, curl, openssl, liburcu, lttng-ust, autoPatchelfHook , python3, musl , pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. @@ -12,6 +12,24 @@ assert ctagsUseFixed -> null != ctags; let + liburcu-0-12 = liburcu.overrideAttrs (oldAttrs: rec { + version = "0.12.2"; + src = fetchurl { + url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; + sha256 = "0yx69kbx9zd6ayjzvwvglilhdnirq4f1x1sdv33jy8bc9wgc3vsf"; + }; + }); + + lttng-ust-2-10 = (lttng-ust.override { + liburcu = liburcu-0-12; + }).overrideAttrs (oldAttrs: rec { + version = "2.10.5"; + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/lttng-ust-${version}.tar.bz2"; + sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; + }; + }); + pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python"; ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags"; @@ -54,7 +72,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { icu curl openssl - lttng-ust + lttng-ust-2-10 musl ]; @@ -75,6 +93,19 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { # Patch `packages.json` so that nix's *ctags* is used as default value for `python.workspaceSymbols.ctagsPath`. substituteInPlace "./package.json" \ --replace "\"default\": \"ctags\"" "\"default\": \"${ctagsDefaultsTo}\"" + + # Similar cleanup to what's done in the `debugpy` python package. + # This prevent our autopatchelf logic to bark on unsupported binaries (`attach_x86.so` + # was problematic) but also should make our derivation less heavy. + ( + cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process + declare kept_aside="${{ + "x86_64-linux" = "attach_linux_amd64.so"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}" + mv "$kept_aside" "$kept_aside.hidden" + rm *.so *.dylib *.dll *.exe *.pdb + mv "$kept_aside.hidden" "$kept_aside" + ) ''; postInstall = '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 922675fa422..5ee2a08f5ad 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.210"; + version = "4.19.211"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cv126j4sghwgzjm9p5l1brcnxkbgggja2ai37gl8m2s99cj59wv"; + sha256 = "1m3y5gsf5s8bb4jxkri20dlxi8aiqabzaijj2h1svz4r19ca8j7v"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 5a8ef895c2b..0da279cfc59 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.72"; + version = "5.10.73"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0z2cp8gqnbv7iz8kb5ydfmk019m0gds8wwvwc6kccsk4wypkbmml"; + sha256 = "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index 465a3f82d51..5722faf3bdc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.11"; + version = "5.14.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0capilz3wx29pw7n2m5cn229vy9psrccmdspp27znhjkvwj0m0wk"; + sha256 = "0dswxf1qk70lms5lph15i7nz3ybwiia58v8zzrmi71ajviwjc9wd"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 931f9f56f82..1ff0803114b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.152"; + version = "5.4.153"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1may19d47d06mplpk29dpjsq31sxk8wwbwb2jspj3vay9h9wfi40"; + sha256 = "0jaz57sd51xqc7w8k3f43bfc5mdsh1413mdngqqsgr8isv4hg7vd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index d8d9edcf4af..8ee8c663b3b 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -16,7 +16,7 @@ let in linux.override { argsOverride = { - modDirVersion = "${linux.modDirVersion}-gnu"; + modDirVersion = "${linux.modDirVersion}-gnu1"; isLibre = true; src = stdenv.mkDerivation { @@ -35,8 +35,6 @@ in linux.override { ''; }; - extraMeta.broken = true; - passthru.updateScript = ./update-libre.sh; maintainers = [ lib.maintainers.qyliss ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 6d21a4fca61..a8655596c51 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,10 +27,10 @@ rec { else legacy_390; beta = generic { - version = "470.42.01"; - sha256_64bit = "04w9nmi3vyww07pmgbd2r1x37s5p6xiy4qg9s06a1kjwzpm59xfd"; - settingsSha256 = "Ohbkm7j0/V0kzcxfsHujBkrdnaefneoLutf2Rju2hIQ="; - persistencedSha256 = "1gfj4ffkidbhgjzdi6sv2sngdcb27w7b0rvfnj129rs36mcxy02j"; + version = "495.29.05"; + sha256_64bit = "sha256-9yVLl9QAxpJQR5ZJb059j2TpOx4xxCeGCk8hmhhvEl4="; + settingsSha256 = "sha256-dcEI+3bxSTwVbHcR6IgvIUFt4vWtK5T4NMGVhmmeVJ0="; + persistencedSha256 = "sha256-OT/hOXEPatc6pAKrxDe0jsmaDFCtVXAbdW4elKe6xE8="; }; # Vulkan developer beta driver diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 79594a87c51..b8a0487bc7e 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils +{ lib, stdenv, fetchFromGitHub, gettext, libnl, ncurses, pciutils , pkg-config, zlib, autoreconfHook }: stdenv.mkDerivation rec { @@ -17,14 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; - patches = lib.optional stdenv.hostPlatform.isMusl ( - fetchpatch { - name = "strerror_r.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; - sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; - } - ); - NIX_LDFLAGS = [ "-lpthread" ]; postPatch = '' @@ -36,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Analyze power consumption on Intel-based laptops"; homepage = "https://01.org/powertop"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c9f0438c86f..cd25f0e981b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -140,6 +140,13 @@ let "INSTALL_MOD_PATH=\${out}" ]; + # Enabling BTF causes zfs to be build with debug symbols. + # Since zfs compress kernel modules on installation, our strip hooks skip stripping them. + # Hence we strip modules prior to compression. + postBuild = optionalString buildKernel '' + find . -name "*.ko" -print0 | xargs -0 -P$NIX_BUILD_CORES strip --strip-debug + ''; + postInstall = optionalString buildKernel '' # Add reference that cannot be detected due to compressed kernel module mkdir -p "$out/nix-support" diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 9e7e6c249e1..420b0923454 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "fb8b962dd9ef744e2551c4f052454bc2a30e39c1f662f4f3522e8f221d8e3d66"; + sha256 = "ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index da57282ae08..881fef7f32f 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.5.4"; + version = "4.5.6"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0sl98ykk2bh0v2aw2hyak7wk9k3pbhvmfkb3i4a72jlsixm60p81"; + sha256 = "004jwyg64ww6sfwlfpyfvh6vymildygwkjhkin2fsrq4h79wv2dv"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d7bdbb451f8..5b00199373e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -19,7 +19,7 @@ "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ airly ]; "airnow" = ps: with ps; [ pyairnow ]; - "airthings" = ps: with ps; [ ]; # missing inputs: airthings_cloud + "airthings" = ps: with ps; [ airthings-cloud ]; "airtouch4" = ps: with ps; [ ]; # missing inputs: airtouch4pyapi "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ aladdin-connect ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b2c3196bdbc..49cb6670de2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -214,6 +214,7 @@ in with py.pkgs; buildPythonApplication rec { "air_quality" "airly" "airnow" + "airthings" "airvisual" "alarm_control_panel" "alarmdecoder" diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 0bf023668ab..7c2d8b80de0 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.1-551-g2ad6eb0b"; + version = "2.1-570-gb802be83"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "XwVcjvBtJkZP46kGMnE4R1ax7Re725GMoV+pCnCNpak="; + sha256 = "0SLaCIjMN2/+Iushyz8OQpRHHBYVqn6+DpwNGbQEzy4="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index 3f495add9f1..3381b7858be 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -29,11 +29,11 @@ buildGoModule rec { mkdir -p $out/lib/systemd/system substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \ - --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/usr/local/bin/maddy" "$out/bin/maddy" \ --replace "/bin/kill" "${coreutils}/bin/kill" substitute dist/systemd/maddy@.service $out/lib/systemd/system/maddy@.service \ - --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/usr/local/bin/maddy" "$out/bin/maddy" \ --replace "/bin/kill" "${coreutils}/bin/kill" ''; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 7f0e5c78eba..ea4a511f722 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.1.2"; + version = "1.2.2"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "1kz52zhsm0xx63vczzplj15hli4i22qfxl08grb7m50bqk651j1n"; + sha256 = "11xjbkws3vv5r4p6w6qfmm9wrmlhzwmvlx3vcgz99ylz34r19xvc"; }; - vendorSha256 = "05lr2ln87902bwamw4l3rrk2j9sdgv1pcvxyvzbga64rymi9dmjb"; + vendorSha256 = "0wwji220pidrmsjzd9c3n40v237680av750jf6hdvp0aqi63p9nr"; # FIXME: tests fail due to read-only nix store doCheck = false; diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 4060917ad53..94ef0b23f3b 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.34.1"; + version = "0.35.1"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "sha256-UUqETnvkdLBoxUHUpcfE3bxE7fZJEToDxz2Q6kN1/n4="; + sha256 = "sha256-dKf68WjCynB73RBWneBsMoyowUcrEaBTnMKVKB0sgsg="; }; vendorSha256 = "sha256-ifH+420FIrib+zQtzzHtMMYd84BED+vgnRw4xToYIl4="; diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 5752d94d6a5..9151202d94a 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.5307"; + version = "1.0.5415"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "epdVQnuL5dJ7DmoqyjfiLEfZxr4IQwkFEla/Y034sgg="; + sha256 = "DJk+2EAADIz3Jck5Tf3AMWq0pZn3q1JQpDm/VdIz7nc="; }; dontBuild = true; diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 6441b0782d5..4c6c6971fc9 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr"; + sha256 = "sha256-Fv2vM3mdYxBONH4BM/kJGW/pDQxQUV0BC8tCLrWgCBg="; }; nativeBuildInputs = [ libxslt docbook_xsl ]; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 43ef985c41c..39ee5a67a5d 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -9,8 +9,8 @@ sha256 = "02s759rm633h4v5a1s3jxwvkahfjrbkz561spijrp3mihrws3xhb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-linux-amd64.tar.gz"; - sha256 = "0ainrb9i14wcq64pg99kb0s41bpmczp1h4sz85kj1a4ic0yrfq14"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-linux-amd64.tar.gz"; + sha256 = "0k67bsqiqalqrifd6r7nm6c2g4ckrfhh7a7nfgfmpvqs7cxx1kfm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-linux-amd64.tar.gz"; @@ -21,8 +21,8 @@ sha256 = "1lmy0dmpspzflc9z8p4w1cz47lbqnbkq8dng3v40lpbs75pnprvs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-linux-amd64.tar.gz"; - sha256 = "1w7ppcqkhh9k9iw10f4d93glmphyvachrkj6p8b6i93n0k78rxv7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-linux-amd64.tar.gz"; + sha256 = "0jl4ic18kf0qcys5mhp6ar4p1bj6ndhi11b51dvzdj5lb39dv43q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-linux-amd64.tar.gz"; @@ -37,12 +37,12 @@ sha256 = "1h5159y7xlslnijs8lpi4vqgvj2px6whxk9m17p9n7wiyqbmd5na"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-linux-amd64.tar.gz"; - sha256 = "0kxwx1lk54kdfw49s719g4vwr2iv6fzr82cxi5siykzpf9gfk7bd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-linux-amd64.tar.gz"; + sha256 = "0rmzb3wn5hmx8z8ly85spizinp6ja861k05fhw7l63zhqr8pnls2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-amd64.tar.gz"; - sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-amd64.tar.gz"; + sha256 = "1ixmsxawp0qbyjs37c74gcvj2icpbda6znl17yp9bhiyvnrdvxn7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-amd64.tar.gz"; @@ -81,8 +81,8 @@ sha256 = "0bp7ki3slszmy1vh4a5d4y4fhbvafrazj1cjf081xv91gi99xxz6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-linux-amd64.tar.gz"; - sha256 = "0ga794vwdggscl9lf57dg7cii91j4px0wyha4r43rhn0gbp1zk8y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-linux-amd64.tar.gz"; + sha256 = "1dznd4c8kpy6mwwb170nfl1m2dmrp6f4jalmk3bdfqscm4xhvk3q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-amd64.tar.gz"; @@ -107,8 +107,8 @@ sha256 = "1lisk9wr5p866x2hxvlz7nhz0xybhag7wgqk23x0lariln9z5na6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-darwin-amd64.tar.gz"; - sha256 = "0n5kgmcy4hsg4s4q7jd34z9hz6vcqs64j680jzsxw902cgrj5y9p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-darwin-amd64.tar.gz"; + sha256 = "103syjj8vla8lygyl5h7ilwm9kl6vxzyn6fdrkz0xcvlhqm1xr30"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-darwin-amd64.tar.gz"; @@ -119,8 +119,8 @@ sha256 = "1j7z5dbqzsdq1q8ks9g5pwzyc3ml6avhhp6xj94dzdhskl6pd8w5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-darwin-amd64.tar.gz"; - sha256 = "0sjh5wws6k90w2y5f5bm22c4qxamr658mww3zx11qakdygraijly"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-darwin-amd64.tar.gz"; + sha256 = "15c5rh0ix7zxn128kangd5x2x1n61xv9d443a7cbriibwvdkvv0j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-darwin-amd64.tar.gz"; @@ -135,12 +135,12 @@ sha256 = "0r2ykjwam5m2mfiibhq993s8n5pzmks837cwb57jwgwx8lc3ra4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-darwin-amd64.tar.gz"; - sha256 = "0vpkwlihq6pj554qd3csgf25id2q0pjx4mwkpfj74y08lv6d3v83"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-darwin-amd64.tar.gz"; + sha256 = "06lfimnlns1bfvks0kv5rjcnz6dvdk38npigyigsk9vqs0idcfi3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-amd64.tar.gz"; + sha256 = "1dy4n03xvirg6fihiid786d88qlkyqkvk4fq6ggnxc92620x7342"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-amd64.tar.gz"; @@ -179,8 +179,8 @@ sha256 = "1i73sxh6vf6adg6as1q1mab3fcjm7ma7gixj2b0y0d2a5d78lhpa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-darwin-amd64.tar.gz"; - sha256 = "19w0m6rxf0i996s9hdjym4f1k0jwf8hrlsr0m9x23xzz5r2simar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-darwin-amd64.tar.gz"; + sha256 = "1jxrz82cadmqkd1d26bj5r3bphvzz5z20shjai351hlh9aa3bv2h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-amd64.tar.gz"; @@ -205,8 +205,8 @@ sha256 = "041lmx5d1c8ls48mv56jchvk714rqw7jywywdgm6d6ipq7h5d67k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-linux-arm64.tar.gz"; - sha256 = "06hq79r35bcm7yn8qdvdiy19wsqq3ihbrmjakw2vf6xdglrxxxwr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-linux-arm64.tar.gz"; + sha256 = "0rijbqaw584b5c0kihrs80cv46s06yv3a68yz1dwa8sl7adi7n9p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-linux-arm64.tar.gz"; @@ -217,8 +217,8 @@ sha256 = "0mddv37k87wiygh6x9bnxpcr721qbmbqf6l5zk3xl61n56j8qyb1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-linux-arm64.tar.gz"; - sha256 = "1zlkij96vr3vf071gwdqcwfxlkfvcnkj4q220l3gxzliix0zvfi4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-linux-arm64.tar.gz"; + sha256 = "19aiksm4d4jxs9gw7rdr77ag58fy1v7gkk6r730imgq0d8vsacm1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-linux-arm64.tar.gz"; @@ -233,12 +233,12 @@ sha256 = "1sc8rf930cz6nkyhqn6p0h7450iqzdsrlw2smhp8yyjjvcjmsksf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-linux-arm64.tar.gz"; - sha256 = "0j8dgbfdscp29zj0vd3ial1g87n72jj07afj5lxzgsh8jay1iz2r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-linux-arm64.tar.gz"; + sha256 = "1bvzazdis423vb1r30q15q1irh07kgymv5ikzmvrygf4hm3aph06"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-arm64.tar.gz"; - sha256 = "0y7wysd4j1dp73hrbydzj2bfvpgv8vxiza5m6dbg7nl66w9ng0rc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-arm64.tar.gz"; + sha256 = "12iv8vjnal2ym70rxmdnvi02x6md7fxi8jbzhzfw526pzqs1dc47"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-arm64.tar.gz"; @@ -274,8 +274,8 @@ sha256 = "0mwpbvv62k8fg07447wwfigs4li4n78fswpzwi4alsjrkqlmw9dj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-linux-arm64.tar.gz"; - sha256 = "0kp13hk57apvqmsn1zw1k7r395wdk1308m0kwx4hmcjy6dzifjsq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-linux-arm64.tar.gz"; + sha256 = "1b8fi56wkk753w6ip1nkrksyk8qd5ypdbaq668pk60l3jb0c9mad"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-arm64.tar.gz"; @@ -300,8 +300,8 @@ sha256 = "06qc42gb2w2qjy2mz5shh082607395jq0js34wlqq61jgjzpca5l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.0-darwin-arm64.tar.gz"; - sha256 = "0nwqrg5in05vvj7ln7gi50vp3bnhkwar8fifpi87b134hl50q935"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.1-darwin-arm64.tar.gz"; + sha256 = "1wqkm32lkwff5gwn7dbznzx5rcbcysj2mx4ip77whba59ikfchsj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.5.0-darwin-arm64.tar.gz"; @@ -312,8 +312,8 @@ sha256 = "0fj1ai1kv8xgmsvfbmy5gsinxag70rx9a9gkifqgcpn3r9mj48ks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.21.0-darwin-arm64.tar.gz"; - sha256 = "0nj8gin7ys63v235x8nywmx0vv2bdcqdmmp7z3lxlxp2hk4nm84g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.22.0-darwin-arm64.tar.gz"; + sha256 = "09v28dgrs5a4w8qn4v4zwrn7n7cn2475a2jh9qz3g2ljaj0086fd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-darwin-arm64.tar.gz"; @@ -328,12 +328,12 @@ sha256 = "1c3pchbnk6dsnxsl02ypq7s4mmkxdgxszdhql1klpx5js7i1lv8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.23.0-darwin-arm64.tar.gz"; - sha256 = "08gcvlfy7kmcx02nf3n4chf6g5lasr2g8gr20gndk0rvihqiwhjz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.24.1-darwin-arm64.tar.gz"; + sha256 = "0fafl5zpnzkncvi52qw6f4898yia8p0whvr41m3g8cxcp6nyr0ij"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "0waf4apw5bzn276s34yaxvm3xyk5333l3zcz2j52c56wkadzxvpg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-arm64.tar.gz"; + sha256 = "0jrihnwfh5wvc95nipqv7ak77kq9xj0pk5hlapv9w2ls5pwykv0r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-arm64.tar.gz"; @@ -369,8 +369,8 @@ sha256 = "1hzhlxbwji4p8apx4rnqllsgf1k11w49rplz0syzmzb2fxpkif75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.22.0-darwin-arm64.tar.gz"; - sha256 = "038nk93mq59d8ynp1ggmhvmgnilrgqzcbg4hapb9pk7hpbwb269c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.24.0-darwin-arm64.tar.gz"; + sha256 = "0nh8305b6qlqr63xaacxs3v804dhrwdz179xlzdgzf9550zdqb39"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index ac2f856c3c0..7bd6265851c 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "03yf9sjqdg3xcbvkn1591zxd2d0r8wz1b749zrn55k3a03c7jzf5"; + sha256 = "1mzhfcf67dc5m0i9b216m58qg36g63if6273ch5bsckd0yrwdk8x"; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index e4e4868e4d9..03465d593ff 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,16 +1,16 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config +{ fetchurl +, gcc9Stdenv +, installShellFiles +, lib , libftdi1 +, libjaylink , libusb1 , pciutils -, installShellFiles +, pkg-config +, jlinkSupport ? false }: -stdenv.mkDerivation rec { +gcc9Stdenv.mkDerivation rec { pname = "flashrom"; version = "1.2"; @@ -19,29 +19,30 @@ stdenv.mkDerivation rec { sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"; }; + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ libftdi1 libusb1 ] + # https://github.com/flashrom/flashrom/issues/125 + ++ lib.optional (!gcc9Stdenv.isAarch64) pciutils + ++ lib.optional jlinkSupport libjaylink; + postPatch = '' substituteInPlace util/z60_flashrom.rules \ --replace "plugdev" "flashrom" ''; - # Meson build doesn't build and install manpage. Only Makefile can. - # Build manpage from source directory. Here we're inside the ./build subdirectory + makeFlags = [ "PREFIX=$(out)" "libinstall" ] + ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes"; + postInstall = '' - make flashrom.8 -C .. - installManPage ../flashrom.8 - install -Dm644 ../util/z60_flashrom.rules $out/etc/udev/rules.d/flashrom.rules + install -Dm644 util/z60_flashrom.rules $out/lib/udev/rules.d/flashrom.rules ''; - mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ]; - nativeBuildInputs = [ meson pkg-config ninja installShellFiles ]; - buildInputs = [ libftdi1 libusb1 pciutils ]; - meta = with lib; { - homepage = "http://www.flashrom.org"; + homepage = "https://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz felixsinger ]; platforms = platforms.all; - broken = stdenv.isDarwin; # requires DirectHW + broken = gcc9Stdenv.isDarwin; # requires DirectHW }; } diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/tools/misc/flitter/default.nix new file mode 100644 index 00000000000..49903559c13 --- /dev/null +++ b/pkgs/tools/misc/flitter/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, ocamlPackages +, fetchFromGitHub +, makeWrapper +, python3 +}: + +ocamlPackages.buildDunePackage rec { + pname = "flitter"; + # request to tag releases: https://github.com/alexozer/flitter/issues/34 + version = "unstable-2020-10-05"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "alexozer"; + repo = "flitter"; + rev = "666c5483bc93efa6d01e0b7a927461269f8e14de"; + sha256 = "1k3m7bjq5yrrq7vhnbdykni65dsqhq6knnv9wvwq3svb3n07z4w3"; + }; + + # https://github.com/alexozer/flitter/issues/28 + postPatch = '' + for f in src/colors.ml src/duration.ml src/event_loop.ml src/splits.ml; do + substituteInPlace "$f" \ + --replace 'Unix.gettimeofday' 'Caml_unix.gettimeofday' + done + ''; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = with ocamlPackages; [ + core + lwt_ppx + sexp_pretty + color + notty + ]; + + postInstall = '' + wrapProgram $out/bin/flitter \ + --prefix PATH : "${python3.withPackages (pp: [ pp.pynput ])}/bin" + ''; + + meta = with lib; { + description = "A Livesplit-inspired speedrunning split timer for Linux/macOS terminal"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://github.com/alexozer/flitter"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d38a0ad7137..e56a61338aa 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-JWTyZRZrW1mFy91D+eZL6iYV0CcNxJUT4JA0hrBKZZU="; + sha256 = "sha256-uVGU8tOHHJYBoWTwx9ilnOKo49R0QHdCABKfGoL7Dkk="; }; - vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw="; + vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0="; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 99acda6b788..98cd0cfbdee 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -7,7 +7,8 @@ , uselibtirpc ? stdenv.isLinux , libtirpc , zlib -, szip ? null +, szipSupport ? false +, szip , javaSupport ? false , jdk }: @@ -55,10 +56,10 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg - szip zlib ] ++ lib.optional javaSupport jdk + ++ lib.optional szipSupport szip ++ lib.optional uselibtirpc libtirpc; preConfigure = lib.optionalString uselibtirpc '' @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { substituteInPlace config/cmake/FindXDR.cmake \ --replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)' - '' + lib.optionalString (szip != null) '' + '' + lib.optionalString szipSupport '' export SZIP_INSTALL=${szip} ''; @@ -85,7 +86,7 @@ stdenv.mkDerivation rec { "-DJAVA_HOME=${jdk}" "-DJAVA_AWT_LIBRARY=${javabase}/libawt.so" "-DJAVA_JVM_LIBRARY=${javabase}/server/libjvm.so" - ] ++ lib.optionals (szip != null) [ + ] ++ lib.optionals szipSupport [ "-DHDF4_ENABLE_SZIP_ENCODING=ON" "-DHDF4_ENABLE_SZIP_SUPPORT=ON" ]; @@ -119,6 +120,17 @@ stdenv.mkDerivation rec { moveToOutput bin "$bin" ''; + passthru = { + inherit + uselibtirpc + libtirpc + szipSupport + szip + javaSupport + jdk + ; + }; + meta = with lib; { description = "Data model, library, and file format for storing and managing data"; homepage = "https://support.hdfgroup.org/products/hdf4/"; diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 4e57a1c8e48..74d8fce599a 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -1,7 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , removeReferencesTo -, zlib ? null +, zlibSupport ? true +, zlib , enableShared ? !stdenv.hostPlatform.isStatic , javaSupport ? false , jdk @@ -24,10 +26,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ removeReferencesTo ]; - propagatedBuildInputs = optional (zlib != null) zlib; + propagatedBuildInputs = optional zlibSupport zlib; - configureFlags = [] - ++ optional enableShared "--enable-shared" + configureFlags = optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java"; patches = [ diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index c5485a5b3fb..43c156de419 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , removeReferencesTo -, cpp ? false -, gfortran ? null -, zlib ? null -, szip ? null +, cppSupport ? false +, fortranSupport ? false +, fortran +, zlibSupport ? true +, zlib +, szipSupport ? false +, szip , mpiSupport ? false , mpi , enableShared ? !stdenv.hostPlatform.isStatic @@ -15,7 +19,7 @@ # cpp and mpi options are mutually exclusive # (--enable-unsupported could be used to force the build) -assert !cpp || !mpiSupport; +assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in @@ -28,28 +32,35 @@ stdenv.mkDerivation rec { }; passthru = { - inherit mpiSupport; - inherit mpi; + inherit + cppSupport + fortranSupport + fortran + zlibSupport + zlib + szipSupport + szip + mpiSupport + mpi + ; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ removeReferencesTo ] - ++ optional (gfortran != null) gfortran; + ++ optional fortranSupport fortran; - buildInputs = [] - ++ optional (szip != null) szip + buildInputs = optional fortranSupport fortran + ++ optional szipSupport szip ++ optional javaSupport jdk; - propagatedBuildInputs = [] - ++ optional (zlib != null) zlib + propagatedBuildInputs = optional zlibSupport zlib ++ optional mpiSupport mpi; - configureFlags = [] - ++ optional cpp "--enable-cxx" - ++ optional (gfortran != null) "--enable-fortran" - ++ optional (szip != null) "--with-szlib=${szip}" - ++ optionals mpiSupport ["--enable-parallel" "CC=${mpi}/bin/mpicc"] + configureFlags = optional cppSupport "--enable-cxx" + ++ optional fortranSupport "--enable-fortran" + ++ optional szipSupport "--with-szlib=${szip}" + ++ optionals mpiSupport [ "--enable-parallel" "CC=${mpi}/bin/mpicc" ] ++ optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java" ++ optional usev110Api "--with-default-api-version=v110"; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b135ed061de..5d812f5867c 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lf"; - version = "24"; + version = "25"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0nc7vfkaxxl2a201wnbz74an3siz8cjwrfylx17v6al5n93vxip0"; + sha256 = "sha256-5/OfEWgtB9R3XRJ16ponf+bBVGAXkqPq8IlB8+zyjAQ="; }; vendorSha256 = "sha256-ujQh4aE++K/fn3PJqkAbTtwRyJPSI9TJQ1DvwLF9etU="; diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix new file mode 100644 index 00000000000..989a9e6734a --- /dev/null +++ b/pkgs/tools/misc/rates/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "rates"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "lunush"; + repo = pname; + rev = version; + sha256 = "077qxs4kwfprsai07dninkhmj3ihnghdxan98iv8gmsl3pijbgwh"; + }; + + cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w"; + + meta = with lib; { + description = "CLI tool that brings currency exchange rates right into your terminal"; + homepage = "https://github.com/lunush/rates"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index a615330a4a8..84c927260c0 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -13,6 +13,7 @@ , makeWrapper , pciutils , perl +, perlcritic , shellcheck , smartmontools , systemd @@ -23,17 +24,20 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5"; + sha256 = "sha256-Blwj4cqrrYXohnGyJYe+1NYifxqfS4DoVUHmxFf62i4="; }; # XXX: See patch files for relevant explanations. - patches = [ ./patches/fix-makefile-sed.patch ./patches/tlp-sleep-service.patch ]; + patches = [ + ./patches/0001-makefile-correctly-sed-paths.patch + ./patches/0002-tlp-sleep.service-reintroduce.patch + ]; buildInputs = [ perl ]; nativeBuildInputs = [ makeWrapper gnused ]; @@ -52,8 +56,10 @@ "TLP_WITH_ELOGIND=0" "TLP_WITH_SYSTEMD=1" + "TLP_BATD=/share/tlp/bat.d" "TLP_BIN=/bin" "TLP_CONFDEF=/share/tlp/defaults.conf" + "TLP_CONFREN=/share/tlp/rename.conf" "TLP_FLIB=/share/tlp/func.d" "TLP_MAN=/share/man" "TLP_META=/share/metainfo" @@ -65,12 +71,11 @@ installTargets = [ "install-tlp" "install-man" ] ++ lib.optionals enableRDW [ "install-rdw" "install-man-rdw" ]; - # XXX: This is disabled because it's basically just noise since upstream - # itself does not seem to care about the zillion shellcheck errors. - doCheck = false; - checkInputs = [ checkbashisms shellcheck ]; + doCheck = true; + checkInputs = [ checkbashisms perlcritic shellcheck ]; checkTarget = [ "checkall" ]; + # TODO: Consider using resholve here postInstall = let paths = lib.makeBinPath ( [ @@ -107,12 +112,16 @@ $out/etc/NetworkManager/dispatcher.d/* $out/lib/udev/tlp-* $out/sbin/* + $out/share/tlp/bat.d/* $out/share/tlp/func.d/* $out/share/tlp/tlp-func-base ) for f in "''${fixup_bash[@]}"; do sed -i '2iexport PATH=${paths}:$PATH' "$f" done + + rm -rf $out/var + rm -rf $out/share/metainfo ''; meta = with lib; { diff --git a/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch b/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch new file mode 100644 index 00000000000..be8afc0667f --- /dev/null +++ b/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch @@ -0,0 +1,56 @@ +From 5c5d878bf49bae5920c330482217477819ba9bc2 Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer <bernardo@meurer.org> +Date: Fri, 15 Oct 2021 23:22:50 -0700 +Subject: [PATCH 1/2] makefile: correctly sed paths + +The default Makefile for tlp makes a mess with catenating `DESTDIR` to +everything, but then not actualy using the catenated (_ prefixed) +variables to sed it's `.in` files. + +This patch makes sure that it correctly sets the paths, taking `DESTDIR` +in account where it makes sense (e.g. /bin where we want $out/bin) but +not where it doesn't (/etc/tlp.conf should be just that). + +The reason DESTDIR is used at all, as opposed to the more appropriate +PREFIX, is covered in the nix formula, and is (also) due to the Makefile +being a bit "different." +--- + Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index e9bbab4..ab05720 100644 +--- a/Makefile ++++ b/Makefile +@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) + + SED = sed \ + -e "s|@TLPVER@|$(TLPVER)|g" \ +- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \ +- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ +- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ +- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ +- -e "s|@TLP_BATD@|$(TLP_BATD)|g" \ ++ -e "s|@TLP_SBIN@|$(_SBIN)|g" \ ++ -e "s|@TLP_TLIB@|$(_TLIB)|g" \ ++ -e "s|@TLP_FLIB@|$(_FLIB)|g" \ ++ -e "s|@TLP_ULIB@|$(_ULIB)|g" \ ++ -e "s|@TLP_BATD@|$(_BATD)|g" \ + -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ + -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ +- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ +- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \ +- -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ ++ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ ++ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \ ++ -e "s|@TLP_CONF@|$(_CONF)|g" \ + -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ + -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ +- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" ++ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" + + INFILES = \ + tlp \ +-- +2.33.0 + diff --git a/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch b/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch index b37c7280e38..40d89e207dc 100644 --- a/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch +++ b/pkgs/tools/misc/tlp/patches/0002-tlp-sleep.service-reintroduce.patch @@ -1,23 +1,29 @@ -commit ca94cd56210067e2a55c1f413bd7713f7d338f9f -Author: Bernardo Meurer <meurerbernardo@gmail.com> -Date: Wed Feb 26 10:46:23 2020 -0800 +From a3506c9bc8929645b7b08859e47039b8cc830d22 Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer <bernardo@meurer.org> +Date: Fri, 15 Oct 2021 23:07:40 -0700 +Subject: [PATCH 2/2] tlp-sleep.service: reintroduce - tlp-sleep.service: reintroduce - - This patch reintroduces tlp-sleep as a systemd unit as opposed to a - systemd system-sleep hook script. This is due to the recommendation by - systemd itself to not use the hook scripts. As per the manual: - - > Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/ - > are intended for local use only and should be considered hacks. If - > applications want to react to system suspend/hibernation and resume, - > they should rather use the Inhibitor interface[1]. +This patch reintroduces tlp-sleep as a systemd unit as opposed to a +systemd system-sleep hook script. This is due to the recommendation by +systemd itself to not use the hook scripts. As per the manual: + +> Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/ +> are intended for local use only and should be considered hacks. If +> applications want to react to system suspend/hibernation and resume, +> they should rather use the Inhibitor interface[1]. +--- + Makefile | 6 +++--- + tlp-sleep | 11 ----------- + tlp-sleep.service.in | 19 +++++++++++++++++++ + 3 files changed, 22 insertions(+), 14 deletions(-) + delete mode 100644 tlp-sleep + create mode 100644 tlp-sleep.service.in diff --git a/Makefile b/Makefile -index 95122df..0e9230a 100644 +index ab05720..075b42f 100644 --- a/Makefile +++ b/Makefile -@@ -70,6 +70,7 @@ INFILES = \ +@@ -76,6 +76,7 @@ INFILES = \ tlp.rules \ tlp-readconfs \ tlp-run-on \ @@ -25,7 +31,7 @@ index 95122df..0e9230a 100644 tlp.service \ tlp-stat \ tlp.upstart \ -@@ -99,7 +100,6 @@ SHFILES = \ +@@ -106,7 +107,6 @@ SHFILES = \ tlp-rdw-udev.in \ tlp-rf.in \ tlp-run-on.in \ @@ -33,7 +39,7 @@ index 95122df..0e9230a 100644 tlp-sleep.elogind \ tlp-stat.in \ tlp-usb-udev.in -@@ -147,7 +147,7 @@ ifneq ($(TLP_NO_INIT),1) +@@ -159,7 +159,7 @@ ifneq ($(TLP_NO_INIT),1) endif ifneq ($(TLP_WITH_SYSTEMD),0) install -D -m 644 tlp.service $(_SYSD)/tlp.service @@ -42,7 +48,7 @@ index 95122df..0e9230a 100644 endif ifneq ($(TLP_WITH_ELOGIND),0) install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep -@@ -204,7 +204,7 @@ uninstall-tlp: +@@ -216,7 +216,7 @@ uninstall-tlp: rm $(_ULIB)/rules.d/85-tlp.rules rm -f $(_SYSV)/tlp rm -f $(_SYSD)/tlp.service @@ -53,7 +59,7 @@ index 95122df..0e9230a 100644 rm -f $(_SHCPL)/bluetooth diff --git a/tlp-sleep b/tlp-sleep deleted file mode 100644 -index 3de85ce..0000000 +index e548d55..0000000 --- a/tlp-sleep +++ /dev/null @@ -1,11 +0,0 @@ @@ -61,7 +67,7 @@ index 3de85ce..0000000 - -# tlp - systemd suspend/resume hook -# --# Copyright (c) 2020 Thomas Koch <linrunner at gmx.net> and others. +-# Copyright (c) 2021 Thomas Koch <linrunner at gmx.net> and others. -# This software is licensed under the GPL v2 or later. - -case $1 in @@ -70,13 +76,13 @@ index 3de85ce..0000000 -esac diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in new file mode 100644 -index 0000000..4ac17bd +index 0000000..79c202c --- /dev/null +++ b/tlp-sleep.service.in @@ -0,0 +1,19 @@ +# tlp - systemd suspend/resume service +# -+# Copyright (c) 2020 Thomas Koch <linrunner at gmx.net> and others. ++# Copyright (c) 2021 Thomas Koch <linrunner at gmx.net> and others. +# This software is licensed under the GPL v2 or later. + +[Unit] @@ -93,3 +99,6 @@ index 0000000..4ac17bd + +[Install] +WantedBy=sleep.target +-- +2.33.0 + diff --git a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch deleted file mode 100644 index 942c9a579f6..00000000000 --- a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit c44347b3b813e209fff537b4d46d23430727a5e2 -Author: Bernardo Meurer <meurerbernardo@gmail.com> -Date: Tue Feb 25 21:27:39 2020 -0800 - - makefile: correctly sed paths - - The default Makefile for tlp makes a mess with catenating `DESTDIR` to - everything, but then not actualy using the catenated (_ prefixed) - variables to sed it's `.in` files. - - This patch makes sure that it correctly sets the paths, taking `DESTDIR` - in account where it makes sense (e.g. /bin where we want $out/bin) but - not where it doesn't (/etc/tlp.conf should be just that). - - The reason DESTDIR is used at all, as opposed to the more appropriate - PREFIX, is covered in the nix formula, and is (also) due to the Makefile - being a bit "different." - -diff --git a/Makefile b/Makefile -index b5af74e..95122df 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,17 +47,17 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) - - SED = sed \ - -e "s|@TLPVER@|$(TLPVER)|g" \ -- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \ -- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \ -- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \ -- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \ -+ -e "s|@TLP_SBIN@|$(_SBIN)|g" \ -+ -e "s|@TLP_TLIB@|$(_TLIB)|g" \ -+ -e "s|@TLP_FLIB@|$(_FLIB)|g" \ -+ -e "s|@TLP_ULIB@|$(_ULIB)|g" \ - -e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \ - -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ -- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ -+ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ - -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ - -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ - -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ -- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g" -+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g" - - INFILES = \ - tlp \ diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 185176440c1..4f59810a762 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "v${version}"; - sha256 = "0vx8ki0wi9xil2iksvxzh8mhx4c5ikkhdcnc8mcwqn14cvjkggja"; + sha256 = "sha256-/gcNVTfLJKA5qzRgAqFSlSI618QBsJTxFE1doOKR7e8="; }; - cargoSha256 = "1nx2lvbjflsjma5q9ck6vq499hf75w91i4h8wlzr83wqk37i7rhc"; + cargoSha256 = "sha256-o5VKj69Wp7zLR3TS+wNA0D8nP6Cynlr4KtW4JSUm0VE="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; diff --git a/pkgs/tools/networking/tnat64/default.nix b/pkgs/tools/networking/tnat64/default.nix index 9b1c2c3aec1..d22f2b98efd 100644 --- a/pkgs/tools/networking/tnat64/default.nix +++ b/pkgs/tools/networking/tnat64/default.nix @@ -2,20 +2,15 @@ stdenv.mkDerivation rec { pname = "tnat64"; - version = "0.05"; + version = "0.06"; src = fetchFromGitHub { owner = "andrewshadura"; repo = pname; rev = "${pname}-${version}"; - sha256 = "07lmzidbrd3aahk2jvv93cic9gf36pwmgfd63gmy6hjkxf9a6fw9"; + sha256 = "191j1fpr3bw6fk48npl99z7iq6m1g33f15xk5cay1gnk5f46i2j6"; }; - postPatch = '' - # Fix usage of deprecated sys_errlist - substituteInPlace tnat64.c --replace 'sys_errlist[errno]' 'strerror(errno)' - ''; - configureFlags = [ "--libdir=$(out)/lib" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index a24ac1f3888..393756a9b2a 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -5,9 +5,13 @@ , nettle , expat , libevent +, libsodium +, protobufc +, hiredis , dns-root-data , pkg-config , makeWrapper +, symlinkJoin # # By default unbound will not be built with systemd support. Unbound is a very # commmon dependency. The transitive dependency closure of systemd also @@ -21,6 +25,11 @@ , systemd ? null # optionally support DNS-over-HTTPS as a server , withDoH ? false +, withECS ? false +, withDNSCrypt ? false +, withDNSTAP ? false +, withTFO ? false +, withRedis ? false , libnghttp2 }: @@ -57,8 +66,24 @@ stdenv.mkDerivation rec { "--enable-systemd" ] ++ lib.optionals withDoH [ "--with-libnghttp2=${libnghttp2.dev}" + ] ++ lib.optionals withECS [ + "--enable-subnet" + ] ++ lib.optionals withDNSCrypt [ + "--enable-dnscrypt" + "--with-libsodium=${symlinkJoin { name = "libsodium-full"; paths = [ libsodium.dev libsodium.out ]; }}" + ] ++ lib.optionals withDNSTAP [ + "--enable-dnstap" + "--with-protobuf-c=${protobufc}" + ] ++ lib.optionals withTFO [ + "--enable-tfo-client" + "--enable-tfo-server" + ] ++ lib.optionals withRedis [ + "--enable-cachedb" + "--with-libhiredis=${hiredis}" ]; + PROTOC_C = if withDNSTAP then "${protobufc}/bin/protoc-c" else null; + # Remove references to compile-time dependencies that are included in the configure flags postConfigure = let inherit (builtins) storeDir; diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix index 060961f3a36..fcc63e6f772 100644 --- a/pkgs/tools/security/agebox/default.nix +++ b/pkgs/tools/security/agebox/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "agebox"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "slok"; repo = pname; rev = "v${version}"; - sha256 = "1mg16xxvsbm5jxlkdjyi3nsvzj37858d9ksh1wsa9ycxj2qipgw2"; + sha256 = "1gi6lj3dpckhsx6hdpdnr8rclqgfkbdmkzx966nlxyi52bjfzbsv"; }; vendorSha256 = "1gw83bd14ig18y8si3f94iivx2ir1vw4b5b95fp6r7qhfp0rgbih"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 9d2e23e3bd2..7d2793647d8 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-10-13"; + version = "2021-10-16"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-rJRr8MEt3GMNPgC/YvWWs8zh1X0DBstM/UeCMlV7VqI="; + sha256 = "sha256-kzMMcipE9AKOWka2yAuljwNG/g+8fF2rYehTtxdQY+k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/ike-scan/default.nix b/pkgs/tools/security/ike-scan/default.nix index 5d54e36585d..15d201fa327 100644 --- a/pkgs/tools/security/ike-scan/default.nix +++ b/pkgs/tools/security/ike-scan/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ike-scan"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "royhills"; repo = pname; rev = version; - sha256 = "01a39bk9ma2lm59q320m9g11909if5gc3qynd8pzn6slqiq5r8kw"; + sha256 = "sha256-mbfg8p3y4aKoXpmLuF9GXAMPEqV5CsvetwGCRDJ9UNY="; }; nativeBuildInputs = [ @@ -33,11 +33,6 @@ stdenv.mkDerivation rec { url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch"; sha256 = "0wbrq89dl8js7cdivd0c45hckmflan33cpgc3qm5s3az6r4mjljm"; }) - (fetchpatch { - # Unknown vendor IDs, https://github.com/royhills/ike-scan/pull/18, was merged but not released - url = "https://github.com/royhills/ike-scan/pull/18/commits/e065ddbe471880275dc7975e7da235e7a2097c22.patch"; - sha256 = "13ly01c96nnd5yh7rxrhv636csm264m5xf2a1inprrzxkkri5sls"; - }) ]; meta = with lib; { diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 22ef43d36f9..00780306d90 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.109"; + version = "1.0.120"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPy0FcDFoBK02pCmDTe5T1QyB9+WC++cBuOI7CtaXtY="; + sha256 = "sha256-aFFJAib0/FTOaPtSLYXIFV3+QfIpzy8fC7rWAQW5yh0="; }; vendorSha256 = "sha256-vN+ci2vCbtDuEEVzZQiFkdi1QkMgnnbbJgD9g6DS7qs="; diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix index 427fe12267e..9fd120b4b65 100644 --- a/pkgs/tools/system/auto-cpufreq/default.nix +++ b/pkgs/tools/system/auto-cpufreq/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.6.9"; + version = "1.7.0"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "1pri182cgbrhr0adq2784gpv6q8c8kjr0jsh8wpvd1wvfsbqywrm"; + sha256 = "0b6j26glg1ffihdr2h7dlr1lrbhkclgp17dxmkjgg5gk4mhz799r"; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; diff --git a/pkgs/tools/system/battop/battery.patch b/pkgs/tools/system/battop/battery.patch deleted file mode 100644 index 218359d904f..00000000000 --- a/pkgs/tools/system/battop/battery.patch +++ /dev/null @@ -1,588 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 57ee609..d156cd2 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,430 +1,429 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 3 -+ - [[package]] - name = "autocfg" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" - - [[package]] - name = "battery" --version = "0.7.4" -+version = "0.7.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4b624268937c0e0a3edb7c27843f9e547c320d730c610d3b8e6e8e95b2026e4" - dependencies = [ -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "core-foundation", -+ "lazycell", -+ "libc", -+ "mach", -+ "nix", -+ "num-traits", -+ "uom", -+ "winapi", - ] - - [[package]] - name = "battop" - version = "0.2.4" - dependencies = [ -- "battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "battery", -+ "humantime", -+ "itertools", -+ "log", -+ "stderrlog", -+ "structopt", -+ "termion", -+ "tui", - ] - - [[package]] - name = "bitflags" --version = "1.0.4" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - - [[package]] - name = "cassowary" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - - [[package]] - name = "cc" - version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" - - [[package]] - name = "cfg-if" - version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "chrono" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" - dependencies = [ -- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer", -+ "num-traits", -+ "time", - ] - - [[package]] - name = "clap" - version = "2.33.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "textwrap", -+ "unicode-width", - ] - - [[package]] - name = "core-foundation" --version = "0.6.4" -+version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" - dependencies = [ -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys", -+ "libc", - ] - - [[package]] - name = "core-foundation-sys" --version = "0.6.2" -+version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - - [[package]] - name = "either" - version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" - - [[package]] - name = "heck" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" - dependencies = [ -- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-segmentation", - ] - - [[package]] - name = "humantime" - version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" - dependencies = [ -- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quick-error", - ] - - [[package]] - name = "itertools" - version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" - dependencies = [ -- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either", - ] - - [[package]] - name = "lazy_static" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" - - [[package]] - name = "lazycell" --version = "1.2.1" -+version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - - [[package]] - name = "libc" --version = "0.2.58" -+version = "0.2.98" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" - - [[package]] - name = "log" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" - dependencies = [ -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.9", - ] - - [[package]] - name = "mach" --version = "0.2.3" -+version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "nix" --version = "0.14.0" -+version = "0.19.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "cc", -+ "cfg-if 1.0.0", -+ "libc", - ] - - [[package]] - name = "num-integer" - version = "0.1.41" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" - dependencies = [ -- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg", -+ "num-traits", - ] - - [[package]] - name = "num-traits" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" - dependencies = [ -- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg", - ] - - [[package]] - name = "numtoa" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" - - [[package]] - name = "proc-macro2" - version = "0.4.30" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" - dependencies = [ -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid", - ] - - [[package]] - name = "quick-error" - version = "1.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" - - [[package]] - name = "quote" - version = "0.6.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", - ] - - [[package]] - name = "redox_syscall" - version = "0.1.54" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" - - [[package]] - name = "redox_termios" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" - dependencies = [ -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall", - ] - - [[package]] - name = "stderrlog" - version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" - dependencies = [ -- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono", -+ "log", -+ "termcolor", -+ "thread_local", - ] - - [[package]] - name = "structopt" - version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" - dependencies = [ -- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap", -+ "structopt-derive", - ] - - [[package]] - name = "structopt-derive" - version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" - dependencies = [ -- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", - ] - - [[package]] - name = "syn" - version = "0.15.34" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", -+ "quote", -+ "unicode-xid", - ] - - [[package]] - name = "termcolor" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" - dependencies = [ -- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wincolor", - ] - - [[package]] - name = "termion" - version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "numtoa", -+ "redox_syscall", -+ "redox_termios", - ] - - [[package]] - name = "textwrap" - version = "0.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" - dependencies = [ -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width", - ] - - [[package]] - name = "thread_local" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" - dependencies = [ -- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static", - ] - - [[package]] - name = "time" - version = "0.1.42" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "redox_syscall", -+ "winapi", - ] - - [[package]] - name = "tui" - version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "cassowary", -+ "either", -+ "itertools", -+ "log", -+ "termion", -+ "unicode-segmentation", -+ "unicode-width", - ] - - [[package]] - name = "typenum" - version = "1.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" - - [[package]] - name = "unicode-segmentation" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" - - [[package]] - name = "unicode-width" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" - - [[package]] - name = "unicode-xid" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - - [[package]] - name = "uom" --version = "0.23.1" -+version = "0.30.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" - dependencies = [ -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits", -+ "typenum", - ] - --[[package]] --name = "void" --version = "1.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" -- - [[package]] - name = "winapi" - version = "0.3.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" - dependencies = [ -- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", - ] - - [[package]] - name = "winapi-i686-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - - [[package]] - name = "winapi-x86_64-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "wincolor" - version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" - dependencies = [ -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi", - ] -- --[metadata] --"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" --"checksum battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6d6fe5630049e900227cd89afce4c1204b88ec8e61a2581bb96fcce26f047b" --"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" --"checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" --"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" --"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" --"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" --"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" --"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" --"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" --"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" --"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" --"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" --"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" --"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" --"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" --"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" --"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" --"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" --"checksum nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d10caafde29a846a82ae0af70414e4643e072993441033b2c93217957e2f867" --"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" --"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" --"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" --"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" --"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" --"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" --"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" --"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" --"checksum stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" --"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" --"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" --"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" --"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" --"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" --"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" --"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" --"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" --"checksum tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" --"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" --"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" --"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" --"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" --"checksum uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef5bbe8385736e498dbb0033361f764ab43a435192513861447b9f7714b3fec" --"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" --"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" --"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" --"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" --"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" -diff --git a/Cargo.toml b/Cargo.toml -index 3d3df77..34b9bc5 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -17,7 +17,7 @@ travis-ci = { repository = "svartalf/rust-battop", branch = "master" } - maintenance = { status = "actively-developed" } - - [dependencies] --battery = "^0.7" -+battery = "^0.7.7" - structopt = { version = "0.2", default-features = false } - log = "0.4.6" - stderrlog = "0.4.1" diff --git a/pkgs/tools/system/battop/default.nix b/pkgs/tools/system/battop/default.nix deleted file mode 100644 index e28789b835e..00000000000 --- a/pkgs/tools/system/battop/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "battop"; - version = "0.2.4"; - - src = fetchFromGitHub { - owner = "svartalf"; - repo = "rust-battop"; - rev = "v${version}"; - sha256 = "0p53jl3r2p1w9m2fvhzzrj8d9gwpzs22df5sbm7wwja4pxn7ay1w"; - }; - - # https://github.com/svartalf/rust-battop/issues/11 - cargoPatches = [ ./battery.patch ]; - - cargoSha256 = "0ipmnrn6lmf6rqzsqmaxzy9lblrxyrxzkji968356nxxmwzfbfvh"; - - meta = with lib; { - description = "is an interactive battery viewer"; - homepage = "https://github.com/svartalf/rust-battop"; - license = licenses.asl20; - maintainers = with maintainers; [ hdhog ]; - }; -} diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 51dad59e819..99d1d0bfa97 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.0.13"; + version = "1.0.16"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Znap1MSWEdKtb9G7+DmfYAhq3q2NfGu1v2cjbYuvUmE="; + sha256 = "sha256-navmEd77+LOvCpjPe6dReOYGO1wGRO3OGIv8mC05Kec="; }; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index f44ddc9d0e9..82d5eab5086 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -20,7 +20,12 @@ let buildInputs = [ getopt lua boost ]; - prePatch = lib.optionalString stdenv.cc.isClang '' + prePatch = '' + substituteInPlace src/makefile \ + --replace "shell pkg-config" "shell $PKG_CONFIG" + substituteInPlace makefile \ + --replace 'gzip' 'gzip -n' + '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace src/makefile \ --replace 'CXX=g++' 'CXX=clang++' ''; diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/tools/text/tidy-viewer/default.nix new file mode 100644 index 00000000000..efa1784e7bf --- /dev/null +++ b/pkgs/tools/text/tidy-viewer/default.nix @@ -0,0 +1,29 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "tidy-viewer"; + version = "0.0.21"; + + src = fetchFromGitHub { + owner = "alexhallam"; + repo = "tv"; + rev = version; + sha256 = "1zjnc2b9y2f6x114svp31r1lzkak4xfn71qrxch30mq2aj4yzd2l"; + }; + + cargoSha256 = "sha256-M6HInLevKvF4zBNe+Sg8fQK6koefRaO0l5AcrFhH+vI="; + + # this test parses command line arguments + # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context + checkFlags = [ + "--skip=build_reader_can_create_reader_without_file_specified" + ]; + + meta = with lib; { + description = "A cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment"; + homepage = "https://github.com/alexhallam/tv"; + changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md"; + license = licenses.unlicense; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 25a98d299a7..fc350162845 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "vale"; - version = "2.10.6"; + version = "2.11.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; src = fetchFromGitHub { - owner = "errata-ai"; - repo = "vale"; - rev = "v${version}"; - sha256 = "sha256-exBrs/MQhfqCxAJrnxECdKnxvsK9LvXIqpnYkR5h7uA="; + owner = "errata-ai"; + repo = "vale"; + rev = "v${version}"; + sha256 = "1g8k9723d1xmx918f60lpla52ly90rz6z0ffzwsb2rh62r3h80h5"; }; - vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc="; + vendorSha256 = "0czxigagjbqdzzgmh1iw3q0d4sj6635384lnn1w5smws8nsqr9ia"; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 9cbf9ac7e2f..bfd0bfb64bf 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "sha256-CMvT9DouwERhDtBsLDesxN/QgEEfXLgtJaQLjq+SzOI="; + sha256 = "1x6pxzl2fxv0ldfdlgm5x2pcbkny8cf2b4gpk8yj8hhnn1ypim1w"; }; - cargoSha256 = "sha256-zGsb49yt6SRFfvNHZY+RpjihGpV9ziLsg9BII7WTX2Y="; + cargoSha256 = "0v5jc26icz83ssky85c8l92jcmglq9f2jbihfh4yqanpmwbpp5fl"; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5e388776df6..431e8ef7798 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -620,6 +620,8 @@ mapAliases ({ osquery = throw "osquery has been removed."; # added 2019-11-24 osxfuse = macfuse-stubs; # added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 + OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16 + OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16 owncloudclient = owncloud-client; # added 2016-08 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 p11_kit = p11-kit; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ea9f1e6ac5..f9630864216 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1269,6 +1269,8 @@ with pkgs; ashuffle = callPackage ../applications/audio/ashuffle {}; + ashpd-demo = callPackage ../development/tools/ashpd-demo {}; + asls = callPackage ../development/tools/misc/asls { }; astc-encoder = callPackage ../tools/graphics/astc-encoder { }; @@ -1664,6 +1666,8 @@ with pkgs; git-fire = callPackage ../tools/misc/git-fire { }; + git-privacy = callPackage ../development/tools/git-privacy { }; + git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; git-revise = with python3Packages; toPythonApplication git-revise; @@ -2847,6 +2851,8 @@ with pkgs; fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; + flitter = callPackage ../tools/misc/flitter { }; + frangipanni = callPackage ../tools/text/frangipanni { }; fselect = callPackage ../tools/misc/fselect { }; @@ -5992,7 +5998,9 @@ with pkgs; pixz = callPackage ../tools/compression/pixz { }; - plplot = callPackage ../development/libraries/plplot { }; + plplot = callPackage ../development/libraries/plplot { + inherit (xorg) libX11; + }; pxattr = callPackage ../tools/archivers/pxattr { }; @@ -6059,28 +6067,25 @@ with pkgs; hddtemp = callPackage ../tools/misc/hddtemp { }; - hdf4 = callPackage ../tools/misc/hdf4 { - szip = null; - }; + hdf4 = callPackage ../tools/misc/hdf4 { }; hdf5 = callPackage ../tools/misc/hdf5 { - gfortran = null; - szip = null; + fortranSupport = false; + fortran = gfortran; }; hdf5_1_10 = callPackage ../tools/misc/hdf5/1.10.nix { }; hdf5-mpi = appendToName "mpi" (hdf5.override { - szip = null; mpiSupport = true; }); hdf5-cpp = appendToName "cpp" (hdf5.override { - cpp = true; + cppSupport = true; }); hdf5-fortran = appendToName "fortran" (hdf5.override { - inherit gfortran; + fortranSupport = true; }); hdf5-threadsafe = appendToName "threadsafe" (hdf5.overrideAttrs (oldAttrs: { @@ -9770,6 +9775,8 @@ with pkgs; thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { }; + tidy-viewer = callPackage ../tools/text/tidy-viewer { }; + tiled = libsForQt5.callPackage ../applications/editors/tiled { }; tiledb = callPackage ../development/libraries/tiledb { }; @@ -10452,6 +10459,11 @@ with pkgs; unbound-full = unbound.override { withSystemd = true; withDoH = true; + withECS = true; + withDNSCrypt = true; + withDNSTAP = true; + withTFO = true; + withRedis = true; }; unicorn = callPackage ../development/libraries/unicorn { }; @@ -12246,7 +12258,10 @@ with pkgs; /**/ if platform.isDarwin then (if platform.isAarch64 then 11 else 7) else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 - else if platform.isLinux then (if platform.isRiscV then 11 else 7) + else if platform.isLinux then + /**/ if platform.isRiscV then 11 + else if platform.isMusl then 11 + else 7 else if platform.isWasm then 8 else latest_version; # We take the "max of the mins". Why? Since those are lower bounds of the @@ -12632,7 +12647,7 @@ with pkgs; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { - inherit (darwin.apple_sdk.frameworks) Security AppKit; + inherit (darwin.apple_sdk.frameworks) AppKit; }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; @@ -12812,6 +12827,8 @@ with pkgs; svd2rust = callPackage ../development/tools/rust/svd2rust { }; + svdtools = with python3Packages; toPythonApplication svdtools; + swift = callPackage ../development/compilers/swift { }; swiProlog = callPackage ../development/compilers/swi-prolog { @@ -13066,6 +13083,12 @@ with pkgs; inherit (beam.packages.erlangR21) lfe lfe_1_3; + gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { + inherit (llvmPackages) openmp; + # MPICH currently build on Darwin + mpi = mpich; + }; + groovy = callPackage ../development/interpreters/groovy { }; inherit (callPackages ../applications/networking/cluster/hadoop { @@ -15378,20 +15401,32 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; + aws-c-auth = callPackage ../development/libraries/aws-c-auth { }; + aws-c-cal = callPackage ../development/libraries/aws-c-cal { inherit (darwin.apple_sdk.frameworks) Security; }; aws-c-common = callPackage ../development/libraries/aws-c-common { }; + aws-c-compression = callPackage ../development/libraries/aws-c-compression { }; + aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; + aws-c-http = callPackage ../development/libraries/aws-c-http { }; + aws-c-io = callPackage ../development/libraries/aws-c-io { inherit (darwin.apple_sdk.frameworks) Security; }; + aws-c-mqtt = callPackage ../development/libraries/aws-c-mqtt { }; + + aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { }; + aws-checksums = callPackage ../development/libraries/aws-checksums { }; + aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { }; + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; @@ -18646,11 +18681,12 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_2; + libressl_3_2 + libressl_3_4; # Please keep this pointed to the latest version. See also # https://discourse.nixos.org/t/nixpkgs-policy-regarding-libraries-available-in-multiple-versions/7026/2 - libressl = libressl_3_2; + libressl = libressl_3_4; boringssl = callPackage ../development/libraries/boringssl { }; @@ -20938,8 +20974,12 @@ with pkgs; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; OVMF = callPackage ../applications/virtualization/OVMF { }; - OVMF-CSM = OVMF.override { csmSupport = true; }; - OVMF-secureBoot = OVMF.override { secureBoot = true; }; + OVMFFull = callPackage ../applications/virtualization/OVMF { + secureBoot = true; + csmSupport = true; + httpSupport = true; + tpmSupport = true; + }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -24181,6 +24221,7 @@ with pkgs; afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; + docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { }; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -25800,6 +25841,8 @@ with pkgs; kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; + kn = callPackage ../applications/networking/cluster/kn { }; + kodestudio = callPackage ../applications/editors/kodestudio { }; kondo = callPackage ../applications/misc/kondo { }; @@ -29522,6 +29565,8 @@ with pkgs; inherit (import ../games/deliantra pkgs) deliantra-server deliantra-arch deliantra-maps deliantra-data; + ddnet = callPackage ../games/ddnet { }; + devilutionx = callPackage ../games/devilutionx {}; dhewm3 = callPackage ../games/dhewm3 {}; @@ -29691,6 +29736,10 @@ with pkgs; gltron = callPackage ../games/gltron { }; + gl-gsync-demo = callPackage ../games/gl-gsync-demo { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; + gmad = callPackage ../games/gmad { }; gnonograms = callPackage ../games/gnonograms { }; @@ -32321,6 +32370,8 @@ with pkgs; qdl = callPackage ../tools/misc/qdl { }; + rates = callPackage ../tools/misc/rates { }; + rargs = callPackage ../tools/misc/rargs { }; rancher = callPackage ../applications/networking/cluster/rancher { }; @@ -32697,6 +32748,7 @@ with pkgs; wasm-pack = callPackage ../development/tools/wasm-pack { inherit (darwin.apple_sdk.frameworks) Security; + libressl = libressl_3_2; }; wavegain = callPackage ../applications/audio/wavegain { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e1387e42b78..efaf06d30a2 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -67,6 +67,10 @@ in inherit lua lib; }; + luarocks-3_7 = callPackage ../development/tools/misc/luarocks/3.7.nix { + inherit lua lib; + }; + # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c80919e07af..3a1fc6a9398 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -183,6 +183,8 @@ let cohttp-mirage = callPackage ../development/ocaml-modules/cohttp/mirage.nix { }; + color = callPackage ../development/ocaml-modules/color { }; + conduit = callPackage ../development/ocaml-modules/conduit { }; conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 573d73ba7cf..dd01245a179 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -365,6 +365,8 @@ in { aioresponses = callPackage ../development/python-modules/aioresponses { }; + aioridwell = callPackage ../development/python-modules/aioridwell { }; + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; aiorun = callPackage ../development/python-modules/aiorun { }; @@ -403,7 +405,7 @@ in { airly = callPackage ../development/python-modules/airly { }; - airthings = callPackage ../development/python-modules/airthings { }; + airthings-cloud = callPackage ../development/python-modules/airthings-cloud { }; ajpy = callPackage ../development/python-modules/ajpy { }; @@ -1236,6 +1238,8 @@ in { bpython = callPackage ../development/python-modules/bpython { }; + braceexpand = callPackage ../development/python-modules/braceexpand { }; + bracex = callPackage ../development/python-modules/bracex { }; braintree = callPackage ../development/python-modules/braintree { }; @@ -2414,6 +2418,8 @@ in { environmental-override = callPackage ../development/python-modules/environmental-override { }; + environs = callPackage ../development/python-modules/environs { }; + envisage = callPackage ../development/python-modules/envisage { }; envs = callPackage ../development/python-modules/envs { }; @@ -3021,6 +3027,8 @@ in { git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { }; + git-filter-repo = callPackage ../development/python-modules/git-filter-repo { }; + gitdb = callPackage ../development/python-modules/gitdb { }; github3_py = callPackage ../development/python-modules/github3_py { }; @@ -5170,6 +5178,8 @@ in { ondilo = callPackage ../development/python-modules/ondilo { }; + onetimepass = callPackage ../development/python-modules/onetimepass { }; + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; @@ -8857,6 +8867,8 @@ in { suseapi = callPackage ../development/python-modules/suseapi { }; + svdtools = callPackage ../development/python-modules/svdtools { }; + svg2tikz = callPackage ../development/python-modules/svg2tikz { }; svglib = callPackage ../development/python-modules/svglib { }; @@ -9528,6 +9540,8 @@ in { versioneer = callPackage ../development/python-modules/versioneer { }; + versionfinder = callPackage ../development/python-modules/versionfinder { }; + versiontag = callPackage ../development/python-modules/versiontag { }; versiontools = callPackage ../development/python-modules/versiontools { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index a5adec5d78f..21d11d339f3 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -174,6 +174,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qcoro = callPackage ../development/libraries/qcoro { }; + qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; qmltermwidget = callPackage ../development/libraries/qmltermwidget { |