diff --git a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md
index 4d3c8888f3..fa1140a7e3 100644
--- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,33 +7,38 @@ assignees: ''
---
-**Describe the bug**
+### Describe the bug
A clear and concise description of what the bug is.
-**To Reproduce**
+### Steps To Reproduce
Steps to reproduce the behavior:
1. ...
2. ...
3. ...
-**Expected behavior**
+### Expected behavior
A clear and concise description of what you expected to happen.
-**Screenshots**
+### Screenshots
If applicable, add screenshots to help explain your problem.
-**Additional context**
+### Additional context
Add any other context about the problem here.
-**Notify maintainers**
+### Notify maintainers
-**Metadata**
+### Metadata
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
+```console
+[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"
+output here
+```
+
Maintainer information:
```yaml
# a list of nixpkgs attributes affected by the problem
diff --git a/third_party/nixpkgs/lib/types.nix b/third_party/nixpkgs/lib/types.nix
index c35f055e17..a0be2ff3a4 100644
--- a/third_party/nixpkgs/lib/types.nix
+++ b/third_party/nixpkgs/lib/types.nix
@@ -287,6 +287,13 @@ rec {
merge = mergeEqualOption;
};
+ nonEmptyStr = mkOptionType {
+ name = "nonEmptyStr";
+ description = "non-empty string";
+ check = x: str.check x && builtins.match "[ \t\n]*" x == null;
+ inherit (str) merge;
+ };
+
strMatching = pattern: mkOptionType {
name = "strMatching ${escapeNixString pattern}";
description = "string matching the pattern ${pattern}";
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 09732359ee..94007a0274 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -802,6 +802,12 @@
githubId = 13426784;
name = "arcnmx";
};
+ arcticlimer = {
+ email = "vinigm.nho@gmail.com";
+ github = "arcticlimer";
+ githubId = 59743220;
+ name = "Vinícius Müller";
+ };
ardumont = {
email = "eniotna.t@gmail.com";
github = "ardumont";
@@ -1054,6 +1060,12 @@
githubId = 135230;
name = "Aycan iRiCAN";
};
+ arjix = {
+ email = "arjix@protonmail.com";
+ github = "arjix";
+ githubId = 62168569;
+ name = "arjix";
+ };
artturin = {
email = "artturin@artturin.com";
github = "artturin";
@@ -4349,6 +4361,12 @@
github = "HolgerPeters";
githubId = 4097049;
};
+ hqurve = {
+ email = "hqurve@outlook.com";
+ github = "hqurve";
+ githubId = 53281855;
+ name = "hqurve";
+ };
hrdinka = {
email = "c.nix@hrdinka.at";
github = "hrdinka";
@@ -4805,6 +4823,12 @@
githubId = 1383440;
name = "Jason Gilliland";
};
+ jdahm = {
+ email = "johann.dahm@gmail.com";
+ github = "jdahm";
+ githubId = 68032;
+ name = "Johann Dahm";
+ };
jdanek = {
email = "jdanek@redhat.com";
github = "jdanekrh";
@@ -5767,6 +5791,12 @@
githubId = 278013;
name = "Tomasz Kontusz";
};
+ kurnevsky = {
+ email = "kurnevsky@gmail.com";
+ github = "kurnevsky";
+ githubId = 2943605;
+ name = "Evgeny Kurnevsky";
+ };
kuznero = {
email = "roman@kuznero.com";
github = "kuznero";
@@ -5894,6 +5924,12 @@
githubId = 1104419;
name = "Lucas Hoffmann";
};
+ lde = {
+ email = "lilian.deloche@puck.fr";
+ github = "lde";
+ githubId = 1447020;
+ name = "Lilian Deloche";
+ };
ldelelis = {
email = "ldelelis@est.frba.utn.edu.ar";
github = "ldelelis";
@@ -6634,6 +6670,12 @@
githubId = 1191859;
name = "Maxim Krivchikov";
};
+ MayNiklas = {
+ email = "info@niklas-steffen.de";
+ github = "MayNiklas";
+ githubId = 44636701;
+ name = "Niklas Steffen";
+ };
mazurel = {
email = "mateusz.mazur@yahoo.com";
github = "Mazurel";
@@ -10098,6 +10140,12 @@
githubId = 1829294;
name = "Steve Chávez";
};
+ stevebob = {
+ email = "stephen@sherra.tt";
+ github = "stevebob";
+ githubId = 417118;
+ name = "Stephen Sherratt";
+ };
steveej = {
email = "mail@stefanjunker.de";
github = "steveej";
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 68eeb85cdd..3695997f71 100644
--- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -544,6 +544,12 @@
2020 to 2021
+
+
+ the mingw-64 package has been upgraded from
+ 6.0.0 to 9.0.0
+
+
@@ -611,6 +617,77 @@
be removed in 22.05.
+
+
+ The order of NSS (host) modules has been brought in line with
+ upstream recommendations:
+
+
+
+
+ The myhostname module is placed before
+ the resolve (optional) and
+ dns entries, but after
+ file (to allow overriding via
+ /etc/hosts /
+ networking.extraHosts, and prevent ISPs
+ with catchall-DNS resolvers from hijacking
+ .localhost domains)
+
+
+
+
+ The mymachines module, which provides
+ hostname resolution for local containers (registered with
+ systemd-machined) is placed to the
+ front, to make sure its mappings are preferred over other
+ resolvers.
+
+
+
+
+ If systemd-networkd is enabled, the
+ resolve module is placed before
+ files and
+ myhostname, as it provides the same
+ logic internally, with caching.
+
+
+
+
+ The mdns(_minimal) module has been
+ updated to the new priorities.
+
+
+
+
+ If you use your own NSS host modules, make sure to update your
+ priorities according to these rules:
+
+
+
+
+ NSS modules which should be queried before
+ resolved DNS resolution should use
+ mkBefore.
+
+
+
+
+ NSS modules which should be queried after
+ resolved, files and
+ myhostname, but before
+ dns should use the default priority
+
+
+
+
+ NSS modules which should come after dns
+ should use mkAfter.
+
+
+
+
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md
index 54ea22e3bf..cc5b6bf81e 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -138,6 +138,8 @@ pt-services.clipcat.enable).
- The `isabelle` package has been upgraded from 2020 to 2021
+- the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0
+
## Other Notable Changes {#sec-release-21.11-notable-changes}
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
@@ -153,3 +155,27 @@ pt-services.clipcat.enable).
- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites).
Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05.
+
+- The order of NSS (host) modules has been brought in line with upstream
+ recommendations:
+
+ - The `myhostname` module is placed before the `resolve` (optional) and `dns`
+ entries, but after `file` (to allow overriding via `/etc/hosts` /
+ `networking.extraHosts`, and prevent ISPs with catchall-DNS resolvers from
+ hijacking `.localhost` domains)
+ - The `mymachines` module, which provides hostname resolution for local
+ containers (registered with `systemd-machined`) is placed to the front, to
+ make sure its mappings are preferred over other resolvers.
+ - If systemd-networkd is enabled, the `resolve` module is placed before
+ `files` and `myhostname`, as it provides the same logic internally, with
+ caching.
+ - The `mdns(_minimal)` module has been updated to the new priorities.
+
+ If you use your own NSS host modules, make sure to update your priorities
+ according to these rules:
+
+ - NSS modules which should be queried before `resolved` DNS resolution should
+ use mkBefore.
+ - NSS modules which should be queried after `resolved`, `files` and
+ `myhostname`, but before `dns` should use the default priority
+ - NSS modules which should come after `dns` should use mkAfter.
diff --git a/third_party/nixpkgs/nixos/modules/config/nsswitch.nix b/third_party/nixpkgs/nixos/modules/config/nsswitch.nix
index d19d35a489..91a36cef10 100644
--- a/third_party/nixpkgs/nixos/modules/config/nsswitch.nix
+++ b/third_party/nixpkgs/nixos/modules/config/nsswitch.nix
@@ -124,8 +124,8 @@ with lib;
group = mkBefore [ "files" ];
shadow = mkBefore [ "files" ];
hosts = mkMerge [
- (mkBefore [ "files" ])
- (mkAfter [ "dns" ])
+ (mkOrder 998 [ "files" ])
+ (mkOrder 1499 [ "dns" ])
];
services = mkBefore [ "files" ];
};
diff --git a/third_party/nixpkgs/nixos/modules/config/swap.nix b/third_party/nixpkgs/nixos/modules/config/swap.nix
index a37b46b8c4..ff2ae1da31 100644
--- a/third_party/nixpkgs/nixos/modules/config/swap.nix
+++ b/third_party/nixpkgs/nixos/modules/config/swap.nix
@@ -127,6 +127,15 @@ let
'';
};
+ options = mkOption {
+ default = [ "defaults" ];
+ example = [ "nofail" ];
+ type = types.listOf types.nonEmptyStr;
+ description = ''
+ Options used to mount the swap.
+ '';
+ };
+
deviceName = mkOption {
type = types.str;
internal = true;
@@ -215,7 +224,7 @@ in
fi
''}
${optionalString sw.randomEncryption.enable ''
- cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName}
+ cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${optionalString (sw.discardPolicy != null) "--allow-discards"} ${sw.device} ${sw.deviceName}
mkswap ${sw.realDevice}
''}
'';
diff --git a/third_party/nixpkgs/nixos/modules/hardware/sensor/iio.nix b/third_party/nixpkgs/nixos/modules/hardware/sensor/iio.nix
index 4c359c3b17..8b3ba87a7d 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/sensor/iio.nix
+++ b/third_party/nixpkgs/nixos/modules/hardware/sensor/iio.nix
@@ -9,7 +9,7 @@ with lib;
hardware.sensor.iio = {
enable = mkOption {
description = ''
- Enable this option to support IIO sensors.
+ Enable this option to support IIO sensors with iio-sensor-proxy.
IIO sensors are used for orientation and ambient light
sensors on some mobile devices.
diff --git a/third_party/nixpkgs/nixos/modules/programs/udevil.nix b/third_party/nixpkgs/nixos/modules/programs/udevil.nix
index ba5670f9df..25975d88ec 100644
--- a/third_party/nixpkgs/nixos/modules/programs/udevil.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/udevil.nix
@@ -10,5 +10,8 @@ in {
config = mkIf cfg.enable {
security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil";
+
+ systemd.packages = [ pkgs.udevil ];
+ systemd.services."devmon@".wantedBy = [ "multi-user.target" ];
};
}
diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix
index 48638fda28..6c824a692b 100644
--- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix
@@ -53,7 +53,7 @@ in
};
shellAliases = mkOption {
- default = {};
+ default = { };
description = ''
Set of aliases for zsh shell, which overrides .
See for an option format description.
@@ -118,7 +118,9 @@ in
setOptions = mkOption {
type = types.listOf types.str;
default = [
- "HIST_IGNORE_DUPS" "SHARE_HISTORY" "HIST_FCNTL_LOCK"
+ "HIST_IGNORE_DUPS"
+ "SHARE_HISTORY"
+ "HIST_FCNTL_LOCK"
];
example = [ "EXTENDED_HISTORY" "RM_STAR_WAIT" ];
description = ''
@@ -278,15 +280,29 @@ in
environment.etc.zinputrc.source = ./zinputrc;
- environment.systemPackages = [ pkgs.zsh ]
- ++ optional cfg.enableCompletion pkgs.nix-zsh-completions;
+ environment.systemPackages =
+ let
+ completions =
+ if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre"
+ then
+ pkgs.nix-zsh-completions.overrideAttrs
+ (_: {
+ postInstall = ''
+ rm $out/share/zsh/site-functions/_nix
+ '';
+ })
+ else pkgs.nix-zsh-completions;
+ in
+ [ pkgs.zsh ]
+ ++ optional cfg.enableCompletion completions;
environment.pathsToLink = optional cfg.enableCompletion "/share/zsh";
#users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh";
environment.shells =
- [ "/run/current-system/sw/bin/zsh"
+ [
+ "/run/current-system/sw/bin/zsh"
"${pkgs.zsh}/bin/zsh"
];
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix
index d68d7b05c1..dcd825bba4 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix
@@ -313,6 +313,7 @@ in {
"w800rf32"
"xbee"
"zha"
+ "zwave"
];
in {
ExecStart = "${package}/bin/hass --runner --config '${cfg.configDir}'";
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix b/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix
index 4930648ba8..909408225e 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix
@@ -2,7 +2,13 @@
with lib;
let
cfg = config.services.klipper;
- format = pkgs.formats.ini { mkKeyValue = generators.mkKeyValueDefault {} ":"; };
+ format = pkgs.formats.ini {
+ # https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996
+ listToValue = l:
+ if builtins.length l == 1 then generators.mkValueStringDefault {} (head l)
+ else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l;
+ mkKeyValue = generators.mkKeyValueDefault {} ":";
+ };
in
{
##### interface
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix
index 0b7d5575c1..020a817f25 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix
@@ -240,8 +240,8 @@ in
system.nssModules = optional cfg.nssmdns pkgs.nssmdns;
system.nssDatabases.hosts = optionals cfg.nssmdns (mkMerge [
- (mkOrder 900 [ "mdns_minimal [NOTFOUND=return]" ]) # must be before resolve
- (mkOrder 1501 [ "mdns" ]) # 1501 to ensure it's after dns
+ (mkBefore [ "mdns_minimal [NOTFOUND=return]" ]) # before resolve
+ (mkAfter [ "mdns" ]) # after dns
]);
environment.systemPackages = [ pkgs.avahi ];
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix b/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix
index 4acdd1d69c..e76ba9a2d0 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix
@@ -37,7 +37,7 @@ in {
}
'';
description = ''
- Configuration for CoreRAD, see
+ Configuration for CoreRAD, see
for supported values. Ignored if configFile is set.
'';
};
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix
index c1cbdb4617..37f44f07ac 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix
@@ -82,13 +82,21 @@ in
LD_PRELOAD = "${pkgs.libredirect}/lib/libredirect.so";
NIX_REDIRECTS = "/var/run=/run/pppd";
};
- serviceConfig = {
+ serviceConfig = let
+ capabilities = [
+ "CAP_BPF"
+ "CAP_SYS_TTY_CONFIG"
+ "CAP_NET_ADMIN"
+ "CAP_NET_RAW"
+ ];
+ in
+ {
ExecStart = "${getBin cfg.package}/sbin/pppd call ${peerCfg.name} nodetach nolog";
Restart = "always";
RestartSec = 5;
- AmbientCapabilities = "CAP_SYS_TTY_CONFIG CAP_NET_ADMIN CAP_NET_RAW CAP_SYS_ADMIN";
- CapabilityBoundingSet = "CAP_SYS_TTY_CONFIG CAP_NET_ADMIN CAP_NET_RAW CAP_SYS_ADMIN";
+ AmbientCapabilities = capabilities;
+ CapabilityBoundingSet = capabilities;
KeyringMode = "private";
LockPersonality = true;
MemoryDenyWriteExecute = true;
@@ -103,7 +111,17 @@ in
ProtectKernelTunables = false;
ProtectSystem = "strict";
RemoveIPC = true;
- RestrictAddressFamilies = "AF_PACKET AF_UNIX AF_PPPOX AF_ATMPVC AF_ATMSVC AF_INET AF_INET6 AF_IPX";
+ RestrictAddressFamilies = [
+ "AF_ATMPVC"
+ "AF_ATMSVC"
+ "AF_INET"
+ "AF_INET6"
+ "AF_IPX"
+ "AF_NETLINK"
+ "AF_PACKET"
+ "AF_PPPOX"
+ "AF_UNIX"
+ ];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix
index 09aef9a1dc..6d7178047e 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix
@@ -21,7 +21,15 @@ let
))
else throw (traceSeq v "services.unbound.settings: unexpected type");
- confFile = pkgs.writeText "unbound.conf" (concatStringsSep "\n" ((mapAttrsToList (toConf "") cfg.settings) ++ [""]));
+ confNoServer = concatStringsSep "\n" ((mapAttrsToList (toConf "") (builtins.removeAttrs cfg.settings [ "server" ])) ++ [""]);
+ confServer = concatStringsSep "\n" (mapAttrsToList (toConf " ") (builtins.removeAttrs cfg.settings.server [ "define-tag" ]));
+
+ confFile = pkgs.writeText "unbound.conf" ''
+ server:
+ ${optionalString (cfg.settings.server.define-tag != "") (toOption " " "define-tag" cfg.settings.server.define-tag)}
+ ${confServer}
+ ${confNoServer}
+ '';
rootTrustAnchorFile = "${cfg.stateDir}/root.key";
@@ -170,6 +178,7 @@ in {
# prevent race conditions on system startup when interfaces are not yet
# configured
ip-freebind = mkDefault true;
+ define-tag = mkDefault "";
};
remote-control = {
control-enable = mkDefault false;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
index 111b317346..5e15aaba09 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
@@ -699,7 +699,6 @@ in {
};
extraConfig = ''
index index.php index.html /index.php$request_uri;
- expires 1m;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix
index caf5ba466d..b56848b79d 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix
@@ -7,10 +7,15 @@ let
# FIXME consider using LoadCredential as soon as it actually works.
envSecrets = ''
- export ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})"
- export SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})"
+ ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})"
+ export ADMIN_USER_PWD # separate export to make `set -e` work
+
+ SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})"
+ export SECRET_KEY_BASE # separate export to make `set -e` work
+
${optionalString (cfg.mail.smtp.passwordFile != null) ''
- export SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})"
+ SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})"
+ export SMTP_USER_PWD # separate export to make `set -e` work
''}
'';
in {
@@ -102,6 +107,11 @@ in {
type = types.str;
description = ''
Public URL where plausible is available.
+
+ Note that /path components are currently ignored:
+
+ https://github.com/plausible/analytics/issues/1182
+ .
'';
};
};
@@ -228,6 +238,7 @@ in {
WorkingDirectory = "/var/lib/plausible";
StateDirectory = "plausible";
ExecStartPre = "@${pkgs.writeShellScript "plausible-setup" ''
+ set -eu -o pipefail
${envSecrets}
${pkgs.plausible}/createdb.sh
${pkgs.plausible}/migrate.sh
@@ -238,6 +249,7 @@ in {
''}
''} plausible-setup";
ExecStart = "@${pkgs.writeShellScript "plausible" ''
+ set -eu -o pipefail
${envSecrets}
plausible start
''} plausible";
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix
index 84bc9b7807..a6fc07da0a 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix
@@ -140,7 +140,8 @@ in
# add resolve to nss hosts database if enabled and nscd enabled
# system.nssModules is configured in nixos/modules/system/boot/systemd.nix
- system.nssDatabases.hosts = optional config.services.nscd.enable "resolve [!UNAVAIL=return]";
+ # added with order 501 to allow modules to go before with mkBefore
+ system.nssDatabases.hosts = (mkOrder 501 ["resolve [!UNAVAIL=return]"]);
systemd.additionalUpstreamSystemUnits = [
"systemd-resolved.service"
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix
index abd8ab29ca..58064e5de8 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix
@@ -925,9 +925,8 @@ in
system.nssModules = [ systemd.out ];
system.nssDatabases = {
hosts = (mkMerge [
- [ "mymachines" ]
- (mkOrder 1600 [ "myhostname" ] # 1600 to ensure it's always the last
- )
+ (mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is mkBefore'd)
+ (mkOrder 999 ["myhostname"]) # after files (which is 998), but before regular nss modules
]);
passwd = (mkMerge [
(mkAfter [ "systemd" ])
diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix
index d274a38a27..2f17608560 100644
--- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix
+++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix
@@ -255,7 +255,7 @@ in
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
swapOptions = sw: concatStringsSep "," (
- [ "defaults" ]
+ sw.options
++ optional (sw.priority != null) "pri=${toString sw.priority}"
++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}"
);
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index 0e2104a20e..d6ef7d4243 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -440,6 +440,7 @@ in
txredisapi = handleTest ./txredisapi.nix {};
tuptime = handleTest ./tuptime.nix {};
turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
+ tuxguitar = handleTest ./tuxguitar.nix {};
ucarp = handleTest ./ucarp.nix {};
ucg = handleTest ./ucg.nix {};
udisks2 = handleTest ./udisks2.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/chromium.nix b/third_party/nixpkgs/nixos/tests/chromium.nix
index d2a8f276f1..0c85b2d219 100644
--- a/third_party/nixpkgs/nixos/tests/chromium.nix
+++ b/third_party/nixpkgs/nixos/tests/chromium.nix
@@ -81,7 +81,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
# Add optional CLI options:
options = []
major_version = "${versions.major (getVersion chromiumPkg.name)}"
- if major_version > "91":
+ if major_version > "91" and pname.startswith("google-chrome"):
# To avoid a GPU crash:
options += ["--use-gl=angle", "--use-angle=swiftshader"]
options.append("file://${startupHTML}")
@@ -239,7 +239,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"):
- pass
+ # To check the text rendering (catches regressions like #131074):
+ machine.wait_for_text("Graphics Feature Status")
machine.shutdown()
diff --git a/third_party/nixpkgs/nixos/tests/grocy.nix b/third_party/nixpkgs/nixos/tests/grocy.nix
index 220c55b1f6..2be5c24ecb 100644
--- a/third_party/nixpkgs/nixos/tests/grocy.nix
+++ b/third_party/nixpkgs/nixos/tests/grocy.nix
@@ -40,7 +40,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
assert task_name == "Test Task"
- machine.succeed("curl -sSfI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'")
+ machine.succeed("curl -sSI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'")
machine.shutdown()
'';
diff --git a/third_party/nixpkgs/nixos/tests/tuxguitar.nix b/third_party/nixpkgs/nixos/tests/tuxguitar.nix
new file mode 100644
index 0000000000..6586132d3c
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/tuxguitar.nix
@@ -0,0 +1,24 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "tuxguitar";
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ asbachb ];
+ };
+
+ machine = { config, pkgs, ... }: {
+ imports = [
+ ./common/x11.nix
+ ];
+
+ services.xserver.enable = true;
+
+ environment.systemPackages = [ pkgs.tuxguitar ];
+ };
+
+ testScript = ''
+ machine.wait_for_x()
+ machine.succeed("tuxguitar &")
+ machine.wait_for_window("TuxGuitar - Untitled.tg")
+ machine.sleep(1)
+ machine.screenshot("tuxguitar")
+ '';
+})
diff --git a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
new file mode 100644
index 0000000000..a1ca052f9c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl
+, libdbusmenu-glib }:
+
+stdenv.mkDerivation rec {
+ pname = "deadbeef-statusnotifier-plugin";
+ version = "1.6";
+
+ src = fetchFromGitHub {
+ owner = "vovochka404";
+ repo = "deadbeef-statusnotifier-plugin";
+ rev = "v${version}";
+ sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4=";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ deadbeef gtk3 libdbusmenu-glib ];
+
+ buildFlags = [ "gtk3" ];
+
+ postPatch = ''
+ substituteInPlace tools/glib-mkenums \
+ --replace /usr/bin/perl "${perl}/bin/perl"
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/lib/deadbeef
+ cp build/sni_gtk3.so $out/lib/deadbeef
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "DeaDBeeF StatusNotifier Plugin";
+ homepage = "https://github.com/vovochka404/deadbeef-statusnotifier-plugin";
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.kurnevsky ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix
index 2551c610c5..a0443aa9a6 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix
@@ -3,6 +3,7 @@
, autoPatchelfHook
, fetchurl
, flac
+, gcc11
, lib
, libmicrohttpd
, llvmPackages_10
@@ -17,13 +18,11 @@
mkDerivation rec {
pname = "hqplayer-desktop";
- version = "4.12.1-35";
+ version = "4.12.2-36";
src = fetchurl {
- # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
- # c.f. https://github.com/NixOS/nixpkgs/pull/111616
- url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm";
- sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8=";
+ url = "https://www.signalyst.eu/bins/hqplayer/fc34/hqplayer4desktop-${version}.fc34.x86_64.rpm";
+ sha256 = "sha256-ng0Tkx6CSnzTxuunStaBhUYjxUmzx31ZaOY2gBWnH6Q=";
};
unpackPhase = ''
@@ -35,11 +34,12 @@ mkDerivation rec {
buildInputs = [
alsa-lib
flac
+ gcc11.cc.lib
libmicrohttpd
llvmPackages_10.openmp
- qtquickcontrols2
qtcharts
qtdeclarative
+ qtquickcontrols2
qtwebengine
qtwebview
wavpack
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix
index 6f0d34b870..60591f42e8 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, mkDerivation
, fetchurl
, fetchFromGitHub
@@ -116,6 +117,23 @@ mkDerivation rec {
"--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
];
+ # mixxx installs udev rules to DATADIR instead of SYSCONFDIR
+ # let's disable this and install udev rules manually via postInstall
+ # see https://github.com/mixxxdj/mixxx/blob/2.3.0/CMakeLists.txt#L1381-L1392
+ cmakeFlags = [
+ "-DINSTALL_USER_UDEV_RULES=OFF"
+ ];
+
+ postInstall = lib.optionalString stdenv.isLinux ''
+ rules="$src/res/linux/mixxx-usb-uaccess.rules"
+ if [ ! -f "$rules" ]; then
+ echo "$rules is missing, must update the Nix file."
+ exit 1
+ fi
+ mkdir -p "$out/lib/udev/rules.d"
+ cp "$rules" "$out/lib/udev/rules.d/69-mixxx-usb-uaccess.rules"
+ '';
+
meta = with lib; {
homepage = "https://mixxx.org";
description = "Digital DJ mixing software";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix
index 24f9f057b6..6c8ad8225f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook gettext ];
- checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]);
+ checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest-xdist polib xvfb-run dbus.daemon glibcLocales ]);
buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xine-lib ] else with gst_all_1;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
index 9e338e1981..4898648599 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
@@ -6,6 +6,8 @@
, intltool
, libpeas
, libsoup
+, libsecret
+, libnotify
, libdmapsharing
, gnome
, totem-pl-parser
@@ -17,8 +19,6 @@
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
}:
let
- pname = "rhythmbox";
- version = "3.4.4";
# The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0.
@@ -39,10 +39,11 @@ let
});
in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ pname = "rhythmbox";
+ version = "3.4.4";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf";
};
@@ -66,11 +67,21 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-plugins-ugly
+ gst_all_1.gst-libav
libdmapsharing_3 # necessary for daap support
+ libsecret
+ libnotify
] ++ gst_plugins;
- configureFlags = [ "--enable-daap" ];
+ configureFlags = [
+ "--enable-daap"
+ "--enable-libnotify"
+ "--with-libsecret"
+ ];
enableParallelBuilding = true;
@@ -84,7 +95,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://wiki.gnome.org/Apps/Rhythmbox";
description = "A music playing application for GNOME";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.rasendubi ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
index a1cba439c4..6cc5565022 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
@@ -19,18 +19,19 @@
, protobuf
, sqlite
, taglib
-, libpulseaudio ? null
-, libselinux ? null
-, libsepol ? null
-, p11-kit ? null
-, util-linux ? null
+, libpulseaudio
+, libselinux
+, libsepol
+, p11-kit
+, util-linux
, qtbase
, qtx11extras
, qttools
, withGstreamer ? true
-, gst_all_1 ? null
+, glib-networking
+, gst_all_1
, withVlc ? true
-, libvlc ? null
+, libvlc
}:
mkDerivation rec {
@@ -61,20 +62,18 @@ mkDerivation rec {
taglib
qtbase
qtx11extras
- ]
- ++ lib.optionals stdenv.isLinux [
+ ] ++ lib.optionals stdenv.isLinux [
libpulseaudio
libselinux
libsepol
p11-kit
- ]
- ++ lib.optionals withGstreamer (with gst_all_1; [
+ ] ++ lib.optionals withGstreamer (with gst_all_1; [
+ glib-networking
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
- ])
- ++ lib.optional withVlc libvlc;
+ ]) ++ lib.optional withVlc libvlc;
nativeBuildInputs = [
cmake
@@ -85,8 +84,11 @@ mkDerivation rec {
util-linux
];
- postInstall = ''
- qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+ postInstall = lib.optionalString withGstreamer ''
+ qtWrapperArgs+=(
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
+ )
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix
index 137014508a..00be093455 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tonelib-gfx/default.nix
@@ -12,6 +12,7 @@
, fribidi
, pango
, freetype
+, curl
}:
stdenv.mkDerivation rec {
@@ -50,6 +51,10 @@ stdenv.mkDerivation rec {
mv $out/bin/ToneLib-GFX $out/bin/tonelib-gfx
'';
+ runtimeDependencies = [
+ (lib.getLib curl)
+ ];
+
meta = with lib; {
description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass.";
homepage = "https://tonelib.net/";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-jam/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tonelib-jam/default.nix
index c58023d6a4..7a5a5c7280 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tonelib-jam/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tonelib-jam/default.nix
@@ -12,6 +12,7 @@
, fribidi
, pango
, freetype
+, curl
}:
stdenv.mkDerivation rec {
@@ -50,6 +51,10 @@ stdenv.mkDerivation rec {
mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam
'';
+ runtimeDependencies = [
+ (lib.getLib curl)
+ ];
+
meta = with lib; {
description = "ToneLib Jam – the learning and practice software for guitar players";
homepage = "https://tonelib.net/";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix
index 94ef3037a7..2eef1f7bd6 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tonelib-zoom/default.nix
@@ -6,6 +6,7 @@
, webkitgtk
, libjack2
, alsa-lib
+, curl
}:
stdenv.mkDerivation rec {
@@ -38,6 +39,10 @@ stdenv.mkDerivation rec {
mv $out/bin/ToneLib-Zoom $out/bin/tonelib-zoom
'';
+ runtimeDependencies = [
+ (lib.getLib curl)
+ ];
+
meta = with lib; {
description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal";
homepage = "https://tonelib.net/";
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
index 8b8ff3f48b..a0e648218f 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
- version = "4.0.12";
+ version = "4.0.13";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
- sha256 = "sha256-cIMaCouzuI7UQ6UY4caGcTzA+Xp7vLdoOwIfGG+ahsU=";
+ sha256 = "sha256-HNpyUD2Tep2XnY3lr5a3ec+NmJtt0VvJx6ujVvSugXo=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
index cdd2a41f01..28a7b22a24 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix
@@ -9,17 +9,17 @@ let
in buildGoModule rec {
pname = "go-ethereum";
- version = "1.10.5";
+ version = "1.10.6";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "sha256:1226picbgnph71fk2y0n1hyfrh6m8sh54kgn3pmikydnw176k9j1";
+ sha256 = "sha256-4lapkoxSKdXlD6rmUxnlSKrfH+DeV6/wV05CqJjuzjA=";
};
runVend = true;
- vendorSha256 = "sha256:1nf2gamamlgr2sl5ibib5wai1pipj66xhbhnb4s4480j5pbv9a76";
+ vendorSha256 = "sha256-5qi01y0SIEI0WRYu2I2RN94QFS8rrlioFvnRqqp6wtk=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix
index 851a1b1d04..f14af0ae79 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "lightning-loop";
- version = "0.14.1-beta";
+ version = "0.14.2-beta";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "loop";
rev = "v${version}";
- sha256 = "0fnbf0cryrw9yk3z1g7innv1rxxk7h2lhfakdj994l5a0pgzghmy";
+ sha256 = "02ndln0n5k2pin9pngjcmn3wak761ml923111fyqb379zcfscrfv";
};
- vendorSha256 = "1i7mmf4ab4a6h08df6zlyjdnmvn44i2y3fc05hq6g1ln1bzdrz40";
+ vendorSha256 = "1izdd9i4bqzmwagq0ilz2s37jajvzf1xwx3hmmbd1k3ss7mjm72r";
subPackages = [ "cmd/loop" "cmd/loopd" ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
index e0cf513831..0ead5ff670 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
@@ -9,17 +9,17 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
- version = "4.2.1.0"; # "Android Studio 4.2.1"
- build = "202.7351085";
- sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36";
+ version = "4.2.2.0"; # "Android Studio 4.2.2"
+ build = "202.7486908";
+ sha256Hash = "18zc9xr2xmphj6m6a1ilwripmvqzplp2583afq1pzzz3cv5h8fvk";
};
betaVersion = {
- version = "2020.3.1.16"; # "Android Studio Arctic Fox (2020.3.1) Beta 1"
- sha256Hash = "0mp1cmxkqc022nv8cggywbwcf8lp6r802nh8hcw5j00hcdnhkcq0";
+ version = "2020.3.1.20"; # "Android Studio Arctic Fox (2020.3.1) Beta 5"
+ sha256Hash = "0swcsjx29ar4b0c8yhbynshqdn2sv94ga58h2nrc99927vp17g85";
};
latestVersion = { # canary & dev
- version = "2021.1.1.1"; # "Android Studio Bumblebee (2021.1.1) Canary 1"
- sha256Hash = "0aavmk8byw817356jm28rl998gcp3zm7x3fq14hm2awzhk5jaklm";
+ version = "2021.1.1.3"; # "Android Studio Bumblebee (2021.1.1) Canary 3"
+ sha256Hash = "1n8iahaqhmzvpps9vhv93n3yabb26vl78yndd6gid028r8r90y4x";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 10a4a2cab5..2bbeaba2a2 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -2885,10 +2885,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
- version = "3.9.2";
+ version = "3.9.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/pyim-3.9.2.tar";
- sha256 = "18m5wni1zns8fad2ll9flbfgxfy14gi03apnycajdbqxsqfp65j9";
+ url = "https://elpa.gnu.org/packages/pyim-3.9.3.tar";
+ sha256 = "0rjaimvbh0fadbqiq4ggyxr0y4pfzld76wb64v7l5874qczn8dfr";
};
packageRequires = [ async emacs xr ];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
index 5d4c438bce..c2ea756a06 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
@@ -2,10 +2,10 @@ let
pkgs = import ../../../../.. { };
src = pkgs.fetchgit {
- url = "https://github.com/ttuegel/emacs2nix.git";
+ url = "https://github.com/nix-community/emacs2nix.git";
fetchSubmodules = true;
- rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923";
- sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df";
+ rev = "703b144eeb490e87133c777f82e198b4e515c312";
+ sha256 = "sha256-YBbRh/Cb8u9+Pn6/Bc0atI6knKVjr8jiTGgFkD2FNGI=";
};
in
pkgs.mkShell {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
new file mode 100644
index 0000000000..0ab44fccc8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -0,0 +1,93 @@
+{ callPackage }:
+ {
+ caml = callPackage ({ elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "caml";
+ ename = "caml";
+ version = "4.7.1";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu/caml-4.7.1.tar";
+ sha256 = "1bv2fscy7zg7r1hyg4rpvh3991vmhy4zid7bv1qbhxa95m9c49j3";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/caml.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ markdown-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "markdown-mode";
+ ename = "markdown-mode";
+ version = "2.4";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.4.tar";
+ sha256 = "002nvc2p7jzznr743znbml3vj8a3kvdd89rlbi28f5ha14g2567z";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/markdown-mode.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
+ elpaBuild {
+ pname = "org-contrib";
+ ename = "org-contrib";
+ version = "0.1";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu/org-contrib-0.1.tar";
+ sha256 = "07hzywvgj11wd21dw4lbkvqv32da03407f9qynlzgg1qa7wknm2k";
+ };
+ packageRequires = [ emacs org ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/org-contrib.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ request = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "request";
+ ename = "request";
+ version = "0.3.3";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar";
+ sha256 = "168yy902bcjfdaahsbzhzb4wgqbw1mq1lfwdjh66fpzqs75c5q00";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/request.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "sly";
+ ename = "sly";
+ version = "1.0.43";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar";
+ sha256 = "0qgji539qwk7lv9g1k11w0i2nn7n7nk456gwa0bh556mcqz2ndr8";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/sly.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "tuareg";
+ ename = "tuareg";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://elpa.nongnu.org/nongnu/tuareg-2.3.0.tar";
+ sha256 = "0a24q64yk4bbgsvm56j1y68zs9yi25qyl83xydx3ff75sk27f1yb";
+ };
+ packageRequires = [ caml emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/tuareg.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ }
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
new file mode 100644
index 0000000000..c3459448c2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
@@ -0,0 +1,32 @@
+/*
+
+# Updating
+
+To update the list of packages from nongnu (ELPA),
+
+1. Run `./update-nongnu`.
+2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages`.
+3. Run `git commit -m "org-packages $(date -Idate)" -- nongnu-generated.nix`
+
+*/
+
+{ lib }:
+
+self: let
+
+ generateNongnu = lib.makeOverridable ({
+ generated ? ./nongnu-generated.nix
+ }: let
+
+ imported = import generated {
+ inherit (self) callPackage;
+ };
+
+ super = imported;
+
+ overrides = {
+ };
+
+ in super // overrides);
+
+in generateNongnu { }
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix
index 5d043f9de9..4dbf968ee2 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix
@@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "20210712";
+ version = "20210719";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-20210712.tar";
- sha256 = "0xdxzfk7hvsmlyivn61ivci6hy2alxg2ysdm5xad4xxz337jrj7x";
+ url = "https://orgmode.org/elpa/org-20210719.tar";
+ sha256 = "1aravj0krdi8bnfinfj1d92vq3g06djxcnpipibkrw9ggk0d01d6";
};
packageRequires = [];
meta = {
@@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
- version = "20210712";
+ version = "20210719";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-plus-contrib-20210712.tar";
- sha256 = "1cdpwsfjmjplyik1r9kl4lvd5lm52zrixlfg2ml1mhh28s680k0q";
+ url = "https://orgmode.org/elpa/org-plus-contrib-20210719.tar";
+ sha256 = "1knjkf365cnjd8sdhaisjx0n6n0l2zfpql1b2gzw0gj62kbpl476";
};
packageRequires = [];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index 5581a52fed..e0cb7878bc 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -1148,8 +1148,8 @@
"auto-complete",
"rtags"
],
- "commit": "65113e2a137baa9f85dc2157b893291470788dc4",
- "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h"
+ "commit": "3a057f127b931c683288f8731f05ba5e2aab4133",
+ "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g"
},
"stable": {
"version": [
@@ -1951,8 +1951,8 @@
"annotation",
"eri"
],
- "commit": "3543ef3df19228012a1ac5be766cc38fd2f65f6a",
- "sha256": "0wlqrl8ikqc7q61i2qzmwp6h0mrv9kn5229pbsrb1ris7gxgi13b"
+ "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a",
+ "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6"
},
"stable": {
"version": [
@@ -2183,15 +2183,15 @@
"repo": "alan-platform/AlanForEmacs",
"unstable": {
"version": [
- 20200723,
- 1405
+ 20210721,
+ 1343
],
"deps": [
"flycheck",
"s"
],
- "commit": "fc1fc0312b3e7f868f95b917a66719afb96f0c9a",
- "sha256": "1cadc2v8mdlz5di7cwhc9qqhrkwgl3gxyw5v4il895r44rcdifgq"
+ "commit": "c1c4205d2cdf8bf69b22e62548568ed4a8529807",
+ "sha256": "023lzr112gjscmyqgfz5ib3a80s3bis72acsaxnk4jw32knjy4yl"
},
"stable": {
"version": [
@@ -2293,7 +2293,7 @@
0
],
"commit": "97c20b1fd9ad3f138e1100e3a837d05108c4c564",
- "sha256": "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj"
+ "sha256": "1x4apig2hrvvy6pjciklmz5afpq5l4rmfjahc2wvyzs79abh0icx"
}
},
{
@@ -2327,14 +2327,14 @@
"repo": "cpitclaudel/alectryon",
"unstable": {
"version": [
- 20210518,
- 1550
+ 20210722,
+ 1554
],
"deps": [
"flycheck"
],
- "commit": "3fad996473200fa07b0381cd66179089d10fcc6f",
- "sha256": "0qj4cjra1kyiw8h2qm024wgy9fy3xjwik7sr1mfkhk1gbndl8m3w"
+ "commit": "f3688475bba4c451fdfe52ad95fb25c7050ec9f9",
+ "sha256": "02h6xhnnbx27gq3xm2f2j3py5h94kcg8m8399j7dhski60ncn4b4"
},
"stable": {
"version": [
@@ -2513,14 +2513,14 @@
"repo": "seagle0128/all-the-icons-ibuffer",
"unstable": {
"version": [
- 20210325,
- 512
+ 20210721,
+ 651
],
"deps": [
"all-the-icons"
],
- "commit": "f304d283cbb815cd28b86c1cbe74b706c0678e25",
- "sha256": "1afjcv94p8za3ri9c324j1wdg4klpcaippby3r1avwnjy5l9qpav"
+ "commit": "a3cc2d96f619a2a6cf1cb6ad881ab6e509ac8fc3",
+ "sha256": "09l0y99lqi3p7h0ll3hm13zi6kp2pbya8rdpvqrx7jpkg3w5slfk"
},
"stable": {
"version": [
@@ -2575,15 +2575,15 @@
"repo": "seagle0128/all-the-icons-ivy-rich",
"unstable": {
"version": [
- 20210626,
- 1956
+ 20210721,
+ 653
],
"deps": [
"all-the-icons",
"ivy-rich"
],
- "commit": "78ee2fb4eb43c970e12a91949f7efd26ca1834d5",
- "sha256": "04pgr5xjk84kksck7f1y9gpvxxnsy803zq252hg1pzg1pl6bx3ga"
+ "commit": "b20df3e2c901a107441b6246b9d03fa3dc57f47f",
+ "sha256": "1hqf3jqpq0viygxnbkq7rsabpyygz2kr6nl6jrarm8wdczs55rpr"
},
"stable": {
"version": [
@@ -3217,8 +3217,8 @@
20200914,
644
],
- "commit": "3543ef3df19228012a1ac5be766cc38fd2f65f6a",
- "sha256": "0wlqrl8ikqc7q61i2qzmwp6h0mrv9kn5229pbsrb1ris7gxgi13b"
+ "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a",
+ "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6"
},
"stable": {
"version": [
@@ -5324,11 +5324,11 @@
"url": "https://git.sr.ht/~pkal/autocrypt",
"unstable": {
"version": [
- 20210709,
- 1230
+ 20210720,
+ 1810
],
- "commit": "32786dc552569c7cc9970628f580b0b7b8e0b03d",
- "sha256": "0vs8kwgxvmbr1yy1f8jvxpixy4jfxpdk17mq0gfvlcmnqb560gdr"
+ "commit": "b2c8d431f89788d1e01d42c55e65612e6fc11b44",
+ "sha256": "05378j4pyxb9s8wpffmmrcn09inxjipiw1sy8jqgc5cslpd1jl3g"
}
},
{
@@ -5532,8 +5532,8 @@
"avy",
"embark"
],
- "commit": "acbe1cba548832d295449da348719f69b9685c6f",
- "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2"
+ "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf",
+ "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha"
},
"stable": {
"version": [
@@ -6187,7 +6187,7 @@
"flycheck"
],
"commit": "5bfd5f91b9f91e46158e0419c6bb5c350e7684a1",
- "sha256": "0nb6dbk8aclkq7jki52y4lwgbxg61xh1598l08yfv2l1ykhgg0n0"
+ "sha256": "0mb85g7bydd0nv3hjzvqb3d01cs4hg5846ibcznaqhsqk93pgm2h"
}
},
{
@@ -7044,8 +7044,8 @@
"deps": [
"bibtex-completion"
],
- "commit": "f5b73bce4fcc31d55044d17949569b35dc50283b",
- "sha256": "06wv37ck15i4m90lwksyc4zq9pwx4ljr90g8yqjmmracpgbm967y"
+ "commit": "6b9a075aebd85fee8a071ffbbada1158ecd470d4",
+ "sha256": "0ihpm7pnlx5acj7jmrqr9di92908mz7z3k1kg62k8vxj2q43a00c"
},
"stable": {
"version": [
@@ -7067,8 +7067,8 @@
"repo": "tmalsburg/helm-bibtex",
"unstable": {
"version": [
- 20210408,
- 1649
+ 20210718,
+ 1044
],
"deps": [
"biblio",
@@ -7078,8 +7078,8 @@
"parsebib",
"s"
],
- "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e",
- "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik"
+ "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590",
+ "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h"
},
"stable": {
"version": [
@@ -8701,17 +8701,18 @@
"repo": "alphapapa/bufler.el",
"unstable": {
"version": [
- 20210716,
- 1006
+ 20210722,
+ 1703
],
"deps": [
"dash",
"f",
"magit-section",
+ "map",
"pretty-hydra"
],
- "commit": "d466eac6c4b2ee25c765e7f31e44beb38dd44e4b",
- "sha256": "00gyqpm0g437z71vbfd4kmih23vh6909dvygng133vxzly9k4f24"
+ "commit": "b951e621bc4a4bb07babf8b32dc318d91ae261c9",
+ "sha256": "14d2mcx6ppjzkpv63m7iir0j2dn549gkxr30bxx8qvc1v7r7r6wn"
},
"stable": {
"version": [
@@ -9748,6 +9749,30 @@
"sha256": "0xz62fivll6yv1x94f7f5m07zg7383llyz6wa1n5q1ysix2p20j1"
}
},
+ {
+ "ename": "capnp-mode",
+ "commit": "7981e5108f449a52631699439724712cba1d2a40",
+ "sha256": "04idy13yzb5khzycsh394j8m4cchvnl7j75cw7ms1kdxzx6w2k4b",
+ "fetcher": "github",
+ "repo": "capnproto/capnproto",
+ "unstable": {
+ "version": [
+ 20210707,
+ 2310
+ ],
+ "commit": "583f07515b3be254ec150ce1dadabb48fdfa5bd3",
+ "sha256": "1nccl2v2fvpmsmvga1ghb9kb72v90bgdqhxb153086qx69s7vlcn"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 8,
+ 0
+ ],
+ "commit": "57a4ca5af5a7f55b768a9d9d6655250bffb1257f",
+ "sha256": "0z7p9687bdvhddgyb6b3j0c3bngynnyvc8z6yp4hhynvrlvsmy5d"
+ }
+ },
{
"ename": "capture",
"commit": "bdfe43be6c5f77845e82745534a1b1a9eb190466",
@@ -10424,8 +10449,8 @@
20171115,
2108
],
- "commit": "d87317f360d64b5f68809a564d03436d2b07e96a",
- "sha256": "1g2q4fg95wpg1d77zrk80923553w2sgsby3ylrrq92y11ks4yiq5"
+ "commit": "94d292543d4869c3c5b48bb4dd1e5d901ce6227e",
+ "sha256": "12pxnwgfr0ypf80hpgrqyb789wj41gv8cbzsr1jks7pinvpda65f"
},
"stable": {
"version": [
@@ -10501,7 +10526,7 @@
"yaml-mode"
],
"commit": "f3462930067de8f79c3d2e8da14d1924f609d3ab",
- "sha256": "15ndphxz1jy4wbk52f6l3hk67b29844ljmmxd8wmahmi6c8nh3si"
+ "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi"
}
},
{
@@ -11419,14 +11444,14 @@
"repo": "emacs-circe/circe",
"unstable": {
"version": [
- 20210713,
- 1609
+ 20210717,
+ 1041
],
"deps": [
"cl-lib"
],
- "commit": "07d6d82cba864b1e38d3bd46654f2e1928a997c2",
- "sha256": "04h60s6ig43sj144s7dlip1saf9kdwvzlfys8qwwx48003rbs0dp"
+ "commit": "77e16de3b9fbaa0417b56a9acc70a9bca17c4ad0",
+ "sha256": "1ww04kfz4kkbhrbd78r4dpylhayb5hl72qcjv8wm0mhgfwmbb358"
},
"stable": {
"version": [
@@ -11497,8 +11522,8 @@
"repo": "andras-simonyi/citeproc-el",
"unstable": {
"version": [
- 20210709,
- 602
+ 20210719,
+ 918
],
"deps": [
"dash",
@@ -11508,8 +11533,8 @@
"s",
"string-inflection"
],
- "commit": "dc118772ad4585c0511f4f8f25c81faf69952038",
- "sha256": "0v8z6fhrsi9kszqcbrm1ggvin0jff744byaiw06d3id1hc428iq5"
+ "commit": "b46d3c3c6e5a00237f62084c64a25c4b4efabe1b",
+ "sha256": "0gyyxaiky82km9c897vvslnin7yll3yzjfz0fd5zg7lz4kmjilqk"
},
"stable": {
"version": [
@@ -11575,11 +11600,11 @@
"repo": "universal-ctags/citre",
"unstable": {
"version": [
- 20210716,
- 403
+ 20210722,
+ 1158
],
- "commit": "813e8c32a41f84ff099feddb5a4d5a51c5c200b5",
- "sha256": "02482ln1458hb6z1x89b7294q4bwwdqi08h6m0mmvgd3vz2nwmqs"
+ "commit": "45e7f801744f471b43fdd96cfe734a4a3796bab6",
+ "sha256": "1sdj2nvgnbvsz2cvgzpr0axzm4gcb0sna0ps37mbxb0y356xyzfv"
},
"stable": {
"version": [
@@ -12530,8 +12555,8 @@
20210104,
1831
],
- "commit": "4e17e90988e9f23dece4c04f574d456309d7a50c",
- "sha256": "1gqbgs8zxn9dcpxmbykz0mrqy6p229b0pdz3hnk0kncqkk004lx1"
+ "commit": "f7a3031b7defbc805a39a8b23dbefe10764d956b",
+ "sha256": "13036j6019viskahslw3vq28h5kn1xr6ap61l2hvgzpimriam012"
},
"stable": {
"version": [
@@ -13499,11 +13524,11 @@
"repo": "company-mode/company-mode",
"unstable": {
"version": [
- 20210709,
- 1110
+ 20210721,
+ 2003
],
- "commit": "d77184094b9a45b204813d824918e1ec2aac8504",
- "sha256": "09f59ipp6c2b1xpnmk82ygxcfkfhh36h4g1c07dmxf7m3z1hwlgi"
+ "commit": "7b731e7d435d8782c5095f6f269704a5e21eccad",
+ "sha256": "1av9ln4nhkjqd6x6v43yjnzp07kx1qhzcxjni343x4npix6p41xm"
},
"stable": {
"version": [
@@ -14406,7 +14431,7 @@
"seq"
],
"commit": "8d643a1776523ef1a6e0bff0bb0a390772fcc77d",
- "sha256": "17m9x3yy0k63j59vx1sf25jcfb6b9yj0ggp2jiq1mih4b62rp97d"
+ "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv"
}
},
{
@@ -14651,7 +14676,7 @@
"s"
],
"commit": "0e6941e1832faafb2176238339667edd482acd95",
- "sha256": "1ri022shrwiw10gdydm66c2xya1qxl449r5f8qadals7m4crczp2"
+ "sha256": "0xw475spfwq32nn5qz3gk22cggj1f5y245da9030vzi2jfb9vvid"
}
},
{
@@ -14741,8 +14766,8 @@
"company",
"prescient"
],
- "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4",
- "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n"
+ "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9",
+ "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h"
},
"stable": {
"version": [
@@ -14930,8 +14955,8 @@
"company",
"rtags"
],
- "commit": "65113e2a137baa9f85dc2157b893291470788dc4",
- "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h"
+ "commit": "3a057f127b931c683288f8731f05ba5e2aab4133",
+ "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g"
},
"stable": {
"version": [
@@ -14996,8 +15021,8 @@
"company",
"solidity-mode"
],
- "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4",
- "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0"
+ "commit": "6f7bd1641e5282ec5163188d8b8c2f6dfddc2e36",
+ "sha256": "0rkw21pic9nypv7vz06chyn9mjl560a4dayb84gj5w6v8gfznrcw"
},
"stable": {
"version": [
@@ -15589,24 +15614,6 @@
"sha256": "09vq7hcsw4027whn3xrnfz9hkgkakva619hyz0zfgpvppqah9n1p"
}
},
- {
- "ename": "confluence",
- "commit": "30de78c9cf83de30093a5647976eeaf552d4b2cb",
- "sha256": "0xa2g168mm31kh5h7smhx35cjsk1js88nzs19yakjljf56b1khlf",
- "fetcher": "github",
- "repo": "emacsorphanage/confluence",
- "unstable": {
- "version": [
- 20151021,
- 128
- ],
- "deps": [
- "xml-rpc"
- ],
- "commit": "4518d270a07760644c4204985c83d234ece4738b",
- "sha256": "1lrq23cxlp2vkyv7g56r06bp7chhw10kii3ymkydf24y4pyn1zpg"
- }
- },
{
"ename": "conkeror-minor-mode",
"commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8",
@@ -15713,11 +15720,11 @@
"repo": "minad/consult",
"unstable": {
"version": [
- 20210716,
- 1219
+ 20210722,
+ 1644
],
- "commit": "5fb6248c8e12630ce1247985c67ea28ae4077e4f",
- "sha256": "1cgk144alm3pbig9acm62q3r7479x69ig76q3z6agamdvf91ay29"
+ "commit": "d42ccdca5bbc4c437819cf4d29c7b8728ed090bc",
+ "sha256": "134flhq2rx2qjhfc5fspsijpdiv7a3z5mk0j1pwipfwfkid27nqk"
},
"stable": {
"version": [
@@ -17451,6 +17458,14 @@
],
"commit": "a7f0f4610c976a28c41b9b8299892f88b5d0336c",
"sha256": "0j8m7rhkf98zqkg6zydcks6qs4msw6vz51nbqya23hka2wpz7f81"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "commit": "a7f0f4610c976a28c41b9b8299892f88b5d0336c",
+ "sha256": "0j8m7rhkf98zqkg6zydcks6qs4msw6vz51nbqya23hka2wpz7f81"
}
},
{
@@ -18060,8 +18075,8 @@
20190111,
2150
],
- "commit": "5bf5aa63d6b6742144071a2af896067c21b3752a",
- "sha256": "1nnyca4bagdbpmzy64pqy95vxbj3dx7lfbapvs120zbpxj193p7a"
+ "commit": "e46e9dd7c37d8d7ad432a94fff5daafa7fa444e3",
+ "sha256": "0lbla1pbqk2gaprkwdyxg5x381nmxx1jcc9snls6crlsf8bbhrm4"
},
"stable": {
"version": [
@@ -18268,8 +18283,8 @@
"repo": "emacs-lsp/dap-mode",
"unstable": {
"version": [
- 20210711,
- 1427
+ 20210720,
+ 448
],
"deps": [
"bui",
@@ -18281,8 +18296,8 @@
"posframe",
"s"
],
- "commit": "685168efc72e61bca2a248155bace7ec633269a5",
- "sha256": "1mwy92rj9jj4ziflhzpy774vrp5m7zwzy2x1iyj33mn2rmykwl2w"
+ "commit": "d472a6c937cf519434e718e873c195f5d1e80f19",
+ "sha256": "17az0rvcy84iahlfdn246marjn4kgrif4gnv0h1zf4sdznk2aijh"
},
"stable": {
"version": [
@@ -18338,7 +18353,7 @@
0
],
"commit": "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976",
- "sha256": "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky"
+ "sha256": "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1"
}
},
{
@@ -18638,11 +18653,11 @@
"repo": "emacs-dashboard/emacs-dashboard",
"unstable": {
"version": [
- 20210714,
- 305
+ 20210718,
+ 940
],
- "commit": "09932ef488b47c6b645a081fee4a82be437f98d8",
- "sha256": "1kfsc5f37i4k4j8rqmi70cd6yvwxhhq2q513gby8qj2bqsgiwkhb"
+ "commit": "67573ceb3db5bc7a5192311c6cac044cb29f61a7",
+ "sha256": "1ljcym1gwibldsp656a4h9x4hn36ywavqan7h8gk2grr5716cpx2"
},
"stable": {
"version": [
@@ -18963,7 +18978,7 @@
"ht"
],
"commit": "5123477396a562fae350a89fbed79464cc498bc9",
- "sha256": "0xd94cpqpv0yw70ajrvs69ygds62m40fk0m4s59zvdn5qs7ivj4k"
+ "sha256": "1bkiwg1wp3l904159gycdr83xkb3i0h2k0da7akzkwc957abvp8w"
}
},
{
@@ -19848,7 +19863,7 @@
0
],
"commit": "6d0c4203eb192d73d89261b3a9bad52951e394af",
- "sha256": "1rdmhsrlqn19a140i3099fp7f9wnlglp760rnrjp5p840wzfm74q"
+ "sha256": "0a89bp9vz8lzg5klhmzpfmc0mhqmx667ivr86ckkjhiwr2mmzq0s"
}
},
{
@@ -20305,11 +20320,11 @@
"repo": "HKey/dired-atool",
"unstable": {
"version": [
- 20210706,
- 1456
+ 20210719,
+ 404
],
- "commit": "c01e0a79c952a29db17c262c9ce8a90632b04b3a",
- "sha256": "1r44s3f29p70li6k6646xcby3ypz1ljgd4j1fhdd0x4d7a09zl0v"
+ "commit": "01416fd5961b901c50686c91cb59b3833adc831b",
+ "sha256": "0dx829jlxr84mylcr0l7wgbkbhajmb2yg2dcnyd1gi768fgh7jdj"
},
"stable": {
"version": [
@@ -20569,7 +20584,7 @@
5
],
"commit": "dbace8d2250f84487d31b39050fcdc260fcde804",
- "sha256": "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki"
+ "sha256": "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd"
}
},
{
@@ -20752,7 +20767,7 @@
"hydra"
],
"commit": "79e422be55c72bfe36d2ec8a838f19d1cc8d101a",
- "sha256": "14hb3d76y4n8qvfl74v9hzgl6774bqdcmsa0npv3gs144fbx9prk"
+ "sha256": "01zdha3p7wsf98yayvwgpd4arcs7yhz62yk1nyq9n13hvmqg7dvk"
}
},
{
@@ -22238,16 +22253,16 @@
"repo": "seagle0128/doom-modeline",
"unstable": {
"version": [
- 20210706,
- 604
+ 20210721,
+ 1833
],
"deps": [
"all-the-icons",
"dash",
"shrink-path"
],
- "commit": "06606e0b8b3c19fbe56e25702e2a664deec593c3",
- "sha256": "0akyzih955j2ijnrvfnajwpml5xb3v9pg9wbn4z8nkcw33hvxgk9"
+ "commit": "8cbb0457f3f35b3a1615eef176785aacdf5afe97",
+ "sha256": "1hxs2vdp0qvjcn32yrxxbqq3vgjb68fx0fqsqhh5x3cgvabcim0j"
},
"stable": {
"version": [
@@ -22955,8 +22970,8 @@
20210715,
548
],
- "commit": "48bd29decb847bd9357aceeca9ad1c916f199913",
- "sha256": "02fy271d8s77l2g4rykgpnqvy4sq2ri88xz97ink00r1r12cdvk9"
+ "commit": "07dd21abc029f50c6a3a96f2867d31102366faba",
+ "sha256": "0pvbvzdljxq7mjfsx4fcm3782wdawx2mgzi4hy7kvw7z80n9zm7k"
},
"stable": {
"version": [
@@ -24554,8 +24569,8 @@
"repo": "joaotavora/eglot",
"unstable": {
"version": [
- 20210611,
- 2249
+ 20210721,
+ 2323
],
"deps": [
"eldoc",
@@ -24564,8 +24579,8 @@
"project",
"xref"
],
- "commit": "5cc8df63d86a6c43134dd6e4e3ae26cfae14e66a",
- "sha256": "0whplm1858d3mv4af6qk0jr5dk9ym1yzp4zsslrrfpyi54vy96yx"
+ "commit": "194b178ef41ccd3d937983f3829d44a546bb24d6",
+ "sha256": "12pmqq3l08p1vggbhccpg9bh0n78qrdmk5q30a1d4jrfkifcfbr0"
},
"stable": {
"version": [
@@ -26441,11 +26456,11 @@
"url": "https://thelambdalab.xyz/git/elpher.git",
"unstable": {
"version": [
- 20210716,
- 1445
+ 20210720,
+ 1520
],
- "commit": "7e0919bd74952fb229862f1280e01817721b7fc2",
- "sha256": "13fjp20hf4jv3325ipnjrzqvxa122sfhs44dgsr52g9mkhhc6kbm"
+ "commit": "3cddc8bdcb0a05ecd308c310bcd020f7288af4de",
+ "sha256": "12xcra3a5bsihcfqs014bcayw0wmv5f22gdk6dipfx1pjygz1x1k"
},
"stable": {
"version": [
@@ -27031,7 +27046,7 @@
0
],
"commit": "f0add6820d250875f7d7c21aa5d813dc73dbcf96",
- "sha256": "18bnw6yb41ki1xvkhi07v7fqx3var928majgd6613ra9nirnyqnj"
+ "sha256": "0zg52b3hl0rp9hjz04546kngssxs0l64dm01bwp9hapy7pichbci"
}
},
{
@@ -27114,11 +27129,11 @@
"repo": "oantolin/embark",
"unstable": {
"version": [
- 20210615,
- 1833
+ 20210723,
+ 47
],
- "commit": "acbe1cba548832d295449da348719f69b9685c6f",
- "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2"
+ "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf",
+ "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha"
},
"stable": {
"version": [
@@ -27137,15 +27152,15 @@
"repo": "oantolin/embark",
"unstable": {
"version": [
- 20210525,
- 1515
+ 20210717,
+ 1845
],
"deps": [
"consult",
"embark"
],
- "commit": "acbe1cba548832d295449da348719f69b9685c6f",
- "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2"
+ "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf",
+ "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha"
},
"stable": {
"version": [
@@ -28333,11 +28348,11 @@
"repo": "alexmurray/erc-matterircd",
"unstable": {
"version": [
- 20210701,
- 32
+ 20210720,
+ 412
],
- "commit": "6e9698310f5df5193bccb334839bca29e4bbfe30",
- "sha256": "0cwq1ljgb0ga1b8f8gks9c4y8rqjfawpr4l0fi0p3y674a76z33f"
+ "commit": "caafa1a62a76c2132d8b0872d57684f877608408",
+ "sha256": "0cba6wawwjmidpv1mccmrn2cr5xkyyj44aildifvyqay7nhldp3d"
}
},
{
@@ -28367,7 +28382,7 @@
"switch-buffer-functions"
],
"commit": "7539654e4a72edcc5bba07a101961e5bf0a9d449",
- "sha256": "11zpqwh1mlfifbgnvhc63bvnhg340jgxssm3m43hr1sxsyb52lh6"
+ "sha256": "0pfnp7gw75hfhsy7jizp622s6yv61h3k2s0l2g33i801ar6abwm5"
}
},
{
@@ -28699,8 +28714,8 @@
20200914,
644
],
- "commit": "3543ef3df19228012a1ac5be766cc38fd2f65f6a",
- "sha256": "0wlqrl8ikqc7q61i2qzmwp6h0mrv9kn5229pbsrb1ris7gxgi13b"
+ "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a",
+ "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6"
},
"stable": {
"version": [
@@ -28723,17 +28738,17 @@
20210315,
1640
],
- "commit": "81c6d94625a04f6550e77a068489ca6378cabfee",
- "sha256": "1kkjyradh316xcqsh9pn4l1nvz1krn8cm3zch0vfp47dkkg54w1y"
+ "commit": "4adbbaa681d902cc342f20c4e153d0cb6d866238",
+ "sha256": "01nq7qdmdpasvay3jg9kmg8wamvf37pwqcc37sfc85h81qf2rvc4"
},
"stable": {
"version": [
24,
0,
- 3
+ 4
],
- "commit": "0a887ba078f6faadea128b51a98e928dcb0e79a4",
- "sha256": "0hirfg5y53gj5smf2rqxiadj02ad761hgq3yqcz4j1ldnm50hlr9"
+ "commit": "c07336b844645f80430505194c01ffd59672804f",
+ "sha256": "0wy4fbflsm5sc1jjs6vf8ad0621q1m3vmfazz6jrg1s9llsxgr9r"
}
},
{
@@ -29815,15 +29830,15 @@
"repo": "tali713/esxml",
"unstable": {
"version": [
- 20210323,
- 1102
+ 20210722,
+ 1345
],
"deps": [
"cl-lib",
"kv"
],
- "commit": "9f96449f6059cb75491dc812ddeb1b6200ec6740",
- "sha256": "1xzxmgsg0j72sf1vjh9gjswz3c29js0kqhm7r3jrqrh3a5agdnml"
+ "commit": "701ccc285f3748d94c12f85636fecaa88858c178",
+ "sha256": "1ig5i3h5ldsdmxas4nvxrdbdmawgpa10kwq3mmzczp5qwp5a3vq8"
},
"stable": {
"version": [
@@ -30180,15 +30195,15 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20210715,
- 1839
+ 20210721,
+ 658
],
"deps": [
"cl-lib",
"goto-chg"
],
- "commit": "070abb16620653fb343980fb85a13c4d55e1070b",
- "sha256": "0pcr471snnmhycvvgczs1gbil45w6lf1bdmg7w19vh2a0dq4pqi9"
+ "commit": "5201f5cf5a4870e081d09bc3113a55cb94f3812f",
+ "sha256": "0i6b358vcsywx66fm5p4476rpy7bnl92zyjisb47kqlkznr3s25r"
},
"stable": {
"version": [
@@ -30382,15 +30397,15 @@
"repo": "emacs-evil/evil-collection",
"unstable": {
"version": [
- 20210715,
- 1552
+ 20210721,
+ 1454
],
"deps": [
"annalist",
"evil"
],
- "commit": "3bd5e90accbb3a12d924bb7b4220221493675591",
- "sha256": "1nikhz4l01zi884dwyjfsaralc1pd6y70fvd36i4qn477xinsvk4"
+ "commit": "8d10ad4ea59752595de37a8ddc44e8d3fb14fe89",
+ "sha256": "18qkc3mbc8sr56823bpdr319dg2k2l29chk7c6zr5ln5jls08q8a"
},
"stable": {
"version": [
@@ -31083,20 +31098,20 @@
"repo": "redguardtoo/evil-nerd-commenter",
"unstable": {
"version": [
- 20210624,
- 1122
+ 20210719,
+ 1305
],
- "commit": "118bebd02a489ddf5eee3ab6fb55b3ef37ebe6d4",
- "sha256": "15phgj1x2k7i6wnhq3lbrjldrc7xr18z4sgsmklwwgr4blx9ql1s"
+ "commit": "2133167e0699f44fe37830839362e2e6793bce88",
+ "sha256": "0qrqpwnny7v4l8abf93c7l6dz7wkk1b8i6wv0fdcq6b7jrq1ixh4"
},
"stable": {
"version": [
3,
5,
- 4
+ 5
],
- "commit": "b8ac35fe019df5602c31912f65303a3d8ad0066c",
- "sha256": "1vyl8lidhjph7k86n8q09mwqpasaxsmwb8vi5i2gcd6klds9hg0d"
+ "commit": "8b0d9654ecf8f3f1d88db6be8238aaf76afa8a94",
+ "sha256": "1qrlg4cxlsd4cf1z8j2662pfb9p6pnqpsyb74flja9cqv6g5ylp8"
}
},
{
@@ -31708,8 +31723,8 @@
"deps": [
"evil"
],
- "commit": "070abb16620653fb343980fb85a13c4d55e1070b",
- "sha256": "0pcr471snnmhycvvgczs1gbil45w6lf1bdmg7w19vh2a0dq4pqi9"
+ "commit": "5201f5cf5a4870e081d09bc3113a55cb94f3812f",
+ "sha256": "0i6b358vcsywx66fm5p4476rpy7bnl92zyjisb47kqlkznr3s25r"
},
"stable": {
"version": [
@@ -33084,14 +33099,14 @@
"repo": "jrosdahl/fancy-dabbrev",
"unstable": {
"version": [
- 20200129,
- 1933
+ 20210720,
+ 1833
],
"deps": [
"popup"
],
- "commit": "158e1e54055cafe5da9122a59519e8b3ed1057cf",
- "sha256": "06616lzvv6vdc2i37gy47zw3rb4yjml83vn5py2k30ck8gl4fhs2"
+ "commit": "1096582f68cda91fe9d9336756b7c044ab0d6096",
+ "sha256": "0qp1nqcni5a3m9iaqar07sii6mpcnnqxmaf5n2fpz1iaz6bwsxva"
}
},
{
@@ -33478,11 +33493,11 @@
"repo": "technomancy/fennel-mode",
"unstable": {
"version": [
- 20210713,
- 2129
+ 20210720,
+ 1516
],
- "commit": "0f83112e70c1cd13a8b98e9e75b2291fcdf3d57f",
- "sha256": "1n1f9bn8447aq3666q9lj7idzj9nwkmknfzybk3is98m03cjki3z"
+ "commit": "12bdd8ee09ce2ba7c232df96fb199461d25a89c5",
+ "sha256": "13fyadml9wa30f4brdwfnby067q6bp2dl1y6x7hz0pzzlbk4sbs5"
},
"stable": {
"version": [
@@ -33491,7 +33506,7 @@
0
],
"commit": "ea8564a2cc4f7e10b3fc13faf26a4f098b159f00",
- "sha256": "1qnmcysrl2zxiid4v1h1hq1nax3a7sxs2dmag54sfifm149lf7f3"
+ "sha256": "03z3f60qsn6k9wg1km49ad4xlwp82114r5pzibnxly2n0vmmdsyb"
}
},
{
@@ -33819,11 +33834,11 @@
"repo": "redguardtoo/find-file-in-project",
"unstable": {
"version": [
- 20210427,
- 1205
+ 20210720,
+ 244
],
- "commit": "680ec93808176442a2c78b91b18bb4256d81d340",
- "sha256": "1af30i3nsms1s2gwq3wx0xbmjxd95hipai63icw3jpwc3pmw3g2n"
+ "commit": "cde02e549512742366a91ffb70c86c354117cfde",
+ "sha256": "1xkpyn5lh6nhsmnq50174lnir9c9xhwb9ihvj0lw721s57xq3aa0"
},
"stable": {
"version": [
@@ -34158,7 +34173,7 @@
4
],
"commit": "ba63f0591c3be1644ee7ee972430c74b5d346579",
- "sha256": "014vbzxz1jmm83a5mg4zsyxm8nw96n8s2l7h3myhrn880d9xnqgg"
+ "sha256": "1yjfvb2vn5pmrq5fw4sfx1lfkbnkwlc160izpvkrf9ww9xsas6al"
}
},
{
@@ -35013,7 +35028,7 @@
"flycheck"
],
"commit": "b4ffad5cabea7e858c66dc824d545653b1cdcb70",
- "sha256": "1la7qhczg9bgs1klinwj21mjywsg1nm3sxd5cyc09bxjzbflzzz6"
+ "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi"
}
},
{
@@ -35789,8 +35804,8 @@
"deps": [
"flycheck"
],
- "commit": "061ce63d217b7cd165c487d81331843dea5bc11c",
- "sha256": "088g4vi01xanjm5dyzlw483h8w3dyijjccla37zfa55cg0nksdd3"
+ "commit": "59b37e09923290da1c8458e507da43f403f555d2",
+ "sha256": "1l0rq2g9dn90xr75cjz64cyai90m5cayr2b2fdrkkrz70g00pqlr"
},
"stable": {
"version": [
@@ -36052,7 +36067,7 @@
"flycheck"
],
"commit": "54744a78d06373404933fedc3ca836916e83de51",
- "sha256": "1zdvan6l2s97s7swnccq21z1ja8vl64l757j3hg50ipq8j5yy9dl"
+ "sha256": "1vvsswadiks9mpb49vz2q8z69wq0jalsvgalhn10k3pyz7p0abnd"
}
},
{
@@ -36985,8 +37000,8 @@
"flycheck",
"rtags"
],
- "commit": "65113e2a137baa9f85dc2157b893291470788dc4",
- "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h"
+ "commit": "3a057f127b931c683288f8731f05ba5e2aab4133",
+ "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g"
},
"stable": {
"version": [
@@ -38536,11 +38551,11 @@
"repo": "d12frosted/flyspell-correct",
"unstable": {
"version": [
- 20210124,
- 1143
+ 20210723,
+ 505
],
- "commit": "404233604439117301562deadc952fe82cb02120",
- "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6"
+ "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
+ "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
},
"stable": {
"version": [
@@ -38567,8 +38582,8 @@
"avy-menu",
"flyspell-correct"
],
- "commit": "404233604439117301562deadc952fe82cb02120",
- "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6"
+ "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
+ "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
},
"stable": {
"version": [
@@ -38599,8 +38614,8 @@
"flyspell-correct",
"helm"
],
- "commit": "404233604439117301562deadc952fe82cb02120",
- "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6"
+ "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
+ "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
},
"stable": {
"version": [
@@ -38631,8 +38646,8 @@
"flyspell-correct",
"ivy"
],
- "commit": "404233604439117301562deadc952fe82cb02120",
- "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6"
+ "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
+ "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
},
"stable": {
"version": [
@@ -38663,8 +38678,8 @@
"flyspell-correct",
"popup"
],
- "commit": "404233604439117301562deadc952fe82cb02120",
- "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6"
+ "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00",
+ "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh"
},
"stable": {
"version": [
@@ -39350,14 +39365,14 @@
"repo": "rnkn/fountain-mode",
"unstable": {
"version": [
- 20210611,
- 1228
+ 20210717,
+ 906
],
"deps": [
"seq"
],
- "commit": "ede8a254fe1bfb125b52ea71252b863cf80eee18",
- "sha256": "0s2qlnx5lq5ni53r0i4fja6qfxxbg6apq5madgkiyz5d1bay551g"
+ "commit": "d2e0cb8f328a1219a3830f82fd01e789cac398b2",
+ "sha256": "04a5mwlxq43mk132j7v4gx9jiss2pah38rgk0dsc6pn00xjf4j9q"
},
"stable": {
"version": [
@@ -39974,8 +39989,8 @@
"deps": [
"cl-lib"
],
- "commit": "5b1c814d84714b0c94c5a7b4aeb3f44d2a4d5998",
- "sha256": "1sw7abwli4hjwbyqmkc8vfg4sgil59gkygvk3f4p6gdihnfqynwp"
+ "commit": "d9b6d549251d4a1a7cec2e83b11bda2ef7ff4ed2",
+ "sha256": "0246kl945g5v539h1hvwg06jsmj10a4q8rld3g6jix2iy1jmnfw7"
},
"stable": {
"version": [
@@ -40586,7 +40601,7 @@
16
],
"commit": "803dfeb9414ed7b99c5d567170f32c97cafa1114",
- "sha256": "16jqni4s2yxszhkbb83fkgflygbxzx01cmq2qq40p4ihbvwm0gb0"
+ "sha256": "0s02443pxi49c8hmkk3g489ngb5bl95inraq3jabb6dh7gyxgkag"
}
},
{
@@ -40873,7 +40888,7 @@
"geiser"
],
"commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981",
- "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07"
+ "sha256": "1dyzpr9i5pxi2p2hg3ndryh7x4y0r9bra88pd1l904vdfsxdxv5z"
}
},
{
@@ -41367,8 +41382,8 @@
20210401,
656
],
- "commit": "8ab9c88a2b8cccd3c092e155f84b1b19930d0719",
- "sha256": "1jiglrlhrph57p5kkm1qlqihwl6z7h9qh16qmmd5783ynksnbxp3"
+ "commit": "5517a557a17d8016c9e26b0acb74197550f829b9",
+ "sha256": "0n0gd4k1c1s8xj7p1yg7irnkaxw9f91jmjp5www5hrwhi3mbmpb8"
},
"stable": {
"version": [
@@ -41376,7 +41391,7 @@
2
],
"commit": "fa81e915c256271fa10b807a2935d5eaa4700dff",
- "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh"
+ "sha256": "1jiglrlhrph57p5kkm1qlqihwl6z7h9qh16qmmd5783ynksnbxp3"
}
},
{
@@ -41675,8 +41690,8 @@
"transient",
"with-editor"
],
- "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45",
- "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5"
+ "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8",
+ "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r"
},
"stable": {
"version": [
@@ -41726,7 +41741,7 @@
"s"
],
"commit": "8a403005ea7f7611bb1bfd829eeefe5a4f10bb40",
- "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5"
+ "sha256": "02hag6jd55mqf0n90p0hvihmqjvd0cdlpm5knsxk3cll7fp0kkkr"
}
},
{
@@ -41949,7 +41964,7 @@
0
],
"commit": "ea49e2e005af977a08331f8caa8f64d102b3b932",
- "sha256": "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv"
+ "sha256": "05bkpg7xz8644np9imsj5ms821sbsb784ap5fjdnnn69kllz0d33"
}
},
{
@@ -42089,7 +42104,7 @@
"transient"
],
"commit": "391eb61050de321101e631fcf373fc70ec6e7700",
- "sha256": "1pz4l1xnq6s67w5yq9107vm8dg7rqf8n9dmbn90jys97c722g70n"
+ "sha256": "05pyjhi26charkjy0mhvigd72rvb4s1s8imycfynf0fmjy7f7n7x"
}
},
{
@@ -42617,7 +42632,7 @@
"yaml-mode"
],
"commit": "2651e831aed84ee2512245952fac94901b086549",
- "sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59"
+ "sha256": "0yd6s5vy5afkigm87xyh1nnwljplx1wdn5h02224ica0py48fzhd"
}
},
{
@@ -42648,7 +42663,7 @@
"gitlab-ci-mode"
],
"commit": "30ea0eab74b24818f187242b079845785035e967",
- "sha256": "0awv24znkxs0h8pkj4b5jwjajxkf1agam09m5glr8zn5g3xbj798"
+ "sha256": "1w1simnlffg56j79gal1qf1nlav9f8fmr2zfswfrmcv6cac6fhj9"
}
},
{
@@ -42710,7 +42725,7 @@
"helm"
],
"commit": "5fe0a66642da6f4e7ba9e1e3a96572c7f1876e37",
- "sha256": "1c5js19zyb1z61hapvbfcl5jhrjqij46cxldgqij6al0scw44dga"
+ "sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w"
}
},
{
@@ -43171,7 +43186,7 @@
"gnus"
],
"commit": "210c70f0021ee78e724f1d8e00ca96e1e99928ca",
- "sha256": "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw"
+ "sha256": "0h7w5wrkrd0jw8nmgbkzq8wam7ynvy7flhjg4frphzmimlhysli2"
}
},
{
@@ -44218,8 +44233,8 @@
20180130,
1736
],
- "commit": "4044bbd5ca4434b8cecd23a4da8ae173c1e0d58e",
- "sha256": "0nym4c4j0awxzpj2qkds1fxppc7jzzazwj0j8qx6vr5yfp7iry51"
+ "commit": "d88a5b7b59948d23977942ee62037e8912ff68ce",
+ "sha256": "1k29za2g3b10jy3nlkg09h5jn8d25w9yghrmz8cvm8zghxkqi2m7"
}
},
{
@@ -46000,7 +46015,7 @@
5
],
"commit": "fd37f013c2f2619a88d3ed5311a9d1308cc82614",
- "sha256": "196ydb57h4mjagjaiflvb20my561i6mdc6v6694ibdik2yns2inm"
+ "sha256": "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f"
}
},
{
@@ -46638,8 +46653,8 @@
"helm-core",
"popup"
],
- "commit": "60db46905443c87f324440202bd0735d57c5c201",
- "sha256": "10rkyy63vqqf9s4i8rs409d22iwhxrhz3qikagmfyvvr1n6czcnp"
+ "commit": "f6cf6078a745ec6ab313dbe98097e3bd5cef0a8c",
+ "sha256": "1h00ay4jjzkvkv5wh9cnd187c3ix8rixasl3wl6ilbilvx1pwv37"
},
"stable": {
"version": [
@@ -46932,8 +46947,8 @@
"cl-lib",
"helm"
],
- "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e",
- "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik"
+ "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590",
+ "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h"
},
"stable": {
"version": [
@@ -47101,8 +47116,8 @@
"bufler",
"helm"
],
- "commit": "d466eac6c4b2ee25c765e7f31e44beb38dd44e4b",
- "sha256": "00gyqpm0g437z71vbfd4kmih23vh6909dvygng133vxzly9k4f24"
+ "commit": "b951e621bc4a4bb07babf8b32dc318d91ae261c9",
+ "sha256": "14d2mcx6ppjzkpv63m7iir0j2dn549gkxr30bxx8qvc1v7r7r6wn"
},
"stable": {
"version": [
@@ -47538,14 +47553,14 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20210714,
- 1600
+ 20210716,
+ 1933
],
"deps": [
"async"
],
- "commit": "60db46905443c87f324440202bd0735d57c5c201",
- "sha256": "10rkyy63vqqf9s4i8rs409d22iwhxrhz3qikagmfyvvr1n6czcnp"
+ "commit": "f6cf6078a745ec6ab313dbe98097e3bd5cef0a8c",
+ "sha256": "1h00ay4jjzkvkv5wh9cnd187c3ix8rixasl3wl6ilbilvx1pwv37"
},
"stable": {
"version": [
@@ -50380,8 +50395,8 @@
"helm",
"rtags"
],
- "commit": "65113e2a137baa9f85dc2157b893291470788dc4",
- "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h"
+ "commit": "3a057f127b931c683288f8731f05ba5e2aab4133",
+ "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g"
},
"stable": {
"version": [
@@ -53139,11 +53154,11 @@
"repo": "humanoid-colors/emacs-humanoid-themes",
"unstable": {
"version": [
- 20210525,
- 2259
+ 20210721,
+ 2022
],
- "commit": "9b4587417f2583c503f84f3b1e994d7934e57bdd",
- "sha256": "1dpanfa8qpy9l2i2pw5w95lqsw06944qbcz8c9fgpj2s3nchhkpi"
+ "commit": "d140638360a3eb1bf8f17877bd888f898df63ec0",
+ "sha256": "1lybjbbcjsry20p6jzmkg2h7am7hcgfhjkdmby9pk4whnhk9l4lh"
}
},
{
@@ -55197,11 +55212,11 @@
"repo": "J3RN/inf-elixir",
"unstable": {
"version": [
- 20210629,
- 40
+ 20210722,
+ 1310
],
- "commit": "ec87ecaab5a10e79034f77d553e7fefbf60b9f97",
- "sha256": "1p6r0iwqcaf9bp123ccwafmzlf8hgwvap0cqwgy33cks6bhcbzb9"
+ "commit": "59b7126540bb848d3a38ccff71e85f3cc0cef39d",
+ "sha256": "1jdc4daydjzrmk07b8a45adrwjaifnwyn9gfi16yl7bn3wx6zcvq"
},
"stable": {
"version": [
@@ -56481,8 +56496,8 @@
"cl-lib",
"swiper"
],
- "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e",
- "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik"
+ "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590",
+ "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h"
},
"stable": {
"version": [
@@ -57024,8 +57039,8 @@
"ivy",
"prescient"
],
- "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4",
- "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n"
+ "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9",
+ "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h"
},
"stable": {
"version": [
@@ -57116,8 +57131,8 @@
"ivy",
"rtags"
],
- "commit": "65113e2a137baa9f85dc2157b893291470788dc4",
- "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h"
+ "commit": "3a057f127b931c683288f8731f05ba5e2aab4133",
+ "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g"
},
"stable": {
"version": [
@@ -59056,8 +59071,8 @@
"repo": "gcv/julia-snail",
"unstable": {
"version": [
- 20210715,
- 1359
+ 20210722,
+ 426
],
"deps": [
"dash",
@@ -59066,8 +59081,8 @@
"spinner",
"vterm"
],
- "commit": "a71a536fc1f194bc329e2c33eed5eab542c00cab",
- "sha256": "0cnhv37m8hcl3lfbiivy3yk338x60q8fglm5nibhfr55ln52jjc4"
+ "commit": "e4035da5322b9528b9751a0305a0feaa28e181fb",
+ "sha256": "1rpcsw7ddg7cs5mha7sn4j719rkvk04vwsri1y6d1c80y2fdlr10"
},
"stable": {
"version": [
@@ -59828,11 +59843,11 @@
"repo": "Boruch-Baum/emacs-key-assist",
"unstable": {
"version": [
- 20210415,
- 227
+ 20210722,
+ 758
],
- "commit": "fae7ce265db3bcfd1c6153eb051afd8789e61a4b",
- "sha256": "16gi43wgqqjqljnmjwap8lng1p4davv8prvpip034qw9v6vjmm2p"
+ "commit": "8e5cd089e0b2fedec57c55eeff74cdb6121441aa",
+ "sha256": "0lg8v6lsa62zhnlrz47hlda65ra6yfqijgz4jcl5vxcx2hgks8g8"
},
"stable": {
"version": [
@@ -60460,26 +60475,28 @@
"repo": "stardiviner/kiwix.el",
"unstable": {
"version": [
- 20210219,
- 51
+ 20210723,
+ 443
],
"deps": [
+ "elquery",
"request"
],
- "commit": "0c5e1619f079df822686cf42af5859111b6afd44",
- "sha256": "179wsr1ffsl4hm4vnb0zzbw338jni5pz8ndgkfq21jppgzk8mlna"
+ "commit": "c0c597d1e1653112f3e10c67dcc22d85beb2aed8",
+ "sha256": "1k056qzw3a4i4icyrl1a0dv971jnl5d096hawj5qhgwslplrhdpj"
},
"stable": {
"version": [
1,
- 0,
+ 1,
0
],
"deps": [
- "cl-lib"
+ "elquery",
+ "request"
],
- "commit": "c662f3dc5d924a4b64b7af4af28f15f27b7cea1e",
- "sha256": "0i11sfnqvjqqb625cgfzibs6yszx891y4dy7fd6wzmdpclcyzr8z"
+ "commit": "e191c312e5c9343fd9601c45a8ccd017479ee475",
+ "sha256": "1lsbd2qjmpbk474n19s9mq2n1i5sdg6jrnbpja6vdmn3a28c5wj7"
}
},
{
@@ -61247,26 +61264,26 @@
"repo": "PillFall/Emacs-LanguageTool.el",
"unstable": {
"version": [
- 20210621,
- 453
+ 20210722,
+ 702
],
"deps": [
"request"
],
- "commit": "feea3f9271ce920490a0d9dcd11e669e3eaad1d0",
- "sha256": "0vxq945x1yn86kpw7qbb686vb3pzyk7wma8g0dbval2m4hsbrn26"
+ "commit": "d3665a97cc87577f434a7476e1194b43f35408a8",
+ "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql"
},
"stable": {
"version": [
0,
4,
- 2
+ 3
],
"deps": [
"request"
],
- "commit": "feea3f9271ce920490a0d9dcd11e669e3eaad1d0",
- "sha256": "0vxq945x1yn86kpw7qbb686vb3pzyk7wma8g0dbval2m4hsbrn26"
+ "commit": "d3665a97cc87577f434a7476e1194b43f35408a8",
+ "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql"
}
},
{
@@ -62420,17 +62437,17 @@
20210303,
1751
],
- "commit": "4a785dbbf4f906584716bb14c92230beda5081ed",
- "sha256": "0vkqp8ck21hhwfnfvmxfwrb3dnkqk4072n4jr7w6ivvhs555srdd"
+ "commit": "3603e4473ce9f81c5d73ba623c1938e152d03723",
+ "sha256": "1s1wsz8w7i1p509dqvv0ykljlqlr56203k4lrc542vjdnj4ih4z4"
},
"stable": {
"version": [
0,
- 20,
+ 21,
0
],
- "commit": "89c2f0ad779b8d15581a3607beb55855b0da8737",
- "sha256": "0vkqp8ck21hhwfnfvmxfwrb3dnkqk4072n4jr7w6ivvhs555srdd"
+ "commit": "ec88b4d6b430338a1a44a04dca1642fdef15641f",
+ "sha256": "02n5yc0nqckfpfxkw8gxigg59769alxvk043c2d9bxgm79zxvhhy"
}
},
{
@@ -63589,6 +63606,40 @@
"sha256": "0bnkc6smvaq37q08q1wbrxw9mlcfbrax304fxw4fx7pc1587av0d"
}
},
+ {
+ "ename": "logms",
+ "commit": "bd2169076b021407552523282ba1df0ae1aec311",
+ "sha256": "1jrqya88ii3l4p9044w8x9nbnfm7gpw9kq0ycsclwyap3n71fm0r",
+ "fetcher": "github",
+ "repo": "jcs-elpa/logms",
+ "unstable": {
+ "version": [
+ 20210721,
+ 349
+ ],
+ "deps": [
+ "f",
+ "ht",
+ "s"
+ ],
+ "commit": "497eb1fa71340a8d7758dd7c8115de05ab452129",
+ "sha256": "1c5psadb590wbcqab0bjdfdsfd3rninbahr42pbi8gvdg0ay9qws"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 1
+ ],
+ "deps": [
+ "f",
+ "ht",
+ "s"
+ ],
+ "commit": "68bab96a13d64efdf4f5951d931d0862e6861fb5",
+ "sha256": "137z22qyfz0d58iqb8w3lcz5cr2ddi0h2xdns90r979b68lhsj56"
+ }
+ },
{
"ename": "lognav-mode",
"commit": "a5b0dadc609d13737d56657c17a945f10e840222",
@@ -63924,8 +63975,8 @@
"dash",
"lsp-mode"
],
- "commit": "49a6bab0b1ad88d220305dbe3a0a14d368f62354",
- "sha256": "1i3gywik5m9j797c69ng70bs28qdww9662sjl6y232rw19rya93b"
+ "commit": "7039afe9507467e0b1c1fba485f26a7892463bc5",
+ "sha256": "1f0k76ic6cv6kdszy38jfi5wbv1i9qqp3gnn63j4p0f0xj0ppsgw"
}
},
{
@@ -64306,8 +64357,8 @@
"repo": "emacs-lsp/lsp-mode",
"unstable": {
"version": [
- 20210715,
- 1320
+ 20210721,
+ 511
],
"deps": [
"dash",
@@ -64317,8 +64368,8 @@
"markdown-mode",
"spinner"
],
- "commit": "cd47168035c98c6ebf9177705b9b7da53fcc9f5f",
- "sha256": "1q1isn2g09pdczqdvbk5hjirym6106ip1z6klg1m2d5b9d8vx0l2"
+ "commit": "ac3b7e6efd1f8d4bb92aa4d89fc361fce3208c46",
+ "sha256": "1gx5y9j259q4iqnp7b58958wnpw8l3fdcs88zx38252givf814nx"
},
"stable": {
"version": [
@@ -64474,8 +64525,8 @@
"ht",
"lsp-mode"
],
- "commit": "71a79760938d2132923fbff58dc25301892b1654",
- "sha256": "0si9qca8lml2hd8zj420dmks4cwzfidq14h3xfczhvrshhsc0mny"
+ "commit": "9a0637e59d2a08a66c49fe8cda708e995ec156ed",
+ "sha256": "1jcf4jzsw10z9068xm20r7qdspd9yxhswpm0jjsm9rcypi2vm78r"
}
},
{
@@ -64492,8 +64543,8 @@
"deps": [
"lsp-mode"
],
- "commit": "4eb78c43046fceb53a66ccd24c85601bdb87ed17",
- "sha256": "10d949gb3v7flnkb5khk11dcmfnlr4h02yfj8g3b0ihr1zr7c958"
+ "commit": "4f2ea975c3199c0e8e35c0b1e9778cf1ed6bd9c2",
+ "sha256": "1hmdayrmxw979vigx1z6mlpzb5dwblx5c1f2k3ysms5didznlmcf"
},
"stable": {
"version": [
@@ -64643,16 +64694,16 @@
"repo": "emacs-lsp/lsp-ui",
"unstable": {
"version": [
- 20210708,
- 134
+ 20210718,
+ 1626
],
"deps": [
"dash",
"lsp-mode",
"markdown-mode"
],
- "commit": "1ee371765612b7aaa6046aabdc2f65bcfcb93b11",
- "sha256": "051hc6310zzn9qpvd9k8cj7ibzsk1k19l2485c5wra0fvm2lfa6x"
+ "commit": "4283414de69312298d51b03e938d95d37d238391",
+ "sha256": "08wqbwxwapi91mj94mgqy02bjz512sj3nwv77b067xqchz5yv6q5"
},
"stable": {
"version": [
@@ -65006,15 +65057,15 @@
"repo": "nbfalcon/macrostep-geiser",
"unstable": {
"version": [
- 20210324,
- 2141
+ 20210717,
+ 801
],
"deps": [
"geiser",
"macrostep"
],
- "commit": "8600fca05fd12a2e0ffe63238ddbfcb37c285dac",
- "sha256": "1912hxbb7mbra91vjw1fnzbb4fd9ri59lc1hcrw196c7a4hzgv0y"
+ "commit": "f6a2d5bb96ade4f23df557649af87ebd0cc45125",
+ "sha256": "0dykvwcvg8n24z3fkx6rv3l1mhzmca4cxj0gsvvqsg9wp0az1fc7"
}
},
{
@@ -65130,8 +65181,8 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20210716,
- 1440
+ 20210721,
+ 1556
],
"deps": [
"dash",
@@ -65140,8 +65191,8 @@
"transient",
"with-editor"
],
- "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45",
- "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5"
+ "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8",
+ "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r"
},
"stable": {
"version": [
@@ -65487,8 +65538,8 @@
"libgit",
"magit"
],
- "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45",
- "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5"
+ "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8",
+ "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r"
},
"stable": {
"version": [
@@ -65655,8 +65706,8 @@
"deps": [
"dash"
],
- "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45",
- "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5"
+ "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8",
+ "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r"
},
"stable": {
"version": [
@@ -66450,11 +66501,11 @@
"repo": "minad/marginalia",
"unstable": {
"version": [
- 20210716,
- 1252
+ 20210721,
+ 2100
],
- "commit": "b5893884abeb6a355233edf54e0f63d04bc32ce2",
- "sha256": "0cjabw0ia9rnb3idmv9s6i4izgklxkiax8zn5xw1c6n8ls5iwbqj"
+ "commit": "a3a8edbf25db4b1e167f1fdff6f60a065d0bf9cb",
+ "sha256": "0a4ra9fwyj5av4cjyj1y1y1z1kr6dnq39hhf51c072zqw3k3jar9"
},
"stable": {
"version": [
@@ -66570,11 +66621,11 @@
"repo": "jrblevin/markdown-mode",
"unstable": {
"version": [
- 20210710,
- 1646
+ 20210722,
+ 839
],
- "commit": "359347b2bb15f8d7ef819692ac79759ccfe2c85d",
- "sha256": "1naqcg0a5shzcg0rlqs6w5mlr7sn0b8b2hmhs07qawvpxln8j628"
+ "commit": "f3c4fd9230252503e3a9f2de6f5d469c4ac270ae",
+ "sha256": "08snhqw9kyg8vdaz7ibga0pf2j5cg1akjiphs88dgvxkph8m65nr"
},
"stable": {
"version": [
@@ -67074,7 +67125,7 @@
"test-simple"
],
"commit": "8d643a1776523ef1a6e0bff0bb0a390772fcc77d",
- "sha256": "17m9x3yy0k63j59vx1sf25jcfb6b9yj0ggp2jiq1mih4b62rp97d"
+ "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv"
}
},
{
@@ -67511,11 +67562,11 @@
"repo": "ocaml/merlin",
"unstable": {
"version": [
- 20210707,
- 901
+ 20210720,
+ 950
],
- "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658",
- "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l"
+ "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78",
+ "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x"
},
"stable": {
"version": [
@@ -67543,8 +67594,8 @@
"auto-complete",
"merlin"
],
- "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658",
- "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l"
+ "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78",
+ "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x"
},
"stable": {
"version": [
@@ -67576,8 +67627,8 @@
"company",
"merlin"
],
- "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658",
- "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l"
+ "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78",
+ "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x"
},
"stable": {
"version": [
@@ -67638,8 +67689,8 @@
"iedit",
"merlin"
],
- "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658",
- "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l"
+ "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78",
+ "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x"
},
"stable": {
"version": [
@@ -68534,7 +68585,7 @@
1
],
"commit": "beb22e85f6073a930f7338a78bd186e3090abdd7",
- "sha256": "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74"
+ "sha256": "1yf21gm4ziplmgx8yn7jqq45mwfiindbrman7fc5b9ifq78x9ryn"
}
},
{
@@ -69029,11 +69080,11 @@
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20210716,
- 431
+ 20210722,
+ 1916
],
- "commit": "9521dcec6c012d3776e3d05692720dd24922218b",
- "sha256": "1m5ifpql8p0w4qk79n2n8wyrq1s7ys0yc8y0a09w1yyxjk6ay12k"
+ "commit": "fd61a0c67ceafa3aeb0aeebddb93955148376b7e",
+ "sha256": "0l9gfq4qapa5snskb747jydprb0xvn80rjc83da1vwh4j8s3gavz"
},
"stable": {
"version": [
@@ -69042,7 +69093,7 @@
0
],
"commit": "b6fb7cda01a665f9369f2c6a29f3bf26c8cc8019",
- "sha256": "1m5ifpql8p0w4qk79n2n8wyrq1s7ys0yc8y0a09w1yyxjk6ay12k"
+ "sha256": "1yz5yr3acc601xcms7vr2jbj4bq6dqz8n5ymyfyxldid0n5ykzy4"
}
},
{
@@ -69735,8 +69786,8 @@
20210306,
1053
],
- "commit": "515b4f47c7f43816fce82cdf555107614e9e7edd",
- "sha256": "1q39iy7g4f11nzhlsa1j8shrvhmg3ip2h43rxawhmypfwd95vzk1"
+ "commit": "d08f2a8d96af3ff80aac0e5641d9d20281084038",
+ "sha256": "1dbpy2bw131g5d166dmw5m4zq7y6h3krm7k1lv33cnbss10kj2fl"
},
"stable": {
"version": [
@@ -70334,8 +70385,8 @@
"repo": "mihaiolteanu/mugur",
"unstable": {
"version": [
- 20210503,
- 1516
+ 20210719,
+ 722
],
"deps": [
"anaphora",
@@ -70343,8 +70394,8 @@
"dash",
"s"
],
- "commit": "b84752c391c5fe515960f77c80d08f313df57f33",
- "sha256": "0la8lqr3wgizmnwnpys9mwrj1qi0al0gx6kxhlfwf9jr5gbdg9np"
+ "commit": "63a0377ac1ad48171621c9f0c719b62ec9395d35",
+ "sha256": "180i7igzqv5l22vk6n96g196mnd50lgwcmjkmzwlwdxn4jsgvjbv"
},
"stable": {
"version": [
@@ -72360,16 +72411,16 @@
"repo": "dickmao/nnhackernews",
"unstable": {
"version": [
- 20210219,
- 1948
+ 20210716,
+ 1030
],
"deps": [
"anaphora",
"dash",
"request"
],
- "commit": "b5a221b63c8b311d50807fdfab4ae6b965844f06",
- "sha256": "1lq3rh52x0f059lxk0cczins2vggiwjs5m1drj7dkb8lmlxc41y4"
+ "commit": "50a6a7a58bc0316a9acc2b972380692f7438d9ed",
+ "sha256": "0q86wzl4va5xjj7czh6ldypwgb09gv8gp7kqi449bhx984a1yq7n"
}
},
{
@@ -72664,7 +72715,7 @@
0
],
"commit": "7825f88cb881a84eaa5cd1689772819a18eb2943",
- "sha256": "009did3i3i8yi0virq606l02w1mw0gdyiqablqg7m368gx0gfvh5"
+ "sha256": "0f8s7mhcs1ym4an8d4dabfvhin30xs2d0c5gv875hsgz8p3asgxs"
}
},
{
@@ -72758,11 +72809,11 @@
"url": "https://git.notmuchmail.org/git/notmuch",
"unstable": {
"version": [
- 20210713,
- 1255
+ 20210719,
+ 1132
],
- "commit": "d8a5fba4fe1efd7d0d652ead6d55371bc4078a9d",
- "sha256": "138wxhawdp8nllpvmrgll4nvn5by3hsp0zy4gywf6nalr0d1wdld"
+ "commit": "bed62eb8bee4aeca1fabfa5e302b515849f50b31",
+ "sha256": "00mixvwwhrmmr7wcscyzdhwhbnfiha0b0lcx1f3zk5xyshll2y9n"
},
"stable": {
"version": [
@@ -73123,20 +73174,19 @@
"repo": "joostkremers/nswbuff",
"unstable": {
"version": [
- 20210129,
- 850
+ 20210721,
+ 741
],
- "commit": "2aa3a96abbc76f007923f3fbb19a5246e29ae500",
- "sha256": "0lhl49cs0sdr7p22spxf83sixp1pzjiq11plmxc8i0lqv735b9sn"
+ "commit": "fa9dcf131697ea7af066e11a1edcc881c397e07f",
+ "sha256": "0bkx7mwy3zbb0ixawvn4cysxk3jjc7ahssvdprvw19ls9xx3wbsp"
},
"stable": {
"version": [
1,
- 2,
- 1
+ 3
],
- "commit": "71e241763ca0a4a1d1b432e172d46bed4f44dbe7",
- "sha256": "1sswhr52rp8c4v4fv30sww1gadbdrlk3l35j8xmqfw6hbgzxb5dn"
+ "commit": "fa9dcf131697ea7af066e11a1edcc881c397e07f",
+ "sha256": "0bkx7mwy3zbb0ixawvn4cysxk3jjc7ahssvdprvw19ls9xx3wbsp"
}
},
{
@@ -74179,14 +74229,14 @@
"repo": "alf/ob-restclient.el",
"unstable": {
"version": [
- 20200316,
- 759
+ 20210718,
+ 2008
],
"deps": [
"restclient"
],
- "commit": "0ebfc7c5ebf96d2fe1a476439831363a5a43b9b6",
- "sha256": "0sc6rljlzm7g4v4l4ziqrr0ydbsyypbq0h19f9xafvnb2pn40j84"
+ "commit": "bfbc4d8e8a348c140f9328542daf5d979f0993e2",
+ "sha256": "0nq5w2gankvb7ix8rv33814j7qvhiawd9r15b9i6syn1i5k5pxhj"
}
},
{
@@ -74579,8 +74629,8 @@
20210617,
1726
],
- "commit": "ba67af28ddca8718ef8816b2b0dc1e5b2f5e9591",
- "sha256": "0dp4pkznz9yvqx9gxwbid1z2b8ajkr8i27zay9ghx69624hz3i4z"
+ "commit": "121f3913f5dad7468b33d4a5ca19e7a687d2ecfc",
+ "sha256": "104jaqllwzcikk17iajgnjnnqchgivj210mhrx07qrk5vy5qwv5d"
},
"stable": {
"version": [
@@ -75520,11 +75570,11 @@
"repo": "oantolin/orderless",
"unstable": {
"version": [
- 20210613,
- 1723
+ 20210721,
+ 2059
],
- "commit": "2646dad28c0819fbe9ee521d39efb9ae40e03982",
- "sha256": "0vxfinsx69fqpcgbsv6g26klim3yasds3ha9v3xkk32y9sb783lr"
+ "commit": "1e84120a28525ccb47b602fc19b7afbeffbbe502",
+ "sha256": "13smhq5yh5awfqfn3739yw19dxdkqz5fbbczvv8kxf70skjxb9bk"
},
"stable": {
"version": [
@@ -76399,7 +76449,7 @@
"seq"
],
"commit": "4c114489e682e514e79701045d541ab6f3dc3fb4",
- "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy"
+ "sha256": "079x6rcz50rpw0vdq5q2kjpixz95k9f3j9dwk91r5111vvr428w3"
}
},
{
@@ -76966,16 +77016,16 @@
"repo": "ahungry/org-jira",
"unstable": {
"version": [
- 20210622,
- 130
+ 20210719,
+ 2242
],
"deps": [
"cl-lib",
"dash",
"request"
],
- "commit": "f4599dd5dfd7f97a22ca98502f809a8d14551c09",
- "sha256": "0i8rqila62qamv3mxh66g678kbang3sxjbf3x70nmrx7fyy2m2jv"
+ "commit": "2ea00944a7426012cda95cede99e49470f1383aa",
+ "sha256": "179h5j0k79hbbxz2n3x6hm1v2ws9qii6n8zx4800avbq1fgsh792"
},
"stable": {
"version": [
@@ -77373,14 +77423,14 @@
"repo": "jeremy-compostella/org-msg",
"unstable": {
"version": [
- 20210518,
- 2355
+ 20210716,
+ 2237
],
"deps": [
"htmlize"
],
- "commit": "4c92c627b6cfb234fd257b714a5dbfc72d7af8d2",
- "sha256": "0mln6324jb8p77pkbiaflmdj8h9m9wvmabgadhi6kh2jp4dhijql"
+ "commit": "7cedeeece58879e05d3a3bab8af1385006f234df",
+ "sha256": "0gw34smbw9v0f3xwjci7zsj8hbnqd54yzbph6az65r5634nqhiv2"
}
},
{
@@ -77829,7 +77879,7 @@
2
],
"commit": "549fa6969660dcf0cf9bca5b7341d0cb48ec3b77",
- "sha256": "12s74if74vw8q5awgrk0d1244ysfgb9kw3dxhypsccsbf413jmii"
+ "sha256": "0ksj6hssyr44qnvb32qj9lrq825ivvndhck9gzx4h7gbxmvq12a4"
}
},
{
@@ -78090,7 +78140,7 @@
"org"
],
"commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1",
- "sha256": "1w6zvgfcyjqlxy4s13h7w66vv0fcid57s6vigzgnzi666w86fdyh"
+ "sha256": "1lfvhc4gly06rq5i2fgjydg4rsy7vgksa8hpydsvklr0ypvc1hcc"
}
},
{
@@ -78122,7 +78172,7 @@
"org-ref"
],
"commit": "abcd622e4edaa5e4480bcd1e7e4953f67c90e036",
- "sha256": "08ia6gn0x0yydl28dhghifyxz0mrn0asllqg4s449gaz729cxqkd"
+ "sha256": "1467vskijg2n8k7fa2jj2hz8xr2s04r8a89521wmz54cza21g5j4"
}
},
{
@@ -78344,36 +78394,36 @@
"repo": "org-roam/org-roam",
"unstable": {
"version": [
- 20210609,
- 1221
+ 20210721,
+ 1746
],
"deps": [
"dash",
"emacsql",
- "emacsql-sqlite3",
+ "emacsql-sqlite",
"f",
- "org",
- "s"
+ "magit-section",
+ "org"
],
- "commit": "756f6215b672e267f986a3d6e494f5309825b91a",
- "sha256": "16rjqzj872y1240w15gawxcwj5gg1cds162wq1hswzplmx8wp9d1"
+ "commit": "9c10a3c04c06d1658a63d44927e385e2d97854d6",
+ "sha256": "0kd7wkd6k37ahsgmcjcs0msp02x6vfkq8gdih210yp2w6vz10hhy"
},
"stable": {
"version": [
- 1,
2,
- 4
+ 0,
+ 0
],
"deps": [
"dash",
"emacsql",
- "emacsql-sqlite3",
+ "emacsql-sqlite",
"f",
- "org",
- "s"
+ "magit-section",
+ "org"
],
- "commit": "9065f6a999b98d4b495e3d8fa1fa4424eddd25a8",
- "sha256": "10jrnjq65lpg1x8d7lqc537yai9m6pdnfbzwr87fcyv6f8yii8xn"
+ "commit": "3a78422a099261317d369be58947f4d4b3df1da3",
+ "sha256": "0mslrdgd41czay3w7znz4qsv1h0p3zqfsq6bkyxmxfyd2w5z82zf"
}
},
{
@@ -78384,31 +78434,30 @@
"repo": "org-roam/org-roam-bibtex",
"unstable": {
"version": [
- 20210602,
- 2113
+ 20210720,
+ 1306
],
"deps": [
"bibtex-completion",
"org-ref",
"org-roam"
],
- "commit": "c9865196efe7cfdfcced0d47ea3e5b39bdddd162",
- "sha256": "0c9y76r1bagz39m74kb2jcxqsc2q461407bbsib3f512sdf93lyg"
+ "commit": "13de4262d87debdbc43f8e2bd72b991b7284e705",
+ "sha256": "0iizd5vzxxl7fsm7k4y7dwisipsqwc3xqn33nk8r4c182mga3d9c"
},
"stable": {
"version": [
0,
6,
- 0,
- -1
+ 0
],
"deps": [
"bibtex-completion",
"org-ref",
"org-roam"
],
- "commit": "03b3a843fdbba428b29faa932661bc74fd66e29b",
- "sha256": "17ds31cdq4prlknbjhhcjz17sim26yx8iws1scg4xcffxnb1s39r"
+ "commit": "eea7469fc32eddc9d74621b7ecc1f36832b7efd3",
+ "sha256": "04vc2w7x2lyamp0qa1y274smsf9x2qxr1igrpz9f4y5ha5332px5"
}
},
{
@@ -79941,11 +79990,11 @@
"repo": "tgbugs/orgstrap",
"unstable": {
"version": [
- 20201129,
- 604
+ 20210722,
+ 737
],
- "commit": "5bd7ee9d9e23ce37fd004054071026ff51445654",
- "sha256": "1qblj2m7bhykm58i63r5ywvpz6hr0vyzx7fa0s6rwlkjzbdn77g6"
+ "commit": "6f3ab471da576938d8200ce600fbb02dcb947f16",
+ "sha256": "1f8dspi9xizrxylff2zllwzz9lzrg3wr9cx0d5qzs74bs685vwwy"
},
"stable": {
"version": [
@@ -80113,10 +80162,11 @@
"stable": {
"version": [
1,
- 3
+ 3,
+ 2
],
- "commit": "bcb858f607b0d833e1581e0630446ecc576eefd6",
- "sha256": "1b6ms822j075fciijpwywzn675hbqqbaylz5iy3czlwypjg1slhh"
+ "commit": "c0ba49bb01d037ce8800aa04db06f454ef043cb6",
+ "sha256": "07ck6slz0z484lywdymh719pfmxhvfsb1cvk2bdbrx4xq89sqwq6"
}
},
{
@@ -83138,11 +83188,11 @@
"repo": "JonWaltman/pcmpl-args.el",
"unstable": {
"version": [
- 20210625,
- 2116
+ 20210722,
+ 329
],
- "commit": "e6957896b065e2fda80a8258dfebb86b49742c15",
- "sha256": "0fx7v5b3v7y9qxr8n8pm6449rdf4ljc0fb6kp0vpdzfzc4yzgdni"
+ "commit": "36139ba64f43a3d3f4090ef0118bcebfef7e20c9",
+ "sha256": "1isab23shk1gfk54z4ppbnnkrm527rzb9cvbqqa47s8gv9k7zbnm"
}
},
{
@@ -84215,20 +84265,20 @@
"repo": "vpxyz/php-quickhelp",
"unstable": {
"version": [
- 20201108,
- 1132
+ 20210721,
+ 1945
],
- "commit": "e36fc61a7061044ab7984421997566b97776f722",
- "sha256": "1zkql9zy35apidxrd29w479600nccbrzn350f0xjsq2wzmk64ci2"
+ "commit": "f22e6d31aad504094b441e2f635869fc97939ddf",
+ "sha256": "12dwjrflhbih1v75sxh0kp4w67i4xzccyxvy9601f94xnrha9s84"
},
"stable": {
"version": [
0,
5,
- 1
+ 3
],
- "commit": "e36fc61a7061044ab7984421997566b97776f722",
- "sha256": "1zkql9zy35apidxrd29w479600nccbrzn350f0xjsq2wzmk64ci2"
+ "commit": "f22e6d31aad504094b441e2f635869fc97939ddf",
+ "sha256": "12dwjrflhbih1v75sxh0kp4w67i4xzccyxvy9601f94xnrha9s84"
}
},
{
@@ -86734,11 +86784,11 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20210425,
- 1720
+ 20210723,
+ 143
],
- "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4",
- "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n"
+ "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9",
+ "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h"
},
"stable": {
"version": [
@@ -86959,8 +87009,8 @@
"deps": [
"dash"
],
- "commit": "e746822cd7d8a0dcf56902d32fbadb3297690590",
- "sha256": "09pskvha06picdlgclvwijng712s3xd5mr3kxxpp6gb02qsiy3yy"
+ "commit": "9e38442d95a49199e1a2e69aefbfe139ca9036ab",
+ "sha256": "1x42lfp3ay31lvdmjsvwqblci1bbwxhddq58fq1ip108lwqazl87"
},
"stable": {
"version": [
@@ -87902,8 +87952,8 @@
20200619,
1742
],
- "commit": "b90ec9c242b303e90811deebaa2e3e684b63de91",
- "sha256": "11n9ybjxfc8x58fwp2f67nc6mg4qkj8m9c7ldjlp77m01k0qrij1"
+ "commit": "d662ec9c2e4f8ca21cb500b25cfe7430511014b2",
+ "sha256": "1n8ls2pm36imqg98yz20q9nyyxf4z0250mp4aigjcv3c66j8fp2a"
},
"stable": {
"version": [
@@ -88203,7 +88253,7 @@
"unidecode"
],
"commit": "d781870e2f57e40110e07768289ab81d8554f122",
- "sha256": "17d2v7q6sfafk8j1ish053xsmihi4f1hbk53fkkmhwan6sw9c4sc"
+ "sha256": "154lkpipi5wgcwx4j9w6h3zysciw7hblf03an2irr9xgdhs7xs7q"
}
},
{
@@ -88271,7 +88321,7 @@
8
],
"commit": "708cae8e67dbae293c7c4be0ca5e49d76fac6714",
- "sha256": "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py"
+ "sha256": "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q"
}
},
{
@@ -88756,16 +88806,16 @@
"repo": "dwcoates/pygn-mode",
"unstable": {
"version": [
- 20210714,
- 1304
+ 20210721,
+ 1917
],
"deps": [
"ivy",
"nav-flash",
"uci-mode"
],
- "commit": "321c14c195cd2f8a31b9bf99dd318a552fbbcd6d",
- "sha256": "1sz8riry4c4lf5n0nsd3msw5kch3ifwg5psrf4y866b0wlya7yk2"
+ "commit": "30cce9c134f685d7f2db81aa879e683864a23b66",
+ "sha256": "0q4q5wziwy2nhv0yyx7k5jx6bccx9lxr4f97njb06j2nvz2x7k1v"
},
"stable": {
"version": [
@@ -88790,15 +88840,15 @@
"repo": "tumashu/pyim",
"unstable": {
"version": [
- 20210714,
- 231
+ 20210720,
+ 47
],
"deps": [
"async",
"xr"
],
- "commit": "ebd3175c4c5e7845c52dddf71a806826a80df89d",
- "sha256": "0p52a4bp4gmgwfpai8cwq3frp0fyhp9ma5a0idxdiamr8xjiwjz0"
+ "commit": "ace904840c676297138ed62abb4f1d05c837fd4c",
+ "sha256": "117h1zanyjlb566kzdx014xjzryvf6qvqa37zbyb821ajxjlpkk0"
},
"stable": {
"version": [
@@ -88881,14 +88931,14 @@
"repo": "tumashu/pyim-wbdict",
"unstable": {
"version": [
- 20210504,
- 1144
+ 20210719,
+ 38
],
"deps": [
"pyim"
],
- "commit": "da51e226bca9be2ed6175298489be64e45492759",
- "sha256": "0nl1yi3zf4pp7cksprmigm119dcp1d2477k4jdm10z7zfcq2p6r0"
+ "commit": "4812f93ee00196b8fee9f434aa5cd77fabcf90d1",
+ "sha256": "1wvzgyf3mq3wy0sdnx5jhscr5x28pgbvw8dmfyn18741xnsn26fb"
},
"stable": {
"version": [
@@ -88960,17 +89010,17 @@
20210411,
1931
],
- "commit": "6c29598ce446dc441a8095b83c82390249df3693",
- "sha256": "0l5dg9snp4p6x3nlyl0civ50kdl1q6zr0hmx9hcp2c72hm22dqi5"
+ "commit": "a054796d7008f4531b482490f917bdef1454b8fd",
+ "sha256": "07zs0dzh500xs26ybyfz2z4wigc74l6wq3z1225gnblphhzl4jv9"
},
"stable": {
"version": [
2,
9,
- 3
+ 5
],
- "commit": "aa688de05e469e33a20478144013946ccb752736",
- "sha256": "0r2xp90bwwqnya3gq0q0gh2qdn7i9fcsq8ab890bnd0b44ivx0nk"
+ "commit": "ec8219e48f031f93377cc7d862a6f3bf80d76dbf",
+ "sha256": "1fixqimr8mq0mg5qs8wj4hbrzlw9925x72311is4s5r8phyjaabb"
}
},
{
@@ -89254,7 +89304,7 @@
0
],
"commit": "906b0a107f7bcfe6e32bcfedb977e6f0f99fda59",
- "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0"
+ "sha256": "17clkgs94dgq5nsjlwkr52m5s446ibfss3qc8a8m0zaz6j4f8l1m"
}
},
{
@@ -89353,7 +89403,7 @@
"python"
],
"commit": "e606469aafec2e6beda8c589540b88a5a6f6f33f",
- "sha256": "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr"
+ "sha256": "0vyipfsppissa87pdnbksamdby0yl2q8nzawqivv6smn33jp6vsn"
}
},
{
@@ -89426,29 +89476,6 @@
"sha256": "1hbb0m5kjczyri6hbgkk1par53zfnsp7m133xqzfhg2sibrvbz2x"
}
},
- {
- "ename": "ql",
- "commit": "475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303",
- "sha256": "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z",
- "fetcher": "github",
- "repo": "ieure/ql-el",
- "unstable": {
- "version": [
- 20180418,
- 2020
- ],
- "commit": "d976414ba6aa576ad524b5ee5bfa620efd072258",
- "sha256": "138h4ndnzpphsmi4b8yw53mxc3rnqrj1c3jp8njx5pkmiqkp1q00"
- },
- "stable": {
- "version": [
- 1,
- 1
- ],
- "commit": "d976414ba6aa576ad524b5ee5bfa620efd072258",
- "sha256": "138h4ndnzpphsmi4b8yw53mxc3rnqrj1c3jp8njx5pkmiqkp1q00"
- }
- },
{
"ename": "qml-mode",
"commit": "f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4",
@@ -89885,15 +89912,15 @@
"repo": "greghendershott/racket-mode",
"unstable": {
"version": [
- 20210715,
- 2107
+ 20210720,
+ 2002
],
"deps": [
"faceup",
"pos-tip"
],
- "commit": "c7aca6f1b4c34a48314bc7812c2d7edc849e3dba",
- "sha256": "1pcxicz7kg6s9j9gsdb8pba3j3n5522gclc5qq95ch2q3i5phg91"
+ "commit": "76ca5838cbc266c306aa54964410730f6fd93d88",
+ "sha256": "1q4cgsi659bk4p1avl6bpzfhlf314432mqjhj3hlyxhf4d3nza8m"
}
},
{
@@ -90550,11 +90577,11 @@
"repo": "pfchen/read-only-cfg",
"unstable": {
"version": [
- 20210608,
- 1259
+ 20210717,
+ 205
],
- "commit": "a02395b37a68b2e20e365c2e3752f966c71d4c02",
- "sha256": "0jihqc16knvws5w2y5djdir4h52mpwk86nbjlap47lh2r18qk6q6"
+ "commit": "a4e50d4fbf48970e98b2464e13f46e51a4c43c37",
+ "sha256": "1mbnyp2xknymfs2nrcw572plrwxgjacrysxaf5szr75vn2vh11nl"
}
},
{
@@ -92452,7 +92479,7 @@
0
],
"commit": "c7c6b726806df7e8cb25a41b213a207850c91cb7",
- "sha256": "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5"
+ "sha256": "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98"
}
},
{
@@ -92646,7 +92673,7 @@
"web-mode"
],
"commit": "6cf58cf04fee933113857af07414b3f27c24b505",
- "sha256": "0s3hs0w6hz8vx4172mfraiqfjhd1a9h1w61ra6fklc5fjf3y8pn8"
+ "sha256": "0b3gqs1lsk80shirsc41zajzjbg1sgzksmnfazffx88h612p7ygd"
}
},
{
@@ -92829,7 +92856,7 @@
4
],
"commit": "71e475ab35555e0a1eca26d73acf1ced911e422e",
- "sha256": "0x3mmf4gq4d0cqfqbkrrpwhayvmplacck0zc9nlzcn35y17jzpcz"
+ "sha256": "0y18i4ly61jyvxymvgjr99arhxfn5y5s659jnqf4gvyp3d671dkf"
}
},
{
@@ -92952,8 +92979,8 @@
20210313,
1541
],
- "commit": "65113e2a137baa9f85dc2157b893291470788dc4",
- "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h"
+ "commit": "3a057f127b931c683288f8731f05ba5e2aab4133",
+ "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g"
},
"stable": {
"version": [
@@ -93512,8 +93539,8 @@
"repo": "brotzeit/rustic",
"unstable": {
"version": [
- 20210609,
- 1900
+ 20210719,
+ 1514
],
"deps": [
"dash",
@@ -93526,8 +93553,8 @@
"spinner",
"xterm-color"
],
- "commit": "6ca73bb3cce4d1db3c4f91efb83b63227eb712d1",
- "sha256": "12arrvvp3idq11a4ham77zxqp2d1026qz89ywgd3i9k1cbj852wi"
+ "commit": "26c2e09907135d5be9628c710bb0753c256b7242",
+ "sha256": "1bilqhln8m6qk5r3q8dvhhsql1c38dnf7m55kysja86bf6yb3s59"
}
},
{
@@ -94642,7 +94669,7 @@
"s"
],
"commit": "91c56311b48a26aa6ef5a113b0a828e174059b0a",
- "sha256": "1iyq8m75gzyx2ww919i4zl63gajsaczgwax214a1jgf8x91j590k"
+ "sha256": "10ikd6ksz5adpldyx9h8s3qnwc488rqixzwnd0rjjwqigmllj9lb"
}
},
{
@@ -94819,8 +94846,8 @@
20210707,
1827
],
- "commit": "48ea51aa5b6959ea2a134e36cd21f727047b0677",
- "sha256": "0lini8hdih1qakf3hg981diw9gmzxjkd6rnjq3lddyqg6dvj9hhw"
+ "commit": "97693d0aea2c548197e9d1de3bdedf8e703775a4",
+ "sha256": "0d03sw0w2yhhmnpdn7xc0sm2n3lk11ffhkbz59kzdkcqqi7ppv04"
},
"stable": {
"version": [
@@ -94846,8 +94873,8 @@
"prescient",
"selectrum"
],
- "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4",
- "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n"
+ "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9",
+ "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h"
},
"stable": {
"version": [
@@ -95858,11 +95885,11 @@
"repo": "emacs-w3m/emacs-w3m",
"unstable": {
"version": [
- 20210714,
- 111
+ 20210721,
+ 148
],
- "commit": "ccdd3681b9e7d8b6a758f2aa61a0ae8eab21240b",
- "sha256": "1ynl1kwnhp5xqvmi8p37lprshk96xi8q78rsjmd9f8pkb8ayqbf3"
+ "commit": "635a71df74d755113f26a6c6d9ae48ccb485393d",
+ "sha256": "0llby9858sjfxrh6x5nklkm24lmk6d5xm6mw0y6d02pn6rinx0sx"
}
},
{
@@ -96102,7 +96129,7 @@
"s"
],
"commit": "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b",
- "sha256": "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki"
+ "sha256": "1xnby24gpxij1z03wvx89s459jw0f8bwhgi80xvdq8gxhbbz2w7a"
}
},
{
@@ -96716,11 +96743,11 @@
"repo": "dawranliou/sketch-themes",
"unstable": {
"version": [
- 20210325,
- 1700
+ 20210719,
+ 2212
],
- "commit": "407094c03e934043aa6d70369bf3e1bd841d1c91",
- "sha256": "1glm8cxd91kq6910rrzgh3xaas67fylvgqxq2ld6gzcgmxzhv8yl"
+ "commit": "8c4b4ef49fbb059ad00ab9fb76f22c2cdd780e7c",
+ "sha256": "0lvjdcsx3gvg7lk22l5c8jmdqk9s38figlr5zcbbk7fgjpf4q0p2"
},
"stable": {
"version": [
@@ -97175,11 +97202,11 @@
"repo": "joaotavora/sly",
"unstable": {
"version": [
- 20210629,
- 2009
+ 20210721,
+ 1756
],
- "commit": "41f4d650485217aa1f2afa7c159418f103a09231",
- "sha256": "0cq1a19d1przjizp7d4vjl8khp09j6jcwavhrpja1saqhwavhv7c"
+ "commit": "e8f57c09cb4cc857887310e61eed7325500e9998",
+ "sha256": "1ipbi9h1p943mxzyc81wyrpyah41dhg33kmb3y9cy6avr2pkm1ry"
},
"stable": {
"version": [
@@ -98448,8 +98475,8 @@
"flycheck",
"solidity-mode"
],
- "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4",
- "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0"
+ "commit": "6f7bd1641e5282ec5163188d8b8c2f6dfddc2e36",
+ "sha256": "0rkw21pic9nypv7vz06chyn9mjl560a4dayb84gj5w6v8gfznrcw"
},
"stable": {
"version": [
@@ -98473,11 +98500,11 @@
"repo": "ethereum/emacs-solidity",
"unstable": {
"version": [
- 20210622,
- 931
+ 20210717,
+ 844
],
- "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4",
- "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0"
+ "commit": "6f7bd1641e5282ec5163188d8b8c2f6dfddc2e36",
+ "sha256": "0rkw21pic9nypv7vz06chyn9mjl560a4dayb84gj5w6v8gfznrcw"
},
"stable": {
"version": [
@@ -99812,11 +99839,11 @@
"repo": "srfi-explorations/emacs-srfi",
"unstable": {
"version": [
- 20210701,
- 23
+ 20210721,
+ 125
],
- "commit": "a92d2a4f748f124910d406a9386979688f7f28a5",
- "sha256": "1gfqskdng23dpacvmypyc2jsrw15hrrwq84qmlnwyibf0g0pjj1f"
+ "commit": "de1fdca07229e5d43c18cb3dc300397849eeab78",
+ "sha256": "0vdlcy211zx3fr8vcl6hm8xj8v3wkjj4y7pjcni9g87iijzf6gx2"
},
"stable": {
"version": [
@@ -100240,8 +100267,8 @@
20200606,
1308
],
- "commit": "ba12f620074b5a6e6615e2963bdc79fbba6060eb",
- "sha256": "1gjmzm8lx8fas9phkbvy3rz9dyzqgdjs2ddd3l9biqqggwka0pa0"
+ "commit": "1b2058a91b7ed920952ea99b5140c60b8c7cdd1b",
+ "sha256": "1nk6mbxl416dpgwmpy52v161n2ag3gi6crrzvczx524879a9zvkf"
},
"stable": {
"version": [
@@ -100249,7 +100276,7 @@
1
],
"commit": "68f949852ab7f0e8bb52c6a6fc2ece2a74ded824",
- "sha256": "129mms7gd0kxqcg3gb2rp5f61420ldlhb0iwslkm7iv64kbxzww1"
+ "sha256": "09d69q9m4k4pwhl2k5r7d7lqd4cj0qf22cys94zjkrsyw5gggd36"
}
},
{
@@ -100598,11 +100625,11 @@
"repo": "PythonNut/su.el",
"unstable": {
"version": [
- 20210626,
- 2025
+ 20210721,
+ 1816
],
- "commit": "36db018de8423a6e380a49d4e602d376a0740f6d",
- "sha256": "08vma290dxzjxyn4df2i1kjzm24myxvsll9cxky277asbb8ja74z"
+ "commit": "1ecf7a7bbf9d88708eb2215e940753f8d6bccc92",
+ "sha256": "1994ypxz5zgrpdd5v61znf41c0dn4favab560wkgfnhhzrc1jgkf"
}
},
{
@@ -101684,8 +101711,8 @@
"repo": "countvajhula/symex.el",
"unstable": {
"version": [
- 20210630,
- 1816
+ 20210720,
+ 1708
],
"deps": [
"evil",
@@ -101697,8 +101724,8 @@
"seq",
"undo-tree"
],
- "commit": "740d80599c0a1ff0882e231e46c61ba16c83cd84",
- "sha256": "1zfjdrm88c16czmi4i6rm87nafpyrjpjkj79cg44l9cizyv5198q"
+ "commit": "acd0874024018a3352761ffef3ca88916370b195",
+ "sha256": "17fi4jzsfp2k1fp772b75ihjsg602qyc1vzc0k6vv0p05kiv8s2x"
},
"stable": {
"version": [
@@ -101931,15 +101958,15 @@
"repo": "vapniks/syslog-mode",
"unstable": {
"version": [
- 20210714,
- 1932
+ 20210722,
+ 1112
],
"deps": [
"hide-lines",
"ov"
],
- "commit": "ff1ab94c0f65e9891656d78d84f71614e0b9a597",
- "sha256": "1x0xlbiisq8wngxhznkhxavhrhbc1w5p5w1qgfxib16fr09aqyc5"
+ "commit": "e18d74d8a12b943a3a64eb8c693981e55aea8e9a",
+ "sha256": "0snf3pjnhff0r7v4iwqqq3568h0a4ff7b2s3axssxk4rfg8bm3ks"
},
"stable": {
"version": [
@@ -101975,7 +102002,7 @@
11
],
"commit": "3ad6d52072f0bd043dced40ba7bd422fd9c00a7b",
- "sha256": "0pxkyys2lgn16rhf4mzqlh27vs9aw6g083z2vr2agr7bmbavd2fp"
+ "sha256": "0n4qr5qqy6hbc1hg4wi1d2ckdl870v5mf9xhv5m9vrlwaphvnnjr"
}
},
{
@@ -103651,18 +103678,18 @@
20200212,
1903
],
- "commit": "b157feff61c3bdefb138753af7636dae5a7b3c08",
- "sha256": "1dnspcmni98xhcz21604238lskdqn6b4kpv2zllvq58si59q32mw"
+ "commit": "1486e47402a5fa7df9791bd01c7e703671de9de6",
+ "sha256": "098hf7w27223v0h7090w4s2gcw5ylnj6fdfw3c1ifhblglyrbq1n"
},
"stable": {
"version": [
2021,
7,
- 12,
+ 22,
0
],
- "commit": "faeb22efa9ed948e6096e37e65e6d121c83e329a",
- "sha256": "1adaqcdzzrrff0186276pdmlqixkv47qfgyxap3by9zdiqwysd50"
+ "commit": "3a1532f0ee53c6746f50dbad17c248eeced05d21",
+ "sha256": "1nzx3bw472m3ajmhlwp217jyrxm31j9av4h6fw884icpnn3392s7"
}
},
{
@@ -103718,8 +103745,8 @@
"deps": [
"haskell-mode"
],
- "commit": "95c065a410c20cbeefeaabc3084b2b09d09564c2",
- "sha256": "02xbzwj1bf0n4lvg1rycmxsbvwi0p0h9a5fqx755kshwx5hngkx3"
+ "commit": "531db05f9b15feadbc1a0df194a4f9dcd0d10c0a",
+ "sha256": "16m17q8kc0fxq1nc47ggxjjna04k27hch93q8pqilp00s7695597"
},
"stable": {
"version": [
@@ -104612,8 +104639,8 @@
20210713,
1609
],
- "commit": "07d6d82cba864b1e38d3bd46654f2e1928a997c2",
- "sha256": "04h60s6ig43sj144s7dlip1saf9kdwvzlfys8qwwx48003rbs0dp"
+ "commit": "77e16de3b9fbaa0417b56a9acc70a9bca17c4ad0",
+ "sha256": "1ww04kfz4kkbhrbd78r4dpylhayb5hl72qcjv8wm0mhgfwmbb358"
},
"stable": {
"version": [
@@ -104716,11 +104743,11 @@
"repo": "magit/transient",
"unstable": {
"version": [
- 20210712,
- 1626
+ 20210721,
+ 2104
],
- "commit": "e90481000f071e9a26a1cc0f40d347f7d3e2201e",
- "sha256": "1sw9248cxr3x2hy2rhyzbwik08nvlkglxgig3rbqshc8spnid5h3"
+ "commit": "769219b5f5757f1373a28e993f36b6a41c778651",
+ "sha256": "1s108ps8l563ywn4k5z64y67fgi3j0c7ln2zz9qi9xfih0lnz81b"
},
"stable": {
"version": [
@@ -106271,7 +106298,7 @@
0
],
"commit": "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9",
- "sha256": "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla"
+ "sha256": "14ybav1f82m2gsxkciwlc0pm01ihqqaqq6arnjqvgxdnw0z6qniq"
}
},
{
@@ -107081,7 +107108,7 @@
"use-package"
],
"commit": "f33c448ed43ecb003b60ff601ee7ef9b08cff947",
- "sha256": "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z"
+ "sha256": "1k1dwydqfgx2yvbipahwzk8kyj7v5ih6hkra8ladbn67x013f9rq"
}
},
{
@@ -108131,7 +108158,7 @@
"outshine"
],
"commit": "5202db4c6a511a90a950a723293d11d55ec05264",
- "sha256": "1ygx8g9cxyyhhpcqan1ca4g741s3dd141bcmp6jjqbjfn2gqraz6"
+ "sha256": "1qfjwsxi3w2gdl258jbk5d3z645gs6zccxx2iah54zbgql17pgj9"
}
},
{
@@ -108688,11 +108715,11 @@
"repo": "ianyepan/vscode-dark-plus-emacs-theme",
"unstable": {
"version": [
- 20210530,
- 629
+ 20210720,
+ 1218
],
- "commit": "bcae11818d74aa0de8e592b8349d90e512444758",
- "sha256": "1rmdin9z68xkxqjhvhyklbby5mxs3qf4wx9c07945p4ps80w8z5g"
+ "commit": "aadf603bccb51addfcbd1ee4f684f720d56df56f",
+ "sha256": "0zskaz2np8x6wz3zrkqw5bhmwzyq8llvqq5sbwjzlgdl2xph876f"
},
"stable": {
"version": [
@@ -108870,30 +108897,30 @@
"repo": "d12frosted/vulpea",
"unstable": {
"version": [
- 20210503,
- 624
+ 20210718,
+ 944
],
"deps": [
"org",
"org-roam",
"s"
],
- "commit": "0f73528e603b1901cbe36eccd536a9113ef0439d",
- "sha256": "030aglgmph8p9qi160ws6qv288mkwpyhhj0m946q72y7hmsc5xxp"
+ "commit": "ebbfc00978603c40222e260f06dbec9d781e3306",
+ "sha256": "1gx8h50r7mhm4p675an5a6hrm37zdcaw1lw2kpn7apr6kyi3c6q7"
},
"stable": {
"version": [
0,
- 1,
- 1
+ 2,
+ 0
],
"deps": [
"org",
"org-roam",
"s"
],
- "commit": "c4f39b853c54cbfab48876812012e040b56838ee",
- "sha256": "1dgmxbdvyb9vdha2swg4ahai6xvfvlr7d03y3c2c3db2jbr00aw5"
+ "commit": "16f61797090df570c182c8b3aefd6fe6c9768e93",
+ "sha256": "04i55w017d2i3sf49rs7jj4yzv51bppz6dlybk09cy5giwafv9cx"
}
},
{
@@ -108966,8 +108993,8 @@
20210615,
103
],
- "commit": "ccdd3681b9e7d8b6a758f2aa61a0ae8eab21240b",
- "sha256": "1ynl1kwnhp5xqvmi8p37lprshk96xi8q78rsjmd9f8pkb8ayqbf3"
+ "commit": "635a71df74d755113f26a6c6d9ae48ccb485393d",
+ "sha256": "0llby9858sjfxrh6x5nklkm24lmk6d5xm6mw0y6d02pn6rinx0sx"
}
},
{
@@ -109563,26 +109590,26 @@
"repo": "pzel/weblio",
"unstable": {
"version": [
- 20210511,
- 2105
+ 20210718,
+ 1410
],
"deps": [
"request"
],
- "commit": "ba0b745c3c11a93eaac826f74232f9eefbbae7a1",
- "sha256": "00agkipgf6hc1bsrq460lydql8f04y42h4lh764k1fwg7x1a8pm2"
+ "commit": "2b4b0c206440b5c63960214feacfceb0c26231c7",
+ "sha256": "1iy1finnxqjbdivzyn7crpnha87mq1fmd98pkx2r8sk551nfw35s"
},
"stable": {
"version": [
0,
3,
- 3
+ 4
],
"deps": [
"request"
],
- "commit": "ba0b745c3c11a93eaac826f74232f9eefbbae7a1",
- "sha256": "00agkipgf6hc1bsrq460lydql8f04y42h4lh764k1fwg7x1a8pm2"
+ "commit": "2b4b0c206440b5c63960214feacfceb0c26231c7",
+ "sha256": "1iy1finnxqjbdivzyn7crpnha87mq1fmd98pkx2r8sk551nfw35s"
}
},
{
@@ -109797,11 +109824,11 @@
"repo": "jstaursky/weyland-yutani-theme",
"unstable": {
"version": [
- 20210530,
- 1418
+ 20210717,
+ 1858
],
- "commit": "a56c56de048900409d271f91fd08a408fd9bf32e",
- "sha256": "0nblkcz52qvfkf4q3yb7drv0rbpkqgzv3clwb6vkvwz13s29b6my"
+ "commit": "246410e1c03f7d8d8e76102f7c5e3cda83acb36b",
+ "sha256": "184n7k0i2m9syy7mkjxdzjm36iyfx4azchwz0aania4pqm8dz7jv"
}
},
{
@@ -111097,8 +111124,8 @@
20210511,
1128
],
- "commit": "f74a58f3cfb2e94cee4c4527b2f7aeb8fa5ab46c",
- "sha256": "0m50xxi5nz08byxjdp5k20d075anv88lsdk1z2q66y2jqaqbxian"
+ "commit": "c310d1ba0e0238e5a22f2a584c966b8b5e7e6616",
+ "sha256": "0k7p39y0lwqr2021nq34asxc4sya4xv3w2nbxqkzjz0ddnyiw2qr"
},
"stable": {
"version": [
@@ -111473,11 +111500,11 @@
"repo": "xahlee/xah-css-mode",
"unstable": {
"version": [
- 20210627,
- 505
+ 20210721,
+ 2312
],
- "commit": "62b7162198ca6659e025feb058e5662c55333ad4",
- "sha256": "0xk5wa209pgc2sfz0j4dac57apy45si87628bqc21fnf877ga8qv"
+ "commit": "372f5bab99c06a3dbdec220ff5558046e1766476",
+ "sha256": "0gxd1sk8k8z9d0rrjpgdnh7by8yvwbh2awj4gm81c11k2ylbjcgl"
}
},
{
@@ -111518,11 +111545,11 @@
"repo": "xahlee/xah-fly-keys",
"unstable": {
"version": [
- 20210715,
- 2014
+ 20210721,
+ 1622
],
- "commit": "95c54a896c1e4af797f0af7cf9de85426c8e11eb",
- "sha256": "137xv47cij7a0zws8xdw140cwlsnywapyb9y51dqpmn08s1ff2l2"
+ "commit": "afacaeebc3225de13acf19378d7af832d6150871",
+ "sha256": "08q495fhvcm8n78smsvcz2svzjqjihmzrvp2allysvyy25ni4d5b"
}
},
{
@@ -111691,11 +111718,11 @@
"repo": "dkogan/xcscope.el",
"unstable": {
"version": [
- 20201025,
- 2002
+ 20210719,
+ 828
],
- "commit": "8e441efab0757778fe3594ff68c378bf90f539f9",
- "sha256": "0v3jypw0c9m8lbiyq9dv4b7jpqjb1lr0qx619dy9xa48rdj107rh"
+ "commit": "d228d7593d762e457340f678d14b663ef66d7cee",
+ "sha256": "0pr85ywp585imjzswm04647nb4iqqvg8jgmbcs5210qmr9kh0z8d"
},
"stable": {
"version": [
@@ -111895,19 +111922,19 @@
"repo": "ndw/xmlunicode",
"unstable": {
"version": [
- 20200823,
- 755
+ 20210717,
+ 1246
],
- "commit": "0c2ee59888042d516f79a7b96526cbeae611c9bc",
- "sha256": "026srs8nf6d5ksq30s3qy1jx4x65bdnyxz8p8nnsqlf81lbmhwq5"
+ "commit": "7e4c71c30f0d5214c45d4d4d48b149029ddb6b77",
+ "sha256": "0gc9fg95ihqz7lkn3vxc0qaslbxbj5jkhm2ddh41c3v9ym79mblp"
},
"stable": {
"version": [
1,
- 23
+ 24
],
- "commit": "0c2ee59888042d516f79a7b96526cbeae611c9bc",
- "sha256": "026srs8nf6d5ksq30s3qy1jx4x65bdnyxz8p8nnsqlf81lbmhwq5"
+ "commit": "7e4c71c30f0d5214c45d4d4d48b149029ddb6b77",
+ "sha256": "0gc9fg95ihqz7lkn3vxc0qaslbxbj5jkhm2ddh41c3v9ym79mblp"
}
},
{
@@ -113277,7 +113304,7 @@
"pkg-info"
],
"commit": "9adc5cf07a9117d25eaab41867ddde914c6d2f5a",
- "sha256": "0g2vfscikz8qa0danvcickcjnz99yjm9jgk3sci094gmgwka3j2y"
+ "sha256": "1vl7nyfdpvh4ilxw1bckfkv59d6mxbb7m3z2fvrxs1gss06ks9va"
}
},
{
@@ -113347,15 +113374,15 @@
"repo": "EFLS/zetteldeft",
"unstable": {
"version": [
- 20210713,
- 1855
+ 20210721,
+ 2026
],
"deps": [
"ace-window",
"deft"
],
- "commit": "7dbf608d17786a69019867fd6b2b7d6c6edf849f",
- "sha256": "1lq80ck08bydl98ka6j4qd6m5iqd1l8cx0y8pa2wq94vj71l65vl"
+ "commit": "f4d2e02e7b9d02799036d2dd864d45115f937fbd",
+ "sha256": "032wpg75jwh0nq9a36727f037vwaic05yqjmcc0lwz23czrkpsd5"
},
"stable": {
"version": [
@@ -113809,7 +113836,7 @@
"request"
],
"commit": "98323098c37a444de49cfef44f1506e9386e8c5f",
- "sha256": "1zr67h0w49rsi84mgf6jdili28h8782q6vjl8za0iq1hcx9zqxyf"
+ "sha256": "18hi6m2ngl9yz599q5bhifafi4vz1adc06bjl0bhb3rs62vbkwk2"
}
},
{
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-nongnu b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-nongnu
new file mode 100755
index 0000000000..dc43a86efb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-nongnu
@@ -0,0 +1,4 @@
+#! /usr/bin/env nix-shell
+#! nix-shell --show-trace ./emacs2nix.nix -i bash
+
+exec nongnu-packages.sh --names $EMACS2NIX/names.nix -o nongnu-generated.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix b/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix
index a48b5eae3d..b76e4fa0a7 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/music/tuxguitar/default.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }:
+{ lib, stdenv, fetchurl, swt, jre, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }:
let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux";
if stdenv.hostPlatform.system == "i686-linux" then
- { arch = "x86"; sha256 = "27675c358db237df74d20e8676000c25a87b9de0bb0a6d1c325e8d6db807d296"; }
+ { arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; }
else
- { arch = "x86_64"; sha256 = "298555a249adb3ad72f3aef72a124e30bfa01cd069c7b5d152a738140e7903a2"; };
+ { arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; };
in stdenv.mkDerivation rec {
- version = "1.5.2";
+ version = "1.5.4";
pname = "tuxguitar";
src = fetchurl {
- url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}-linux-${metadata.arch}.tar.gz";
sha256 = metadata.sha256;
};
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
ln -s $out/share $out/bin/share
wrapProgram $out/bin/tuxguitar \
- --set JAVA "${jdk}/bin/java" \
+ --set JAVA "${jre}/bin/java" \
--prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \
--prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar"
'';
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/coreimage/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/coreimage/default.nix
new file mode 100644
index 0000000000..1dcff1f6e8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/coreimage/default.nix
@@ -0,0 +1,31 @@
+{ mkDerivation, lib, fetchFromGitLab, libcprime, qtbase, cmake, ninja }:
+
+mkDerivation rec {
+ pname = "coreimage";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore/coreapps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-dxRHzSG5ea1MhpTjgZbFztV9mElEaeOK4NsmieSgf5Q";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ libcprime
+ ];
+
+ meta = with lib; {
+ description = "An image viewer from the C Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/coreimage";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix
index b9b2eb3687..33bae268c8 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix
@@ -41,7 +41,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
pytest
pytest-xvfb
pytest-mock
- pytestcov
+ pytest-cov
pytest-repeat
pytest-qt
];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix
index 371bb3a3ef..123d839341 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix
@@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchFromGitHub {
owner = "Cloudef";
repo = pname;
rev = version;
- sha256 = "sha256-2xmi/Mh5iU50yc2R1x1yzP8Xaz+mUgLnH73tAeLwxI8=";
+ sha256 = "sha256-U4IMfDvQ0rfEJhE3Uext2c/Cs0mjy1tw+k8uk441Ag8=";
};
nativeBuildInputs = [ pkg-config pcre ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
index 04003f6a9b..21e63b8b29 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
@@ -8,13 +8,13 @@
python3Packages.buildPythonApplication rec {
pname = "bottles";
- version = "3.1.6";
+ version = "2021.7.14-treviso";
src = fetchFromGitHub {
owner = "bottlesdevs";
repo = pname;
rev = version;
- sha256 = "1izks01010akjf83xvi70dr4yzgk6yr84kd0slzz22yq204pdh5m";
+ sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix";
};
postPatch = ''
@@ -44,6 +44,8 @@ python3Packages.buildPythonApplication rec {
];
propagatedBuildInputs = with python3Packages; [
+ pyyaml
+ requests
pycairo
pygobject3
lxml
diff --git a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix
index 68b4f7b3e5..e8b8714ca2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix
@@ -1,20 +1,41 @@
{ lib, python3, fetchFromGitHub }:
-with python3.pkgs; buildPythonApplication rec {
- version = "4.5";
+let
+ python3' = python3.override {
+ packageOverrides = self: super: {
+ sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
+ version = "1.3.24";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
+ };
+ });
+ sqlalchemy-utils = super.sqlalchemy-utils.overridePythonAttrs (oldAttrs: rec {
+ version = "0.36.6";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "0srs5w486wp5zydjs70igi5ypgxhm6h73grb85jz03fqpqaanzvs";
+ };
+ });
+ };
+ };
+in
+with python3'.pkgs; buildPythonApplication rec {
+ version = "4.6";
pname = "buku";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
- sha256 = "1lcq5fk8d5j2kfhn9m5l2hk46v7nj4vfa22m1psz35c9zpw4px8q";
+ sha256 = "sha256-hr9qiP7SbloigDcs+6KVWu0SOlggMaBr7CCfY8zoJG0=";
};
checkInputs = [
- pytestcov
+ pytest-cov
hypothesis
pytest
+ pytest-vcr
pylint
flake8
pyyaml
@@ -55,8 +76,8 @@ with python3.pkgs; buildPythonApplication rec {
# Disables a test which requires internet
substituteInPlace tests/test_bukuDb.py \
--replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \
- --replace "self.assertEqual(shorturl, 'http://tny.im/yt')" "" \
- --replace "self.assertEqual(url, 'https://www.google.com')" ""
+ --replace "self.assertEqual(shorturl, \"http://tny.im/yt\")" "" \
+ --replace "self.assertEqual(url, \"https://www.google.com\")" ""
substituteInPlace setup.py \
--replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1
'';
@@ -75,7 +96,7 @@ with python3.pkgs; buildPythonApplication rec {
homepage = "https://github.com/jarun/Buku";
license = licenses.gpl3;
platforms = platforms.unix;
- maintainers = with maintainers; [ matthiasbeyer infinisil ];
+ maintainers = with maintainers; [ matthiasbeyer infinisil ma27 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
index ef307ce346..daef73a567 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "cherrytree";
- version = "0.99.38";
+ version = "0.99.39";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
- sha256 = "sha256-04MRw6pMtJGxTMKwOzPNGg1T85SfVY5bMkF3gt2V0e0=";
+ sha256 = "sha256-QSRYtnZxLAaq42PvPd5+LxSzq/Hd/Cz5bquBTiGWnAE=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix
index 192cddc2e1..7b52145f79 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "clightd";
- version = "5.3";
+ version = "5.4";
src = fetchFromGitHub {
owner = "FedeDP";
repo = "Clightd";
rev = version;
- sha256 = "sha256-CuTYCNZ9oiDsm5mUDmjbxkmAl61PEXv3WMrZRzgdZeE=";
+ sha256 = "sha256-ppaxfnZB3+aOzvc/wk1f8D2mFYngQspEOl9XArNMdBE=";
};
# dbus-1.pc has datadir=/etc
diff --git a/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix
index 56938f5338..954501c0b7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix
@@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec {
buildInputs = with pythonPackages; [ glibcLocales ];
- propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ];
+ propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 configargparse keyring pyasn1 requests six urllib3 ];
checkInputs = with pythonPackages; [ pytest mock ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix
index 4197c1af04..28c965a72b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix
@@ -20,7 +20,7 @@
}:
let
- version = "4.1.3";
+ version = "4.1.5";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@@ -36,7 +36,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
- sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781";
+ sha256 = "1ps8yaps5kfd7yv7bpdvssbwm6f5qivxcvhwn17cpddc2760a7nk";
extraPostFetch = ''
mv $out ./all
@@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf";
+ sha256 = "188r4zji985z8pm9b942xhmvv174yndk6jxagxl7ljk03wl2wiwi";
};
postUnpack = ''
@@ -154,6 +154,8 @@ python3.pkgs.buildPythonApplication {
of the blockchain.
'';
homepage = "https://electrum.org/";
+ downloadPage = "https://electrum.org/#download";
+ changelog = "https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ joachifm np prusnak ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix
index 26c6a8cbc7..e8f329ecb0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "formatter";
- version = "0.3.2";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "Djaler";
repo = "Formatter";
rev = version;
- sha256 = "0da1dvzsvbwg1ys19yf0n080xc0hjwin9zacjndb24jvphy3bxql";
+ sha256 = "sha256-8lZ0jUwHuc3Kntz73Btj6dJvkW2bvShu2KWTSQszbJo=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix
index 6fde2c8fac..802c153297 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "girara";
- version = "0.3.5";
+ version = "0.3.6";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
- sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf";
+ sha256 = "sha256-GPECj0CVxKh+gTfAkkvs13tdiy93il97iqbSTxLQSiM=";
};
nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpu-burn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpu-burn/default.nix
new file mode 100644
index 0000000000..ad11b73476
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/gpu-burn/default.nix
@@ -0,0 +1,45 @@
+{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }:
+
+stdenv.mkDerivation rec {
+ pname = "gpu-burn";
+ version = "unstable-2021-04-29";
+
+ src = fetchFromGitHub {
+ owner = "wilicc";
+ repo = "gpu-burn";
+ rev = "1e9a84f4bec3b0835c00daace45d79ed6c488edb";
+ sha256 = "sha256-x+kta81Z08PsBgbf+fzRTXhNXUPBd5w8bST/T5nNiQA=";
+ };
+
+ postPatch = ''
+ substituteInPlace gpu_burn-drv.cpp \
+ --replace "const char *kernelFile = \"compare.ptx\";" \
+ "const char *kernelFile = \"$out/share/compare.ptx\";"
+ '';
+
+ buildInputs = [ cudatoolkit ];
+
+ nativeBuildInputs = [ addOpenGLRunpath ];
+
+ makeFlags = [ "CUDAPATH=${cudatoolkit}" ];
+
+ LDFLAGS = "-L${cudatoolkit}/lib/stubs";
+
+ installPhase = ''
+ mkdir -p $out/{bin,share}
+ cp gpu_burn $out/bin/
+ cp compare.ptx $out/share/
+ '';
+
+ postFixup = ''
+ addOpenGLRunpath $out/bin/gpu_burn
+ '';
+
+ meta = with lib; {
+ homepage = "http://wili.cc/blog/gpu-burn.html";
+ description = "Multi-GPU CUDA stress test";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ elohmeier ];
+ license = licenses.bsd2;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix b/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix
index a30778762b..c182db8fdd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/grip/default.nix
@@ -15,11 +15,11 @@
}:
stdenv.mkDerivation rec {
- name = "grip-4.2.1";
+ name = "grip-4.2.2";
src = fetchurl {
url = "mirror://sourceforge/grip/${name}.tar.gz";
- sha256 = "sha256-3bFJURPbq9rzLsJCppRjSARhcOJxC4eSfw5VxvZgQ3Q=";
+ sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE=";
};
nativeBuildInputs = [ pkg-config libtool ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix
index a0491a0988..e8c927b79a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hugo";
- version = "0.85.0";
+ version = "0.86.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-IW41e4imaXKcXJKa7dAB60ulvRrk3qvF1//Lo55TLVI=";
+ sha256 = "sha256-1ELOQT4zLjtsLKyAsfSIUGGW4wH5+kpw33Fw5hCPR50=";
};
vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk=";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix
index c7c184febe..8ad7578ade 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix
@@ -20,7 +20,7 @@ with python3.pkgs; buildPythonApplication rec {
pkgs.vdirsyncer
pytz
pyxdg
- requests_toolbelt
+ requests-toolbelt
tzlocal
urwid
pkginfo
diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix
index f281ab5a4c..7367d18ddf 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
- version = "0.2.3";
+ version = "0.2.6";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
- sha256 = "LTwgLG/jUVOSR29LkLJ9q5wpPMK78yFvGtglzMG0ZC0=";
+ sha256 = "/tpegRGyGPviYpaSbWw7fH9ntvR7vUSD5rmwDMST5+Y=";
name = "${pname}-${version}.AppImage";
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mnamer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mnamer/default.nix
new file mode 100644
index 0000000000..dd634ae7f1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/mnamer/default.nix
@@ -0,0 +1,46 @@
+{ python3Packages, fetchFromGitHub, lib }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "mnamer";
+ version = "2.5.3";
+
+ src = fetchFromGitHub {
+ owner = "jkwill87";
+ repo = "mnamer";
+ rev = version;
+ sha256 = "1frrvfhp85fh82yw9yb6n61by8qp1v7f3c0f623njxk1afawhccd";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ babelfish
+ requests
+ appdirs
+ teletype
+ requests-cache
+ guessit
+ ];
+
+ patches = [
+ # requires specific old versions of dependencies which have been updated in nixpkgs
+ ./remove_requirements.patch
+
+ # author reads a private property that changed between versions
+ ./update_hack.patch
+ ];
+
+ checkInputs = [ python3Packages.pytestCheckHook ];
+
+ # disable test that fail (networking, etc)
+ disabledTests = [
+ "network"
+ "e2e"
+ "test_utils.py"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/jkwill87/mnamer";
+ description = "An intelligent and highly configurable media organization utility";
+ license = licenses.mit;
+ maintainers = with maintainers; [ urlordjames ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mnamer/remove_requirements.patch b/third_party/nixpkgs/pkgs/applications/misc/mnamer/remove_requirements.patch
new file mode 100644
index 0000000000..46fc0571ce
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/mnamer/remove_requirements.patch
@@ -0,0 +1,21 @@
+diff --git a/setup.py b/setup.py
+index 245c1dd..fdc17ab 100755
+--- a/setup.py
++++ b/setup.py
+@@ -7,16 +7,12 @@ from mnamer.__version__ import VERSION
+ with open("readme.md", "r", encoding="utf8") as fp:
+ LONG_DESCRIPTION = fp.read()
+
+-with open("requirements.txt", "r", encoding="utf8") as fp:
+- REQUIREMENTS = fp.read().splitlines()
+-
+ setup(
+ author="Jessy Williams",
+ author_email="jessy@jessywilliams.com",
+ description="A media file organiser",
+ entry_points={"console_scripts": ["mnamer=mnamer.__main__:main"]},
+ include_package_data=True,
+- install_requires=REQUIREMENTS,
+ license="MIT",
+ long_description=LONG_DESCRIPTION,
+ long_description_content_type="text/markdown",
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mnamer/update_hack.patch b/third_party/nixpkgs/pkgs/applications/misc/mnamer/update_hack.patch
new file mode 100644
index 0000000000..56c83a20a9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/mnamer/update_hack.patch
@@ -0,0 +1,13 @@
+diff --git a/mnamer/utils.py b/mnamer/utils.py
+index 636b596..e52bd37 100644
+--- a/mnamer/utils.py
++++ b/mnamer/utils.py
+@@ -280,7 +280,7 @@ def request_json(
+ "like Gecko) Chrome/79.0.3945.88 Safari/537.36"
+ )
+
+- initial_cache_state = session._is_cache_disabled # yes, i'm a bad person
++ initial_cache_state = session._disabled # yes, i'm a bad person
+ try:
+ session._is_cache_disabled = not cache
+ response = session.request(
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix
new file mode 100644
index 0000000000..4e6518c6ff
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, pkg-config
+, cairo
+, gobject-introspection
+, gtk3
+, gtk-layer-shell
+}:
+
+buildGoModule rec {
+ pname = "nwg-drawer";
+ version = "0.1.4";
+
+ src = fetchFromGitHub {
+ owner = "nwg-piotr";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-YjMuXSBAgRh6vZUxKHLTqT2lEU/f+AuI/dX4PHfftZg=";
+ };
+
+ vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk=";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ];
+
+ meta = with lib; {
+ description = "Application drawer for sway Wayland compositor";
+ homepage = "https://github.com/nwg-piotr/nwg-drawer";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ plabadens ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
index 750043d4a9..d7393313c1 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
@@ -50,19 +50,25 @@ let
}
)
- # Octoprint needs zeroconf >=0.24 <0.25. While this should be done in
- # the mkOverride aboves, this package also has broken tests, so we need
- # a proper override.
+ # Octoprint needs zeroconf >=0.24 <0.25. This can't be done via mkOverride, because in zeroconf 0.32
+ # the super package was migrated to fetchFromGitHub.
(
self: super: {
zeroconf = super.zeroconf.overrideAttrs (oldAttrs: rec {
version = "0.24.5";
- src = oldAttrs.src.override {
+ src = super.fetchPypi {
+ inherit (oldAttrs) pname;
inherit version;
sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9";
};
- buildInputs = [ self.nose ];
- checkPhase = "nosetests";
+ pythonImportsCheck = [
+ "zeroconf"
+ ];
+ buildInputs = with self; [
+ pytestCheckHook
+ nose
+ ];
+ pytestFlagsArray = [ "zeroconf/test.py" ];
});
}
)
diff --git a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix
index 7545253d50..98bb6d02eb 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix
@@ -12,18 +12,27 @@ let
sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
};
});
+ flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec {
+ version = "2.7.0";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";
+ };
+ });
+ werkzeug = self.callPackage ../../../development/python-modules/werkzeug/1.nix { };
+ flask = self.callPackage ../../../development/python-modules/flask/1.nix { };
};
};
in
python3'.pkgs.buildPythonPackage rec {
pname = "privacyIDEA";
- version = "3.6";
+ version = "3.6.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-yywkQ3TdBzRMbJGY0Seaprztgt0JrCAbgqosMQ5fcQM=";
+ sha256 = "sha256-NRfTEZ/6K6xLP+wcT6o54wqk/EyWTiiC9W1KDgaAEbg=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix b/third_party/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix
index 5eb43c0e35..0e473c6a1b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest-runner, pytest }:
buildPythonPackage rec {
pname = "Cerberus";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5";
};
- checkInputs = [ pytestrunner pytest ];
+ checkInputs = [ pytest-runner pytest ];
meta = with lib; {
homepage = "http://python-cerberus.org/";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix
index 79a4d9fc7a..d0d59af604 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix
@@ -5,7 +5,7 @@
, waylandSupport ? true
, x11Support ? true
-, ConfigArgParse
+, configargparse
, rofi
, wl-clipboard
, wtype
@@ -26,7 +26,7 @@ buildPythonApplication rec {
# `rofi` and the `waylandSupport` and `x11Support` dependencies
# contain binaries needed at runtime.
- propagatedBuildInputs = with lib; [ ConfigArgParse rofi ]
+ propagatedBuildInputs = with lib; [ configargparse rofi ]
++ optionals waylandSupport [ wl-clipboard wtype ]
++ optionals x11Support [ xdotool xsel ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/udevil/default.nix b/third_party/nixpkgs/pkgs/applications/misc/udevil/default.nix
index e83a5e9a2c..9d1df5245e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/udevil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/udevil/default.nix
@@ -1,12 +1,20 @@
-{ lib, stdenv, fetchurl, intltool, glib, pkg-config, udev, util-linux, acl }:
-stdenv.mkDerivation {
- name = "udevil-0.4.4";
- src = fetchurl {
- url = "https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz";
- sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd";
+{ lib, stdenv, fetchFromGitHub, intltool, glib, pkg-config, udev, util-linux, acl }:
+
+stdenv.mkDerivation rec {
+ pname = "udevil";
+ version = "0.4.4";
+
+ src = fetchFromGitHub {
+ owner = "IgnorantGuru";
+ repo = "udevil";
+ rev = version;
+ sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad";
};
+
nativeBuildInputs = [ pkg-config ];
+
buildInputs = [ intltool glib udev ];
+
configurePhase = ''
substituteInPlace src/Makefile.in --replace "-o root -g root" ""
# do not set setuid bit in nix store
@@ -19,11 +27,18 @@ stdenv.mkDerivation {
--with-setfacl-prog=${acl.bin}/bin/setfacl \
--sysconfdir=$prefix/etc
'';
+
+ postInstall = ''
+ substituteInPlace $out/lib/systemd/system/devmon@.service \
+ --replace /usr/bin/devmon "$out/bin/devmon"
+ '';
+
patches = [ ./device-info-sys-stat.patch ];
- meta = {
+
+ meta = with lib; {
description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes";
homepage = "https://ignorantguru.github.io/udevil/";
- platforms = lib.platforms.linux;
- license = lib.licenses.gpl3;
+ platforms = platforms.linux;
+ license = licenses.gpl3Plus;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix
index e41bc6bd20..d669b97c44 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix
@@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "zola";
- version = "unstable-2021-07-10";
+ version = "unstable-2021-07-14";
src = fetchFromGitHub {
owner = "getzola";
repo = pname;
# unstable because the latest release fails to build
- rev = "8c3ce7d7fbc0d585d4cbf27598ac7dfe5acd96f1";
- sha256 = "sha256-Tw3u96ZPb0yUXvtJ+rna6nnb0a+KfTEiR/PPEadFxDA=";
+ rev = "312ffcb04c06c5f157b9fd2b944b858703238592";
+ sha256 = "0i5zqs1gwxhvsynb540c3azfi4357igr4i5p0bi3h7ras2asas8w";
};
- cargoSha256 = "sha256-mOO39LK7lQ5IxwMgfJpNwX/H5MZ3qKqfeDmnY8zXOx4=";
+ cargoSha256 = "0g5z0s837cfwzral2zz0avp0xywyaa3l1adxg520qrnga7z0kbh8";
nativeBuildInputs = [ cmake pkg-config installShellFiles];
buildInputs = [ openssl oniguruma ]
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
description = "A fast static site generator with everything built-in";
homepage = "https://www.getzola.org/";
license = licenses.mit;
- maintainers = with maintainers; [ dywedir _0x4A6F ];
+ maintainers = with maintainers; [ dandellion dywedir _0x4A6F ];
# set because of unstable-* version
mainProgram = "zola";
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
index 7b2acbd6b3..7bbbbe082d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.26.74";
+ version = "1.26.77";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "ULmoUXyPWHCewK4FPP7SX1Ena6n0aM/EWR7ZnMN1ztY=";
+ sha256 = "tV/VseU+IncvM3gdrmqkYLPClbsf2kSvIAZj0Ylz2Rw=";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
index 6398b82dbe..705255942c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -62,9 +62,9 @@ mkChromiumDerivation (base: rec {
-e '/\[Desktop Entry\]/a\' \
-e 'StartupWMClass=chromium-browser' \
$out/share/applications/chromium-browser.desktop
- '' + lib.optionalString (channel != "stable") ''
+ '' + ''
cp -v "$buildPath/crashpad_handler" "$libExecPath/"
- '';
+ ''; # TODO: Merge
passthru = { inherit sandboxExecutableName; };
@@ -84,7 +84,7 @@ mkChromiumDerivation (base: rec {
else "https://www.chromium.org/";
maintainers = with maintainers; if ungoogled
then [ squalus primeos ]
- else [ primeos thefloweringash bendlas ];
+ else [ primeos thefloweringash ];
license = if enableWideVine then licenses.unfree else licenses.bsd3;
platforms = platforms.linux;
mainProgram = "chromium";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
index 18565f31a2..6daafc204e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
@@ -167,6 +167,19 @@ let
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
./patches/fix-missing-atspi2-dependency.patch
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
+ ] ++ lib.optionals (versionRange "91" "94.0.4583.0") [
+ # Required as dependency for the next patch:
+ (githubPatch {
+ # Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat""
+ commit = "4b438323d68840453b5ef826c3997568e2e0e8c7";
+ sha256 = "1lf6yilx2ffd3r0840ilihp4px35w7jvr19ll56bncqmz4r5fd82";
+ })
+ # To fix the text rendering, see #131074:
+ (githubPatch {
+ # Linux sandbox: fix fstatat() crash
+ commit = "60d5e803ef2a4874d29799b638754152285e0ed9";
+ sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70";
+ })
] ++ lib.optionals (chromiumVersionAtLeast "93") [
# We need to revert this patch to build M93 with LLVM 12.
(githubPatch {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
index 535b87a87f..33619f2735 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,8 +1,7 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
-, libva ? null
-, pipewire
+, libva, pipewire, wayland
, gcc, nspr, nss, runCommand
, lib
@@ -165,7 +164,7 @@ in stdenv.mkDerivation {
buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
- libPath = lib.makeLibraryPath [ libva pipewire ];
+ libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 ];
in with lib; ''
mkdir -p "$out/bin"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 71887b8b85..a6df334a97 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,20 +1,20 @@
{
"stable": {
- "version": "91.0.4472.164",
- "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4",
- "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr",
+ "version": "92.0.4515.107",
+ "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf",
+ "sha256bin64": "0vfg8wjf9i1yz8nlxsij8fmqq7qr4nsccaihppqm3axpk91mmdsj",
"deps": {
"gn": {
- "version": "2021-04-06",
+ "version": "2021-05-07",
"url": "https://gn.googlesource.com/gn",
- "rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
- "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
+ "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
+ "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
}
},
"chromedriver": {
- "version": "91.0.4472.101",
- "sha256_linux": "0dzx565z2rd0y4i57rv5kd7dsm69sffza96y3c773hqaghm4y1ng",
- "sha256_darwin": "0nff1jmmrn6a4clfvhyzrhfp8hx85z72563jwk28apflqmnm0k68"
+ "version": "92.0.4515.43",
+ "sha256_linux": "1s22y892py99kzcb2j3gafmbz9jrr2lfhhh8hp3ggn2i37yxs8bw",
+ "sha256_darwin": "1cjg4r4z5m74c2si4m25rj3z44n0iimhqzb1l3l3y0a3q024bi8f"
}
},
"beta": {
@@ -31,9 +31,9 @@
}
},
"dev": {
- "version": "93.0.4573.0",
- "sha256": "0knks0padlcqhwnjpg32d875nycznlbd228sx8qwnylg1ilrzqck",
- "sha256bin64": "1kxbsdcc0gh2pllz3szmnjswxqbw9sr457pq8aafpgk9rdchikg1",
+ "version": "93.0.4577.8",
+ "sha256": "1x6i5bmcnj8bkpcb9gcyd1m9nzpq206yyprxrnpak117k7abr2b1",
+ "sha256bin64": "0qjfb9jxr2gmwb1dsvl6yzz06vsjny2l3icrsdcm0pl6r6davk2w",
"deps": {
"gn": {
"version": "2021-07-08",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 5813868286..93eef40afa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,975 +1,975 @@
{
- version = "90.0.1";
+ version = "90.0.2";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ach/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ach/firefox-90.0.2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "b985849c5109b6a9992ca0fc4699b769af37c84f1aea5fc6c1b66845f51da83d";
+ sha256 = "ee3f5f5e5fef9b41a075569515467ae53706d1b456afc34acc3e73cb53ad7549";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/af/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/af/firefox-90.0.2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "7ddb078a80b7991576f691a1c3bc76635621aa13d64c465651e16ae4dade7436";
+ sha256 = "0c6178c97b21580038495444500cd9cbd8de980ba64ab9345366d2eb43ff7c9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/an/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/an/firefox-90.0.2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "dca47858177ed263332c7cb093e3285b5c8f61782a66cf683ee52896c3fc76a2";
+ sha256 = "6dd2b6b3219f1ef39e0d204dc346ff750d045bcfe16cfc55efc15ee3dcd74b85";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ar/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ar/firefox-90.0.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "2249834099e5cc9a5feb0b38bdc277e5e3f65635b1a1179afe1240113f0ee1d9";
+ sha256 = "efb5dae74218823b3550d716be8b6aa907c9daa2611588d254c3ffd24923a1e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ast/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ast/firefox-90.0.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "7ad21576299643e480922a2a7b6077a0edc84d362e33bb8318b33d04133a7c7b";
+ sha256 = "ef665e2ace9a41650d873cbc5562b2072c9de013f8a48a5ce72b735c9e76e883";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/az/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/az/firefox-90.0.2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "10eabc925d651985229d6bac1c34b12267a31886f5354ba943178f6a2d0ef04a";
+ sha256 = "2eac97a8216725732ad9e79451e23af0a4f6688d248fb12f17e0ddfdbcbe8766";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/be/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/be/firefox-90.0.2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "d1e6d939233b23e5378161c79f338e66c010056d9d3e619b9eb6c26dc4461724";
+ sha256 = "5da97b0b3e7be0ee77ffc013a453249fdb1b6c90a6baa93e6e180f64a2e6bed5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bg/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/bg/firefox-90.0.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "d59e69127462aa3efff558d5cd5035951dbe54161f913dacb4142a8bd3f258fb";
+ sha256 = "de04186cb91dac93edb81c6da8cfa21a2bb33abe0677038cc08762b79fd9032e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bn/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/bn/firefox-90.0.2.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "56ca1d7e84ada3f0124e36186a32dfdf287547bdc8d3b111baf9407fedf0a7ae";
+ sha256 = "6e408ad360718bed39902e4634c8bbf89de5bd31d4eb6124b3e0a624f4a817ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/br/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/br/firefox-90.0.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "33a6ceb6d37b73d03fe5a6e93e19e29346b2861ee69ab2fffd6cca4a2dbaf40f";
+ sha256 = "192b8e20b9f42f443dcbbc1dca6103e2ea44925fc1df05f6a6c61861ccc2e09e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bs/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/bs/firefox-90.0.2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "7c853a13afd74307e7a468b85ed430b20f1622dbecb697b8c80945ccea9f0805";
+ sha256 = "9fc5a531065f5fe0466e8e3027dfba654dc30470ae2763765692a49223e80da3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca-valencia/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ca-valencia/firefox-90.0.2.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "0aa103c471b3f71ef638cbf9e8f83447875ef5cd96bdc8535435188510272c65";
+ sha256 = "c1a9d555dad9598379733404141272292cbac858b2b2f7fd7f5cc1962aef3280";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ca/firefox-90.0.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "4672d9fe667f72de45af1eb6a205792440afa9de86eae1f33426d3b948fbc841";
+ sha256 = "942fd1cbe717d344e09e4c56e2b5f2fd54d341f92b85d9ea5c90d272b5fdd385";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cak/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/cak/firefox-90.0.2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "7b12a52926888f52957a75f639f09094dc4cbc18a1c6d14bf433028461c4a71a";
+ sha256 = "b4ee321fe684de9919bc7333096dcd590576c8ce405e454cd362bd4e7559d0c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cs/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/cs/firefox-90.0.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "7dfdf0c4c740dab356205c52384faf61e9963a42675031f0292be1c0f4e402c3";
+ sha256 = "6249f8805552c035160c1a6a155323190e4cde495409ebdb1be182234eea78b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cy/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/cy/firefox-90.0.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "ad7f76b997bced6df5c240273fb736fe7dcb0c86ae867a5cbdb5097dd5c382ba";
+ sha256 = "a362582fa671c3a9c54afb10d1c88348ad3da31add280e730e4ced4aed21a733";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/da/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/da/firefox-90.0.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "9f59ff2eec510b75312bcbe29e9706fe0710f300c12e33200937571414254d31";
+ sha256 = "7ea8aeb5eeeb17799642498905893e8b043e5abfc4a0d3ce142f95d54737f473";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/de/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/de/firefox-90.0.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "c838f9238939cc8e91fff903a231062c03388c2202e273f7b99701415a8f3f22";
+ sha256 = "ebbd750201afbcb189cff2db5f72af590024e7d801a04a00c9b2e656921b0440";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/dsb/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/dsb/firefox-90.0.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "5370c32283f8bf7fc3273dbe3cb5c77db829723a39401b00f0e8f70c9f3dba91";
+ sha256 = "8885710a72d73ee150763fbe942fb645797f791636d27a3c52425a67169c851f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/el/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/el/firefox-90.0.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "2af4feceeea5c0932935d91c22df516ae2e25d9006ab41ba6274783b74b3a5e5";
+ sha256 = "652c6d6cb263b57f3f5801bece2464d5df4bcb326072419c9e269dfcbe92dfb8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-CA/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-CA/firefox-90.0.2.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "e805c2eebe0c9892082b900af2bd1511264ed5fd5d47864ca5a8fc3e6c0a05de";
+ sha256 = "87f4cb450da3180eefc47f0ab453c00182904f9a367d4a6fb0baf6e1a1aa0955";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-GB/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-GB/firefox-90.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "2d888fdd72a65137790b10f02056d6194fd9c374cc6ff09cf7217cfbb84e2d7d";
+ sha256 = "e0d55687a6c577d04db7c1b90532aa6274882e92275e2cf5af1efbf6f4bd1c9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-US/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-US/firefox-90.0.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "998607f028043b3780f296eee03027279ef059acab5b50f9754df2bd69ca42b3";
+ sha256 = "2d62a8b1b1e39c00ddd8923fc862484fa1501eba243894ae4c5079766e58d1fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eo/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/eo/firefox-90.0.2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "3fee8ee742d6ebc03a6fd66404979b7e2fc823757801ac205ca291c249f7b31c";
+ sha256 = "4e1198ff0d83718326784348d301ab6782a73435ab1b32d40ccdc9d05238ca8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-AR/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-AR/firefox-90.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "854cf81090ccdb2f8d4ccf0729c7228c2945626a56d1cfee524f927c5bb67c47";
+ sha256 = "ae8a2145ae461fd5a13744fbeb93f16330f68497a58b21465cc8c174fb5a4fcb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-CL/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-CL/firefox-90.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "c0b92a9e2defa74171c880be9ed84f12ab946d4d9af888d7d9ed735114968fb5";
+ sha256 = "1c66b290d07ae7d7093a67930a15e648b0c4ca95fe8bbd42ca9349766537a4b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-ES/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-ES/firefox-90.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "a2fcc7126f6c5b6edf162357ddf7493df2873ecbe36d74a176c3924b877c4448";
+ sha256 = "164575fc3385ea9f3883febbd827aaa9115da185e07f70afdd8b2cd5442fdf46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-MX/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-MX/firefox-90.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "fd27c822086cfdd3636d1edd0afb62be22546d2dcb86d968ef4e1875acbb66fe";
+ sha256 = "6f2284a3de5653d9e6cfb769162530d9630b45a3fb5ae73bbe5d77b78c4e19a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/et/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/et/firefox-90.0.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "13f34d32f05de7d77d4ffed59a00d539cc819edb3ad9ab52d1a77d9f92a05264";
+ sha256 = "9c6a073b4539082ef1714d6068c26f0182d3358903cc1b1a6c15d5cdb6067c18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eu/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/eu/firefox-90.0.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "b53133754eadfd473a68b0647bbf3ada70ad46cd0820ffc94b96ca0bd259db62";
+ sha256 = "025c94ed2fd16956ae30c98ee1173386c5ac8920cf3ca4e61ebc0a9d6b71222f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fa/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fa/firefox-90.0.2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "048ab2377915cf7efd4daab495873f9c1282f74907bedc22093b0cf17cc3b301";
+ sha256 = "3456216eaf2e17f6973e79161815d963be70db4c1a6aed65dd2e378e7611f310";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ff/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ff/firefox-90.0.2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "99de5853888020d6435e8a369eb8b983fe4374e754451dabc2785b9ab2d5bb24";
+ sha256 = "e9a8e66a209a135206757082dc0dcc3fbe991fc0f1a10bfc76b7706778d5f433";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fi/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fi/firefox-90.0.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "03513b1d725a6f5ffa243fe38e19a66c2850d849c09d7b80c3ba17fcb3012b17";
+ sha256 = "6f33d44c0f74b9a29accf07d8205604f4c1c7397f9957fd219b246f31def9c82";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fr/firefox-90.0.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "350c5ded72a988773acdb3411f0d9d1ecfdd79501cbc04a9ed8777ada8248ae5";
+ sha256 = "0e78948af1d6a18195904a6e2c9a368459d5578e9727afc0159fb2c88eb659df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fy-NL/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fy-NL/firefox-90.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "026a5a3e8140110c830c237b1dee5857d07c9eacd1e803d0f5b054afd0d5d06b";
+ sha256 = "8513f2bd6c2004d1fe778573aaeb029877af01b0d3bb2390584337c8095365a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ga-IE/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ga-IE/firefox-90.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "1b522979314c1c672c30da02ea7d38f94ea811df91d86b8327836937069ed956";
+ sha256 = "74978be3cf0672e779f291a4260fb977c155b3769c0654f4b819bbb69849d9ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gd/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gd/firefox-90.0.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "d6830e901c20477dd4121cd3a0f918634bc3107d799eaf4439b9ba036acd88d5";
+ sha256 = "9593cba33374fda3381798b94d6cfcd41b08a3540cbf845aeebd14e8fff6b2ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gl/firefox-90.0.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "f25adcd9c7c027a7e531a9072201f174cb69e30c30dffabfff4d0d8e12250f68";
+ sha256 = "2072671f052216881cab6323912cf32671dd829c0d2a25a0530026bcf763ff33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gn/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gn/firefox-90.0.2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "a0df03aa486320a1fbb554a5be600067d2447af0a63726290f2c7d599c9a9534";
+ sha256 = "74a3ba6468110a5bf719fa0ed064ed0ceb2cabc9f9182789d3cf8cc7e166548e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gu-IN/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gu-IN/firefox-90.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "daf1ba05f971b8b8f04da9085eefb03ad15fa5bf6d637ad1bcedb94665bb150d";
+ sha256 = "e58cafd6d1ebd0d5158683e640e745b993365dac9c3ad118274e5115ca3fa986";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/he/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/he/firefox-90.0.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "cedcbd2e76bf371ed8daefd100631e0381470b3980946e033b39a2b94035a55c";
+ sha256 = "f2ec967d4e4b9037a46e840ebbcddff8d30ba5284bcc0e9c993807e477004002";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hi-IN/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hi-IN/firefox-90.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "d0d6ba66c59fed2c33d9e21c9015b40743ac7e4305b1055f39b909754af984bd";
+ sha256 = "74b7fd465be49622638042bd92ebafb961371e8ba3229c5f51b6e16b3d86c2d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hr/firefox-90.0.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "11ba8ffdf88bbaec536e4a362dd40f2eb535edb652fb01587ed46ba09fa7f17e";
+ sha256 = "8eba7ac66bb1c50537cd684c637ad3bf827cb4d835dea895bef648adbf5ae901";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hsb/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hsb/firefox-90.0.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "d1e1fbba7748ffc2c0f92e4be4dbe346359bc145fa2dc063ed4660d14ffb0b1f";
+ sha256 = "04dc064d385a2cc9558ffb293d03a9200046982911c8ffae04fb940ef6348f0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hu/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hu/firefox-90.0.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "ba8d28151ddd5e02b530b653f5bf5de9dc97669355a8b6370e5067527f22bf34";
+ sha256 = "fbb823826e6c27b4fc771128ac7e4cabfe25957726ad6926ce6092d92a0ee805";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hy-AM/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hy-AM/firefox-90.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "df7d7543013687f02a88f9e6d52d4bfbb46c6ce6646bfbbf86571d7473be2554";
+ sha256 = "9267181169545acdf9a1c3d34d2a8486b06e470704bacb4d77f608c4a0d7fe89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ia/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ia/firefox-90.0.2.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "1df0469ba5a368bf5ddd323e68ab458d29042b85e471bb7e20dfccefdf086ba9";
+ sha256 = "197a1a6e71f14c4ddbfab5be47d60ec8bae32bef4dcaf6638932dba41bdd0c06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/id/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/id/firefox-90.0.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "fee462d383763763a6034a452150166d507d424e303b114b68bb13b6779605d8";
+ sha256 = "4fa565fb93e011f7bca7cf321e342361e4ea3462764bb2b965fd192f4fdc20ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/is/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/is/firefox-90.0.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "86568d6afaed2043d916343c565689047246ff3dbab5e6d928e5a6722f8d093d";
+ sha256 = "c6f026a88f5e3e81a5b6998004f122dc3d225decaed161c83145fde0f97ec0b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/it/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/it/firefox-90.0.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "36e5dc00b8f9bc3fdc91441c0939eae5d43356ef0268c2bebea1d087f5d414e5";
+ sha256 = "41da1b7f11386b99ab836b098250d677b1d9804807932e021050d9d5705bb61a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ja/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ja/firefox-90.0.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "b07f66b82be0f6f716384c37286205be455c83d8c9299456376d171167269903";
+ sha256 = "e6c64a6f8d9d7369c4d768e86195d7ae4943a36ce2a17bc52c64d6d506790b89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ka/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ka/firefox-90.0.2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "5b391f01586ca70900ce279de8f3e22c670de5b210f350bc8bf82c75dd47e0ac";
+ sha256 = "15af2a3dde8265ef88578f1682ed5874745bbe8afb40cec31933a03618c74eb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kab/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/kab/firefox-90.0.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "a833e4c862c8805d4a1571b210de928f5d4fd6e7973d1de5e7ac1e8e3877b722";
+ sha256 = "0030c8ca365659698af414b325681673ff600642c873b5403abd77019a3b3c97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kk/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/kk/firefox-90.0.2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "5041bbd4acba0a2710e705798c8196605c62852de8a1c43f3676631dba5369a5";
+ sha256 = "e596da9120269aea24f275f15a04f65e4319e7c19508fe292752af19d8ff1af4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/km/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/km/firefox-90.0.2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "f71888db4e4cc49172d625cca26b5b72c6d85180894f29ee0b934781f0f6efff";
+ sha256 = "d42dc8a75e3e474da6017c15b699a4b9cdaaa78d1afb8dade7af14f2503ef8d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kn/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/kn/firefox-90.0.2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "7d32dee56e657d791eb80e6829ad2ff3624d949531bff1366b685924564d6534";
+ sha256 = "4674bda817818609461aa128f9aad337a25718646a65924545b403985eecbc8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ko/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ko/firefox-90.0.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "f9f0781ca8eeb1b21060a3cc2df8f8f5fecd659a230fa4f5f2907db5c37fe6c6";
+ sha256 = "f3f95e0d996e4cc1fbd3d1051b34a2f6d436a6672fb417f74ff140dc01943f67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lij/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/lij/firefox-90.0.2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "0cff9a886e2d158ff00638200106d6537a254cc5a64e48a8233770e5798c1ca5";
+ sha256 = "40e470989b0ab746c04c3fa7023c90b0512ef6b580a77b2de8651483e145b1ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lt/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/lt/firefox-90.0.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "69c8e5a6f5c3d2435ed6dd02bc1c4b9264b1543b7763ade3accf4f30eea7b9e6";
+ sha256 = "fcb0b0eaa5144357809197539100013ab027de6334d093061b8971057e85e694";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lv/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/lv/firefox-90.0.2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "55b59adc86e9e91f5a134bb16837c8843449f4dfc85abbb3f292bb34214bbca0";
+ sha256 = "2aef3f3de461f1c00909dea7bdc00ed1f56d0e4edcb7b2f08581fd06dc6286b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mk/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/mk/firefox-90.0.2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "d670166e34e513ff4dac69740f547542e4e2c3e24f7ae7d165dbe5a4151f17e4";
+ sha256 = "789fbe69ab269da101585eab463eb7eab50c1fbfbc92fb88116f402966ad3e71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/mr/firefox-90.0.2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "9cd258a90e1a12a113e626bbaa4d557936b29b71491138e73f74ebf6645a9b76";
+ sha256 = "fd4d1e60ed873bbbb522c956e14ac21bb490888f84dbe900dfcfd036bfd84289";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ms/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ms/firefox-90.0.2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "0b68ba835ae0f3561eaa2721de08bab95946c1e1111b05f8b02cb7f95bc23335";
+ sha256 = "970f5e7f8962c05653228830f53bb55585e7a14bc526f06e09e4fe18c30cf93b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/my/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/my/firefox-90.0.2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "071df9d8ee0a5d1e3b3ae8f472173b5da378b6b41646a3d1d2222a3dbc73596a";
+ sha256 = "188813a56ed195452e3dc77760707ac6bb8daf7e8063ae5b3f8dd18597d70452";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nb-NO/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/nb-NO/firefox-90.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "2623cb59780a1db3cc20267023c93f578ad4c6cfede8b12416f538d62ffa930c";
+ sha256 = "0e1e979c3e33c5b272355238491bd971a68e6b17cd619f14d61814214516553b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ne-NP/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ne-NP/firefox-90.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "a6c6c514cf476bd93d64c1e315161d765792528a632aa881a75abb85076ac998";
+ sha256 = "b45d52daf7a8fccb52642eea1da34ba5447a9511d6d577530379804ce64b3a68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/nl/firefox-90.0.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "60d7de62f35cadc8bab987bf81fe6d8635388b361f3157e5d13809604cc41927";
+ sha256 = "36a5808b6e510a8c9eb4d61e8cdd1a29f43bade3c30876b1c0d882af1a9b4dd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nn-NO/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/nn-NO/firefox-90.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "a1b0cebb8de16685011e5cded38add6a3b13738163dbcf6216182b350c293f27";
+ sha256 = "958f51581c99d459f2e82c0abd311d487e444388bbcacae193fbc8d44df0a567";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/oc/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/oc/firefox-90.0.2.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "f4f491e962ec713e708e9f773de3af9f6251ab6f2f41f516116f83a63824928a";
+ sha256 = "895f42c9024a9e15e2bad2a1eda74eb6d1e928d01766235ca706543eca822b05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pa-IN/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pa-IN/firefox-90.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "5a41333ed465121d212ddc6c61faf2a5c4eab25daf0ec3206196077f490a18e1";
+ sha256 = "fc24be218f92076761afa833a1374cf2573b1ac3e86bafd1bde8ea720a181c43";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pl/firefox-90.0.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "de5d8c3e5b8f458c400a98c1b72595ff951a54083ff29e1bf01fc3421443cbd8";
+ sha256 = "eeac2270945b16aef7d138733fb08576e877347b0a222eb97a0b8f154074af76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-BR/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pt-BR/firefox-90.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "53fb72801cc33ded2e31142161faaca04ec5f7742413faeada30e1c5ef51025b";
+ sha256 = "6c609946024a8659d84e3b356245db80e08df7a0fdf4745b846537bc164bfbf0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-PT/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pt-PT/firefox-90.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "2c72ac24a7cbdb79b338ad9a79f649be85caa0377b78fabcf07c42b1ef02a94e";
+ sha256 = "604f36949f5b7107f4b84e2da7c0125ab67add31a3adf811cd696458127a0d9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/rm/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/rm/firefox-90.0.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "bfd252411406e6a8816ef000fc6fcff6357741924754daf05ee39ff331bdf3e5";
+ sha256 = "52a29404671e2b3132c2d3b27859b414820755b2d60a1043483e26dc33985336";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ro/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ro/firefox-90.0.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "f4c9a173ab7e9fc964f4c255ef9830559fc835d1f18ac388de5fa16d2df5d521";
+ sha256 = "60a8c8e6cd54b4093d922dfd3aaeda483d82ec8c23725e8d1a15ec7c21d662dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ru/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ru/firefox-90.0.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "07d1c8cd10323f039a040295230f223e9e6b40860830b2e26a0ab9fd2c15d0a7";
+ sha256 = "6e18bb8f1828a832715543be37f5bee235135623256a0af70e40cbc0513a0477";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/si/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/si/firefox-90.0.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "6f816e89adaabb79ff1b73eed516e6c5f817d7af0ccaee58262ea47c80a08664";
+ sha256 = "f85b0f7c1234a9bad7bf7c242209df03dc17655e9a9b5672df04790433648f24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sk/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sk/firefox-90.0.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "14fbd3f2057da82c95e2cd194021adc3c7c19b0f64cd56e623ae2341b7414301";
+ sha256 = "1bdbd0877f513c4368de9fc494b4d3eaf47ff28c73cd323a99f6f02e105f6ec0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sl/firefox-90.0.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "388ef17576722a32d22350ac2848c8e7f0239481f1d0172441770052bf1c53d5";
+ sha256 = "7f581f23d215bd6d5c52518b4711601b3558fd7b0d5ee6e7484453340d9bfbef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/son/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/son/firefox-90.0.2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "f7785fc5a91c991c277b36eca1928c350953043e77cdb4b47f25d5f2f611828d";
+ sha256 = "47de297dc96c63f1eca6dc37df4dcbb73e5ed1561311c9b60cf2e0eba52e4a9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sq/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sq/firefox-90.0.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "cc0f348c99304e0da47bbc4be45bc350c53574ea1e20d781f88862e5add4c60a";
+ sha256 = "cca2b590997e16daadc8772cd67deff819cb587e2e8bdbcf943c7d5b99a323e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sr/firefox-90.0.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "6824091ffb721ff42072798cd72c3061921eb69f85a710c141407f83ddddd836";
+ sha256 = "d31e8bb274404448473e57021995fd7ae78c2024f146206e415580676656a6ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sv-SE/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sv-SE/firefox-90.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "3d86180707aa4f2fbe271e9d8fdf10ef5cd52126648a64e684214f159cbc7512";
+ sha256 = "6bf03f5aef1391708f25a386f05d7b3959bee8390421cefa3b993cd5b9278c3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/szl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/szl/firefox-90.0.2.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "e49776c7820b51648c8e2d19f5e8073515fda5397adae3302383e9f503240e08";
+ sha256 = "2198b1cff87868bd9152f24306d99be63c322dca578d12ede90d5d34c3635a8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ta/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ta/firefox-90.0.2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "d8b32890c9ad376cd9122ae6e80d1dc65c0b8be1e5dd4c7381011b1059dd8bbd";
+ sha256 = "5fad9a8a62e6a1a96341842f34011db87ffb30dc7490582c0c4da0d2245e6425";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/te/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/te/firefox-90.0.2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "87974e3cf5214db7f82244b43a584f3cb11d4ba66ac45dfce1d22f417fd63185";
+ sha256 = "78010fc0503019b04cb7cc44c500c845e28a90c52db7480264e989fbd5deb389";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/th/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/th/firefox-90.0.2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "1d65c868936bd174ae9ecac66e1c1bc30e4b1214aaa0a2762dfcda6929eed1ec";
+ sha256 = "221016e5e7e4f4fb53eb570edd825b2d38922fba7c0344a0048525ffbbb2ae02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/tl/firefox-90.0.2.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "115ecf4d90d13df1352637c9ed6d1701b6a9d0793d3487d582b90d487e27b52f";
+ sha256 = "81ff9417cbdb2c36be61baa2752701d5507cf5214ac0afac822d426e029c8141";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/tr/firefox-90.0.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "d66f4114e577e945abbb1b32206b2cddff65db1f9a2b1cbd1c8a11e528ce656f";
+ sha256 = "e3a053ff1b785e52df509a08d66bc5662252c8edf7e476812aca76c2c4ab0b75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/trs/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/trs/firefox-90.0.2.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "1dc6d43229d0912d34394889deba3d91796ac4aac437b7ed86065d978871fbec";
+ sha256 = "d8c246da9885ec4b5f73284f09a6a80b7fe07f1f49da83975811f478526366f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uk/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/uk/firefox-90.0.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "1795fbe577dee1bc042a7b50bceb958446e7f6c95133c2d1432f1494ba86b6a0";
+ sha256 = "0e1024086ade42468ed2f12396a03b87e2698e2490f69cc62c9f76f462d07ffc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ur/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ur/firefox-90.0.2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "1da88a58d6262c4b2866e765efae0ccc23ff224ed59d5f9a30434a16408b17d1";
+ sha256 = "14376446a9006673e2bc2fd5d947a08b07af2ff50e70cc9dd4e3bff51052a298";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uz/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/uz/firefox-90.0.2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "549956dc6ac0eab50becf7562e91a17fdc3f0244197379f03bbdb2b12f2ecaef";
+ sha256 = "15fc45a28194b3fe8f3aaf2a47de64693e8ffe9054e9b7e06ae72018a7c0ee5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/vi/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/vi/firefox-90.0.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "3e9575342f30b81bebc730c855b54120c95e385edf9273e5355f857da81d55ea";
+ sha256 = "69d69c341b80ca9b521607b737084297119cff0f66c4606c28bcdb47c67907dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xh/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xh/firefox-90.0.2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "d2e7dd3cbd70ef34c53bcfc5b3427508ed368cad548afe0509ff7149a6472ff8";
+ sha256 = "9714bf46a53920a79844cf25cb7f2be2b33d4c98fc9c862edbb44ecba35c0bee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-CN/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/zh-CN/firefox-90.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "a65f4a1002422a07083fb8566e3129f781a8083d9427ba4236812204c953a5f3";
+ sha256 = "fd5b352d29c37ef0c750d40b8182da3399a8e52589d325dbd85fdfc2fabb1ed8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-TW/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/zh-TW/firefox-90.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "e5f1c0d36c7a4b3634858d691c5f26481018ac4ce7c5ab7a4c19e04b33810941";
+ sha256 = "4b79f6db1aae404d23d1dca8ed8745b1132fefe62c2c2a4e64a49aff0cbcb0ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ach/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ach/firefox-90.0.2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "b5908565dea1f33f82d8e380bb5d648fab9ebcb4af24d602a6c71e176fee5007";
+ sha256 = "73f89b3c521f974f865ce35081ca23aa34288a3c2c97793031edc0c03e999f1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/af/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/af/firefox-90.0.2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "d40bd877e5ad156a45c0c325794537ef9dd71770a395aeebf8381075df0c74d6";
+ sha256 = "02c1c8be1c00405a2c2ac66486e01f761c5c6400b2f685f739cc196c130d391d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/an/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/an/firefox-90.0.2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "c72b84b92239955c750cdc302cfed32c7ed1a1352a88b5f599b4edfaad79fdf6";
+ sha256 = "173b9ccad19be6b1b5b48eaa0f5f670ee97cfa28e249d36bd85846c8e52c4c87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ar/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ar/firefox-90.0.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "25b4175421efe766e7be49591c04b636699bc685aee6459c48b19fe9aaca07db";
+ sha256 = "fcea5e8c3fde2d339556d4f1544d7f5f83a4c72adb129d028dd0eb342d3fc85f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ast/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ast/firefox-90.0.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "d7919de20cf70de38f03e508b6ac5728b76ceedb626636cfed74c4698ce4dbc6";
+ sha256 = "79c68a84f273543a92796e725530dc8f7097801d1958052576ca5b26b8075c86";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/az/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/az/firefox-90.0.2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "addbe7fa0121dc3643afde905bf33b764d36d49a60ccf6c427ab97ac941ce9f3";
+ sha256 = "3aaac6897845e3884fbfca0888b1b2bb08709a4a1934aa5bf1d7a84dedf29377";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/be/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/be/firefox-90.0.2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "db52de7ce7236110b28322996303e2a07f69b88eb53393aa4ff75dd841b02aa3";
+ sha256 = "2bbcdf98b683420da29b8f3b09a6527a8013deefd9ad987d91947b7ac4764dd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bg/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/bg/firefox-90.0.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "2abe8c91ce73f350e31de13807fcdc48c2621a29fe25d17ed25a2fb8052ce831";
+ sha256 = "693d8513e86329c3796713d9a42ecb9d844bdd3935ad377321156af233f2919e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bn/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/bn/firefox-90.0.2.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "2b5f6e1bd73eda0fdf69f6d8181b83206bfbcfcb5edb11be12f2a29e6ffd4a37";
+ sha256 = "19a2eee6ad520be48b9499bdd0308b15cc022d9767216382d8de3de24c342a46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/br/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/br/firefox-90.0.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "53339a26816934aa1f5edac114844c42b7107326f114ba28818700ae8ee199ca";
+ sha256 = "d4901f3ec5ffc0340dee345fdf381b8f38ffe36d0fe934ed2b983b5600d2f6b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bs/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/bs/firefox-90.0.2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "d49005f911a027a7628f45103ad2e43438a7ec33142f9a5ec7738a8694d071de";
+ sha256 = "5a40c41b8ec915b94139f82ac77480c37a2da4595b0f4066f11d33463dff9703";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca-valencia/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ca-valencia/firefox-90.0.2.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "ccaa99d7eede57e43c57ab2a185a53061476cedb65f37d4659c1e765297c937a";
+ sha256 = "831a7712f29ccc118ca8ab9ce3796292f56c0e45596e1f2904ae899661e727a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ca/firefox-90.0.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "b4df85c3f723a3e8c44d249f12f37bd27eeade4ec802baccf2e82a92e9869002";
+ sha256 = "eb604650d0b3539c853c1709835edf05c0c60969f0065c8f6c0ed80d41f2a8ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cak/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/cak/firefox-90.0.2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "a8e1244c9904e3f5bada11c33f2f542b6dbb5ccb867f7cc6d5a2d1a99e95c48d";
+ sha256 = "5fe7fc105f7ae411ffc24df0e2ba8c36cdd2fc1be9077ca261a9c422dae6dfe2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cs/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/cs/firefox-90.0.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "b2cbe665a6b2482edbe29b50036922708e7bc7aaad65ef6d91b47beb4f53acbe";
+ sha256 = "53c39c90aed6e55b324b8ef8375ab5b8b627788d716d71ff94f33a3706b7a3c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cy/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/cy/firefox-90.0.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "5e151c341812dcf8bdf769ba0a1ae9ec03b3e79d5f55fb18241ab0ef907538fe";
+ sha256 = "d12f73551705c7ad3afd9898f92d4a20080040542df5ce5fdca27f150491c83d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/da/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/da/firefox-90.0.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "ebcb60a77185d17114c26d58a61a3a3ef5198709c43133263efbe39c05275dcd";
+ sha256 = "c5016abf9337ac7f48e12e656e1aefaa572cbeed9ed4ca27717724b08c48cbb5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/de/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/de/firefox-90.0.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "8819ad2efc7d49946eed2adbb10280602d0004722207cb46e06f46f4fb0f80d8";
+ sha256 = "65a8b0830a07b3d8936cc2f266ced396481dc140433f8092d774ed9b0600bd53";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/dsb/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/dsb/firefox-90.0.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "c91e40aed7b1c1c41ebe0cdf77e46cb284d7cd308c6ae66a70f46fc4dab008a0";
+ sha256 = "5044dc086c73ff07ee88f1987d15a432931e7ff48c045a05eea8eb1aee5e5f65";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/el/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/el/firefox-90.0.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "f9032320f0fd0622c9e6ad048de12533e92660bf56e255d2f79fc0c2adc3356c";
+ sha256 = "0b4633ce3aabbd590c308e2b110db416fb0d719778c0132231e3ba94235d940f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-CA/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-CA/firefox-90.0.2.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "9224c71771b26085f067acd29993e48aea66a61c7ae193bb6442569b9291677a";
+ sha256 = "117590c95bd4f372714ea8ea13eea03c7755c5a4442a5a35e01a7ae2900823e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-GB/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-GB/firefox-90.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "fd27cadfa31f81d7103f867aea3efb6f03f341708c4ed93df5d6d8fba601c1eb";
+ sha256 = "449f0e563b3fcae89e324e0c331c1a1d61ef76a54018fa02ca6a6ca6c16f2910";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-US/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-US/firefox-90.0.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "1043cc2125aa682953340fb40b721b3dcffab1ad0c06184fc5a92740638d4a13";
+ sha256 = "6713930204c699a6b508a1885785f94672116d8ee1df3eaaab3187011b5540e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eo/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/eo/firefox-90.0.2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "1dd42f52563463c146ddef224f97b6e87f82f01249f7bea290a4cb8331dc9fde";
+ sha256 = "3754cf70f5a3ec935435c9b8284c1b405870f51fc3224d6c032845d641b3abef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-AR/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-AR/firefox-90.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "fae114afacd99e045abad6dd5a6d4ad5669b00158431ea8458d48e43aa06d4af";
+ sha256 = "41f8b2cda0b52cd8d810545a240604ecec7132df3c5b2394b6407f038aa8886b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-CL/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-CL/firefox-90.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "1a4b839f8b55ef758c56ce18770cc31e871278e58f378fa7e7cbf4502e3b930c";
+ sha256 = "8febcdbf610c842c31e57a5e0190eb62e586198710ecfbf4b4075d62a7d5f15a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-ES/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-ES/firefox-90.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "cc21e66b7c7250d57067c8fc133a8b6f4a4f4020474bb7d4510c94ca02c316c6";
+ sha256 = "54e311e0fd76d0239618f90ce05fa8ed9dc956a0f35886ec587e316f566932b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-MX/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-MX/firefox-90.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "cfd89dd866f633359c57af8915586abc7d3bedcf2523bf60f7878d70417c09db";
+ sha256 = "f57bbcc4176f51aae50ee8fbe5b82e1aed6dca7db6c5bb61b90237a32e93e70d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/et/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/et/firefox-90.0.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "6e678eeef5ebe30b6005533e69ebbc4f096e3a1e2fc07be8c8f1cf3d1b5c1b06";
+ sha256 = "633581b5f19a8c271e3e3cd524b3ae7757ab9e2339d8546fd1d223b844b020ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eu/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/eu/firefox-90.0.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "4fcab02f0a755db4baadd5e04fe9589226b0082768ef58e32680a72a86ef52f2";
+ sha256 = "1307bdd3214c6a36cfd860e81a1a948df37843effd21ff53525aeef8abbcd3a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fa/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fa/firefox-90.0.2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "bd7500a850ae6c4ea9702521716336bd2809c8e3fc058ea021ee27a1b6d40aa7";
+ sha256 = "38fe66fdcc8105a00f5d8655585e96e65f9a1bb6c7d261cad8f7992480728627";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ff/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ff/firefox-90.0.2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "76b4327258aedc72fcae8b56dc5dd0c99952f0a2021252c5d0e36d1366b68016";
+ sha256 = "9e7acbee5e5be85c6fd8bbd11773533f73cb5c6395efbe86d19b20e236e16c1e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fi/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fi/firefox-90.0.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "4500cd834525149ad46b94a7b86ff776511f3173a48064ed88d6b2e67596dc68";
+ sha256 = "eece28ddbc746a4182a69f75366e6c2bf0f8e11da790b6bbad0dcd7fb63de0fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fr/firefox-90.0.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "85313248992ddcc04bc5b72802929a2c601daae07d5e6d8a11c762159caecf86";
+ sha256 = "6bda4541f450ccdeeab51097275e253125078bfd2f7a9454ca8fd44a31a45d6c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fy-NL/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fy-NL/firefox-90.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "ba0d003e88355027ccf1be545555e68e06a19e11b7090844707e0053796f2a1d";
+ sha256 = "aaab56b445b8cebf325dccd2f809aaa95d30ed9da1834f54b81722ac718e72c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ga-IE/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ga-IE/firefox-90.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "52f94cb53101e4d2564cb4f4589cb2246a4c78314e38e3d566290adf43f40e74";
+ sha256 = "2f29abd19a5974d250da1aefdf06986e1b55524610e9bd493e7f94da8e6152fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gd/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gd/firefox-90.0.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "0998440173e3b5886ff3a356a79fd05e7ea113cab4582a9400abad44ecbf6c48";
+ sha256 = "fa2d7d5d462ebc4b21e4652e9e538bfdc4ff3091428454be67ad52cadc3a50b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gl/firefox-90.0.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "6ab3ef1a97c8382160420f563c814f14610f1a0d4565ef8f86b8c8ddbf34e162";
+ sha256 = "9d133d05024307c5ae30f5b737dc25afd3d9038d3d4e198924d836f61b66fd81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gn/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gn/firefox-90.0.2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "f57a5d2ed2b9eb8d35b9bbbb9f76a988409db09c7855d6cb93abf151f8e449c5";
+ sha256 = "edb82865a9aff2b459dcf3f26583f27989a5d9aa7eb35aa86c30d672f464e3c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gu-IN/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gu-IN/firefox-90.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "eb62873a8c7e2b5b706cd0033b5042a4f4496c265f7e57e1c65f23e3fc896a6a";
+ sha256 = "db64823b1b4610dc4107062a51567c349600fe9e4072ca18fdea80391d7a8064";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/he/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/he/firefox-90.0.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "6c22304604f9e93153d55251e31bb250168015a4ac6c3d93cffcdd9c64ece7e9";
+ sha256 = "98f7d8e0b662b7a020e8aec6a17a171740f4e162cdd2318eacdb2b18d1e84435";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hi-IN/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hi-IN/firefox-90.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "155f425d7d9b867acc7035d1220f60148fb94c25dd51ee7049e9c2e9b096a0fd";
+ sha256 = "679340528df16854b4366b968f05103dd183a0983393065630d71a963ed59f60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hr/firefox-90.0.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "96faca700f49d3f8d9337f0f4f820f8a5a6335b06348b835bd39a26619e4efdc";
+ sha256 = "e95335aa07145e2388a2cd6973a12ce826ea9a0c44e7669a8f0c916b9c897f3a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hsb/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hsb/firefox-90.0.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "42ce59b460cf94705f88b80c91705bba81142798803bb1d7a3a0bc34dd96a7e3";
+ sha256 = "e6450586d82c4c01a96ba5c7947e92ea7285540dbf57c15398449f33d46c20c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hu/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hu/firefox-90.0.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "804db507b43af04716bbb4d53525aa9b2958b1d3ff08b93812f1d78531eb01da";
+ sha256 = "09f33e1cb7595f1f8e7724e6e311f4c2354093839e5bfe9f598c16689d7c53ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hy-AM/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hy-AM/firefox-90.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "488e6bdd3d36490a33d5794f5ede500bad29cd2014cdd50ab5edf74c829fd424";
+ sha256 = "fa43f2a212e3b2fb1737057dbaf55eb78cdecf1021b086c5afae67d03abd4dd5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ia/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ia/firefox-90.0.2.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "fd3f22e1247b394b654c12aed384c515a390e91651bcc66f3823205c67951287";
+ sha256 = "ad5384348f5795bf1c14445cd58b957cf320b5202f987a55efe4d51e0437e532";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/id/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/id/firefox-90.0.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "2a197f4f2aa069b888ad9bfaa54da1b3bc461309a2f0475c298b7e501f06e6fc";
+ sha256 = "9519624ef818e9baafa3918bc3972f0d176eaa8df640f6258b4425d0366316e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/is/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/is/firefox-90.0.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "b215c19156d129ef30c2d5b30d723d3923e57658888736bd31d3c7fd4a30f835";
+ sha256 = "0e425528e760ce2c5fcfe48559a4ac7d14a0cc79c1e95610e491ea14f941acb9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/it/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/it/firefox-90.0.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "f94a4ddd3278993c80e776849cd52721f40a2808a41f37c74f34ef4b7deea972";
+ sha256 = "98a24df84e74a257d2885f78933b23804408c6bfb625b85f5015c0f69b52d338";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ja/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ja/firefox-90.0.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "4b22759406f177c98ee2496ff17de565f87a0f566e3759ce030fd757c1555e32";
+ sha256 = "82830708da718cb70eaabf990b503b9f62a1232ed3ff5537fa91b140e4bd0678";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ka/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ka/firefox-90.0.2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "7e602c099b680f1da42030067988f818e954ec4b02ddc6ec5473e02402a06428";
+ sha256 = "bcf43fa1a6cf21139b7672144e6f355367d680395f32961b5915fcb6d4cd9dd5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kab/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/kab/firefox-90.0.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "92d0441b33b179d515c88711bb13684e37c748a938d818723256092930428dea";
+ sha256 = "c965383ee64db3f84ae1736db80f772e38b04080fdac9117953d8a59697a2998";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kk/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/kk/firefox-90.0.2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "50a44e34e2a12ba6357f62bc82d9de9c5250c6e3b5635c81724d0a96f5111436";
+ sha256 = "26e0becb0c7feaba174ff1de85585364addfdb2dc7e6f5188d81c2a83eb68383";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/km/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/km/firefox-90.0.2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "de8bddaf5a937bfc5bc21897cf95b3d40068133df4c9edfe7eb9eaf76d23e17f";
+ sha256 = "a25e0ddb1ecee69236bef3389641921c906f03272c8bea3a6ee17e61327fd377";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kn/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/kn/firefox-90.0.2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "86e88fbc62e131f6b6a599575f5c507385251e7d03a114b61e8c1b78c4a8c22f";
+ sha256 = "4101658f06850402957e08578cec7fc730b9eee24e0e59d0b083e3814f13c713";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ko/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ko/firefox-90.0.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "10e0169e337cbef4a33e227ea57ff517ec570997fc471509ff95f098cfb52b12";
+ sha256 = "c72b19e5928c7f3cb2bf3c681620865c292e02cf88859b13785527598b1b5610";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lij/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/lij/firefox-90.0.2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "3e054180575b29c5afb286f6d7e8453bc8d4bfaf1ff5d8ac5fc53757b9dc48f1";
+ sha256 = "9741436304db85da8b2ff9aaf7254c6304cd8703fc612a906cabbb1bbfa6b1be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lt/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/lt/firefox-90.0.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "79685f8b0d646dc6fb446a85808e22107760343a63be429551866a22581106da";
+ sha256 = "cc6ad73885caa3780a22a70ef3a2a321d948fee71a0b9f9e6512c724be5e80d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lv/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/lv/firefox-90.0.2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "4df1044be63e35775c89005cddba209760b169be29a3e49d3d29bc370b11dacc";
+ sha256 = "6043b8a53d92d3ee9d2eced77e664e15585f38acd2c9bc69ab6c6ddee4e11fa9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mk/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/mk/firefox-90.0.2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "8040fd3637b5e25215e1e50cb74b6f25736f78d610cc862eef08b5a7e4905f2c";
+ sha256 = "f722688ebc78a9c0647f8562a7d333d15a6f0a23be2e41881cd3395ce9af492b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/mr/firefox-90.0.2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "49b9eddd2dff87a631ad143e66019d52574ea16b136956e4da473fcee4b810ef";
+ sha256 = "e375938caf127ff1ef5f71bafb7df48d8d0f7ae7dbb5c664c99530e2401b08ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ms/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ms/firefox-90.0.2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "629d480a6cc207b558cc2aff169225ec636c3d5656b0d04d34b60f8235151bc2";
+ sha256 = "cf927622a682ba18b69134da056c09217950085f14d3abb828b78cc2318e71d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/my/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/my/firefox-90.0.2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "25b330fa564734cd9ead80a58a770a6453d64483cd448dc8ac93e70a2a06a04b";
+ sha256 = "dab06f8c4daf9f2287ccfcbf567e830cf2c1154e4a0db403d4c9bb1a5d509c88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nb-NO/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/nb-NO/firefox-90.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "4d2a0b7101197a603c136b7476e6887d6d9731bbb62e5176ad9876039cc7e166";
+ sha256 = "19eaf7c9fedcb79d134304f16c804dd24a1adcddeb48e4f5cd26459556b905e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ne-NP/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ne-NP/firefox-90.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "74c9685da27d362a2729303ddf451f684be097d3ca74bf3596585a869921a881";
+ sha256 = "049f573cc57b4ac37417a8674b6a535643cd563f0806a69f5ce769c67d8bcb79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/nl/firefox-90.0.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "a10dc5b62f058d71b3dbd8cb12083fc583528b1642d4f2bccce0f1a422147c7f";
+ sha256 = "95d99572d07502ca39dfbce3f4f5e046247e1bcbfc8ca14cd1404744a9665731";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nn-NO/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/nn-NO/firefox-90.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "479c022dbadf9b10b2c37577199c3f4df714501502bc894c63efde9358b59745";
+ sha256 = "cc7466ce958d97c7ab13235745199631f4cd2c2713ce2d4017c337d5415b3d1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/oc/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/oc/firefox-90.0.2.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "3b702fcd7972cc48151498783e8d0129766fa7adef311369acdba7902bd08f19";
+ sha256 = "c24083b7a4d85d97c8b25b34229115558b94db56d3bc95fb510672be6a693f3d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pa-IN/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pa-IN/firefox-90.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "69727d81e5dd911bfa426f3f66385caed061e3b22825eeea270925e6d7997a03";
+ sha256 = "ae4eaebf65657401c2177dcb3085cf1b463d75d47e0863bf8017beaa5bc4bdf8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pl/firefox-90.0.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "29d59a753381aed8fd4838cf6da0a43389b1dd408988ffd4e97ec3262c1ec75a";
+ sha256 = "1f7f4f477fc42a87038555b3375ec84995fee73a0465f7cdf973cc5498f802ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-BR/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pt-BR/firefox-90.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "6ca5bf042fc2a94dd229303cec352ec797e8494ca58b12a337997b8289dff78a";
+ sha256 = "ca8ff807c9292c5105114ee2093a0e38b33c8ca57db3d21766c5d3d2456efd26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-PT/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pt-PT/firefox-90.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "50e682cf9bff2b4202ee4c9e64d5efcca66acbcb74d4074ae5d571875cd0f509";
+ sha256 = "f3b17fa92fc078fd4c394bfd5763a1fd5b513696fb20547104286527f833be66";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/rm/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/rm/firefox-90.0.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "983c8fb011f348b6de1665b1347cdbda23fe130ea33c7c58a49cd417d0419cff";
+ sha256 = "820bc076e2286052b36349170969a42bc76fa196f75f140985ddd5ddc5b4943a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ro/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ro/firefox-90.0.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "1f2ff5fe5d65f5f143e89e258a247291d10c25ee2270607250817187353bafa7";
+ sha256 = "1991ad5ecda302b3c9253239452da490c5fd0ec765c464d95a2a682167402bc1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ru/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ru/firefox-90.0.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "3a2f872bcdd7736c1e528d306cb9409826c4958d1e8aea627ef0e2c26b7d8889";
+ sha256 = "a7f87bdbb023a8daa498befb586fe08015062defc2998433ccc77d6c03ff9807";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/si/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/si/firefox-90.0.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "cfb67ee121130d9ea92af43e33751c31f778f9ff6f9beca2dc609ef5340f09b9";
+ sha256 = "7f659c6d46f7499c317bbbfe0f35d0db104c9baf46d9daa1145e7a6ab7dfd86a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sk/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sk/firefox-90.0.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "c045f5c48e3f3f9b20229e744b85920e47e3858f97262ab4d3a8fd61db80da40";
+ sha256 = "40a2ffd2a5270715c40375ccef2ed0287ca97b277c7968636222d288cf282fce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sl/firefox-90.0.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "ae3bf5e327c4f4fb7a36b8367539de466acf8f60f40e9deee3bd4928959f0111";
+ sha256 = "7614af91d89ec3273836d663becd0e215729fc203f8d384c5f42508fbd6dbf81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/son/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/son/firefox-90.0.2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "a7d7f7d1ffdc9126f04f8f96001bce26d21de0e0c65dd1fd00f6f85f75976ba8";
+ sha256 = "3225134a36d53ee5fb0f3ca9651ea214f42e74d02ad0efb72cc7090280de1e70";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sq/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sq/firefox-90.0.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "2982b315ab29ab375d77b1093c53a4a207f36a2d9a40b34aed3376ce96ce5dbe";
+ sha256 = "f6c06b96cce4971b02ebca69af7dbf8e8b596dc45b57c0ceda4b7fec071d747d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sr/firefox-90.0.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "0a2a702216adf7c98ddb19cebfea886b5d0582523ca64f2d7c8656ec663aaf6e";
+ sha256 = "7ee70f3e386587b4a09bffb2005eda9c2335adb559d05b3e9c72f64c49ea7c0f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sv-SE/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sv-SE/firefox-90.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "dded767dd98cc3725044c988354842086768bf9a35eb316111df96368a95900e";
+ sha256 = "b735af09cf9a0adee055c4f383852f68f0bf15ac5034287ff56fd4e63d93f851";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/szl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/szl/firefox-90.0.2.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "4ab8b5112cdfdc051a65b5cd562015bf85e11d5ccc0773111439cd469e175c33";
+ sha256 = "9cc37dacd4f13ef6d9af99d24eecf42fc4254b52e42ee4b18c52bf830c9a6b45";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ta/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ta/firefox-90.0.2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "0240cb3f5357a213f622f1c708e2116db4a4271f4b36135d6614bacdee88f00c";
+ sha256 = "badec8d86c4b824bded63fa9a7d49acab7c79a25b7cdc4715a805d6e825efd04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/te/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/te/firefox-90.0.2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "83b5ed844b16f6b9108432a692bc0895d733de03701ab800bb330d06796176bd";
+ sha256 = "68ba99a66bbaddf277fec5f97ca311368e915ff4090121f06daa04847bdc108f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/th/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/th/firefox-90.0.2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "faedac7df604ed9cd321a655d27ebf313c08b085c4eeecc310a94c3afd979b6f";
+ sha256 = "d43d2be9347cbe576a9e141110efe1b68d211593bbfaac130f3c2b876718fb9b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tl/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/tl/firefox-90.0.2.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "5abdce18c7b0e53f5efd00aa0381c6e90f669c51dcb4c021128a0e7a0a86223e";
+ sha256 = "8251186670a3e82c6f10d93a3c6ff5563537011aa6c599fd21cefd434342a4b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tr/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/tr/firefox-90.0.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "92fd9bb4aef9b723b00cb84ffd253b81d5c86b2bfcefad93e948e443d871bd95";
+ sha256 = "3021d700b183c6748d61c0dd104e732e3e373465ee0ac4607f3e31584fb69389";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/trs/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/trs/firefox-90.0.2.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "291c64e95d8accc64fd83738a9b7060122e713786cbb360acbd26b5ed0dc3793";
+ sha256 = "bff8d09f8170abf515b28c8fe8492f4b5125cd54a50518d145b86e70b15fbadd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uk/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/uk/firefox-90.0.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "163de4dd52684912f794c1f9c35b003f9cd38acf1be3bc68f42b2da9c1e13fce";
+ sha256 = "36310b3c0272c1592560bbcf2801e7358d0b3583f832d522e38e09c926594549";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ur/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ur/firefox-90.0.2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "72ebffebcaf8848c5a9cfbc6c9e33cd1a7bfd62b7689f938065730249506a6eb";
+ sha256 = "e48d260743ec015816036088f913cdaa9740751854d56c0ad12013c8fe24d5f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uz/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/uz/firefox-90.0.2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "f9c56e6adfa9a0e7289e2a80f88869ebb1556843c940574cfcba4295aac464c0";
+ sha256 = "f4079a9c0a439357e97c4838ef6c4caf8969a21569b2d84b1f0f3f2405981a4b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/vi/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/vi/firefox-90.0.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "f15136e2e432ae999df5efda82d44c2c61cd680995436cda094bd2fd705e541b";
+ sha256 = "6e2f66c5fe236080ad9c8e72461667d7ba98260d038deaf6d4abbd73afe72719";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/xh/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/xh/firefox-90.0.2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "360623cac6e11c9179f9c08f2f7f3eb844c3671b8f26a2680e097e1c84896b06";
+ sha256 = "7c75f694933e4998496cf4c1895afdc2940aedf9fd2151c2f2946551cbbcf5da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-CN/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/zh-CN/firefox-90.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "f69c7f0fad2bbefbe477ed7ee5414dab2c9ab14e1009970eca07092357cfc7ba";
+ sha256 = "74787fb0d2674a2e34f6cbd556bd13f9ea7d83c640aa7c8cc6fe79b58870dbd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-TW/firefox-90.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/zh-TW/firefox-90.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "612abc1a9b8b116753ee1417d774fc2ea2f2f931248c57ea93c32ee1c534f9c0";
+ sha256 = "df3493d9cf02a0a3c88bb06b6c755658b7638cc6bfe07df193fa19db870fa991";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index 091ca7b448..3aa0eeece9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
- ffversion = "90.0.1";
+ ffversion = "90.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "9f87c3f3dad33e42a7a9d2161d7f23ff2e7184b2274f9081511c7982957ae9954784bd844a2348ff4744231415aac195d1f12971392db90be0375b4738acb590";
+ sha512 = "4fda0b1e666fb0b1d846708fad2b48a5b53d48e7fc2a5da1f234b5b839c55265b41f6509e6b506d5e8a7455f816dfa5ab538589bc9e83b7e3846f0f72210513e";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
index 0dfb550728..9fdd7de045 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "argocd";
- version = "2.0.4";
- commit = "0842d448107eb1397b251e63ec4d4bc1b4efdd6e";
+ version = "2.0.5";
+ commit = "4c94d886f56bcb2f9d5b3251fdc049c2d1354b88";
tag = "v${version}";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = tag;
- sha256 = "sha256-SKSAJtp20f6A+CvrsBEmbcNJAKI5b4Wm4K0cr/lGo64=";
+ sha256 = "sha256-8YymSR15e+6gGGqr5CH4ERHN8RO3wd9NJkM9K7InlFU=";
};
- vendorSha256 = "sha256-RbEqivzTpXVQp4zl0zZWAh6qCr2KZSJ6Bj2pZaClQaQ=";
+ vendorSha256 = "sha256-9dVkGl0gjjMehG2nt1eNpNT5fD9GbJ1mNMzYS8FTm08=";
nativeBuildInputs = [ packr makeWrapper installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
index 69961a2c0a..8e9d2662ea 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm";
- version = "3.6.2";
+ version = "3.6.3";
gitCommit = "ee407bdf364942bcb8e8c665f82e15aa28009b71";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "1s40zbk83s1kylcglydw356282virf1828v9waj1zs1gjnjml69h";
+ sha256 = "sha256-DfMI50eQsMHRX8S5rBzF3qlSfJizlYQyofA7HPkD4EQ=";
};
- vendorSha256 = "06ccsy30kd68ml13l5k7d4225vlax3fm2pi8dapsyr4gdr234c1x";
+ vendorSha256 = "sha256-PTAyRG6PZK+vaiheUd3oiu4iBGlnFjoCrci0CYbXjBk=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix
index ed4a201db3..933f1bfe71 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmsman";
- version = "3.7.0";
+ version = "3.7.2";
src = fetchFromGitHub {
owner = "Praqma";
repo = "helmsman";
rev = "v${version}";
- sha256 = "sha256-Xp86tCIM7XVtue/MjQ8/wGs2fHfxSWS3B6MzNMYRqg4=";
+ sha256 = "sha256-wzmn06nUycNaQ4tUEBd4q17M1CVC0+5X13rqF7zaHqU=";
};
- vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI=";
+ vendorSha256 = "sha256-XHgdVFGIzbPPYgv/T4TtvDDbKAe3niev4S5tu/nwSqg=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix
index dfeb61915e..4340543b77 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix
@@ -44,12 +44,21 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
- k3sVersion = "1.21.2+k3s1"; # k3s git tag
- k3sCommit = "5a67e8dc473f8945e8e181f6f0b0dbbc387f6fca"; # k3s git commit at the above version
+ k3sVersion = "1.21.3+k3s1"; # k3s git tag
+ k3sCommit = "1d1f220fbee9cdeb5416b76b707dde8c231121f2"; # k3s git commit at the above version
traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION
- k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION
+ k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS
+
+ baseMeta = {
+ description = "A lightweight Kubernetes distribution";
+ license = licenses.asl20;
+ homepage = "https://k3s.io";
+ maintainers = with maintainers; [ euank superherointj ];
+ platforms = platforms.linux;
+ };
+
# bundled into the k3s binary
traefikChart = fetchurl {
url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz";
@@ -67,7 +76,7 @@ let
k3sRoot = fetchzip {
# Note: marked as apache 2.0 license
url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
- sha256 = "sha256-r3Nkzl9ccry7cgD3YWlHvEWOsWnnFGIkyRH9sx12gks=";
+ sha256 = "sha256-qI84KYJKY/T6pqWZW9lOTq5NzZiu//v1zrMzUCiRTGQ=";
stripRoot = false;
};
k3sPlugins = buildGoPackage rec {
@@ -84,12 +93,8 @@ let
sha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4=";
};
- meta = {
+ meta = baseMeta // {
description = "CNI plugins, as patched by rancher for k3s";
- license = licenses.asl20;
- homepage = "https://k3s.io";
- maintainers = [ maintainers.euank ];
- platforms = platforms.linux;
};
};
# Grab this separately from a build because it's used by both stages of the
@@ -97,7 +102,7 @@ let
k3sRepo = fetchgit {
url = "https://github.com/k3s-io/k3s";
rev = "v${k3sVersion}";
- sha256 = "sha256-ZRkdHQ4RJ6XqE+DKE6wwpxetuKDG3k/4HaHyFxHev1U=";
+ sha256 = "sha256-K4HVXFp5cpByEO4dUwmpzOuhsGh1k7X6k5aShCorTjg=";
};
# Stage 1 of the k3s build:
# Let's talk about how k3s is structured.
@@ -161,12 +166,8 @@ let
popd
'';
- meta = {
+ meta = baseMeta // {
description = "The various binaries that get packaged into the final k3s binary";
- license = licenses.asl20;
- homepage = "https://k3s.io";
- maintainers = [ maintainers.euank ];
- platforms = platforms.linux;
};
};
k3sBin = buildGoPackage rec {
@@ -228,12 +229,8 @@ let
popd
'';
- meta = {
+ meta = baseMeta // {
description = "The k3s go binary which is used by the final wrapped output below";
- license = licenses.asl20;
- homepage = "https://k3s.io";
- maintainers = [ maintainers.euank ];
- platforms = platforms.linux;
};
};
in
@@ -241,7 +238,7 @@ stdenv.mkDerivation rec {
pname = "k3s";
version = k3sVersion;
- # Important utilities used by the kubelet, see
+ # Important utilities used by the kubelet, see
# https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494
# Note the list in that issue is stale and some aren't relevant for k3s.
k3sRuntimeDeps = [
@@ -279,11 +276,10 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
- meta = {
- description = "A lightweight Kubernetes distribution";
- license = licenses.asl20;
- homepage = "https://k3s.io";
- maintainers = [ maintainers.euank ];
- platforms = platforms.linux;
- };
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/k3s --version | grep v${k3sVersion} > /dev/null
+ '';
+
+ meta = baseMeta;
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix
index 8da48f8485..89d07da748 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
- version = "0.24.13";
+ version = "0.24.14";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
- sha256 = "sha256-5gMRjnrk1FyTj3Lzp+6scLuqfP8rCUvDDBK33/RzG28=";
+ sha256 = "sha256-Kw3TT8IeJT0y2vSd38/y7BRq7PxMH2tiXV4/lOn5INA=";
};
buildFlagsArray = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix
new file mode 100644
index 0000000000..3d27716388
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubedb-cli";
+ version = "0.19.0";
+
+ src = fetchFromGitHub {
+ owner = "kubedb";
+ repo = "cli";
+ rev = "v${version}";
+ sha256 = "sha256-CwAa2YqJ0R+L+VwxqruQmZJUctP4GgKszY49ZVyyNBE=";
+ };
+
+ vendorSha256 = null;
+
+ # Don't compile the documentation stuff
+ subPackages = [ "cmd/kubectl-dba" ];
+
+ meta = with lib; {
+ description = "kubectl plugin for KubeDB by AppsCode.";
+ homepage = "https://github.com/kubedb/cli";
+ license = licenses.unfree;
+ maintainers = [ maintainers.starcraft66 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
index 9bd9a8e7a1..883d16319b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -64,8 +64,8 @@ in
};
edge = generic {
channel = "edge";
- version = "21.7.2";
- sha256 = "sha256-rEO84t6znNb59a9i+SHgT4r0xzja6eMYi9lWmdU24Cc=";
- vendorSha256 = "sha256-esVy+oIZa/ucvucdNV7MfUGFkIql9T2zl0+eu3hZAt8=";
+ version = "21.7.3";
+ sha256 = "sha256-fEkqZ/4BQVnmOKUrrLmi6DKlMVNeqvW95bxbZX0o7iI=";
+ vendorSha256 = "sha256-NqOmmeEGWvy/LYfSpIdnJZX4lGweCgiL008ed05XIFs=";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f7eb378e71..cc46bf16ac 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -728,9 +728,10 @@
"owner": "terraform-providers",
"provider-source-address": "registry.terraform.io/hashicorp/oci",
"repo": "terraform-provider-oci",
- "rev": "v3.79.0",
- "sha256": "11n2v537zniiv5xvhpypqrm09my8zybirvq4ly94hp69v73xj89c",
- "version": "3.79.0"
+ "rev": "v4.35.0",
+ "sha256": "12acy39cr6pxq8gk483b6i78x463ml9pk10qp9jpz0dr05zcyhqw",
+ "vendorSha256": null,
+ "version": "4.35.0"
},
"okta": {
"owner": "terraform-providers",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
index c255ccd1ef..8d13fab793 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
@@ -195,9 +195,9 @@ rec {
};
terraform_1_0 = mkTerraform {
- version = "1.0.2";
- sha256 = "0gnv6hajpn1ks4944cr8rgkvly9cgvx4zj1zwc7nf1sikqfa8r1a";
- vendorSha256 = "0q1frza5625b1va0ipak7ns3myca9mb02r60h0py3v5gyl2cb4dk";
+ version = "1.0.3";
+ sha256 = "0m7r66nw0nppra90sjhbq5d0f4q525c73q6ncmy6w37j2nixz35z";
+ vendorSha256 = "07pzqvf9lwgc1fadmyam5hn7arlvzrjsplls445738jpn61854gg";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
index 1717d32090..589164e276 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.31.0";
+ version = "0.31.1";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-JRIwPOExPbwLS7ps4pJpvIRaZ9jZZjVK+POaUHAmiPI=";
+ sha256 = "sha256-vc3DGYb3vp55LRguhg3nG5zH7w1lTFEI2bx7kNffvas=";
};
- vendorSha256 = "sha256-lck4nabDhFA8N0lo+cIKiJjlg2TGx3qMExbblHQwbvQ=";
+ vendorSha256 = "sha256-lBhLaYn8adgfCXQJBsIVuwnA0vY8+tgeqE+C669AV+A=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
index 69f71a7479..494a40c6bf 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnscontrol";
- version = "3.10.1";
+ version = "3.11.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-fYQqH/J027XJPML/qKMpuu2Nxuvb0cyjOu2czLH8SoM=";
+ sha256 = "sha256-ExpwJ4lMrYy1WztYo+RYa9jb8slIa3IJk/SUKA1fBKI=";
};
- vendorSha256 = "sha256-225TR9jTZSGEJZz3csl/pR/v2unUK67l08x5ESQTJzA=";
+ vendorSha256 = "sha256-IXA4YNdWR6DWIH4ceif2XcAdwnMr2kCuG3ozagtzsgo=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix
index 66b1d2639d..07854f48fc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
substituteInPlace setup.py --replace "bottle==" "bottle>="
'';
- nativeBuildInputs = with python3Packages; [ pytestrunner ];
+ nativeBuildInputs = with python3Packages; [ pytest-runner ];
propagatedBuildInputs = with python3Packages; [
daemonocle
dnspython
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index adc19f5dcf..bca1a1affc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -44,11 +44,11 @@ in
stdenv.mkDerivation rec {
pname = "bluejeans";
- version = "2.22.0.87";
+ version = "2.23.0.39";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
- sha256 = "sha256-0nobn+YcvqakwvBdkoEJrzHoL+OGym2zJ806oUabYfo=";
+ sha256 = "sha256-LGg14KJ/hEnSaSrdTltY9YXv7Nekkfo66uLkxjMx8AI=";
};
nativeBuildInputs = [ rpmextract makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix
index 5d3b251089..1b6bcd6758 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix
@@ -17,10 +17,10 @@ in
mkFranzDerivation' rec {
pname = "ferdi";
name = "Ferdi";
- version = "5.6.0-beta.6";
+ version = "5.6.0";
src = fetchurl {
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
- sha256 = "sha256-Q1HSAEVcaxFyOq7oWqa6AJJpsBKRxbsKb9ydyK/gH/A=";
+ sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc=";
};
extraBuildInputs = [ xorg.libxshmfence ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix
index f1e335133d..e554f63192 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix
@@ -2,19 +2,19 @@
buildGoModule {
pname = "go-neb";
- version = "unstable-2021-03-24";
+ version = "unstable-2021-07-21";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "go-neb";
- rev = "b6edd50d6e33de3bcdb35055fa6c5f0157f45321";
- sha256 = "sha256-wFqkN4C0rWzWxa6+/LiHMMS8i/g3Q57f5z4cG2XZQzs=";
+ rev = "8916c80f8ce1732f64b50f9251242ca189082e76";
+ sha256 = "sha256-kuH4vbvS4G1bczxUdY4bd4oL4pIZzuueUxdEp4xuzJM=";
};
subPackages = [ "." ];
buildInputs = [ olm ];
- vendorSha256 = "sha256-sWrLWjODf25Z8QqCDg4KyVWmTc3PRiYpRL88yxK0j/M";
+ vendorSha256 = "sha256-5Vg7aUkqiFIQuxmsDOJjvXoeA5NjMoBoD0XBhC+o4GA=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
index 4918a4d91f..ced0c77a96 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix
@@ -13,13 +13,13 @@
mkDerivation rec {
pname = "kdeltachat";
- version = "unstable-2021-07-04";
+ version = "unstable-2021-07-17";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
- rev = "5d3cddc47773b49d4a801d031c1de96c38617908";
- sha256 = "1sah27pvdkilnyj41xf4awri9ya14gxayr99qksllz92ywd9lxad";
+ rev = "9e5fe2dc856795d0d3d8b6a3adf3fdd3015d9158";
+ sha256 = "12arcrnpacq2fbjbzs6a9yz6lfsj2dkga9chpld1ran3v6by58z9";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
index aadb18606e..7e88a77193 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchgit
, buildPythonApplication, buildPythonPackage
- , pygobject3, pytestrunner, requests, responses, pytest, python-olm
+ , pygobject3, pytest-runner, requests, responses, pytest, python-olm
, canonicaljson, olm
}:
let
@@ -20,7 +20,7 @@ let
propagatedBuildInputs = [
requests responses olm python-olm canonicaljson
- pytestrunner pytest
+ pytest-runner pytest
];
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index daf1c476e6..a46649acb1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -28,7 +28,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "5.9.0"; # Please backport all updates to the stable channel.
+ version = "5.10.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:
@@ -38,7 +38,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 = "1pmyi9b0b5h6mi6dwml41x4igy8rfpsv6j67izh78m5gla8wp34h";
+ sha256 = "049i4nypqr6lx8f3w32pia6cfb3pmqmvasxjb5zhp6mxb3vn7wz3";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
index 39cff6de85..24282f4be3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -50,8 +50,12 @@ let
x86_64-linux-version = "4.17.0";
x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi";
+ aarch64-darwin-version = "4.17.0";
+ aarch64-darwin-sha256 = "1a5crmnbz8ng3z2pk5zw17dds9d5fyir4rkvv611fn858kq5fv46";
+
version = {
x86_64-darwin = x86_64-darwin-version;
+ aarch64-darwin = aarch64-darwin-version;
x86_64-linux = x86_64-linux-version;
}.${system} or throwSystem;
@@ -64,6 +68,10 @@ let
url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
sha256 = x86_64-darwin-sha256;
};
+ aarch64-darwin = fetchurl {
+ url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg";
+ sha256 = aarch64-darwin-sha256;
+ };
x86_64-linux = fetchurl {
url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
sha256 = x86_64-linux-sha256;
@@ -75,7 +83,7 @@ let
homepage = "https://slack.com";
license = licenses.unfree;
maintainers = with maintainers; [ mmahut ];
- platforms = [ "x86_64-darwin" "x86_64-linux" ];
+ platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin"];
};
linux = stdenv.mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 959d1a96d8..31aec0a467 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,11 +1,11 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch
-, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo
+, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc
-, libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules
+, rnnoise, extra-cmake-modules
# Transitive dependencies:
-, pcre, xorg, util-linux, libselinux, libsepol, epoxy
+, pcre, xorg, util-linuxMinimal, libselinux, libsepol, epoxy
, at-spi2-core, libXtst, libthai, libdatrie
, xdg-utils, libsysprof-capture, libpsl, brotli
}:
@@ -46,22 +46,33 @@ in mkDerivation rec {
postPatch = ''
substituteInPlace Telegram/CMakeLists.txt \
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
+
+ substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
+ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
+ substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \
+ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
+ substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
+ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
'';
# We want to run wrapProgram manually (with additional parameters)
dontWrapGApps = true;
dontWrapQtApps = true;
- nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ];
+ nativeBuildInputs = [
+ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook
+ extra-cmake-modules
+ ];
buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash
ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3
tl-expected hunspell glibmm webkitgtk jemalloc
- libtgvoip rnnoise abseil-cpp extra-cmake-modules
+ rnnoise
tg_owt
# Transitive dependencies:
- pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy
+ util-linuxMinimal # Required for libmount thus not nativeBuildInputs.
+ pcre xorg.libpthreadstubs xorg.libXdmcp libselinux libsepol epoxy
at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli
];
@@ -70,19 +81,17 @@ in mkDerivation rec {
# We're allowed to used the API ID of the Snap package:
"-DTDESKTOP_API_ID=611335"
"-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
- #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
- "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default
+ # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
+ "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
];
# Note: The following packages could be packaged system-wide, but it's
# probably best to use the bundled ones from tdesktop (Arch does this too):
# rlottie:
- # - CMake flag: "-DTDESKTOP_USE_PACKAGED_TGVOIP=ON"
# - Sources (problem: there are no stable releases!):
# - desktop-app (tdesktop): https://github.com/desktop-app/rlottie
# - upstream: https://github.com/Samsung/rlottie
# libtgvoip:
- # - CMake flag: "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON"
# - Sources (problem: the stable releases might be too old!):
# - tdesktop: https://github.com/telegramdesktop/libtgvoip
# - upstream: https://github.com/grishka/libtgvoip
@@ -113,10 +122,10 @@ in mkDerivation rec {
Desktop client for the Telegram messenger, based on the Telegram API and
the MTProto secure protocol.
'';
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
platforms = platforms.linux;
homepage = "https://desktop.telegram.org/";
- changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v{version}";
- maintainers = with maintainers; [ primeos abbradar ];
+ changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
+ maintainers = with maintainers; [ primeos abbradar oxalica ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index 46076bca68..363650dae5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -1,9 +1,9 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config, cmake, ninja, yasm
, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
-, xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr
+, openh264, usrsctp, libevent, libvpx
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
-, libXi
+, xorg, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
}:
stdenv.mkDerivation {
@@ -24,15 +24,23 @@ stdenv.mkDerivation {
buildInputs = [
libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf
- xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr
+ openh264 usrsctp libevent libvpx
+ libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi
glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire
- libXi
];
cmakeFlags = [
- # Building as a shared library isn't officially supported and currently broken:
+ # Building as a shared library isn't officially supported and may break at any time.
"-DBUILD_SHARED_LIBS=OFF"
];
- meta.license = lib.licenses.bsd3;
+ propagatedBuildInputs = [
+ # Required for linking downstream binaries.
+ abseil-cpp openh264 usrsctp libevent libvpx
+ ];
+
+ meta = with lib; {
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ oxalica ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
index 8f39533e29..89e4021862 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
@@ -71,7 +71,3 @@ if __name__ == "__main__":
tg_owt_hash = nix_prefetch_git('https://github.com/desktop-app/tg_owt.git', tg_owt_ref)
update_file('tg_owt.nix', tg_owt_version, tg_owt_hash, tg_owt_ref)
tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha']
- libtgvoip_ref = github_api_request(f'repos/telegramdesktop/tdesktop/contents/Telegram/ThirdParty/libtgvoip?ref={tdesktop_tag}')['sha']
- libtgvoip_version = get_commit_date('telegramdesktop/libtgvoip', libtgvoip_ref)
- libtgvoip_hash = nix_prefetch_url(f'https://github.com/telegramdesktop/libtgvoip/archive/{libtgvoip_ref}.tar.gz', unpack=True)
- update_file('../../../../../development/libraries/libtgvoip/default.nix', libtgvoip_version, libtgvoip_hash, libtgvoip_ref)
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
index e97ea7bb65..b2f80c70d2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
glibcLocales
] ++ (with python3.pkgs; [
pytestCheckHook
- pytestcov
+ pytest-cov
pytest-mock
]);
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
index a4a1b3405b..6e3ef93ec7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
@@ -5,12 +5,12 @@
let
pname = "zulip";
- version = "5.7.0";
+ version = "5.8.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
- sha256 = "0yfr0n84p3jp8mnnqww2dqpcj9gd7rwpygpq4v10rmrnli18qygw";
+ sha256 = "0z8lp56j6qvm57sfqdyqrqzj9add3drh1z4zsckg45jfw6yn3jdv";
name="${pname}-${version}.AppImage";
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix
index e96602a54c..2823b84d47 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ipfs";
- version = "0.9.0";
+ version = "0.9.1";
rev = "v${version}";
# go-ipfs makes changes to it's source tarball that don't match the git source.
src = fetchurl {
url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
- sha256 = "sha256:1fyffnw1d860w7gwm6ijbgrh68297z5bmvww8yqfshm3xgvcs6bf";
+ sha256 = "sha256-RliyIEtNgwzbLVwl6T38VIbhc12CZMBc3LZ6T/llaHc=";
};
# tarball contains multiple files/directories
@@ -29,10 +29,13 @@ buildGoModule rec {
postInstall = ''
install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service
+ install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service
install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket
install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket
substituteInPlace $out/etc/systemd/system/ipfs.service \
--replace /usr/bin/ipfs $out/bin/ipfs
+ substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \
+ --replace /usr/bin/ipfs $out/bin/ipfs
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix
index b7bffcd694..43fee635f4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/nym/default.nix
@@ -10,26 +10,33 @@
rustPlatform.buildRustPackage rec {
pname = "nym";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "nymtech";
repo = "nym";
rev = "v${version}";
- sha256 = "sha256-7x+B+6T0cnEOjXevA5n1k/SY1Q2tcu0bbZ9gIGoljw0=";
+ sha256 = "sha256-bZXbteryXkOxft63zUMWdpBgbDSvrBHQY3f70/+mBtI=";
};
- cargoSha256 = "0a7yja0ihjc66fqlshlaxpnpcpdy7h7gbv6120w2cr605qdnqvkx";
+ cargoSha256 = "0xwa114fs4h6y2a3nrl2dp0rv0k336xy9y330g9yix4g34qmrynq";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
- patches = [ ./ignore-networking-tests.patch ];
checkType = "debug";
passthru.updateScript = ./update.sh;
+ checkFlags = [
+ "--skip commands::upgrade::upgrade_tests"
+ "--skip allowed_hosts::tests::creating_a_new_host_store"
+ "--skip allowed_hosts::tests::getting_the_domain_root"
+ "--skip allowed_hosts::tests::requests_to_allowed_hosts"
+ "--skip allowed_hosts::tests::requests_to_unknown_hosts"
+ ];
+
meta = with lib; {
description = "A mixnet providing IP-level privacy";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/nym/ignore-networking-tests.patch b/third_party/nixpkgs/pkgs/applications/networking/nym/ignore-networking-tests.patch
deleted file mode 100644
index e971557e7c..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/nym/ignore-networking-tests.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff --git a/service-providers/network-requester/src/allowed_hosts.rs b/service-providers/network-requester/src/allowed_hosts.rs
-index 3026b4ee..fd156682 100644
---- a/service-providers/network-requester/src/allowed_hosts.rs
-+++ b/service-providers/network-requester/src/allowed_hosts.rs
-@@ -306,6 +306,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn leaves_a_com_alone() {
- let filter = setup();
- assert_eq!(
-@@ -315,6 +316,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn trims_subdomains_from_com() {
- let filter = setup();
- assert_eq!(
-@@ -324,6 +326,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn works_for_non_com_roots() {
- let filter = setup();
- assert_eq!(
-@@ -333,6 +336,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn works_for_non_com_roots_with_subdomains() {
- let filter = setup();
- assert_eq!(
-@@ -342,12 +346,14 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn returns_none_on_garbage() {
- let filter = setup();
- assert_eq!(None, filter.get_domain_root("::/&&%@"));
- }
-
- #[test]
-+ #[ignore]
- fn returns_none_on_nonsense_domains() {
- let filter = setup();
- assert_eq!(None, filter.get_domain_root("flappappa"));
-@@ -368,6 +374,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn are_not_allowed() {
- let host = "unknown.com";
- let mut filter = setup();
-@@ -375,6 +382,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn get_appended_once_to_the_unknown_hosts_list() {
- let host = "unknown.com";
- let mut filter = setup();
-@@ -405,6 +413,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn are_allowed() {
- let host = "nymtech.net";
-
-@@ -413,6 +422,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn are_allowed_for_subdomains() {
- let host = "foomp.nymtech.net";
-
-@@ -421,6 +431,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn are_not_appended_to_file() {
- let mut filter = setup(&["nymtech.net"]);
-
-@@ -436,6 +447,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn are_allowed_for_ipv4_addresses() {
- let address_good = "1.1.1.1";
- let address_good_port = "1.1.1.1:1234";
-@@ -448,6 +460,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn are_allowed_for_ipv6_addresses() {
- let ip_v6_full = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
- let ip_v6_full_rendered = "2001:0db8:85a3::8a2e:0370:7334";
-@@ -477,6 +490,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn are_allowed_for_ipv4_address_ranges() {
- let range1 = "127.0.0.1/32";
- let range2 = "1.2.3.4/24";
-@@ -495,6 +509,7 @@ mod tests {
- }
-
- #[test]
-+ #[ignore]
- fn are_allowed_for_ipv6_address_ranges() {
- let range = "2620:0:2d0:200::7/32";
-
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix
index f630cb4071..95970a7b87 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, buildPythonApplication, fuse
-, appdirs, colorama, python-dateutil, requests, requests_toolbelt
+, appdirs, colorama, python-dateutil, requests, requests-toolbelt
, fusepy, sqlalchemy, setuptools }:
buildPythonApplication rec {
@@ -16,7 +16,7 @@ buildPythonApplication rec {
};
propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests
- requests_toolbelt setuptools sqlalchemy ];
+ requests-toolbelt setuptools sqlalchemy ];
makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix
index 0a74d19dfd..4b1a0bed04 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "rclone";
- version = "1.55.1";
+ version = "1.56.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1fyi12qz2igcf9rqsp9gmcgfnmgy4g04s2b03b95ml6klbf73cns";
+ sha256 = "03fqwsbpwb8vmgxg6knkp8f4xlvgg88n2c7inwjg8x91c7c77i0b";
};
- vendorSha256 = "199z3j62xw9h8yviyv4jfls29y2ri9511hcyp5ix8ahgk6ypz8vw";
+ vendorSha256 = "1gryisn63f6ss889s162ncvlsaznwgvgxdwk2pn5c5zw8dkmjdmi";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix
index 98070994fa..bbabd4e70b 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix
@@ -161,11 +161,11 @@
md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
}
{
- name = "expat-2.2.8.tar.bz2";
- url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";
- sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102";
+ name = "expat-2.4.1.tar.bz2";
+ url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2";
+ sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40";
md5 = "";
- md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2";
+ md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2";
}
{
name = "Firebird-3.0.0.32483-0.tar.bz2";
@@ -567,11 +567,11 @@
md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz";
}
{
- name = "libxml2-2.9.10.tar.gz";
- url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";
- sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f";
+ name = "libxml2-2.9.12.tar.gz";
+ url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz";
+ sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92";
md5 = "";
- md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz";
+ md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz";
}
{
name = "libxslt-1.1.34.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index 2e1a4b1d78..dfc680e343 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -8,7 +8,7 @@ rec {
major = "7";
minor = "1";
- patch = "4";
+ patch = "5";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m";
+ sha256 = "1kl54ddpvmrcs4r1vd4dfzg5a8im0kijhaqdg37zvgb5fqv31bxf";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
- sha256 = "0cslzhp5ic1w7hnl6wbyxrxhczdmap1g1hh1nj9sgpw9iqdryqj7";
+ sha256 = "0nf5s012l7mkpd1srvijl9q6x8f7svm6i84bj75dwyvipkg40rxq";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
- sha256 = "091yhm1qkxgvv130a1yzmmikchvxvp8109mcdrlpybp4gc276l8q";
+ sha256 = "1m1hxbhrkaynpcps77rym1d0kwl380jv1p7b6ibfl4by0ii2j16a";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix
index 68032ebe84..74bdacd958 100644
--- a/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/paperless/default.nix
@@ -148,7 +148,7 @@ let
pytest
pytest-django
pytest-env
- pytest_xdist
+ pytest-xdist
];
pyocrWithUserTesseract = pyPkgs:
diff --git a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix
index 5894c6c3e1..fc9f70094d 100644
--- a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix
@@ -44,8 +44,8 @@ buildPythonApplication rec {
freezegun
hypothesis
pytest
- pytestrunner
- pytestcov
+ pytest-runner
+ pytest-cov
glibcLocales
];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
index b5c66289c9..cd19b9a944 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix
@@ -162,6 +162,7 @@ self = stdenv.mkDerivation {
prefixKey = "-prefix ";
buildFlags = [ "revision" "coq" "coqide" "bin/votour" ];
+ enableParallelBuilding = true;
createFindlibDestdir = true;
diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/nengo-gui/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/nengo-gui/default.nix
new file mode 100644
index 0000000000..6380f25177
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/nengo-gui/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+ pname = "nengo-gui";
+ version = "0.4.8";
+
+ src = fetchFromGitHub {
+ owner = "nengo";
+ repo = "nengo-gui";
+ rev = "v${version}";
+ sha256 = "1awb0h2l6yifb77zah7a4qzxqvkk4ac5fynangalidr10sk9rzk3";
+ };
+
+ propagatedBuildInputs = with python3Packages; [ nengo ];
+
+ # checks req missing:
+ # pyimgur
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Nengo interactive visualizer";
+ homepage = "https://nengo.ai/";
+ license = licenses.unfreeRedistributable;
+ maintainers = with maintainers; [ arjix ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix
index 5270cac578..419323cfa3 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix
@@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
appdirs
- ConfigArgParse
+ configargparse
connection-pool
datrie
docutils
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix
new file mode 100644
index 0000000000..a25fbe7565
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/toil/default.nix
@@ -0,0 +1,39 @@
+{ lib, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "toil";
+ version = "5.4.0";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "73c0648828bd3610c07b7648dd06d6ec27efefdb09473bf01d05d91eb899c9fd";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "docker = " "docker = 'docker' #" \
+ --replace "addict = " "addict = 'addict' #"
+ '';
+
+ propagatedBuildInputs = with python3Packages; [
+ addict
+ docker
+ pytz
+ pyyaml
+ enlighten
+ psutil
+ python-dateutil
+ dill
+ ];
+ checkInputs = with python3Packages; [ pytestCheckHook ];
+
+ pytestFlagsArray = [ "src/toil/test" ];
+ pythonImportsCheck = [ "toil" ];
+
+ meta = with lib; {
+ homepage = "https://toil.ucsc-cgl.org/";
+ license = with licenses; [ asl20 ];
+ description = "Workflow engine written in pure Python";
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix
index 60fb743f85..e4c5eb752d 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix
@@ -131,7 +131,7 @@ rustPlatform.buildRustPackage rec {
description = "A cross-platform, GPU-accelerated terminal emulator";
homepage = "https://github.com/alacritty/alacritty";
license = licenses.asl20;
- maintainers = with maintainers; [ Br1ght0ne mic92 cole-h ma27 ];
+ maintainers = with maintainers; [ Br1ght0ne mic92 ma27 ];
platforms = platforms.unix;
changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md";
};
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/coreterminal/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/coreterminal/default.nix
new file mode 100644
index 0000000000..e358fae071
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/coreterminal/default.nix
@@ -0,0 +1,42 @@
+{ mkDerivation
+, lib
+, fetchFromGitLab
+, cmake
+, ninja
+, qtbase
+, qtserialport
+, qtermwidget
+, libcprime
+}:
+
+mkDerivation rec {
+ pname = "coreterminal";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore/coreapps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-YXs6VTem3AaK4n1DYwKP/jqNuf09Srn2THHyJJnArlc=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ qtserialport
+ qtermwidget
+ libcprime
+ ];
+
+ meta = with lib; {
+ description = "A terminal emulator from the C Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/coreterminal";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix
index f069338ae8..a5740fc45b 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix
@@ -2,6 +2,7 @@
, lib
, fetchzip
, fetchurl
+, fetchpatch
, runCommandNoCC
, fcft
, freetype
@@ -98,6 +99,15 @@ stdenv.mkDerivation rec {
sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h";
};
+ patches = [
+ # Fixes PGO builds with clang
+ (fetchpatch {
+ url = "https://codeberg.org/dnkl/foot/commit/2acd4b34c57659d86dca76c58e4363de9b0a1f17.patch";
+ sha256 = "13xi9ppaqx2p88cxbh6801ry9ral70ylh40agn6ij7pklybs4d7s";
+ includes = [ "pgo/pgo.c" ];
+ })
+ ];
+
depsBuildBuild = [
pkg-config
];
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix
index 6ddeffe68e..e922a34423 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
intltool
gobject-introspection
wrapGAppsHook
- python3.pkgs.pytestrunner
+ python3.pkgs.pytest-runner
];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix
index c15d833dfb..6b445446d5 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix
@@ -18,10 +18,7 @@ stdenv.mkDerivation rec {
version = "2.15.1";
src = fetchurl {
- urls =
- [
- "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
- ];
+ url = "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz";
name = "${pname}-${version}.tar.gz";
sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index 3dd241840c..d73ae5c960 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -1,14 +1,17 @@
{ lib, buildPythonApplication, fetchPypi
, installShellFiles, pbr
-, flake8, mock, pycodestyle, pylint, tox }:
+, flake8, mock, pycodestyle, pylint, tox
+, nix-update-script
+, testVersion, git-machete
+}:
buildPythonApplication rec {
pname = "git-machete";
- version = "3.2.1";
+ version = "3.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1sw6b1jaddacfm4kvvhgxn743khmsi1c4b4f5mgvm3rabv0h473h";
+ sha256 = "0mq6hmb3wvj0ash27h4zyl46l3fikpf0mv3ng330lcy6v7bhy5b8";
};
nativeBuildInputs = [ installShellFiles pbr ];
@@ -23,6 +26,18 @@ buildPythonApplication rec {
installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = pname;
+ };
+
+ tests = {
+ version = testVersion {
+ package = git-machete;
+ };
+ };
+ };
+
meta = with lib; {
homepage = "https://github.com/VirtusLab/git-machete";
description = "Git repository organizer and rebase/merge workflow automation tool";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
index 15d0fe9bc0..1469690354 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
@@ -28,11 +28,14 @@ stdenv.mkDerivation rec {
gnused
];
- fixupPhase = ''
- patchShebangs $out/bin
+ postFixup = ''
+ wrap_path="${wrapperPath}":$out/bin
wrapProgram $out/bin/git-sync \
- --prefix PATH : "${wrapperPath}"
+ --prefix PATH : $wrap_path
+
+ wrapProgram $out/bin/git-sync-on-inotify \
+ --prefix PATH : $wrap_path
'';
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix
new file mode 100644
index 0000000000..650ec73619
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix
@@ -0,0 +1,73 @@
+{ stdenv
+, lib
+, fetchurl
+, autoPatchelfHook
+, wrapGAppsHook
+, gnome
+, libsecret
+, git
+, curl
+, nss
+, nspr
+, xorg
+, libdrm
+, alsa-lib
+, cups
+, mesa
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+ pname = "github-desktop";
+ version = "2.9.0";
+
+ src = fetchurl {
+ url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux4/GitHubDesktop-linux-${version}-linux4.deb";
+ sha256 = "sha256-kyzvvzSCfo6uaTA0Z1yqAUjr4A5p3OuIpaVQv64WW7M";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gnome.gnome-keyring
+ xorg.libXdamage
+ xorg.libX11
+ libsecret
+ git
+ curl
+ nss
+ nspr
+ libdrm
+ alsa-lib
+ cups
+ mesa
+ ];
+
+ unpackPhase = ''
+ mkdir -p $TMP/${pname} $out/{opt,bin}
+ cp $src $TMP/${pname}.deb
+ ar vx ${pname}.deb
+ tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${pname}/
+ '';
+
+ installPhase = ''
+ cp -R $TMP/${pname}/usr/share $out/
+ cp -R $TMP/${pname}/usr/lib/${pname}/* $out/opt/
+ ln -sf $out/opt/${pname} $out/bin/${pname}
+ '';
+
+ runtimeDependencies = [
+ (lib.getLib systemd)
+ ];
+
+ meta = with lib; {
+ description = "GUI for managing Git and GitHub.";
+ homepage = "https://desktop.github.com/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix
index 06a4b2c98a..5e556b40a8 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix
@@ -9,7 +9,7 @@ buildPythonApplication rec {
# application, it would mess up the Python environment. Thus, don't add it
# here, instead add it to PATH when running unit tests
checkInputs = [ pytest pytest-flake8 git ];
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ ipython nbformat ];
src = fetchPypi {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
index 8b91b5e5fa..9c62198cb0 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
@@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "a4ksubtitles";
namespace = "service.subtitles.a4ksubtitles";
- version = "2.6.0";
+ version = "2.8.0";
src = fetchFromGitHub {
owner = "a4k-openproject";
repo = "a4kSubtitles";
rev = "${namespace}/${namespace}-${version}";
- sha256 = "1rzgrxdcws064ji65fdbzzmgd2pdlaak3apa5n1clkmzknn7n881";
+ sha256 = "0fg5mcvxdc3hqybp1spy7d1nnqirwhcvrblbwksikym9m3qgw2m5";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix
index b99a64f3ee..1088f560ad 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix
@@ -9,8 +9,11 @@ buildKodiAddon rec {
sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy";
};
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.certifi";
+ passthru = {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.certifi";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix
index cfe3d501cb..fe482447cf 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix
@@ -9,8 +9,11 @@ buildKodiAddon rec {
sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj";
};
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.chardet";
+ passthru = {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.chardet";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/dateutil/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/dateutil/default.nix
index 665858d3d5..54a22cedf9 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/dateutil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/dateutil/default.nix
@@ -14,8 +14,11 @@ buildKodiAddon rec {
six
];
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.dateutil";
+ passthru = {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.dateutil";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix
index c90f52ffdc..01f16696fa 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix
@@ -9,8 +9,11 @@ buildKodiAddon rec {
sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7";
};
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.idna";
+ passthru = {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.idna";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
index 784e0f7faf..0230b6bcf2 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "inputstream-adaptive";
namespace = "inputstream.adaptive";
- version = "2.6.20";
+ version = "2.6.22";
src = fetchFromGitHub {
owner = "xbmc";
repo = "inputstream.adaptive";
rev = "${version}-${rel}";
- sha256 = "0g0pvfdmnd3frsd5sdckv3llwyjiw809rqy1slq3xj6i08xhcmd5";
+ sha256 = "sha256-WSFbDuUgw0WHWb3ZZVavwpu1TizU9lMA5JAC5haR7c0=";
};
extraNativeBuildInputs = [ gtest ];
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
index 4ca45f8b7b..fcf53e7a16 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
@@ -9,8 +9,11 @@ buildKodiAddon rec {
sha256 = "0y4xn3ygwv1kb7gya7iwdga0g9sa89snpnram0wwqzqn8wn2lyb4";
};
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.inputstreamhelper";
+ passthru = {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.inputstreamhelper";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-six/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-six/default.nix
index b4f1169b36..24404ef349 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-six/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-six/default.nix
@@ -10,8 +10,11 @@ buildKodiAddon rec {
sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x";
};
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.kodi-six";
+ passthru = {
+ pythonPath = "libs";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.kodi-six";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix
index bd0c98137a..e39625545f 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix
@@ -9,8 +9,11 @@ buildKodiAddon rec {
sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k";
};
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.myconnpy";
+ passthru = {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.myconnpy";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix
index 8896a94c9c..62a5853c79 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix
@@ -11,6 +11,8 @@ buildKodiAddon rec {
sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml";
};
+ passthru.pythonPath = "lib/api";
+
meta = with lib; {
homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
description = "A comic book reader";
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix
index 0f2d5044f0..c5759fcc32 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix
@@ -16,8 +16,11 @@ buildKodiAddon rec {
urllib3
];
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.requests";
+ passthru = {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.requests";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix
index bba7b112e9..b66b1e99a8 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix
@@ -9,8 +9,11 @@ buildKodiAddon rec {
sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs";
};
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.signals";
+ passthru= {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.signals";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix
index 12d8e60d67..de0fbb9976 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix
@@ -9,8 +9,11 @@ buildKodiAddon rec {
sha256 = "1d2k6gbsnhdadcl1xc7igz4m71z2fcnpln5ppfjv455cmkk110vf";
};
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.urllib3";
+ passthru = {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.urllib3";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/websocket/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/websocket/default.nix
index 3c83e1f9b0..423dfa73f3 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/websocket/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/websocket/default.nix
@@ -14,8 +14,11 @@ buildKodiAddon rec {
six
];
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.websocket";
+ passthru = {
+ pythonPath = "lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.websocket";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix
index 65613658e0..8e57adbfb1 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/youtube/default.nix
@@ -16,8 +16,11 @@ buildKodiAddon rec {
inputstreamhelper
];
- passthru.updateScript = addonUpdateScript {
- attrPath = "kodi.packages.youtube";
+ passthru = {
+ pythonPath = "resources/lib";
+ updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.youtube";
+ };
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
index 8616468213..7377e63867 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/wrapper.nix
@@ -1,8 +1,19 @@
-{ lib, makeWrapper, buildEnv, kodi, addons }:
+{ lib, makeWrapper, buildEnv, kodi, addons, callPackage }:
let
+ kodiPackages = callPackage ../../../top-level/kodi-packages.nix { inherit kodi; };
+
# linux distros are supposed to provide pillow and pycryptodome
- requiredPythonPackages = with kodi.pythonPackages; [ pillow pycryptodome] ++ addons;
+ requiredPythonPath = with kodi.pythonPackages; makePythonPath ([ pillow pycryptodome ]);
+
+ # each kodi addon can potentially export a python module which should be included in PYTHONPATH
+ # see any addon which supplies `passthru.pythonPath` and the corresponding entry in the addons `addon.xml`
+ # eg. `` -> pythonPath = "lib";
+ additionalPythonPath =
+ let
+ addonsWithPythonPath = lib.filter (addon: addon ? pythonPath) addons;
+ in
+ lib.concatMapStringsSep ":" (addon: "${addon}${kodiPackages.addonDir}/${addon.namespace}/${addon.pythonPath}") addonsWithPythonPath;
in
buildEnv {
@@ -18,7 +29,7 @@ buildEnv {
for exe in kodi{,-standalone}
do
makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
- --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath requiredPythonPackages} \
+ --prefix PYTHONPATH : ${requiredPythonPath}:${additionalPythonPath} \
--prefix KODI_HOME : $out/share/kodi \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
(lib.concatMap
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix
deleted file mode 100644
index 37f03d8772..0000000000
--- a/third_party/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, stdenv, fetchurl, python2Packages, intltool, libxml2Python }:
-
-with lib;
-
-let version = "0.600.4"; in
-
-stdenv.mkDerivation rec {
- pname = "virtinst";
- inherit version;
-
- src = fetchurl {
- url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz";
- sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf";
- };
-
- pythonPath = with python2Packages;
- [ setuptools eventlet greenlet gflags netaddr carrot routes
- PasteDeploy m2crypto ipy twisted
- distutils_extra simplejson cheetah lockfile httplib2
- # !!! should libvirt be a build-time dependency? Note that
- # libxml2Python is a dependency of libvirt.py.
- libvirt libxml2Python urlgrabber
- ];
-
- buildInputs =
- [ python2Packages.python
- python2Packages.wrapPython
- python2Packages.mox
- intltool
- ] ++ pythonPath;
-
- buildPhase = "python setup.py build";
-
- installPhase =
- ''
- python setup.py install --prefix="$out";
- wrapPythonPrograms
- '';
-
- meta = {
- homepage = "http://virt-manager.org";
- license = lib.licenses.gpl2Plus;
- maintainers = with lib.maintainers; [qknight];
- description = "Command line tool which provides an easy way to provision operating systems into virtual machines";
- platforms = with lib.platforms; linux;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index 868686bd5c..23718bf636 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -62,6 +62,7 @@ let
# Fonts
"fonts"
# ALSA
+ "alsa"
"asound.conf"
# SSL
"ssl/certs"
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix b/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix
index 965b8d8189..08257ff254 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix
@@ -28,7 +28,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
emacs --batch -Q -l ${./elpa2nix.el} \
-f elpa2nix-install-package \
- "${src}" "$out/share/emacs/site-lisp/elpa"
+ "$src" "$out/share/emacs/site-lisp/elpa"
runHook postInstall
'';
diff --git a/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix b/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix
index 5d7b945bf1..497dcb0660 100644
--- a/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix
@@ -41,6 +41,9 @@ in rec {
let split = match "^(!?)(.*)" l;
in [(elemAt split 1) (head split == "!")];
+ # regex -> regex
+ handleHashesBangs = replaceStrings ["\\#" "\\!"] ["#" "!"];
+
# ignore -> regex
substWildcards =
let
@@ -86,7 +89,7 @@ in rec {
mapPat = f: l: [(f (head l)) (last l)];
in
map (l: # `l' for "line"
- mapPat (l: handleSlashSuffix (handleSlashPrefix (mapAroundCharclass substWildcards l)))
+ mapPat (l: handleSlashSuffix (handleSlashPrefix (handleHashesBangs (mapAroundCharclass substWildcards l))))
(computeNegation l))
(filter (l: !isList l && !isComment l)
(split "\n" gitignore));
diff --git a/third_party/nixpkgs/pkgs/data/documentation/anarchism/default.nix b/third_party/nixpkgs/pkgs/data/documentation/anarchism/default.nix
index d0cda3da54..b9cedffa19 100644
--- a/third_party/nixpkgs/pkgs/data/documentation/anarchism/default.nix
+++ b/third_party/nixpkgs/pkgs/data/documentation/anarchism/default.nix
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5";
};
- phases = [ "unpackPhase" "postPatch" "installPhase" ];
-
postPatch = ''
substituteInPlace debian/anarchism.desktop \
--replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
diff --git a/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
index d31272c2a5..79a48acd9f 100644
--- a/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
+++ b/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "man-pages";
- version = "5.11";
+ version = "5.12";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
- sha256 = "sha256-PtpdzlGEWZ7Dfa40lM+WTFUDYumkH7ckeS2mEL2xPKo=";
+ sha256 = "07ip4f70nyxn24wy0fin6klq1hm1cjjvzr9zh5baqzssl1hckxbs";
};
- makeFlags = [ "MANDIR=$(out)/share/man" ];
+ makeFlags = [ "prefix=$(out)" ];
postInstall = ''
# conflict with shadow-utils
rm $out/share/man/man5/passwd.5 \
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Linux development manual pages";
homepage = "https://www.kernel.org/doc/man-pages/";
- repositories.git = "http://git.kernel.org/pub/scm/docs/man-pages/man-pages";
+ repositories.git = "https://git.kernel.org/pub/scm/docs/man-pages/man-pages";
license = licenses.gpl2Plus;
platforms = with platforms; unix;
priority = 30; # if a package comes with its own man page, prefer it
diff --git a/third_party/nixpkgs/pkgs/data/fonts/comic-neue/default.nix b/third_party/nixpkgs/pkgs/data/fonts/comic-neue/default.nix
index df618aea81..7485d435cb 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/comic-neue/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/comic-neue/default.nix
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
stripRoot = false; # because it comes with a __MACOSX directory
};
- phases = [ "unpackPhase" "installPhase" ];
-
installPhase = ''
mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}}
cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index b399741f93..27577047ec 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip ];
- phases = [ "unpackPhase" ];
+ dontInstall = true;
unpackPhase = ''
mkdir -p $out/share/fonts
diff --git a/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix
index 146b832af9..5938172756 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix
@@ -58,15 +58,15 @@ in
stdenv.mkDerivation rec {
pname = "joypixels";
- version = "6.5.0";
+ version = "6.6.0";
src = assert !acceptLicense -> throwLicense;
with systemSpecific; fetchurl {
name = fontFile;
url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}";
sha256 = {
- darwin = "034bwxy6ljvhx9zlm6jkb8vw222sg79sjwlcjfql51rk6zkmv4wx";
- }.${kernel.name} or "1v6hz0qhbnzayxhs5j9qfa2ggn7nak53ij7kr06m93wcmlnnln86";
+ darwin = "0qcmb2vn2nykyikzgnlma627zhks7ksy1vkgvpcmqwyxq4bd38d7";
+ }.${kernel.name} or "17gjaz7353zyprmds64p01qivy2r8pwf88nvvhi57idas2qd604n";
};
dontUnpack = true;
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The finest emoji you can use legally (formerly EmojiOne)";
longDescription = ''
- Updated for 2021! JoyPixels 6.5 includes 3,559 originally crafted icon
+ Updated for 2021! JoyPixels 6.6 includes 3,559 originally crafted icon
designs and is 100% Unicode 13.1 compatible. We offer the largest
selection of files ranging from png, svg, iconjar, sprites, and fonts.
'';
diff --git a/third_party/nixpkgs/pkgs/data/fonts/lobster-two/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lobster-two/default.nix
deleted file mode 100644
index fb1595fe2f..0000000000
--- a/third_party/nixpkgs/pkgs/data/fonts/lobster-two/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{lib, stdenv, fetchurl}:
-
-let
-
- # HG revision in which this version of the font can be fount.
- rev = "8e98053718f9a15184c93d6530885791be71b756";
-
- urlBase = "https://googlefontdirectory.googlecode.com/hg-history/${rev}/ofl/lobstertwo";
-
- # Just a small convenience function.
- fetch = {name, path ? "/src", sha256}:
- {
- inherit name;
- file = fetchurl {
- url = "${urlBase}${path}/${name}";
- inherit sha256;
- };
- };
-
- fontlog =
- fetch {
- name = "FONTLOG.txt";
- path = "";
- sha256 = "0n405i8m70q95y8w43gzr5yvkj7gx7rd3xa4rx6y8qcqv5g7v9if";
- };
-
- bold =
- fetch {
- name = "LobsterTwo-Bold.otf";
- sha256 = "0gkayn96vvgngs9xnmcyyf16q4payk79ghvl354rl93ayb3gf7x0";
- };
-
- boldItalic =
- fetch {
- name = "LobsterTwo-BoldItalic.otf";
- sha256 = "0wznqkvwjqi9s4bg10fpp2345by3nxa0m0w6b3al3zaqyx2p1dxp";
- };
-
- italic =
- fetch {
- name = "LobsterTwo-Italic.otf";
- sha256 = "0lpnzwgwl5fm6gqy8bylbryz0hy94mf1mp615y5sh0wikdvk570z";
- };
-
- regular =
- fetch {
- name = "LobsterTwo-Regular.otf";
- sha256 = "147m3sa3sqqbkbw1hgjdwnw8w0y37x58g5p09s7q2vm74flcpbq1";
- };
-in
-
- stdenv.mkDerivation rec {
- pname = "lobstertwo";
- version = "1.006";
-
- phases = ["installPhase"];
-
- installPhase = ''
- mkdir -p $out/share/fonts/opentype
- mkdir -p $out/share/doc/${pname}-${version}
- cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name}
- cp -v ${bold.file} $out/share/fonts/opentype/${bold.name}
- cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name}
- cp -v ${italic.file} $out/share/fonts/opentype/${italic.name}
- cp -v ${regular.file} $out/share/fonts/opentype/${regular.name}
- '';
-
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym";
-
- meta = with lib; {
- homepage = "https://github.com/librefonts/lobstertwo";
- description = "Script font with many ligatures";
- license = licenses.ofl;
- platforms = platforms.all;
- maintainers = [maintainers.rycee];
- broken = true; # googlecode.com RIP; can be built from sources
- };
- }
diff --git a/third_party/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix b/third_party/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
index 7083b9e003..a55fb65c56 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
- phases = [ "unpackPhase" "installPhase" ];
unpackPhase = ''
unzip -j ${meslo-lg}
unzip -j ${meslo-lg-dz}
diff --git a/third_party/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix b/third_party/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix
index 6bcceff16d..ecafc9572b 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/tempora-lgc/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
name = "tempora-lgc";
inherit nativeBuildInputs;
inherit srcs;
- phases = "installPhase";
installPhase = ''
mkdir -p "$out/share/fonts/opentype/public"
cp ${toString srcs} "$out/share/fonts/opentype/public"
diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix
index 507faae53e..7fb7387179 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
- phases = [ "buildPhase" "installPhase" ];
+ dontUnpack = true;
buildPhase =
''
diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
index bb825c8044..711354026d 100644
--- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha-gtk-theme";
- version = "2021-07-08";
+ version = "2021-07-20";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "sha256-iTwPN31JvpFlCBWikOeSTda2wBEtg6ygy8o6ovqHPCw=";
+ sha256 = "0shdkwpqj3fw5qr99ww4z5dyrpa2pq79s0i02p9j3v6w6aca2gic";
};
buildInputs = [ gdk-pixbuf librsvg ];
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
index 125e39d1f4..dd9ab9be1d 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
pname = "${caja.pname}-with-extensions";
version = caja.version;
- phases = [ "installPhase" ];
+ dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix
index a3e75d231f..556b67aeaf 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -7,7 +7,6 @@
, elementary-gtk-theme
, elementary-icon-theme
, fetchFromGitHub
-, fetchpatch
, flatpak
, gettext
, glib
@@ -15,6 +14,7 @@
, gtk3
, json-glib
, libgee
+, libhandy
, libsoup
, libxml2
, meson
@@ -25,30 +25,20 @@
, python3
, vala
, polkit
-, libhandy_0
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "appcenter";
- version = "3.5.1";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI=";
+ sha256 = "0kwqgilhyrj2nbvw5y34nzch5h9jnrg1a1n333qdsx4ax6yrxh4j";
};
- patches = [
- # Allow build with appstream 0.14.x
- # https://github.com/elementary/appcenter/pull/1493
- (fetchpatch {
- url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch";
- sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo=";
- })
- ];
-
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
@@ -78,7 +68,7 @@ stdenv.mkDerivation rec {
gtk3
json-glib
libgee
- libhandy_0 # doesn't support libhandy-1 yet
+ libhandy
libsoup
libxml2
packagekit
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 791c2508e1..8b02af57d4 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "elementary-calculator";
- version = "1.6.1";
+ version = "1.6.2";
repoName = "calculator";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "sha256-LGY111wPldxuSfqhZ2E2TeJjexcGbfS25RjLw+Wi99c=";
+ sha256 = "sha256-kOQr94PAfLPv4LjY2WDdTtlbf3/tYf+NUESZ94+L41M=";
};
passthru = {
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
new file mode 100644
index 0000000000..7a0b616225
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
@@ -0,0 +1,40 @@
+{ lib, stdenv
+, cmake, fetchFromGitHub, extra-cmake-modules
+, qtbase, wrapQtAppsHook, ki18n, kdelibs4support, krunner
+}:
+
+stdenv.mkDerivation rec {
+ pname = "krunner-symbols";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "domschrei";
+ repo = "krunner-symbols";
+ rev = version;
+ sha256 = "sha256-YsoZdPTWpk3/YERwerrVEcaf2IfGVJwpq32onhP8Exo=";
+ };
+
+ buildInputs = [ qtbase ki18n kdelibs4support krunner ];
+ nativeBuildInputs = [ cmake wrapQtAppsHook extra-cmake-modules ];
+
+ postPatch = ''
+ # symbols.cpp hardcodes the location of configuration files
+ substituteInPlace symbols.cpp \
+ --replace "/usr/share/config/krunner-symbol" "$out/share/config/krunner-symbol"
+
+ # change cmake flag names to output using the correct qt-plugin prefix and kservice location
+ substituteInPlace CMakeLists.txt \
+ --replace "LOCATION_PLUGIN" "KDE_INSTALL_PLUGINDIR" \
+ --replace "LOCATION_DESKTOP" "KDE_INSTALL_KSERVICES5DIR"
+ '';
+
+ cmakeFlags = [ "-DLOCATION_CONFIG=share/config" ];
+
+ meta = with lib; {
+ description = "A little krunner plugin (Plasma 5) to retrieve unicode symbols, or any other string, based on a corresponding keyword";
+ homepage = "https://github.com/domschrei/krunner-symbols";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ hqurve ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
index 4b41e5ad9d..9252aa7b39 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
@@ -158,6 +158,7 @@ let
kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { };
kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { };
krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { };
+ krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { };
parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix
index d2d866a280..ee47ebd988 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix
@@ -1,24 +1,16 @@
-{ lib, stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }:
+{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten }:
stdenv.mkDerivation rec {
pname = "binaryen";
- version = "96";
+ version = "99";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "binaryen";
rev = "version_${version}";
- sha256 = "1mqpb6yy87aifpbcy0lczi3bp6kddrwi6d0g6lrhjrdxx2kvbdag";
+ sha256 = "1a6ixxm1f8mrr9mn6a0pimajdzsdr4w1qhr92skxq67168vvc1ic";
};
- patches = [
- # Adds --minimize-wasm-changes option required by emscripten 2.0.1
- (fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/WebAssembly/binaryen/pull/3044.patch";
- sha256 = "1hdbc9h9zhh2d3bl4sqv6v9psfmny715612bwpjdln0ibdvc129s";
- })
- ];
-
nativeBuildInputs = [ cmake python3 ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix
index 648ec156ab..a142008e2e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "emscripten";
- version = "2.0.1";
+ version = "2.0.10";
llvmEnv = symlinkJoin {
name = "emscripten-llvm-${version}";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "emscripten-core";
repo = "emscripten";
- sha256 = "06dsd819qjv4n2ihrz1mpn5aigmbv0gpkm7iw06wrqx30nzphnpk";
+ sha256 = "0jy4n1pykk9vkm5da9v3qsfrl6j7yhngcazh2792xxs6wzfcs9gk";
rev = version;
};
@@ -43,10 +43,14 @@ stdenv.mkDerivation rec {
sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py
sed -i "/^def check_sanity/a\\ return" tools/shared.py
+ # super ugly: monkeypatch to add sysroot/include to the include
+ # path because they are otherwise not part of Nix's clang.
+ sed -i "490a\\ '/include'," tools/shared.py
+
# required for wasm2c
ln -s ${nodeModules}/node_modules .
- echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten
+ echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten
echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten
echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten
echo "JS_ENGINES = [NODE_JS]" >> .emscripten
@@ -74,7 +78,7 @@ stdenv.mkDerivation rec {
chmod -R +w $appdir
mkdir -p $out/bin
- for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do
+ for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons; do
makeWrapper $appdir/$b $out/bin/$b \
--set NODE_PATH ${nodeModules}/node_modules \
--set EM_EXCLUSIVE_CACHE_ACCESS 1 \
diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json b/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json
index 039d215efc..36cd2efe27 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json
+++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json
@@ -1,15 +1,15 @@
{
"name": "emscripten",
- "version": "2.0.1",
- "private": true,
+ "version": "2.0.10",
"devDependencies": {
+ "es-check": "^5.1.0",
"ws": "~0.4.28"
},
"dependencies": {
- "google-closure-compiler": "20200224.0.0",
+ "acorn": "7.3.1",
+ "google-closure-compiler": "20200920.0.0",
"html-minifier-terser": "5.0.2",
"source-map": "0.5.6",
- "wasm2c": "1.0.0",
- "acorn": "7.3.1"
+ "wasm2c": "1.0.0"
}
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.lock b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.lock
index 079b254a47..948fcd4ed7 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.lock
+++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.lock
@@ -7,6 +7,31 @@ acorn@7.3.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
+acorn@^6.4.1:
+ version "6.4.2"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+ integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
+
+ansi-escapes@^1.1.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+ integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
+
+ansi-regex@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+ integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+ integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-styles@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+ integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
ansi-styles@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -14,6 +39,42 @@ ansi-styles@^3.2.1:
dependencies:
color-convert "^1.9.0"
+ansi@^0.3.0, ansi@~0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
+ integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
+
+are-we-there-yet@~1.1.2:
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+ integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+ dependencies:
+ delegates "^1.0.0"
+ readable-stream "^2.0.6"
+
+async@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
+ integrity sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=
+
+balanced-match@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+ integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+bluebird@^3.4.7:
+ version "3.7.2"
+ resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+ integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+brace-expansion@^1.1.7:
+ version "1.1.11"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+ integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+ dependencies:
+ balanced-match "^1.0.0"
+ concat-map "0.0.1"
+
buffer-from@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -27,6 +88,21 @@ camel-case@^3.0.0:
no-case "^2.2.0"
upper-case "^1.1.1"
+caporal@1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/caporal/-/caporal-1.4.0.tgz#d6087b815e3df97c3a0f55dbb82850fae29ed585"
+ integrity sha512-3pWfIwKVdIbB/gWmpLloO6iGAXTRi9mcTinPOwvHfzH3BYjOhLgq2XRG3hKtp+F6vBcBXxMgCobUzBAx1d8T4A==
+ dependencies:
+ bluebird "^3.4.7"
+ cli-table3 "^0.5.0"
+ colorette "^1.0.1"
+ fast-levenshtein "^2.0.6"
+ lodash "^4.17.14"
+ micromist "1.1.0"
+ prettyjson "^1.2.1"
+ tabtab "^2.2.2"
+ winston "^2.3.1"
+
chalk@2.x:
version "2.4.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -36,6 +112,17 @@ chalk@2.x:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
+chalk@^1.0.0:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+ integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+ dependencies:
+ ansi-styles "^2.2.1"
+ escape-string-regexp "^1.0.2"
+ has-ansi "^2.0.0"
+ strip-ansi "^3.0.0"
+ supports-color "^2.0.0"
+
clean-css@^4.2.1:
version "4.2.3"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
@@ -43,6 +130,28 @@ clean-css@^4.2.1:
dependencies:
source-map "~0.6.0"
+cli-cursor@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+ integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
+ dependencies:
+ restore-cursor "^1.0.1"
+
+cli-table3@^0.5.0:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
+ integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
+ dependencies:
+ object-assign "^4.1.0"
+ string-width "^2.1.1"
+ optionalDependencies:
+ colors "^1.1.2"
+
+cli-width@^2.0.0:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+ integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
clone-buffer@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
@@ -67,6 +176,11 @@ cloneable-readable@^1.0.0:
process-nextick-args "^2.0.0"
readable-stream "^2.3.5"
+code-point-at@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+ integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
color-convert@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -79,6 +193,21 @@ color-name@1.1.3:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+colorette@^1.0.1:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+ integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
+colors@1.0.x:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+ integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
+
+colors@^1.1.2:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+ integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
commander@^2.20.0:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -94,62 +223,174 @@ commander@~2.1.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=
+concat-map@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+ integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.4.7:
+ version "1.6.2"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+ integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+ dependencies:
+ buffer-from "^1.0.0"
+ inherits "^2.0.3"
+ readable-stream "^2.2.2"
+ typedarray "^0.0.6"
+
core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-escape-string-regexp@^1.0.5:
+cycle@1.0.x:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
+ integrity sha1-IegLK+hYD5i0aPN5QwZisEbDStI=
+
+debug@^2.2.0:
+ version "2.6.9"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+ integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+ dependencies:
+ ms "2.0.0"
+
+delegates@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+ integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+es-check@^5.1.0:
+ version "5.2.4"
+ resolved "https://registry.yarnpkg.com/es-check/-/es-check-5.2.4.tgz#76fe2d96ad238bd8ec1d9c3b3d0e98ddbcc723e7"
+ integrity sha512-FZ3qAJ9hwguqPvGGagaKAVDnusSkezeHbiKNM5rOepOjloeVuX2e6meMxQ+mKcnWbAFucCG7fszNrzUT8bvHcQ==
+ dependencies:
+ acorn "^6.4.1"
+ caporal "1.4.0"
+ glob "^7.1.2"
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-google-closure-compiler-java@^20200224.0.0:
- version "20200224.0.0"
- resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz#03d71aefd0a07010fd8a7057d09c76f6729767bc"
- integrity sha512-palFcDoScauZjWIsGDzMK6h+IctcRb55I3wJX8Ko/DTSz72xwadRdKm0lGt8OoYL7SKEO+IjgD7s8XrAGpLnlQ==
+exit-hook@^1.0.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+ integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
-google-closure-compiler-js@^20200224.0.0:
- version "20200224.0.0"
- resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz#cf4b598abf7be686c683e530529756805b8af500"
- integrity sha512-70VKN0kbnTRtu2dqxDjWZQGfEQIHj7b7oUUCsYPO5oEXCDfgxNc13oYUJXvrTONLRWlHCNl/I8FNrVOwZ3gY/g==
+extend@^3.0.0:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+ integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-google-closure-compiler-linux@^20200224.0.0:
- version "20200224.0.0"
- resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz#d9608b224b4d8f38d4d34e99a24da54bca6b1902"
- integrity sha512-/BaE889EPrXWOKJVolA9++e99xBDMzeFBf7zF7nBB8PUmU5DlvtsoLL82xnT6nbZC1ktHaETlVx+vYGju8zKBQ==
+external-editor@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b"
+ integrity sha1-Etew24UPf/fnCBuvQAVwAGDEYAs=
+ dependencies:
+ extend "^3.0.0"
+ spawn-sync "^1.0.15"
+ tmp "^0.0.29"
-google-closure-compiler-osx@^20200224.0.0:
- version "20200224.0.0"
- resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz#aee62d8b878a662fc73b92419603168c0c3a35ed"
- integrity sha512-WXVNW9nPUqjvCe38mUIlBGEPVPCTKLtdaXC+q+kQdonkJFHNrpdyYWa746Y8cNP/byQyDNpPsqcKseZTLh17sQ==
+eyes@0.1.x:
+ version "0.1.8"
+ resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
+ integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=
-google-closure-compiler-windows@^20200224.0.0:
- version "20200224.0.0"
- resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz#cae323b898625ca57b0e87aaddde021a414dda58"
- integrity sha512-l6w2D8r9+GC9CQTAYEMAuNI996Zb6YV5qG7+FR0gCoL6h6S3Mc7mi87bafgwaicsVcmmHE/9kCBuW4ZyTMs5Fg==
+fast-levenshtein@^2.0.6:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+ integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-google-closure-compiler@20200224.0.0:
- version "20200224.0.0"
- resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz#ec0e708d9716a48e12fff43fe37fa5cec732a283"
- integrity sha512-V81dRYygdHbZtOtU16VX26xAdJBB1UZyfSg3OTzdNl3l/xEIx1D/L7TYUqjeTXsxcy+JruJ/UfUlIJAOaMRTog==
+figures@^1.3.5:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+ integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
+ dependencies:
+ escape-string-regexp "^1.0.5"
+ object-assign "^4.1.0"
+
+fs.realpath@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+ integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+gauge@~1.2.5:
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
+ integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM=
+ dependencies:
+ ansi "^0.3.0"
+ has-unicode "^2.0.0"
+ lodash.pad "^4.1.0"
+ lodash.padend "^4.1.0"
+ lodash.padstart "^4.1.0"
+
+glob@^7.1.2:
+ version "7.1.7"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+ integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.0.4"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+google-closure-compiler-java@^20200920.0.0:
+ version "20200920.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz#23519b14e004f2a9eda4f5b887842ae46ad7022e"
+ integrity sha512-q8m/+QLBWrzjg5VZ2b4B628zDvbi0Gyenj9bvZQlPY7mqj68HXhe5aOfKzZO7vXgHDXMvsvI3v/1g5mPAku/5w==
+
+google-closure-compiler-linux@^20200920.0.0:
+ version "20200920.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz#622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b"
+ integrity sha512-F5HcTbeklcaxdWzlZu5b1ZKzCt1kSBUWsBfvlrDCFkA2pdBxIIC2VPokGAUZCqlfno2J2gYARz8FNCrx0tCx5g==
+
+google-closure-compiler-osx@^20200920.0.0:
+ version "20200920.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz#6157a06e7d851d25d60de95c4bcd464d768278b1"
+ integrity sha512-2WY+HaUWVQNg9WZs9d4Op3zvS6yIVN2AIouU4grwYWXfFk+CMXZou0ASlsOURaYc2WZ22LW/G1w3vINDoCkSww==
+
+google-closure-compiler-windows@^20200920.0.0:
+ version "20200920.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz#755ddeb8032530c6ed13962e328d9af3269d0748"
+ integrity sha512-0c4Dem3em3ASNpcR/2USx1Kvb+I7L2MvsV1IZ5Pu98jTuhnkmlccQqPzk2rZR6lllVbVFXTb6tju0JxZ7Zoxjg==
+
+google-closure-compiler@20200920.0.0:
+ version "20200920.0.0"
+ resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz#e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3"
+ integrity sha512-IOC77xL3+pYcAM+OVfcILKdrZNEy767JmpdVs2sq3I9+4JoHeKaJrmQXgbcXN2reUmzBw5b5m9Kd036Cr8ouBA==
dependencies:
chalk "2.x"
- google-closure-compiler-java "^20200224.0.0"
- google-closure-compiler-js "^20200224.0.0"
+ google-closure-compiler-java "^20200920.0.0"
minimist "1.x"
vinyl "2.x"
vinyl-sourcemaps-apply "^0.2.0"
optionalDependencies:
- google-closure-compiler-linux "^20200224.0.0"
- google-closure-compiler-osx "^20200224.0.0"
- google-closure-compiler-windows "^20200224.0.0"
+ google-closure-compiler-linux "^20200920.0.0"
+ google-closure-compiler-osx "^20200920.0.0"
+ google-closure-compiler-windows "^20200920.0.0"
+
+has-ansi@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+ integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+ dependencies:
+ ansi-regex "^2.0.0"
has-flag@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+has-unicode@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+ integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
he@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -168,26 +409,137 @@ html-minifier-terser@5.0.2:
relateurl "^0.2.7"
terser "^4.3.9"
-inherits@^2.0.1, inherits@~2.0.3:
+inflight@^1.0.4:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+ integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+ dependencies:
+ once "^1.3.0"
+ wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+inquirer@^1.0.2:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"
+ integrity sha1-TexvMvN+97sLLtPx0aXD9UUHSRg=
+ dependencies:
+ ansi-escapes "^1.1.0"
+ chalk "^1.0.0"
+ cli-cursor "^1.0.1"
+ cli-width "^2.0.0"
+ external-editor "^1.1.0"
+ figures "^1.3.5"
+ lodash "^4.3.0"
+ mute-stream "0.0.6"
+ pinkie-promise "^2.0.0"
+ run-async "^2.2.0"
+ rx "^4.1.0"
+ string-width "^1.0.1"
+ strip-ansi "^3.0.0"
+ through "^2.3.6"
+
+is-fullwidth-code-point@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+ integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+ dependencies:
+ number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+ integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+isstream@0.1.x:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+ integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+lodash.camelcase@^4.3.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+ integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
+lodash.difference@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+ integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=
+
+lodash.pad@^4.1.0:
+ version "4.5.1"
+ resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70"
+ integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA=
+
+lodash.padend@^4.1.0:
+ version "4.6.1"
+ resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e"
+ integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=
+
+lodash.padstart@^4.1.0:
+ version "4.6.1"
+ resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"
+ integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=
+
+lodash.uniq@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+ integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
+lodash@^4.17.14, lodash@^4.3.0:
+ version "4.17.21"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+ integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
lower-case@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
-minimist@1.x:
+micromist@1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/micromist/-/micromist-1.1.0.tgz#a490bcf9a4b918ad9eed8e52d0ec98b9c3b2d3c8"
+ integrity sha512-+CQ76pabE9egniSEdmDuH+j2cYyIBKP97kujG8ZLZyLCRq5ExwtIy4DPHPFrq4jVbhMRBnyjuH50KU9Ohs8QCg==
+ dependencies:
+ lodash.camelcase "^4.3.0"
+
+minimatch@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+ integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+ dependencies:
+ brace-expansion "^1.1.7"
+
+minimist@1.x, minimist@^1.2.0, minimist@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+mkdirp@^0.5.1:
+ version "0.5.5"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+ integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+ dependencies:
+ minimist "^1.2.5"
+
+ms@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+ integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+mute-stream@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
+ integrity sha1-SJYrGeFp/R38JAs/HnMXYnu8R9s=
+
nan@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"
@@ -200,11 +552,52 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
+npmlog@^2.0.3:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692"
+ integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI=
+ dependencies:
+ ansi "~0.3.1"
+ are-we-there-yet "~1.1.2"
+ gauge "~1.2.5"
+
+number-is-nan@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+ integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+object-assign@^4.1.0:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+ integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+once@^1.3.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+ integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+ dependencies:
+ wrappy "1"
+
+onetime@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+ integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
+
options@>=0.0.5:
version "0.0.6"
resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=
+os-shim@^0.1.2:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917"
+ integrity sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc=
+
+os-tmpdir@~1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+ integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
param-case@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
@@ -212,12 +605,37 @@ param-case@^2.1.1:
dependencies:
no-case "^2.2.0"
+path-is-absolute@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+ integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+pinkie-promise@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+ integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+ dependencies:
+ pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+ integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+prettyjson@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289"
+ integrity sha1-/P+rQdGcq0365eV15kJGYZsS0ok=
+ dependencies:
+ colors "^1.1.2"
+ minimist "^1.2.0"
+
process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-readable-stream@^2.3.5:
+readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5:
version "2.3.7"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -245,6 +663,24 @@ replace-ext@^1.0.0:
resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
+restore-cursor@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+ integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
+ dependencies:
+ exit-hook "^1.0.0"
+ onetime "^1.0.0"
+
+run-async@^2.2.0:
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+ integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+rx@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+ integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
+
safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -273,6 +709,36 @@ source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+spawn-sync@^1.0.15:
+ version "1.0.15"
+ resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476"
+ integrity sha1-sAeZVX63+wyDdsKdROih6mfldHY=
+ dependencies:
+ concat-stream "^1.4.7"
+ os-shim "^0.1.2"
+
+stack-trace@0.0.x:
+ version "0.0.10"
+ resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+ integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
+
+string-width@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+ integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+ dependencies:
+ code-point-at "^1.0.0"
+ is-fullwidth-code-point "^1.0.0"
+ strip-ansi "^3.0.0"
+
+string-width@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+ integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+ dependencies:
+ is-fullwidth-code-point "^2.0.0"
+ strip-ansi "^4.0.0"
+
string_decoder@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -280,6 +746,25 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"
+strip-ansi@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+ integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+ dependencies:
+ ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+ integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+ dependencies:
+ ansi-regex "^3.0.0"
+
+supports-color@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+ integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
supports-color@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -287,6 +772,20 @@ supports-color@^5.3.0:
dependencies:
has-flag "^3.0.0"
+tabtab@^2.2.2:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-2.2.2.tgz#7a047f143b010b4cbd31f857e82961512cbf4e14"
+ integrity sha1-egR/FDsBC0y9MfhX6ClhUSy/ThQ=
+ dependencies:
+ debug "^2.2.0"
+ inquirer "^1.0.2"
+ lodash.difference "^4.5.0"
+ lodash.uniq "^4.5.0"
+ minimist "^1.2.0"
+ mkdirp "^0.5.1"
+ npmlog "^2.0.3"
+ object-assign "^4.1.0"
+
terser@^4.3.9:
version "4.8.0"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
@@ -296,11 +795,28 @@ terser@^4.3.9:
source-map "~0.6.1"
source-map-support "~0.5.12"
+through@^2.3.6:
+ version "2.3.8"
+ resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+ integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
tinycolor@0.x:
version "0.0.1"
resolved "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz#320b5a52d83abb5978d81a3e887d4aefb15a6164"
integrity sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=
+tmp@^0.0.29:
+ version "0.0.29"
+ resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"
+ integrity sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=
+ dependencies:
+ os-tmpdir "~1.0.1"
+
+typedarray@^0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+ integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
upper-case@^1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
@@ -335,6 +851,23 @@ wasm2c@1.0.0:
resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0"
integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA==
+winston@^2.3.1:
+ version "2.4.5"
+ resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz#f2e431d56154c4ea765545fc1003bd340c95b59a"
+ integrity sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A==
+ dependencies:
+ async "~1.0.0"
+ colors "1.0.x"
+ cycle "1.0.x"
+ eyes "0.1.x"
+ isstream "0.1.x"
+ stack-trace "0.0.x"
+
+wrappy@1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+ integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
ws@~0.4.28:
version "0.4.32"
resolved "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz#787a6154414f3c99ed83c5772153b20feb0cec32"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix
index af01d9c686..d0c3395f28 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix
@@ -9,6 +9,46 @@
sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd";
};
}
+ {
+ name = "acorn___acorn_6.4.2.tgz";
+ path = fetchurl {
+ name = "acorn___acorn_6.4.2.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz";
+ sha1 = "35866fd710528e92de10cf06016498e47e39e1e6";
+ };
+ }
+ {
+ name = "ansi_escapes___ansi_escapes_1.4.0.tgz";
+ path = fetchurl {
+ name = "ansi_escapes___ansi_escapes_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz";
+ sha1 = "d3a8a83b319aa67793662b13e761c7911422306e";
+ };
+ }
+ {
+ name = "ansi_regex___ansi_regex_2.1.1.tgz";
+ path = fetchurl {
+ name = "ansi_regex___ansi_regex_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz";
+ sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+ };
+ }
+ {
+ name = "ansi_regex___ansi_regex_3.0.0.tgz";
+ path = fetchurl {
+ name = "ansi_regex___ansi_regex_3.0.0.tgz";
+ url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz";
+ sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+ };
+ }
+ {
+ name = "ansi_styles___ansi_styles_2.2.1.tgz";
+ path = fetchurl {
+ name = "ansi_styles___ansi_styles_2.2.1.tgz";
+ url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz";
+ sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+ };
+ }
{
name = "ansi_styles___ansi_styles_3.2.1.tgz";
path = fetchurl {
@@ -17,6 +57,54 @@
sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d";
};
}
+ {
+ name = "ansi___ansi_0.3.1.tgz";
+ path = fetchurl {
+ name = "ansi___ansi_0.3.1.tgz";
+ url = "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz";
+ sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21";
+ };
+ }
+ {
+ name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz";
+ path = fetchurl {
+ name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz";
+ url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+ sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21";
+ };
+ }
+ {
+ name = "async___async_1.0.0.tgz";
+ path = fetchurl {
+ name = "async___async_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz";
+ sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
+ };
+ }
+ {
+ name = "balanced_match___balanced_match_1.0.2.tgz";
+ path = fetchurl {
+ name = "balanced_match___balanced_match_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz";
+ sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee";
+ };
+ }
+ {
+ name = "bluebird___bluebird_3.7.2.tgz";
+ path = fetchurl {
+ name = "bluebird___bluebird_3.7.2.tgz";
+ url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz";
+ sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f";
+ };
+ }
+ {
+ name = "brace_expansion___brace_expansion_1.1.11.tgz";
+ path = fetchurl {
+ name = "brace_expansion___brace_expansion_1.1.11.tgz";
+ url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz";
+ sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd";
+ };
+ }
{
name = "buffer_from___buffer_from_1.1.1.tgz";
path = fetchurl {
@@ -33,6 +121,14 @@
sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73";
};
}
+ {
+ name = "caporal___caporal_1.4.0.tgz";
+ path = fetchurl {
+ name = "caporal___caporal_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/caporal/-/caporal-1.4.0.tgz";
+ sha1 = "d6087b815e3df97c3a0f55dbb82850fae29ed585";
+ };
+ }
{
name = "chalk___chalk_2.4.2.tgz";
path = fetchurl {
@@ -41,6 +137,14 @@
sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
};
}
+ {
+ name = "chalk___chalk_1.1.3.tgz";
+ path = fetchurl {
+ name = "chalk___chalk_1.1.3.tgz";
+ url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz";
+ sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+ };
+ }
{
name = "clean_css___clean_css_4.2.3.tgz";
path = fetchurl {
@@ -49,6 +153,30 @@
sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78";
};
}
+ {
+ name = "cli_cursor___cli_cursor_1.0.2.tgz";
+ path = fetchurl {
+ name = "cli_cursor___cli_cursor_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz";
+ sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987";
+ };
+ }
+ {
+ name = "cli_table3___cli_table3_0.5.1.tgz";
+ path = fetchurl {
+ name = "cli_table3___cli_table3_0.5.1.tgz";
+ url = "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz";
+ sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202";
+ };
+ }
+ {
+ name = "cli_width___cli_width_2.2.1.tgz";
+ path = fetchurl {
+ name = "cli_width___cli_width_2.2.1.tgz";
+ url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz";
+ sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48";
+ };
+ }
{
name = "clone_buffer___clone_buffer_1.0.0.tgz";
path = fetchurl {
@@ -81,6 +209,14 @@
sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec";
};
}
+ {
+ name = "code_point_at___code_point_at_1.1.0.tgz";
+ path = fetchurl {
+ name = "code_point_at___code_point_at_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz";
+ sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+ };
+ }
{
name = "color_convert___color_convert_1.9.3.tgz";
path = fetchurl {
@@ -97,6 +233,30 @@
sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
};
}
+ {
+ name = "colorette___colorette_1.2.2.tgz";
+ path = fetchurl {
+ name = "colorette___colorette_1.2.2.tgz";
+ url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz";
+ sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94";
+ };
+ }
+ {
+ name = "colors___colors_1.0.3.tgz";
+ path = fetchurl {
+ name = "colors___colors_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz";
+ sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
+ };
+ }
+ {
+ name = "colors___colors_1.4.0.tgz";
+ path = fetchurl {
+ name = "colors___colors_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz";
+ sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78";
+ };
+ }
{
name = "commander___commander_2.20.3.tgz";
path = fetchurl {
@@ -121,6 +281,22 @@
sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
};
}
+ {
+ name = "concat_map___concat_map_0.0.1.tgz";
+ path = fetchurl {
+ name = "concat_map___concat_map_0.0.1.tgz";
+ url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz";
+ sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+ };
+ }
+ {
+ name = "concat_stream___concat_stream_1.6.2.tgz";
+ path = fetchurl {
+ name = "concat_stream___concat_stream_1.6.2.tgz";
+ url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz";
+ sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34";
+ };
+ }
{
name = "core_util_is___core_util_is_1.0.2.tgz";
path = fetchurl {
@@ -129,6 +305,38 @@
sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
};
}
+ {
+ name = "cycle___cycle_1.0.3.tgz";
+ path = fetchurl {
+ name = "cycle___cycle_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz";
+ sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+ };
+ }
+ {
+ name = "debug___debug_2.6.9.tgz";
+ path = fetchurl {
+ name = "debug___debug_2.6.9.tgz";
+ url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz";
+ sha1 = "5d128515df134ff327e90a4c93f4e077a536341f";
+ };
+ }
+ {
+ name = "delegates___delegates_1.0.0.tgz";
+ path = fetchurl {
+ name = "delegates___delegates_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz";
+ sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+ };
+ }
+ {
+ name = "es_check___es_check_5.2.4.tgz";
+ path = fetchurl {
+ name = "es_check___es_check_5.2.4.tgz";
+ url = "https://registry.yarnpkg.com/es-check/-/es-check-5.2.4.tgz";
+ sha1 = "76fe2d96ad238bd8ec1d9c3b3d0e98ddbcc723e7";
+ };
+ }
{
name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
path = fetchurl {
@@ -138,51 +346,123 @@
};
}
{
- name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz";
+ name = "exit_hook___exit_hook_1.1.1.tgz";
path = fetchurl {
- name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz";
- url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz";
- sha1 = "03d71aefd0a07010fd8a7057d09c76f6729767bc";
+ name = "exit_hook___exit_hook_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz";
+ sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8";
};
}
{
- name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz";
+ name = "extend___extend_3.0.2.tgz";
path = fetchurl {
- name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz";
- url = "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz";
- sha1 = "cf4b598abf7be686c683e530529756805b8af500";
+ name = "extend___extend_3.0.2.tgz";
+ url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz";
+ sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa";
};
}
{
- name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz";
+ name = "external_editor___external_editor_1.1.1.tgz";
path = fetchurl {
- name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz";
- url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz";
- sha1 = "d9608b224b4d8f38d4d34e99a24da54bca6b1902";
+ name = "external_editor___external_editor_1.1.1.tgz";
+ url = "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz";
+ sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
};
}
{
- name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz";
+ name = "eyes___eyes_0.1.8.tgz";
path = fetchurl {
- name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz";
- url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz";
- sha1 = "aee62d8b878a662fc73b92419603168c0c3a35ed";
+ name = "eyes___eyes_0.1.8.tgz";
+ url = "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz";
+ sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
};
}
{
- name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz";
+ name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
path = fetchurl {
- name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz";
- url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz";
- sha1 = "cae323b898625ca57b0e87aaddde021a414dda58";
+ name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
+ url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
};
}
{
- name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz";
+ name = "figures___figures_1.7.0.tgz";
path = fetchurl {
- name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz";
- url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz";
- sha1 = "ec0e708d9716a48e12fff43fe37fa5cec732a283";
+ name = "figures___figures_1.7.0.tgz";
+ url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz";
+ sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e";
+ };
+ }
+ {
+ name = "fs.realpath___fs.realpath_1.0.0.tgz";
+ path = fetchurl {
+ name = "fs.realpath___fs.realpath_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz";
+ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+ };
+ }
+ {
+ name = "gauge___gauge_1.2.7.tgz";
+ path = fetchurl {
+ name = "gauge___gauge_1.2.7.tgz";
+ url = "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz";
+ sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93";
+ };
+ }
+ {
+ name = "glob___glob_7.1.7.tgz";
+ path = fetchurl {
+ name = "glob___glob_7.1.7.tgz";
+ url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz";
+ sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90";
+ };
+ }
+ {
+ name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz";
+ sha1 = "23519b14e004f2a9eda4f5b887842ae46ad7022e";
+ };
+ }
+ {
+ name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz";
+ sha1 = "622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b";
+ };
+ }
+ {
+ name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz";
+ sha1 = "6157a06e7d851d25d60de95c4bcd464d768278b1";
+ };
+ }
+ {
+ name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz";
+ sha1 = "755ddeb8032530c6ed13962e328d9af3269d0748";
+ };
+ }
+ {
+ name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz";
+ path = fetchurl {
+ name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz";
+ url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz";
+ sha1 = "e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3";
+ };
+ }
+ {
+ name = "has_ansi___has_ansi_2.0.0.tgz";
+ path = fetchurl {
+ name = "has_ansi___has_ansi_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz";
+ sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
};
}
{
@@ -193,6 +473,14 @@
sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
};
}
+ {
+ name = "has_unicode___has_unicode_2.0.1.tgz";
+ path = fetchurl {
+ name = "has_unicode___has_unicode_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz";
+ sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+ };
+ }
{
name = "he___he_1.2.0.tgz";
path = fetchurl {
@@ -209,6 +497,14 @@
sha1 = "0e67a0b062ae1dd0719fc73199479298f807ae16";
};
}
+ {
+ name = "inflight___inflight_1.0.6.tgz";
+ path = fetchurl {
+ name = "inflight___inflight_1.0.6.tgz";
+ url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz";
+ sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+ };
+ }
{
name = "inherits___inherits_2.0.4.tgz";
path = fetchurl {
@@ -217,6 +513,30 @@
sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
};
}
+ {
+ name = "inquirer___inquirer_1.2.3.tgz";
+ path = fetchurl {
+ name = "inquirer___inquirer_1.2.3.tgz";
+ url = "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz";
+ sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918";
+ };
+ }
+ {
+ name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz";
+ path = fetchurl {
+ name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+ sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+ };
+ }
+ {
+ name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz";
+ path = fetchurl {
+ name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+ sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+ };
+ }
{
name = "isarray___isarray_1.0.0.tgz";
path = fetchurl {
@@ -225,6 +545,70 @@
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
};
}
+ {
+ name = "isstream___isstream_0.1.2.tgz";
+ path = fetchurl {
+ name = "isstream___isstream_0.1.2.tgz";
+ url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz";
+ sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+ };
+ }
+ {
+ name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz";
+ path = fetchurl {
+ name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz";
+ sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
+ };
+ }
+ {
+ name = "lodash.difference___lodash.difference_4.5.0.tgz";
+ path = fetchurl {
+ name = "lodash.difference___lodash.difference_4.5.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz";
+ sha1 = "9ccb4e505d486b91651345772885a2df27fd017c";
+ };
+ }
+ {
+ name = "lodash.pad___lodash.pad_4.5.1.tgz";
+ path = fetchurl {
+ name = "lodash.pad___lodash.pad_4.5.1.tgz";
+ url = "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz";
+ sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70";
+ };
+ }
+ {
+ name = "lodash.padend___lodash.padend_4.6.1.tgz";
+ path = fetchurl {
+ name = "lodash.padend___lodash.padend_4.6.1.tgz";
+ url = "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz";
+ sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e";
+ };
+ }
+ {
+ name = "lodash.padstart___lodash.padstart_4.6.1.tgz";
+ path = fetchurl {
+ name = "lodash.padstart___lodash.padstart_4.6.1.tgz";
+ url = "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz";
+ sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b";
+ };
+ }
+ {
+ name = "lodash.uniq___lodash.uniq_4.5.0.tgz";
+ path = fetchurl {
+ name = "lodash.uniq___lodash.uniq_4.5.0.tgz";
+ url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
+ sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
+ };
+ }
+ {
+ name = "lodash___lodash_4.17.21.tgz";
+ path = fetchurl {
+ name = "lodash___lodash_4.17.21.tgz";
+ url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz";
+ sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c";
+ };
+ }
{
name = "lower_case___lower_case_1.1.4.tgz";
path = fetchurl {
@@ -233,6 +617,22 @@
sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac";
};
}
+ {
+ name = "micromist___micromist_1.1.0.tgz";
+ path = fetchurl {
+ name = "micromist___micromist_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/micromist/-/micromist-1.1.0.tgz";
+ sha1 = "a490bcf9a4b918ad9eed8e52d0ec98b9c3b2d3c8";
+ };
+ }
+ {
+ name = "minimatch___minimatch_3.0.4.tgz";
+ path = fetchurl {
+ name = "minimatch___minimatch_3.0.4.tgz";
+ url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
+ sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
+ };
+ }
{
name = "minimist___minimist_1.2.5.tgz";
path = fetchurl {
@@ -241,6 +641,30 @@
sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
};
}
+ {
+ name = "mkdirp___mkdirp_0.5.5.tgz";
+ path = fetchurl {
+ name = "mkdirp___mkdirp_0.5.5.tgz";
+ url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz";
+ sha1 = "d91cefd62d1436ca0f41620e251288d420099def";
+ };
+ }
+ {
+ name = "ms___ms_2.0.0.tgz";
+ path = fetchurl {
+ name = "ms___ms_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz";
+ sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+ };
+ }
+ {
+ name = "mute_stream___mute_stream_0.0.6.tgz";
+ path = fetchurl {
+ name = "mute_stream___mute_stream_0.0.6.tgz";
+ url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz";
+ sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+ };
+ }
{
name = "nan___nan_1.0.0.tgz";
path = fetchurl {
@@ -257,6 +681,46 @@
sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac";
};
}
+ {
+ name = "npmlog___npmlog_2.0.4.tgz";
+ path = fetchurl {
+ name = "npmlog___npmlog_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz";
+ sha1 = "98b52530f2514ca90d09ec5b22c8846722375692";
+ };
+ }
+ {
+ name = "number_is_nan___number_is_nan_1.0.1.tgz";
+ path = fetchurl {
+ name = "number_is_nan___number_is_nan_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz";
+ sha1 = "097b602b53422a522c1afb8790318336941a011d";
+ };
+ }
+ {
+ name = "object_assign___object_assign_4.1.1.tgz";
+ path = fetchurl {
+ name = "object_assign___object_assign_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz";
+ sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+ };
+ }
+ {
+ name = "once___once_1.4.0.tgz";
+ path = fetchurl {
+ name = "once___once_1.4.0.tgz";
+ url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz";
+ sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+ };
+ }
+ {
+ name = "onetime___onetime_1.1.0.tgz";
+ path = fetchurl {
+ name = "onetime___onetime_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz";
+ sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789";
+ };
+ }
{
name = "options___options_0.0.6.tgz";
path = fetchurl {
@@ -265,6 +729,22 @@
sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
};
}
+ {
+ name = "os_shim___os_shim_0.1.3.tgz";
+ path = fetchurl {
+ name = "os_shim___os_shim_0.1.3.tgz";
+ url = "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz";
+ sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917";
+ };
+ }
+ {
+ name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
+ path = fetchurl {
+ name = "os_tmpdir___os_tmpdir_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+ sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+ };
+ }
{
name = "param_case___param_case_2.1.1.tgz";
path = fetchurl {
@@ -273,6 +753,38 @@
sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
};
}
+ {
+ name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
+ path = fetchurl {
+ name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+ };
+ }
+ {
+ name = "pinkie_promise___pinkie_promise_2.0.1.tgz";
+ path = fetchurl {
+ name = "pinkie_promise___pinkie_promise_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+ sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+ };
+ }
+ {
+ name = "pinkie___pinkie_2.0.4.tgz";
+ path = fetchurl {
+ name = "pinkie___pinkie_2.0.4.tgz";
+ url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz";
+ sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+ };
+ }
+ {
+ name = "prettyjson___prettyjson_1.2.1.tgz";
+ path = fetchurl {
+ name = "prettyjson___prettyjson_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz";
+ sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289";
+ };
+ }
{
name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
path = fetchurl {
@@ -313,6 +825,30 @@
sha1 = "2d6d996d04a15855d967443631dd5f77825b016a";
};
}
+ {
+ name = "restore_cursor___restore_cursor_1.0.1.tgz";
+ path = fetchurl {
+ name = "restore_cursor___restore_cursor_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz";
+ sha1 = "34661f46886327fed2991479152252df92daa541";
+ };
+ }
+ {
+ name = "run_async___run_async_2.4.1.tgz";
+ path = fetchurl {
+ name = "run_async___run_async_2.4.1.tgz";
+ url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz";
+ sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455";
+ };
+ }
+ {
+ name = "rx___rx_4.1.0.tgz";
+ path = fetchurl {
+ name = "rx___rx_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz";
+ sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
+ };
+ }
{
name = "safe_buffer___safe_buffer_5.1.2.tgz";
path = fetchurl {
@@ -353,6 +889,38 @@
sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263";
};
}
+ {
+ name = "spawn_sync___spawn_sync_1.0.15.tgz";
+ path = fetchurl {
+ name = "spawn_sync___spawn_sync_1.0.15.tgz";
+ url = "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz";
+ sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476";
+ };
+ }
+ {
+ name = "stack_trace___stack_trace_0.0.10.tgz";
+ path = fetchurl {
+ name = "stack_trace___stack_trace_0.0.10.tgz";
+ url = "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz";
+ sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
+ };
+ }
+ {
+ name = "string_width___string_width_1.0.2.tgz";
+ path = fetchurl {
+ name = "string_width___string_width_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz";
+ sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+ };
+ }
+ {
+ name = "string_width___string_width_2.1.1.tgz";
+ path = fetchurl {
+ name = "string_width___string_width_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz";
+ sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e";
+ };
+ }
{
name = "string_decoder___string_decoder_1.1.1.tgz";
path = fetchurl {
@@ -361,6 +929,30 @@
sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
};
}
+ {
+ name = "strip_ansi___strip_ansi_3.0.1.tgz";
+ path = fetchurl {
+ name = "strip_ansi___strip_ansi_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz";
+ sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+ };
+ }
+ {
+ name = "strip_ansi___strip_ansi_4.0.0.tgz";
+ path = fetchurl {
+ name = "strip_ansi___strip_ansi_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz";
+ sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+ };
+ }
+ {
+ name = "supports_color___supports_color_2.0.0.tgz";
+ path = fetchurl {
+ name = "supports_color___supports_color_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz";
+ sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+ };
+ }
{
name = "supports_color___supports_color_5.5.0.tgz";
path = fetchurl {
@@ -369,6 +961,14 @@
sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f";
};
}
+ {
+ name = "tabtab___tabtab_2.2.2.tgz";
+ path = fetchurl {
+ name = "tabtab___tabtab_2.2.2.tgz";
+ url = "https://registry.yarnpkg.com/tabtab/-/tabtab-2.2.2.tgz";
+ sha1 = "7a047f143b010b4cbd31f857e82961512cbf4e14";
+ };
+ }
{
name = "terser___terser_4.8.0.tgz";
path = fetchurl {
@@ -377,6 +977,14 @@
sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17";
};
}
+ {
+ name = "through___through_2.3.8.tgz";
+ path = fetchurl {
+ name = "through___through_2.3.8.tgz";
+ url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz";
+ sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+ };
+ }
{
name = "tinycolor___tinycolor_0.0.1.tgz";
path = fetchurl {
@@ -385,6 +993,22 @@
sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
};
}
+ {
+ name = "tmp___tmp_0.0.29.tgz";
+ path = fetchurl {
+ name = "tmp___tmp_0.0.29.tgz";
+ url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz";
+ sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0";
+ };
+ }
+ {
+ name = "typedarray___typedarray_0.0.6.tgz";
+ path = fetchurl {
+ name = "typedarray___typedarray_0.0.6.tgz";
+ url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz";
+ sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+ };
+ }
{
name = "upper_case___upper_case_1.1.3.tgz";
path = fetchurl {
@@ -425,6 +1049,22 @@
sha1 = "761671e141c46b8a7c6c54429db1e6bfa3cd0ec0";
};
}
+ {
+ name = "winston___winston_2.4.5.tgz";
+ path = fetchurl {
+ name = "winston___winston_2.4.5.tgz";
+ url = "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz";
+ sha1 = "f2e431d56154c4ea765545fc1003bd340c95b59a";
+ };
+ }
+ {
+ name = "wrappy___wrappy_1.0.2.tgz";
+ path = fetchurl {
+ name = "wrappy___wrappy_1.0.2.tgz";
+ url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz";
+ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+ };
+ }
{
name = "ws___ws_0.4.32.tgz";
path = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix
index 1024ddb6a8..adb7490785 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/mint/default.nix
@@ -1,18 +1,18 @@
-{ lib, fetchFromGitHub, crystal_0_36, openssl }:
+{ lib, fetchFromGitHub, crystal_1_0, openssl }:
let
- crystal = crystal_0_36;
+ crystal = crystal_1_0;
in
crystal.buildCrystalPackage rec {
- version = "0.11.0";
+ version = "0.14.0";
pname = "mint";
src = fetchFromGitHub {
owner = "mint-lang";
repo = "mint";
rev = version;
- sha256 = "sha256-QqO4Kc8hf6WNCENPvLwYIF9gtXG/VRR7DhyZvxB4VsA=";
+ sha256 = "1mf9d0jpdb21hkzaqvwyx2171dv3hr50zhl07p85wpf0d3n5wml8";
};
postPatch = ''
@@ -34,6 +34,6 @@ crystal.buildCrystalPackage rec {
license = licenses.bsd3;
maintainers = with maintainers; [ manveru ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
- broken = lib.versionOlder crystal.version "0.33";
+ broken = lib.versionOlder crystal.version "1.0";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mint/shards.nix b/third_party/nixpkgs/pkgs/development/compilers/mint/shards.nix
index 595f9c5ebe..49ba1ad743 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/mint/shards.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/mint/shards.nix
@@ -2,79 +2,55 @@
admiral = {
owner = "jwaldrip";
repo = "admiral.cr";
- rev = "v1.11.2";
- sha256 = "0rxsy41d0qpw9h1d3jvhmbmzqba9yhgyzc0jrdbg28f59fl7zp7q";
+ rev = "v1.11.4";
+ sha256 = "1rpybhhzz892s2dp2kzbkkn1c8c7574275ql6amhbvc6ds5j3i46";
};
ameba = {
owner = "crystal-ameba";
repo = "ameba";
- rev = "v0.13.3";
- sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y";
+ rev = "v0.14.2";
+ sha256 = "1l1q1icpzg1zvhfj8948w36j7ikaj7w816677zi29vi6y2d1dmf2";
};
baked_file_system = {
owner = "schovi";
repo = "baked_file_system";
- rev = "7183bfde8d86a976a6912f582b51cbd1783456af";
- sha256 = "0s1bsrimz30wfkkfmb4bm49mx44nhqj0hky8jkn0kz0mpc28mkkl";
- };
- diff = {
- owner = "MakeNowJust";
- repo = "crystal-diff";
- rev = "v1.1.0";
- sha256 = "1q5q2d5mp1r8c6k5v4755sb3b6awiz85d1j280djzhbd0pggk3z7";
+ rev = "v0.10.0";
+ sha256 = "10f25sby8ipps5c2jj4j2q30kscgv4g1s5nhdddmldhg9isj0jli";
};
dotenv = {
owner = "gdotdesign";
repo = "cr-dotenv";
- rev = "v0.3.1";
- sha256 = "1xp7c3g8dj1hqk2b885qr4y0s8661gpp9q28lv6rhr0ckllc6zgz";
+ rev = "v1.0.0";
+ sha256 = "00pdawysns1w1iqwh6j3shilpwh41ljz1chsqkacn6dj2yn21n0r";
};
exception_page = {
owner = "crystal-loot";
repo = "exception_page";
- rev = "v0.1.4";
- sha256 = "0bsp2m89sl0bg9d5szbs1nxyk7yk58rkk24aibr39hhb5zi70pqi";
+ rev = "v0.1.5";
+ sha256 = "0nlph4rmavwsndf94hisdikh3qhhkyyh97cc39mvbqzrqrc6lbx3";
};
kemal = {
owner = "kemalcr";
repo = "kemal";
- rev = "v0.27.0";
- sha256 = "01p5fkm6q9k6390dhhw3dwwzlxhxafykknkkcayv1k4ynn126hi7";
+ rev = "v1.0.0";
+ sha256 = "0yy6mkqyxlgdi6svj206iprw3njrxw61y2s2wwz78yz7j6sly1wf";
};
kilt = {
owner = "jeromegn";
repo = "kilt";
- rev = "v0.4.0";
- sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k";
+ rev = "v0.4.1";
+ sha256 = "1bhmmk4djnysf2fr0020dakn1730a33xzi10c8lg1a343x77rm64";
};
markd = {
owner = "icyleaf";
repo = "markd";
- rev = "620845abb6776d1765d20d86cc0220aa40f89a91";
- sha256 = "1nq1ddmd2kgnl8vrk0y65lqhy145740a3s68kn0advm2xx8rbhmy";
+ rev = "v0.4.0";
+ sha256 = "0zi39ik7zqnidysafwn6icpr0gdb6z40v63bx5hablarpf2r9637";
};
radix = {
owner = "luislavena";
repo = "radix";
- rev = "v0.3.9";
- sha256 = "19pksfr7ddc31hvikb433jg0zav1ar93k6zmsgaf3vsrjnvia3ix";
- };
- string_inflection = {
- owner = "mosop";
- repo = "string_inflection";
- rev = "v0.2.1";
- sha256 = "10vkr28h7n53ijjv57ldxhh473086qg313lzs55a7wsh0zgc104m";
- };
- time_format = {
- owner = "vladfaust";
- repo = "time_format.cr";
- rev = "v0.1.1";
- sha256 = "0mmssnabf476i07sajm7s3rlvfcav4lkh0n8g12rybxr6c9f683v";
- };
- tree_template = {
- owner = "gdotdesign";
- repo = "tree_template";
- rev = "7e24c92208cc99938f3fbd8f5fecda22bcbe3cc3";
- sha256 = "0ixscq7nqlp83x976d41kq83a5gw9kkk7lnxhlsc91000hm5h3wq";
+ rev = "v0.4.1";
+ sha256 = "1l08cydkdidq9yyil1wl240hvk41iycv04jrg6nx5mkvzw4z1bzg";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix
index dc805f7e61..008d2cd6d0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix
@@ -1,9 +1,9 @@
import ./generic.nix {
major_version = "4";
minor_version = "13";
- patch_version = "0-alpha1";
+ patch_version = "0-alpha2";
src = fetchTarball {
- url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha1.tar.xz";
- sha256 = "071k12q8m2w9bcwvfclyc46pwd9r49v6av36fhjdlqq29niyq915";
+ url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha2.tar.xz";
+ sha256 = "0krb0254i6ihbymjn6mwgzcfrzsvpk9hbagl0agm6wml21zpcsif";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
index bf85fd3533..0f19b19b60 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
@@ -11,8 +11,8 @@
let
major = "11";
minor = "0";
- update = "11";
- build = "9";
+ update = "12";
+ build = "7";
openjdk = stdenv.mkDerivation rec {
pname = "openjdk" + lib.optionalString headless "-headless";
@@ -22,7 +22,7 @@ let
owner = "openjdk";
repo = "jdk${major}u";
rev = "jdk-${version}";
- sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx";
+ sha256 = "0s8g6gj5vhm7hbp05cqaxasjrkwr41fm634qim8q6slklm4pkkli";
};
nativeBuildInputs = [ pkg-config autoconf unzip ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix
index 0feaabc92e..0f617d0f66 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.117";
src = fetchurl {
- url = "www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip";
+ url = "http://www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip";
sha256 = "1hwily4cfays59qm7qd1ax48i7cpbxhs5l9mfpyn7m2lxsfqrl3z";
};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix
index d0bfa5b0b9..74c2503523 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, writeText, asttokens
-, pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx
-, sphinx_rtd_theme, pytestrunner }:
+, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx
+, sphinx_rtd_theme, pytest-runner }:
let
sample-contract = writeText "example.vy" ''
@@ -21,7 +21,7 @@ buildPythonPackage rec {
sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
postPatch = ''
substituteInPlace setup.py \
diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix
index 254afae0cc..0b3dfefcbe 100644
--- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix
+++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "guile-git";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchFromGitLab {
owner = "guile-git";
repo = pname;
rev = "v${version}";
- sha256 = "7Cnuyk9xAPTvz9R44O3lvKDrT6tUQui7YzxIoqhRfPQ=";
+ sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU=";
};
postConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
index c0a11cf9f0..0d2984904d 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, libck, darwin }:
let
- version = "0.21";
+ version = "0.30.0";
bootstrap = stdenv.mkDerivation {
pname = "cyclone-bootstrap";
inherit version;
@@ -10,7 +10,7 @@ let
owner = "justinethier";
repo = "cyclone-bootstrap";
rev = "v${version}";
- sha256 = "0bb3a7x7vzmdyhm4nilm8bcn4q50pwqryggnxz21n16v6xakwjmr";
+ sha256 = "sha256-/zAcCBdJ7YQXsspdjrMca1Oj9SUUFXQKLwZPoZLhHYg=";
};
enableParallelBuilding = true;
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
owner = "justinethier";
repo = "cyclone";
rev = "v${version}";
- sha256 = "1vb4yaprs2bwbxmxx2zkqvysxx8r9qww2q1nqkz8yps3ji715jw7";
+ sha256 = "sha256-a3wiqKlIbnvIhyrI0lyVGciQiM7KSuYH5iUfGFrgOuM=";
};
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix
index 7f4b49c5c3..b4e9ebba79 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix
@@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
- version = "24.0.3";
- sha256 = "KVMISrWNBkk+w37gB4M5TQkgm4odZ+GqLvKN4stzOUI=";
+ version = "24.0.4";
+ sha256 = "OeXXNaVJh5el+V+5ukcNOAgDmkJuGy1lYLpUTd1yxHM=";
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix
index 241caf16d6..8e654444dd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix
@@ -1,20 +1,20 @@
{ lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }:
mkDerivation rec {
-
- # Version 0.2 is meant to be used with the Agda 2.6.1 compiler.
pname = "cubical";
- version = "0.2";
+ version = "0.3pred5030a9";
src = fetchFromGitHub {
repo = pname;
owner = "agda";
- rev = "v${version}";
- sha256 = "07qlp2f189jvzbn3aqvpqk2zxpkmkxhhkjsn62iq436kxqj3z6c2";
+ rev = "d5030a9c89070255fc575add4e9f37b97e6a0c0c";
+ sha256 = "18achbxap4ikydigmz3m3xjfn3i9dw4rn8yih82vrlc01j02nqpi";
};
LC_ALL = "en_US.UTF-8";
+ preConfigure = ''export AGDA_EXEC=agda'';
+
# The cubical library has several `Everything.agda` files, which are
# compiled through the make file they provide.
nativeBuildInputs = [ ghc glibcLocales ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix
index fcc6498960..b0f0682b52 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
- version = "10.5.3";
+ version = "10.6.1";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
- sha256 = "sha256-5sUdjVKm94ucZFn2mGE1CT4O5wWmdDBxEPYXXyzV7jc=";
+ sha256 = "sha256-HQbDI31lx7xGHqEvT9/YtaabapZbSQCucJYM6SCIF58=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix
index ec90d0086c..1cc1927752 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix
@@ -2,19 +2,19 @@
stdenv.mkDerivation rec {
pname = "cmark";
- version = "0.30.0";
+ version = "0.30.1";
src = fetchFromGitHub {
owner = "jgm";
repo = pname;
rev = version;
- sha256 = "sha256-SU31kJL+8wt57bGW5fNeXjXPgPeCXZIknZwDxMXCfdc=";
+ sha256 = "sha256-UjDM2N6gCwO94F1nW3qCP9JX42MYAicAuGTKAXMy1Gg=";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [
- # https://github.com/commonmark/cmark/releases/tag/0.30.0
+ # https://github.com/commonmark/cmark/releases/tag/0.30.1
# recommends distributions dynamically link
"-DCMARK_STATIC=OFF"
];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix
index c413cf277c..1340f5e87a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "fcft";
- version = "2.4.2";
+ version = "2.4.4";
src = fetchzip {
url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
- sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2";
+ sha256 = "0ycc2xy9jhxcxwbfk9d4jdxgf2zsc664phbf859kshb822m3jf57";
};
depsBuildBuild = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix
index 4e28f84bac..7fb93a61a0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
pythonPackages.pytest
];
- checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ];
+ checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ];
preConfigure = ''
mkdir -p build/external/src
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
index 00d3c4a563..2bf843241a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- version = "1.38.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+ version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
- sha256 = "0hjp946x5695srmc6bg2m7iih81jdmhpxn4bjcl80f09v4qsb0nl";
+ sha256 = "1wa7n7mf20fnvxqw093kr7a4c7vilcmx9yl3hicnyfcd663jgqvd";
fetchSubmodules = true;
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
index 7aefaa9d49..b64d4d5053 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
- version = "21.2.3";
+ version = "21.3.0";
src = fetchFromGitHub {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
- sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c";
+ sha256 = "1byliq1c80xfklm3d2d910j1i7s7pfi3i3c6baigag1kzgc0apd0";
};
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix
index 2d439db593..24bec8ec35 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
- version = "1.12.5";
+ version = "1.12.6";
src = fetchFromGitHub {
- sha256 = "sha256-1romJiOIQDlglo/nAJjn1l06dSwDRwG1b49H6js9MB4=";
+ sha256 = "sha256-k5Lt/NCSlBaTGhpR4T3Q4Ih+RR1xKROxz+RNYor7zaQ=";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcprime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcprime/default.nix
new file mode 100644
index 0000000000..4db6ac1b46
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libcprime/default.nix
@@ -0,0 +1,40 @@
+{ mkDerivation
+, lib
+, fetchFromGitLab
+, libnotify
+, cmake
+, ninja
+, qtbase
+, qtconnectivity
+}:
+
+mkDerivation rec {
+ pname = "libcprime";
+ version = "4.2.2";
+
+ src = fetchFromGitLab {
+ owner = "cubocore";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ qtconnectivity
+ libnotify
+ ];
+
+ meta = with lib; {
+ description = "A library for bookmarking, saving recent activites, managing settings of C-Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/libcprime";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix
index 324e675f33..04137eb02e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libkeyfinder/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libkeyfinder";
- version = "2.2.4";
+ version = "2.2.5";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "libkeyfinder";
rev = "v${version}";
- sha256 = "005qq81xfzi1iifvpgkqpizxcrfisafq2r0cjp4fxqh1ih7bfimv";
+ sha256 = "sha256-4jbnsKMGJKUIRfRPymGGgqPgwPyLInc6rLvCXnOcQ5g=";
};
# needed for finding libkeyfinder.so to link it into keyfinder-tests executable
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix
index aa42edfead..ed479ad53e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="libmwaw";
- version="0.3.19";
+ version="0.3.20";
name="${baseName}-${version}";
- hash="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8=";
- url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.19/libmwaw-0.3.19.tar.xz";
- sha256="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8=";
+ hash="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE=";
+ url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.20/libmwaw-0.3.20.tar.xz";
+ sha256="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE=";
};
nativeBuildInputs = [ pkg-config ];
@@ -21,6 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
inherit (s) url sha256;
};
+ enableParallelBuilding = true;
meta = {
inherit (s) version;
description = "Import library for some old mac text documents";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix
index fe02a96a56..99c8b73529 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix
@@ -16,14 +16,14 @@
stdenv.mkDerivation rec {
pname = "libsidplayfp";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "libsidplayfp";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "sha256-lDM4nJozZF8Rt+XWnM41hBAYatZVsmvvQajgHLI9uy0=";
+ sha256 = "sha256-Ut6tXaM97R8Y5D2dV/xPvxVzS6Ep6fOKAujtRNKoQCc=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtgvoip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtgvoip/default.nix
deleted file mode 100644
index 3c10220fff..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/libtgvoip/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch
-, pkg-config, autoreconfHook
-, openssl, libopus, alsa-lib, libpulseaudio
-}:
-
-with lib;
-
-stdenv.mkDerivation rec {
- pname = "libtgvoip";
- version = "unstable-2021-07-13";
-
- src = fetchFromGitHub {
- owner = "telegramdesktop";
- repo = "libtgvoip";
- rev = "f321e7c8cc086bac6ae06fa0934aac7d9833a310";
- sha256 = "1gk5nsqhbnn1cdh83b70qr3d3v2c1bncylvgn77vvj8vnyjlmnfq";
- };
-
- # To fix the build without external webrtc:
- patches = [
- (fetchpatch {
- # Use methods from updated webrtc.
- url = "https://github.com/telegramdesktop/libtgvoip/commit/13a5fcb16b04472d808ce122abd695dbf5d206cd.patch";
- sha256 = "0wapqvml3yyv5dlp2q8iih5rfvfnkngll69krhnw5xsdjy22sp7r";
- revert = true;
- })
- (fetchpatch {
- # Allow working with external webrtc.
- url = "https://github.com/telegramdesktop/libtgvoip/commit/6e82b6e45664c1f80b9039256c99bebc76d34672.patch";
- sha256 = "0m87ixja70vnm80a9z4gxk0yl7n64y59smczxb88lxnj6kdgih7x";
- revert = true;
- })
- ];
-
- outputs = [ "out" "dev" ];
-
- nativeBuildInputs = [ pkg-config autoreconfHook ];
- buildInputs = [ openssl libopus alsa-lib libpulseaudio ];
- enableParallelBuilding = true;
-
- meta = {
- description = "VoIP library for Telegram clients";
- license = licenses.unlicense;
- platforms = platforms.linux;
- homepage = "https://github.com/telegramdesktop/libtgvoip";
- maintainers = with maintainers; [ ilya-fedin ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix
index ce9a72f00c..dfeaeed8ca 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "libxlsxwriter";
- version = "1.0.8";
+ version = "1.0.9";
src = fetchFromGitHub {
owner = "jmcnamara";
repo = "libxlsxwriter";
rev = "RELEASE_${version}";
- sha256 = "1z9bkg0pfkzxbpj2rys4mx9wmcxyjjqsg0nbiaabsg455q00plki";
+ sha256 = "sha256-6MMQr0ynMmfZj+RFoKtLB/f1nTBfn9tcYpzyUwnfB3M=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix
index 5a5257168e..1193119999 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix
@@ -1,44 +1,46 @@
-{ lib, stdenv, fetchFromGitHub, catch, cmake
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, gtest
+, fetchurl
+, pkg-config
}:
-let
- nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform;
-in
stdenv.mkDerivation rec {
pname = "microsoft_gsl";
- version = "2.1.0";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "GSL";
rev = "v${version}";
- sha256 = "09f08lxqm00152bx9yrizlgabzpzxlpbv06h00z4w78yxywgxlgx";
+ sha256 = "sha256-gIpyuNlp3mvR8r1Azs2r76ElEodykRLGAwMN4BDJez0=";
};
- # build phase just runs the unit tests, so skip it if
- # we're doing a cross build
- nativeBuildInputs = [ catch cmake ];
- buildPhase = if nativeBuild then "make" else "true";
+ patches = [
+ # Search for GoogleTest via pkg-config first, ref: https://github.com/NixOS/nixpkgs/pull/130525
+ (fetchurl {
+ url = "https://github.com/microsoft/GSL/commit/f5cf01083baf7e8dc8318db3648bc6098dc32d67.patch";
+ sha256 = "sha256-uouv35crtly8kYhKyvMyZkqwTKt1jXC6dZjw4sQ6uv0=";
+ })
+ ];
- # https://github.com/microsoft/GSL/issues/806
- cmakeFlags = lib.optionals stdenv.cc.isGNU
- [ "-DCMAKE_CXX_FLAGS=-Wno-catch-value" ];
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ gtest ];
- installPhase = ''
- mkdir -p $out/include
- mv ../include/ $out/
- '';
+ doCheck = true;
meta = with lib; {
description = "C++ Core Guideline support library";
longDescription = ''
- The Guideline Support Library (GSL) contains functions and types that are suggested for
- use by the C++ Core Guidelines maintained by the Standard C++ Foundation.
- This package contains Microsoft's implementation of GSL.
+ The Guideline Support Library (GSL) contains functions and types that are suggested for
+ use by the C++ Core Guidelines maintained by the Standard C++ Foundation.
+ This package contains Microsoft's implementation of GSL.
'';
- homepage = "https://github.com/Microsoft/GSL";
- license = licenses.mit;
- platforms = platforms.all;
+ homepage = "https://github.com/Microsoft/GSL";
+ license = licenses.mit;
+ platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
index 5f32216737..3fed43d2d0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
@@ -48,7 +48,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
- version = "0.3.31";
+ version = "0.3.32";
outputs = [
"out"
@@ -66,7 +66,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
- sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79";
+ sha256 = "0f5hkypiy1qjqj3frzz128668hzbi0fqmj0j21z7rp51y62dapnp";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
index 5cfca8d80c..5d8688cfdc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -125,6 +125,12 @@ let
url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch";
sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2";
})
+ # Fix invisible fonts with glibc 2.33: https://github.com/NixOS/nixpkgs/issues/131074
+ (fetchpatch {
+ url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-%231904652.patch";
+ name = "qtwebengine-everywhere-src-5.15.5-_1904652.patch";
+ sha256 = "01q7hagq0ysii1jnrh5adm97vdm9cis592xr6im7accyw6hgcn7b";
+ })
] ++ optionals stdenv.isDarwin [
./qtwebengine-darwin-no-platform-check.patch
./qtwebengine-mac-dont-set-dsymutil-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix
index bd406d6324..67826f07a4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix
@@ -19,10 +19,11 @@ rustPlatform.buildRustPackage rec {
'';
postInstall = ''
- mkdir $out/lib/tezos-rust-libs
cp -r rustc-bls12-381/include $out/include
- cp $out/lib/librustc_bls12_381.a $out/lib/tezos-rust-libs
- cp $out/lib/librustzcash.a $out/lib/tezos-rust-libs
+ cp -r librustzcash/include $out
+ cp -r $out/lib $out/tmp
+ mkdir $out/lib/tezos-rust-libs
+ mv $out/tmp/ $out/lib/tezos-rust-libs/
'';
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix
index c676f8f017..c2a8ae0337 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tidyp/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "tidyp";
version = "1.04";
- src = fetchFromGitHub {
- owner = "petdance";
- repo = "tidyp";
- rev = version;
- sha256 = "0jslskziwzk4hb6i640fvpnbv2zxrvim6pdx2gwx5wyc64aviskc";
+ src = fetchurl {
+ # downloads from a legacy GitHub download page from ~11 years ago
+ # project does not work with autoconf anymore and the configure script cannot be generated from the source download
+ url = "https://github.com/downloads/petdance/tidyp/${pname}-${version}.tar.gz";
+ sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10";
};
hardeningDisable = [ "format" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
index 3b6362f739..37d82b0b4b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix
@@ -10,13 +10,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "vapoursynth";
- version = "R53";
+ version = "R54";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
- sha256 = "0qcsfkpkry0cmvi60khjwvfz4fqhy23nqmn4pb9qrwll26sn9dcr";
+ sha256 = "01jym2rq28j0g792yagk9dvm411gwmk6qgj9rgrg7ckpxmw27w2s";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 40f51d6f48..563c13b26f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -63,7 +63,7 @@ assert enableGeoLocation -> geoclue2 != null;
stdenv.mkDerivation rec {
pname = "webkitgtk";
- version = "2.32.1";
+ version = "2.32.3";
outputs = [ "out" "dev" ];
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
- sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k";
+ sha256 = "sha256-wfSW9axlTv5M72L71PL77u8mWgfF50GeXSkAv+6lLLw=";
};
patches = lib.optionals stdenv.isLinux [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix
index 735cc278de..5340306de7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/xlibs-wrapper/default.nix
@@ -11,9 +11,9 @@ stdenv.mkDerivation {
propagatedBuildInputs = packages;
preferLocalBuild = true;
-} // {
+
# For compatability with XFree86.
- buildClientLibs = true;
+ passthru.buildClientLibs = true;
meta = {
platforms = lib.platforms.unix;
diff --git a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix
index 1d12e0f2b0..a5299f865d 100644
--- a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "h3";
- version = "3.7.1";
+ version = "3.7.2";
src = fetchFromGitHub {
owner = "uber";
repo = "h3";
rev = "v${version}";
- sha256 = "1ccyzbvbacf0bl9av4yp15zmhiqr3679nnbab11yrhxm9csyal16";
+ sha256 = "sha256-MvWqQraTnab6EuDx4V0v8EvrFWHT95f2EHTL2p2kei8=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix
index 4d039770ce..d3603266be 100644
--- a/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix
+++ b/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix
@@ -43,7 +43,7 @@ python27Packages.buildPythonApplication {
nativeBuildInputs = [ installShellFiles ];
- propagatedBuildInputs = [ deps.oildev python27Packages.ConfigArgParse ];
+ propagatedBuildInputs = [ deps.oildev python27Packages.configargparse ];
patchPhase = ''
for file in resholve; do
diff --git a/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix b/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix
index 17b4e2fb3f..ce44b7dd93 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/mobile/gomobile/default.nix
@@ -3,21 +3,20 @@
, xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs
, androidPkgs ? androidenv.composeAndroidPackages {
includeNDK = true;
- ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken.
+ ndkVersion = "22.1.7171670";
} }:
buildGoModule {
pname = "gomobile";
- version = "unstable-2020-06-22";
+ version = "unstable-2021-06-14";
- vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94";
+ vendorSha256 = "1irgkgv72rakg7snk1bnp10ibr64ykz9l40s59l4fnl63zsh12a0";
src = fetchgit {
- # WARNING: Next commit removes support for ARM 32 bit builds for iOS
- rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5";
+ rev = "7c8f154d100840bc5828285bb390bbae1cb5a98c";
name = "gomobile";
url = "https://go.googlesource.com/mobile";
- sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm";
+ sha256 = "1w9mra1mqf60iafp0ywvja5196fjsjyfhvz4yizqq4qkyll5qmj1";
};
subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ];
@@ -25,8 +24,6 @@ buildGoModule {
# Fails with: go: cannot find GOROOT directory
doCheck = false;
- patches = [ ./resolve-nix-android-sdk.patch ];
-
nativeBuildInputs = [ makeWrapper ]
++ lib.optionals stdenv.isDarwin [ xcodeWrapper ];
@@ -48,8 +45,8 @@ buildGoModule {
wrapProgram $out/bin/gomobile \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \
--prefix PATH : "${androidPkgs.androidsdk}/bin" \
- --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \
- --set GOPATH $out
+ --set ANDROID_NDK_HOME "${androidPkgs.androidsdk}/libexec/android-sdk/ndk-bundle" \
+ --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch b/third_party/nixpkgs/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch
deleted file mode 100644
index cc143e3a44..0000000000
--- a/third_party/nixpkgs/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go
-index 3b01adc..76216fa 100644
---- a/cmd/gomobile/bind_androidapp.go
-+++ b/cmd/gomobile/bind_androidapp.go
-@@ -372,6 +372,10 @@ func androidAPIPath() (string, error) {
- var apiVer int
- for _, fi := range fis {
- name := fi.Name()
-+ // Resolve symlinked directories (this is how the Nix Android SDK package is built)
-+ if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil {
-+ fi = fi2
-+ }
- if !fi.IsDir() || !strings.HasPrefix(name, "android-") {
- continue
- }
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
index 7e17928d7d..1bf813952e 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
+++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
@@ -178,6 +178,7 @@
, "np"
, "npm"
, "npm-check-updates"
+, "npm-merge-driver"
, {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
, "ocaml-language-server"
, "parcel-bundler"
@@ -226,6 +227,7 @@
, "stf"
, "stylelint"
, "svelte-language-server"
+, "svelte-check"
, "svgo"
, "swagger"
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
index 1f75999141..8c97268089 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
@@ -310,13 +310,13 @@ let
sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20";
};
};
- "@babel/cli-7.14.5" = {
+ "@babel/cli-7.14.8" = {
name = "_at_babel_slash_cli";
packageName = "@babel/cli";
- version = "7.14.5";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.5.tgz";
- sha512 = "poegjhRvXHWO0EAsnYajwYZuqcz7gyfxwfaecUESxDujrqOivf3zrjFbub8IJkrqEaz3fvJWh001EzxBub54fg==";
+ url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.8.tgz";
+ sha512 = "lcy6Lymft9Rpfqmrqdd4oTDdUx9ZwaAhAfywVrHG4771Pa6PPT0danJ1kDHBXYqh4HHSmIdA+nlmfxfxSDPtBg==";
};
};
"@babel/code-frame-7.10.4" = {
@@ -364,13 +364,13 @@ let
sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==";
};
};
- "@babel/core-7.14.6" = {
+ "@babel/core-7.14.8" = {
name = "_at_babel_slash_core";
packageName = "@babel/core";
- version = "7.14.6";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz";
- sha512 = "gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==";
+ url = "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz";
+ sha512 = "/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==";
};
};
"@babel/core-7.9.0" = {
@@ -382,13 +382,13 @@ let
sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==";
};
};
- "@babel/generator-7.14.5" = {
+ "@babel/generator-7.14.8" = {
name = "_at_babel_slash_generator";
packageName = "@babel/generator";
- version = "7.14.5";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz";
- sha512 = "y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==";
+ url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz";
+ sha512 = "cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==";
};
};
"@babel/helper-annotate-as-pure-7.14.5" = {
@@ -418,13 +418,13 @@ let
sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==";
};
};
- "@babel/helper-create-class-features-plugin-7.14.6" = {
+ "@babel/helper-create-class-features-plugin-7.14.8" = {
name = "_at_babel_slash_helper-create-class-features-plugin";
packageName = "@babel/helper-create-class-features-plugin";
- version = "7.14.6";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz";
- sha512 = "Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==";
+ url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz";
+ sha512 = "bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==";
};
};
"@babel/helper-create-regexp-features-plugin-7.14.5" = {
@@ -499,13 +499,13 @@ let
sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==";
};
};
- "@babel/helper-module-transforms-7.14.5" = {
+ "@babel/helper-module-transforms-7.14.8" = {
name = "_at_babel_slash_helper-module-transforms";
packageName = "@babel/helper-module-transforms";
- version = "7.14.5";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz";
- sha512 = "iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==";
+ url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz";
+ sha512 = "RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==";
};
};
"@babel/helper-optimise-call-expression-7.14.5" = {
@@ -553,13 +553,13 @@ let
sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==";
};
};
- "@babel/helper-simple-access-7.14.5" = {
+ "@babel/helper-simple-access-7.14.8" = {
name = "_at_babel_slash_helper-simple-access";
packageName = "@babel/helper-simple-access";
- version = "7.14.5";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz";
- sha512 = "nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==";
+ url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz";
+ sha512 = "TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==";
};
};
"@babel/helper-skip-transparent-expression-wrappers-7.14.5" = {
@@ -580,13 +580,13 @@ let
sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==";
};
};
- "@babel/helper-validator-identifier-7.14.5" = {
+ "@babel/helper-validator-identifier-7.14.8" = {
name = "_at_babel_slash_helper-validator-identifier";
packageName = "@babel/helper-validator-identifier";
- version = "7.14.5";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz";
- sha512 = "5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==";
+ url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz";
+ sha512 = "ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==";
};
};
"@babel/helper-validator-option-7.14.5" = {
@@ -607,13 +607,13 @@ let
sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==";
};
};
- "@babel/helpers-7.14.6" = {
+ "@babel/helpers-7.14.8" = {
name = "_at_babel_slash_helpers";
packageName = "@babel/helpers";
- version = "7.14.6";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz";
- sha512 = "yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==";
+ url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz";
+ sha512 = "ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==";
};
};
"@babel/highlight-7.14.5" = {
@@ -634,13 +634,13 @@ let
sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==";
};
};
- "@babel/parser-7.14.7" = {
+ "@babel/parser-7.14.8" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
- version = "7.14.7";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz";
- sha512 = "X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==";
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz";
+ sha512 = "syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==";
};
};
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = {
@@ -1399,13 +1399,13 @@ let
sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg==";
};
};
- "@babel/preset-env-7.14.7" = {
+ "@babel/preset-env-7.14.8" = {
name = "_at_babel_slash_preset-env";
packageName = "@babel/preset-env";
- version = "7.14.7";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.7.tgz";
- sha512 = "itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA==";
+ url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz";
+ sha512 = "a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg==";
};
};
"@babel/preset-flow-7.14.5" = {
@@ -1489,13 +1489,13 @@ let
sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==";
};
};
- "@babel/runtime-7.14.6" = {
+ "@babel/runtime-7.14.8" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
- version = "7.14.6";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz";
- sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==";
+ url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz";
+ sha512 = "twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==";
};
};
"@babel/runtime-7.9.0" = {
@@ -1507,22 +1507,22 @@ let
sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA==";
};
};
- "@babel/runtime-corejs3-7.14.7" = {
+ "@babel/runtime-corejs3-7.14.8" = {
name = "_at_babel_slash_runtime-corejs3";
packageName = "@babel/runtime-corejs3";
- version = "7.14.7";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz";
- sha512 = "Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA==";
+ url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz";
+ sha512 = "4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w==";
};
};
- "@babel/standalone-7.14.7" = {
+ "@babel/standalone-7.14.8" = {
name = "_at_babel_slash_standalone";
packageName = "@babel/standalone";
- version = "7.14.7";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.7.tgz";
- sha512 = "7RlfMPR4604SbYpj5zvs2ZK587hVhixgU9Pd9Vs8lB8KYtT3U0apXSf0vZXhy8XRh549eUmJOHXhWKTO3ObzOQ==";
+ url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.8.tgz";
+ sha512 = "5Aa1Bhis4oZD23iLJE5CDYHEs1zSC3ejppHE5aim0OWjGCWTa9Oq1PwopK4u1++ao6B6POW/PqNZjOCZNTSx0Q==";
};
};
"@babel/template-7.14.5" = {
@@ -1534,13 +1534,13 @@ let
sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==";
};
};
- "@babel/traverse-7.14.7" = {
+ "@babel/traverse-7.14.8" = {
name = "_at_babel_slash_traverse";
packageName = "@babel/traverse";
- version = "7.14.7";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz";
- sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==";
+ url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz";
+ sha512 = "kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==";
};
};
"@babel/types-7.13.12" = {
@@ -1552,13 +1552,13 @@ let
sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA==";
};
};
- "@babel/types-7.14.5" = {
+ "@babel/types-7.14.8" = {
name = "_at_babel_slash_types";
packageName = "@babel/types";
- version = "7.14.5";
+ version = "7.14.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz";
- sha512 = "M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==";
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz";
+ sha512 = "iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==";
};
};
"@braintree/sanitize-url-3.1.0" = {
@@ -2497,13 +2497,13 @@ let
sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw==";
};
};
- "@google-cloud/pubsub-2.16.0" = {
+ "@google-cloud/pubsub-2.16.1" = {
name = "_at_google-cloud_slash_pubsub";
packageName = "@google-cloud/pubsub";
- version = "2.16.0";
+ version = "2.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.0.tgz";
- sha512 = "1cZveyznm9qHXzRqlbS3GLeDiaFp8JVN6Urkrt5hgJGWP/IY9kxuJ0ZCnCeZE4x9O/+a5hWgKaQtBKseJYw//Q==";
+ url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.1.tgz";
+ sha512 = "+uO7r9uRfD/x0BzBI67clbIu0VIdqYLZ5NINuGEsMiAXIGWQWmceuLMixMEb/JOxeaqKygH1mL2rshkDisUmGg==";
};
};
"@graphql-cli/common-4.1.0" = {
@@ -4171,13 +4171,13 @@ let
sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
};
};
- "@netlify/build-15.11.5" = {
+ "@netlify/build-16.1.0" = {
name = "_at_netlify_slash_build";
packageName = "@netlify/build";
- version = "15.11.5";
+ version = "16.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.5.tgz";
- sha512 = "qsL1bvVAa5ZPIkYxo1Z4vdOcq8sDxQhyKjDqPAEasLqfX3ZTABctze3WdD6WmpyR9wzQEJLpCy1s3ncTDeiU0w==";
+ url = "https://registry.npmjs.org/@netlify/build/-/build-16.1.0.tgz";
+ sha512 = "FEPgiR2IoEC7fwCkAguMdWbiWwdAr6Zh1+mEFlgqTPAQDE6j/ji3elD8kuXwtdHHhC8U28YYOTZL6fCodlvRAw==";
};
};
"@netlify/cache-utils-1.0.7" = {
@@ -4189,13 +4189,13 @@ let
sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA==";
};
};
- "@netlify/config-12.6.0" = {
+ "@netlify/config-13.0.0" = {
name = "_at_netlify_slash_config";
packageName = "@netlify/config";
- version = "12.6.0";
+ version = "13.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/config/-/config-12.6.0.tgz";
- sha512 = "L+ZmoGsO2Gql+T6+147G7ZctcXgViuh8Q1ReADICM4xdaYVmipRFC+ICU4iJ8I9UQnc0M7qM0ZHzKuhTdPJfiA==";
+ url = "https://registry.npmjs.org/@netlify/config/-/config-13.0.0.tgz";
+ sha512 = "d7NNG3lbvZN/w9eCRdlFKBY21Vpjxlwis08v5NJjkZpNTuuAuemNFrhZv2y5zmy33TM+zTrkaoEAk6vJ96R5cQ==";
};
};
"@netlify/esbuild-0.13.6" = {
@@ -4234,6 +4234,123 @@ let
sha512 = "bvlvFAB9VU3wTYYEEUinsOeRFxZ/MmetffzHehSMEyP00kXakvrySq4XbC6G8u3wCDln34eOjKDt8uPYoqfuNQ==";
};
};
+ "@netlify/local-functions-proxy-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy";
+ packageName = "@netlify/local-functions-proxy";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-0.1.0.tgz";
+ sha512 = "n4Y3LE3I6MrSCCLqLjY4VOVAi/uXdU35Kswd0eK0060Fla5huj+rKSnzu8GIERrvuRJMPi/AY7WFxB5mkFS8qw==";
+ };
+ };
+ "@netlify/local-functions-proxy-darwin-arm64-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-darwin-arm64";
+ packageName = "@netlify/local-functions-proxy-darwin-arm64";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-0.1.0.tgz";
+ sha512 = "QsVber2F4H2zS2Oi31y226zeLkhWQrjy+9lYV4bsU0lZB9wHqrLGQNlOabqs6MWUQmWMqcDHLv31XMFpfhndnw==";
+ };
+ };
+ "@netlify/local-functions-proxy-darwin-x64-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-darwin-x64";
+ packageName = "@netlify/local-functions-proxy-darwin-x64";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-0.1.0.tgz";
+ sha512 = "7Wb3ooicvRzHMErMWF+L+QG+rVy7iBEQ7b2GOzywL/VmeajatVk/D16v5b9adM2sX0KX1dyj3O9x2QLkDW2G7w==";
+ };
+ };
+ "@netlify/local-functions-proxy-freebsd-arm64-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-freebsd-arm64";
+ packageName = "@netlify/local-functions-proxy-freebsd-arm64";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-0.1.0.tgz";
+ sha512 = "Keno1p1rvp5fiGEDZDm0fIOZTbcE1QwyqF5hgVSpD0bxitSAFOaXZwhcyo80x8qcMlBqQp9zWEJWu4zN1UiZMA==";
+ };
+ };
+ "@netlify/local-functions-proxy-freebsd-x64-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-freebsd-x64";
+ packageName = "@netlify/local-functions-proxy-freebsd-x64";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-0.1.0.tgz";
+ sha512 = "kyEjE/aW/k7yD1+Oy28LLZjg6W8091HPCqUHzCk5GzT46zvR61vTPfeAEQwNaEL2uFHPJ3SauDNUZ1+U+FNlHA==";
+ };
+ };
+ "@netlify/local-functions-proxy-linux-arm-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-linux-arm";
+ packageName = "@netlify/local-functions-proxy-linux-arm";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-0.1.0.tgz";
+ sha512 = "Un4RIA3xaiWT1njCMgYJsYc1etksFuARz8suHtcoKadsEJ1XICh6OzJoCO3AdHCN1kMQlo3cVC/sHoAB2EyEqw==";
+ };
+ };
+ "@netlify/local-functions-proxy-linux-arm64-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-linux-arm64";
+ packageName = "@netlify/local-functions-proxy-linux-arm64";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-0.1.0.tgz";
+ sha512 = "ZDdy+5fgpHxFqpKghtJuMyyQ5tKWV+LJm6t8tKlXkAgC1n1GuqeWNP0JqHV8DSSShFHRaRNoBVpLoXJbtNIorQ==";
+ };
+ };
+ "@netlify/local-functions-proxy-linux-ia32-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-linux-ia32";
+ packageName = "@netlify/local-functions-proxy-linux-ia32";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-0.1.0.tgz";
+ sha512 = "vR1qlu341JKN91t0TPsYt2xC+ug8Bjp/WCqMtARmFT9jaL8NBTm6kiUh89QcGILYCo2hMNcYb9eih8y5D4N5Iw==";
+ };
+ };
+ "@netlify/local-functions-proxy-linux-ppc64-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-linux-ppc64";
+ packageName = "@netlify/local-functions-proxy-linux-ppc64";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-0.1.0.tgz";
+ sha512 = "pcAPe+PzFkNrHpICvrIHHfxk5KNIVo3GgZKoI67NXECCtVel48aXitvlcOwsodrejD8ruQkfbvossBQs9Deq8A==";
+ };
+ };
+ "@netlify/local-functions-proxy-linux-x64-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-linux-x64";
+ packageName = "@netlify/local-functions-proxy-linux-x64";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-0.1.0.tgz";
+ sha512 = "sjlMLoKNJRJnq8Esk+GkxEk9CByDNouKdeQ+doiiQhYGRjLhKXZdXbaC137z2tm/vHhI/94Lg7mhCcGygitJpA==";
+ };
+ };
+ "@netlify/local-functions-proxy-openbsd-x64-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-openbsd-x64";
+ packageName = "@netlify/local-functions-proxy-openbsd-x64";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-0.1.0.tgz";
+ sha512 = "Dn9wQfeAU6FvurFo8eJL2scahtVigQyAi6lpV+c4YLD87WUfmiQ/mVgB7dfYB9zMiq5GO/iXbcK6wWjFyAZ6Aw==";
+ };
+ };
+ "@netlify/local-functions-proxy-win32-ia32-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-win32-ia32";
+ packageName = "@netlify/local-functions-proxy-win32-ia32";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-0.1.0.tgz";
+ sha512 = "LRz6UZpgS0UzB5IKgOvBnVNkpBcnzRfT4YBBSBL31fucJ1J2c0zGJIUTqbFdS8eBLOS9Npq2qUT7qlnrgAWyMw==";
+ };
+ };
+ "@netlify/local-functions-proxy-win32-x64-0.1.0" = {
+ name = "_at_netlify_slash_local-functions-proxy-win32-x64";
+ packageName = "@netlify/local-functions-proxy-win32-x64";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-0.1.0.tgz";
+ sha512 = "YYzVpBPsAiup/Jg+kCAi0/EsV80BMF6JkQ3/2JjJhUqRuEG99THA+HwrFpsQOpOnr3niJBY93YrQymnJPgrk3A==";
+ };
+ };
"@netlify/open-api-2.5.0" = {
name = "_at_netlify_slash_open-api";
packageName = "@netlify/open-api";
@@ -4261,13 +4378,13 @@ let
sha512 = "Z2RNrNhO7fsNFmpUQ+eNawgtfHwbGH/4Hji2g+GCRYL7W60kgK5rsWxveky1Nrye45I2OQn/4ZGapKqB1IqTaw==";
};
};
- "@netlify/routing-local-proxy-0.30.2" = {
+ "@netlify/routing-local-proxy-0.31.0" = {
name = "_at_netlify_slash_routing-local-proxy";
packageName = "@netlify/routing-local-proxy";
- version = "0.30.2";
+ version = "0.31.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.2.tgz";
- sha512 = "rQnv383/vFF1x3iKnY/2Q2i7Z7RhugfoVfAIbEJ2bIaWFMQ2YcGMVpwj1w8rK+4MGH5uwvlNNlfE0gGYQOq+4Q==";
+ url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.31.0.tgz";
+ sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A==";
};
};
"@netlify/run-utils-1.0.7" = {
@@ -4639,13 +4756,13 @@ let
sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg==";
};
};
- "@octokit/openapi-types-8.3.0" = {
+ "@octokit/openapi-types-9.1.0" = {
name = "_at_octokit_slash_openapi-types";
packageName = "@octokit/openapi-types";
- version = "8.3.0";
+ version = "9.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.3.0.tgz";
- sha512 = "ZFyQ30tNpoATI7o+Z9MWFUzUgWisB8yduhcky7S4UYsRijgIGSnwUKzPBDGzf/Xkx1DuvUtqzvmuFlDSqPJqmQ==";
+ url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.1.0.tgz";
+ sha512 = "XBP03pG4XuTU+VgeJM1ozRdmZJerMG4tk6wA+raFKycC4qV9jtD2UQroAg9bAcmI3Q0zWvifeDGtPqsFjMzkLg==";
};
};
"@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -4675,13 +4792,13 @@ let
sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==";
};
};
- "@octokit/plugin-rest-endpoint-methods-5.4.1" = {
+ "@octokit/plugin-rest-endpoint-methods-5.5.0" = {
name = "_at_octokit_slash_plugin-rest-endpoint-methods";
packageName = "@octokit/plugin-rest-endpoint-methods";
- version = "5.4.1";
+ version = "5.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.4.1.tgz";
- sha512 = "Nx0g7I5ayAYghsLJP4Q1Ch2W9jYYM0FlWWWZocUro8rNxVwuZXGfFd7Rcqi9XDWepSXjg1WByiNJnZza2hIOvQ==";
+ url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.0.tgz";
+ sha512 = "v4dNoHF8cXNx7C67yQx7oarHs5Wg2IiafWvp/ULkNcCOuXgQdBOkJtwidpYqPiRPUw4uHDkI6Tgfje+nXB+Deg==";
};
};
"@octokit/request-5.6.0" = {
@@ -4702,22 +4819,22 @@ let
sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==";
};
};
- "@octokit/rest-18.6.7" = {
+ "@octokit/rest-18.7.0" = {
name = "_at_octokit_slash_rest";
packageName = "@octokit/rest";
- version = "18.6.7";
+ version = "18.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.7.tgz";
- sha512 = "Kn6WrI2ZvmAztdx+HEaf88RuJn+LK72S8g6OpciE4kbZddAN84fu4fiPGxcEu052WmqKVnA/cnQsbNlrYC6rqQ==";
+ url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.0.tgz";
+ sha512 = "8K8BJFyPFRSfnwu+aSbdjU5w3EtxC33PkDlEi5tyVTYC+t4n7gaqygRg5ajJLCpb/ZzVaXXFJXC9OxQ9TvFRAw==";
};
};
- "@octokit/types-6.19.0" = {
+ "@octokit/types-6.21.0" = {
name = "_at_octokit_slash_types";
packageName = "@octokit/types";
- version = "6.19.0";
+ version = "6.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.0.tgz";
- sha512 = "9wdZFiJfonDyU6DjIgDHxAIn92vdSUBOwAXbO2F9rOFt6DJwuAkyGLu1CvdJPphCbPBoV9iSDMX7y4fu0v6AtA==";
+ url = "https://registry.npmjs.org/@octokit/types/-/types-6.21.0.tgz";
+ sha512 = "VPSxn9uhCoOUMpxCsOAQhf8DgIx+uzFjZRYDiZS5+TvrKaEwBrWkjr/5NmUVvPbW6xdPC2n3yL3XCnoxa4rxvg==";
};
};
"@open-policy-agent/opa-wasm-1.2.0" = {
@@ -5476,13 +5593,13 @@ let
sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
};
};
- "@serverless/components-3.13.4" = {
+ "@serverless/components-3.14.0" = {
name = "_at_serverless_slash_components";
packageName = "@serverless/components";
- version = "3.13.4";
+ version = "3.14.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.4.tgz";
- sha512 = "Qv0hDwj5dG2WaCnVvfzZ4LggMWPfONVtCUWIM7LbCGwVq+K3nnkdql1nJqrfCMkqc3rz2hjxck35ckOPxDiVRQ==";
+ url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.0.tgz";
+ sha512 = "Ssuu+OcyWvisGIMZD4Lr9Uj20Ndgb9a8Z/Jw4VbhFS+grc89uK7vZR3pS9I4LTfTUKH4HUbMJXxDndNEFGgLAA==";
};
};
"@serverless/core-1.1.2" = {
@@ -5557,13 +5674,13 @@ let
sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog==";
};
};
- "@serverless/utils-5.4.0" = {
+ "@serverless/utils-5.6.0" = {
name = "_at_serverless_slash_utils";
packageName = "@serverless/utils";
- version = "5.4.0";
+ version = "5.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.4.0.tgz";
- sha512 = "abEYhQ8Bgh48w/8uzvv8hlfOXsbkvTns3vuMU4THpb0nhbhqL7Y4AWf6z4wJFxcMd0yffkgUQWwSzYHwGJp3kA==";
+ url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.6.0.tgz";
+ sha512 = "R3mb6DlPwrlo49fwQNz3YTQb2XJCxVui+s/olVBSdAh82fi8EbbjgkZkaLKB9ES7lV2MIr3jqrIWjYyGE/2Bgw==";
};
};
"@serverless/utils-china-1.1.4" = {
@@ -7213,6 +7330,15 @@ let
sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ==";
};
};
+ "@types/node-16.4.0" = {
+ name = "_at_types_slash_node";
+ packageName = "@types/node";
+ version = "16.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/node/-/node-16.4.0.tgz";
+ sha512 = "HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg==";
+ };
+ };
"@types/node-6.14.13" = {
name = "_at_types_slash_node";
packageName = "@types/node";
@@ -11254,13 +11380,13 @@ let
sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg==";
};
};
- "aws-sdk-2.949.0" = {
+ "aws-sdk-2.951.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.949.0";
+ version = "2.951.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.949.0.tgz";
- sha512 = "n9vqtsLPmSvJcvYvBLBbI1n4GZokwc/5zgHZD7VxdioLNXo1nHQ3VUi4MiW+3kIN40NUNf+Gc5vpc82yNYCvsw==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.951.0.tgz";
+ sha512 = "YPqhdESUzd4+pSuGJcfMnG1qNVbmZjnmsa85Z9jofR1ilIpuV31onIiFHv8iubM59ETok/+zy3QOmxRSLYzFmQ==";
};
};
"aws-sign2-0.6.0" = {
@@ -14674,13 +14800,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001245" = {
+ "caniuse-lite-1.0.30001246" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001245";
+ version = "1.0.30001246";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz";
- sha512 = "768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz";
+ sha512 = "Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA==";
};
};
"canvas-2.8.0" = {
@@ -17365,13 +17491,13 @@ let
sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
};
};
- "constructs-3.3.98" = {
+ "constructs-3.3.99" = {
name = "constructs";
packageName = "constructs";
- version = "3.3.98";
+ version = "3.3.99";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-3.3.98.tgz";
- sha512 = "VvDuJMqDUb16jB4EsCHthVb74yJcnD/5XWkybYgK5Ieee5o54eyxEzM9jFbZEasysPX4zR05Z/ygEzdlj+QZPg==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-3.3.99.tgz";
+ sha512 = "uX3bZtp6Zn53Utyurp4DrKolIDUuiDddHVTgsQ39KhVRkQ8TRMtl0nyXllysMtu78t8zLo9QygeyQ0QOBy3LHw==";
};
};
"consume-http-header-1.0.0" = {
@@ -18140,13 +18266,13 @@ let
sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
};
};
- "create-gatsby-1.9.0" = {
+ "create-gatsby-1.10.0" = {
name = "create-gatsby";
packageName = "create-gatsby";
- version = "1.9.0";
+ version = "1.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.9.0.tgz";
- sha512 = "KYQnXV2uaZCUt3y4Kkh4hlBGg4LYc6XCEdp99CEfMKOCu34rte5+6c1EZRpphATLqdKIitdFlPp5dJm3knBeMA==";
+ url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.10.0.tgz";
+ sha512 = "EiN8bJepWMN4itheoQ9ul1jNrSWoWy5Cw+kAfF1sN0J7ZWtuYCFfRZX97VRTt6C7bvlHkTw7gew2pUbFS8La+Q==";
};
};
"create-graphback-1.0.1" = {
@@ -21857,13 +21983,13 @@ let
sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==";
};
};
- "duplexify-4.1.1" = {
+ "duplexify-4.1.2" = {
name = "duplexify";
packageName = "duplexify";
- version = "4.1.1";
+ version = "4.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz";
- sha512 = "DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==";
+ url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz";
+ sha512 = "fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==";
};
};
"duration-0.2.2" = {
@@ -22055,13 +22181,13 @@ let
sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ==";
};
};
- "electron-to-chromium-1.3.780" = {
+ "electron-to-chromium-1.3.782" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.780";
+ version = "1.3.782";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz";
- sha512 = "2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz";
+ sha512 = "6AI2se1NqWA1SBf/tlD6tQD/6ZOt+yAhqmrTlh4XZw4/g0Mt3p6JhTQPZxRPxPZiOg0o7ss1EBP/CpYejfnoIA==";
};
};
"electrum-client-git://github.com/janoside/electrum-client" = {
@@ -25000,13 +25126,13 @@ let
sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA==";
};
};
- "file-type-16.5.1" = {
+ "file-type-16.5.2" = {
name = "file-type";
packageName = "file-type";
- version = "16.5.1";
+ version = "16.5.2";
src = fetchurl {
- url = "https://registry.npmjs.org/file-type/-/file-type-16.5.1.tgz";
- sha512 = "Pi1G43smrCy82Q3be3sfKaeS5uHdfj905dP88YqhroG6TYbVY2ljTdDXeXqa6Cn5nOk6znOjWM2uZptA8vH/qQ==";
+ url = "https://registry.npmjs.org/file-type/-/file-type-16.5.2.tgz";
+ sha512 = "lnHRZj2USLF3v4C5ZY7/vQQeoTVA1YV9TtD6UUCr9z5Cd0uyutqxPBJxkXzM6lufPNuSfefq/yFmnSPz0C3wNw==";
};
};
"file-type-3.9.0" = {
@@ -26602,31 +26728,31 @@ let
sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9";
};
};
- "gatsby-core-utils-2.9.0" = {
+ "gatsby-core-utils-2.10.0" = {
name = "gatsby-core-utils";
packageName = "gatsby-core-utils";
- version = "2.9.0";
+ version = "2.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.9.0.tgz";
- sha512 = "LKmkk4B/VnSEYKR9W/C8Lp9lwk/l/qY5jbsoiChc43F67VM667gITWH0noSUdcGzbEsN8xi0Wuc8dMA6BvKkvg==";
+ url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.10.0.tgz";
+ sha512 = "xvVebKSrjHkZQQkeEjuAekCAg17KT2l44d/yn7w2dzBGay244m8hoY8LRtLRdsrSp30ix89QklefuP9frEfhbA==";
};
};
- "gatsby-recipes-0.20.0" = {
+ "gatsby-recipes-0.21.0" = {
name = "gatsby-recipes";
packageName = "gatsby-recipes";
- version = "0.20.0";
+ version = "0.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.20.0.tgz";
- sha512 = "GsQOovAFImV3MtZVTTjv6utMRRo5QDC1+7l3Je3kqHz425J7UcmjMH/ZzHdzIZ1hO2/RUgGoFXAbWgqhipJp2g==";
+ url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.21.0.tgz";
+ sha512 = "oo9ci5G6TiXc5wVnRrTfJhX92ZsjICVa0ldX7aQ/8JR77HelfO3MFfQuIkswla+o0MGcbyxgVoLX45kgzY7aaA==";
};
};
- "gatsby-telemetry-2.9.0" = {
+ "gatsby-telemetry-2.10.0" = {
name = "gatsby-telemetry";
packageName = "gatsby-telemetry";
- version = "2.9.0";
+ version = "2.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.9.0.tgz";
- sha512 = "Ji40by9qHm9Zz2vKIBACT77awt0FpqKES9uT9nLmaqyiOZ/7Hs1dKwMrZ2yCkHNBh6S9RplcgfUQLq2LE4oeaA==";
+ url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.10.0.tgz";
+ sha512 = "uon+KRo6NQqkc6Qk/QTw+RmaxIjFFIK7cSU8XXE3y353il2Tk04Kxct2hMHn8Zdl4TYyKla1T5UIvVV/EfpBcg==";
};
};
"gauge-1.2.7" = {
@@ -33435,13 +33561,13 @@ let
sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw==";
};
};
- "jsii-srcmak-0.1.301" = {
+ "jsii-srcmak-0.1.302" = {
name = "jsii-srcmak";
packageName = "jsii-srcmak";
- version = "0.1.301";
+ version = "0.1.302";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.301.tgz";
- sha512 = "RmUimAPVkk1QflCGjJVUsQsv+W+lD6yZMLpHEHkNEdUvlYSUkZIM2VXjF7LUw7HnS9gFFBftUd6W02OVGbd9Bg==";
+ url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.302.tgz";
+ sha512 = "UsXZ6LGLqP/nUNyq0ey3xOLpNDpkye5HeNAnJCVqw4vsT9o5EX7MHv9ca/JDlt7fWn+cUdo/Bcj5UZJvg+Chfg==";
};
};
"json-bigint-0.2.3" = {
@@ -33750,13 +33876,13 @@ let
sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
};
};
- "json2jsii-0.1.270" = {
+ "json2jsii-0.1.272" = {
name = "json2jsii";
packageName = "json2jsii";
- version = "0.1.270";
+ version = "0.1.272";
src = fetchurl {
- url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.270.tgz";
- sha512 = "blBOb7+GDWTLv6jxye684joWzQyuFM6HT+NsPQPuASkT7pABBt3Xx2wsVm/qMJeg7ITufgSfeh1TnNrFROicMg==";
+ url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.272.tgz";
+ sha512 = "OUZqjQhnRalQmQx3kFM3mG5DQcfEYzmUYBWGdb6QwGLuvwB/eJ2PhXuLEkGF+PhRwOrW5IyEcF8U+O39mh3G5Q==";
};
};
"json3-3.2.6" = {
@@ -34300,13 +34426,13 @@ let
sha512 = "dD2ga5gLcQhsq1yNoQdy1MU4x4z7YnXM5bcG9SdQuiNr5KKuAmXixH1Mggwdah5o7EfholFbcNDPSVA6BIfaug==";
};
};
- "katex-0.13.11" = {
+ "katex-0.13.13" = {
name = "katex";
packageName = "katex";
- version = "0.13.11";
+ version = "0.13.13";
src = fetchurl {
- url = "https://registry.npmjs.org/katex/-/katex-0.13.11.tgz";
- sha512 = "yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw==";
+ url = "https://registry.npmjs.org/katex/-/katex-0.13.13.tgz";
+ sha512 = "cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ==";
};
};
"keep-alive-agent-0.0.1" = {
@@ -35101,13 +35227,13 @@ let
sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==";
};
};
- "lighthouse-logger-1.2.0" = {
+ "lighthouse-logger-1.3.0" = {
name = "lighthouse-logger";
packageName = "lighthouse-logger";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz";
- sha512 = "wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw==";
+ url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz";
+ sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==";
};
};
"lightning-3.3.12" = {
@@ -35137,6 +35263,15 @@ let
sha512 = "z/bfkDEAKyN0HtN7rkiyVlDA3J5L/jxXsE4YuGfQPa8TyPWovyLdo6/aHP0mMy8n+G4tq0g2oKZ/1Z5ONJAVqA==";
};
};
+ "lightning-3.4.0" = {
+ name = "lightning";
+ packageName = "lightning";
+ version = "3.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lightning/-/lightning-3.4.0.tgz";
+ sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw==";
+ };
+ };
"lilconfig-2.0.3" = {
name = "lilconfig";
packageName = "lilconfig";
@@ -35281,6 +35416,15 @@ let
sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA==";
};
};
+ "ln-service-51.10.0" = {
+ name = "ln-service";
+ packageName = "ln-service";
+ version = "51.10.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.0.tgz";
+ sha512 = "k6wGBB6RfyHhMY296MsHhZrVuJSqNsqx3nF3WM5lkKAg+58OdU6bLzqVttpit9uHamc6tssD2GDxNS6gdUzOYQ==";
+ };
+ };
"ln-service-51.8.2" = {
name = "ln-service";
packageName = "ln-service";
@@ -35317,6 +35461,15 @@ let
sha512 = "FMfcEISlboFVz+wLTAJ+FnEIQkoMR7IHcUg4l5JNwsU/UOijM1vTQDFhHVqg5fEQAFboZe3lNd7Rh1uxxqs47Q==";
};
};
+ "ln-sync-0.4.7" = {
+ name = "ln-sync";
+ packageName = "ln-sync";
+ version = "0.4.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.7.tgz";
+ sha512 = "2yqc59OhK0affnkwhgw7iY4x2tKZTb8y8KSWxRHn6cSXL3clUJgXdTNOGr4Jp8j1TkTl0iRVnLSNZlRbtU4vVA==";
+ };
+ };
"ln-telegram-3.2.9" = {
name = "ln-telegram";
packageName = "ln-telegram";
@@ -45265,6 +45418,15 @@ let
sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==";
};
};
+ "peek-readable-3.1.4" = {
+ name = "peek-readable";
+ packageName = "peek-readable";
+ version = "3.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz";
+ sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg==";
+ };
+ };
"peek-readable-4.0.0" = {
name = "peek-readable";
packageName = "peek-readable";
@@ -45940,13 +46102,13 @@ let
sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==";
};
};
- "pnp-webpack-plugin-1.6.4" = {
+ "pnp-webpack-plugin-1.7.0" = {
name = "pnp-webpack-plugin";
packageName = "pnp-webpack-plugin";
- version = "1.6.4";
+ version = "1.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz";
- sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==";
+ url = "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz";
+ sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==";
};
};
"polished-4.1.3" = {
@@ -46058,13 +46220,13 @@ let
sha512 = "/tZY0PXExXXnNhKv3TOvZAOUYRyuqcCbBm2c17YMDK0PlVII3K7/LKdt3ScHL+hhouddjUWi+1sKDf9xXW+8YA==";
};
};
- "postcss-8.3.5" = {
+ "postcss-8.3.6" = {
name = "postcss";
packageName = "postcss";
- version = "8.3.5";
+ version = "8.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz";
- sha512 = "NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==";
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz";
+ sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==";
};
};
"postcss-calc-7.0.5" = {
@@ -51080,13 +51242,13 @@ let
sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==";
};
};
- "resolve-alpn-1.1.2" = {
+ "resolve-alpn-1.2.0" = {
name = "resolve-alpn";
packageName = "resolve-alpn";
- version = "1.1.2";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.1.2.tgz";
- sha512 = "8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA==";
+ url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.0.tgz";
+ sha512 = "e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA==";
};
};
"resolve-cwd-2.0.0" = {
@@ -51584,13 +51746,13 @@ let
sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
};
};
- "rollup-2.53.2" = {
+ "rollup-2.53.3" = {
name = "rollup";
packageName = "rollup";
- version = "2.53.2";
+ version = "2.53.3";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz";
- sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz";
+ sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA==";
};
};
"rollup-plugin-babel-4.4.0" = {
@@ -51953,6 +52115,15 @@ let
sha1 = "182a991208fc1ab5214443eb250fc8f53b4bc9ea";
};
};
+ "sade-1.7.4" = {
+ name = "sade";
+ packageName = "sade";
+ version = "1.7.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sade/-/sade-1.7.4.tgz";
+ sha512 = "y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA==";
+ };
+ };
"safe-buffer-5.0.1" = {
name = "safe-buffer";
packageName = "safe-buffer";
@@ -55202,13 +55373,13 @@ let
sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
};
};
- "sscaff-1.2.21" = {
+ "sscaff-1.2.22" = {
name = "sscaff";
packageName = "sscaff";
- version = "1.2.21";
+ version = "1.2.22";
src = fetchurl {
- url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.21.tgz";
- sha512 = "X9Ei1liwS+LljdRsWz/QbgYK2sByLbDpvLTwVlL8+fGSz9Oh1D85WU3TR8kCCuPKLvfdGWIRimSQWvJ8zh5riw==";
+ url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.22.tgz";
+ sha512 = "aEkcIR+UIro2xsDASNy/K0v7hxGi18jgFshHpGrJ/tfB0GlQHQJR0W9y23mNxfDmFg/lbTaR0BdEsgC0znNEGA==";
};
};
"ssh-config-1.1.6" = {
@@ -56480,6 +56651,15 @@ let
sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa";
};
};
+ "strtok3-6.1.3" = {
+ name = "strtok3";
+ packageName = "strtok3";
+ version = "6.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz";
+ sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA==";
+ };
+ };
"strtok3-6.2.2" = {
name = "strtok3";
packageName = "strtok3";
@@ -58623,6 +58803,15 @@ let
sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q==";
};
};
+ "token-types-3.1.0" = {
+ name = "token-types";
+ packageName = "token-types";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/token-types/-/token-types-3.1.0.tgz";
+ sha512 = "WhoeIW7UTn7NC7L0t/4x3vU/YYSS1oeUxYgiGXQLd82Kaf1qtlxOex3ETY0+o2QuRgAdyursMlUhQBKDCfMUkQ==";
+ };
+ };
"toml-2.3.6" = {
name = "toml";
packageName = "toml";
@@ -66429,7 +66618,7 @@ in
sources."@hyperswarm/hypersign-2.1.1"
sources."@hyperswarm/network-2.1.0"
sources."@leichtgewicht/ip-codec-2.0.3"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."abstract-extension-3.1.1"
sources."abstract-leveldown-6.2.3"
sources."ansi-colors-3.2.3"
@@ -66743,7 +66932,7 @@ in
sources."pump-3.0.0"
(sources."pumpify-2.0.1" // {
dependencies = [
- sources."duplexify-4.1.1"
+ sources."duplexify-4.1.2"
sources."readable-stream-3.6.0"
];
})
@@ -66934,7 +67123,7 @@ in
];
})
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -66959,7 +67148,7 @@ in
sources."@types/eslint-scope-3.7.1"
sources."@types/estree-0.0.49"
sources."@types/json-schema-7.0.8"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/parse-json-4.0.0"
sources."@webassemblyjs/ast-1.11.1"
sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
@@ -66998,7 +67187,7 @@ in
sources."buffer-5.7.1"
sources."buffer-from-1.1.1"
sources."callsites-3.1.0"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."chalk-3.0.0"
sources."chardet-0.7.0"
sources."chokidar-3.5.2"
@@ -67025,7 +67214,7 @@ in
sources."cross-spawn-7.0.3"
sources."deepmerge-4.2.2"
sources."defaults-1.0.3"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
(sources."enhanced-resolve-5.8.2" // {
@@ -67273,12 +67462,12 @@ in
sources."@apollographql/graphql-upload-8-fork-8.1.3"
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- sources."@babel/core-7.14.6"
- sources."@babel/generator-7.14.5"
+ sources."@babel/core-7.14.8"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-annotate-as-pure-7.14.5"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5"
sources."@babel/helper-compilation-targets-7.14.5"
- sources."@babel/helper-create-class-features-plugin-7.14.6"
+ sources."@babel/helper-create-class-features-plugin-7.14.8"
sources."@babel/helper-create-regexp-features-plugin-7.14.5"
sources."@babel/helper-define-polyfill-provider-0.2.3"
sources."@babel/helper-explode-assignable-expression-7.14.5"
@@ -67287,20 +67476,20 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-plugin-utils-7.14.5"
sources."@babel/helper-remap-async-to-generator-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
sources."@babel/helper-wrap-function-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5"
sources."@babel/plugin-proposal-async-generator-functions-7.14.7"
sources."@babel/plugin-proposal-class-properties-7.14.5"
@@ -67367,7 +67556,7 @@ in
sources."@babel/plugin-transform-typescript-7.14.6"
sources."@babel/plugin-transform-unicode-escapes-7.14.5"
sources."@babel/plugin-transform-unicode-regex-7.14.5"
- sources."@babel/preset-env-7.14.7"
+ sources."@babel/preset-env-7.14.8"
sources."@babel/preset-flow-7.14.5"
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-typescript-7.14.5"
@@ -67378,10 +67567,10 @@ in
sources."semver-5.7.1"
];
})
- sources."@babel/runtime-7.14.6"
+ sources."@babel/runtime-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@hapi/address-2.1.4"
sources."@hapi/bourne-1.3.2"
sources."@hapi/hoek-8.5.1"
@@ -67434,7 +67623,7 @@ in
sources."@types/long-4.0.1"
sources."@types/mime-1.3.2"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/normalize-package-data-2.4.1"
sources."@types/qs-6.9.7"
sources."@types/range-parser-1.2.4"
@@ -67577,7 +67766,7 @@ in
sources."call-bind-1.0.2"
sources."call-me-maybe-1.0.1"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."caseless-0.12.0"
sources."caw-2.0.1"
sources."chalk-2.4.2"
@@ -67705,7 +67894,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
@@ -68598,12 +68787,12 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/generator-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/generator-7.14.8"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/types-7.14.5"
+ sources."@babel/types-7.14.8"
sources."@webassemblyjs/ast-1.11.1"
sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
sources."@webassemblyjs/helper-api-error-1.11.1"
@@ -68679,12 +68868,12 @@ in
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- (sources."@babel/core-7.14.6" // {
+ (sources."@babel/core-7.14.8" // {
dependencies = [
sources."source-map-0.5.7"
];
})
- (sources."@babel/generator-7.14.5" // {
+ (sources."@babel/generator-7.14.8" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -68695,19 +68884,19 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."JSV-4.0.2"
sources."ansi-styles-3.2.1"
sources."array-unique-0.3.2"
@@ -68715,7 +68904,7 @@ in
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."browserslist-4.16.6"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
@@ -68726,7 +68915,7 @@ in
sources."convert-source-map-1.8.0"
sources."debug-4.3.2"
sources."ejs-3.1.6"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."ensure-posix-path-1.1.1"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
@@ -68820,7 +69009,7 @@ in
dependencies = [
sources."@types/glob-7.1.4"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."chromium-pickle-js-0.2.0"
@@ -68855,9 +69044,9 @@ in
};
dependencies = [
sources."browserslist-4.16.6"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."colorette-1.2.2"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."escalade-3.1.1"
sources."fraction.js-4.1.1"
sources."node-releases-1.1.73"
@@ -68884,14 +69073,14 @@ in
};
dependencies = [
sources."@tootallnate/once-1.1.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/yauzl-2.9.2"
sources."agent-base-6.0.2"
sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."ast-types-0.13.4"
- (sources."aws-sdk-2.949.0" // {
+ (sources."aws-sdk-2.951.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -69095,10 +69284,10 @@ in
balanceofsatoshis = nodeEnv.buildNodePackage {
name = "balanceofsatoshis";
packageName = "balanceofsatoshis";
- version = "10.7.0";
+ version = "10.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.0.tgz";
- sha512 = "rJ29qKw5UMS5WM9hdur696oXNiuszSJLhYKMBQuHDuwITeuwNk9GYhXyXRVFFOKVNetjsP/HruSU6tZ3jBq4kQ==";
+ url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.1.tgz";
+ sha512 = "V3LVbkFNTiy+ctpvCDgEgP8e0myUC/Iupm8D9URkS76SFYibAoMX3elcLVtsOXXqM4QyRrg29iGZj+HB+sQCHg==";
};
dependencies = [
sources."@alexbosworth/html2unicode-1.1.5"
@@ -69111,7 +69300,7 @@ in
sources."@cto.af/textdecoder-0.0.0"
(sources."@grpc/grpc-js-1.3.2" // {
dependencies = [
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
];
})
sources."@grpc/proto-loader-0.6.2"
@@ -69478,7 +69667,34 @@ in
sources."ws-7.5.0"
];
})
- (sources."ln-service-51.9.0" // {
+ (sources."ln-service-51.10.0" // {
+ dependencies = [
+ sources."@grpc/grpc-js-1.3.6"
+ sources."@grpc/proto-loader-0.6.4"
+ sources."@types/express-4.17.13"
+ sources."@types/node-16.3.3"
+ sources."@types/request-2.48.6"
+ sources."@types/ws-7.4.7"
+ sources."bn.js-5.2.0"
+ sources."form-data-2.5.1"
+ sources."lightning-3.4.0"
+ sources."ws-7.5.3"
+ ];
+ })
+ (sources."ln-sync-0.4.7" // {
+ dependencies = [
+ sources."@grpc/grpc-js-1.3.6"
+ sources."@grpc/proto-loader-0.6.4"
+ sources."@types/express-4.17.13"
+ sources."@types/node-16.3.3"
+ sources."@types/request-2.48.6"
+ sources."@types/ws-7.4.7"
+ sources."bn.js-5.2.0"
+ sources."form-data-2.5.1"
+ sources."lightning-3.4.0"
+ ];
+ })
+ (sources."ln-telegram-3.2.9" // {
dependencies = [
sources."@grpc/grpc-js-1.3.5"
sources."@grpc/proto-loader-0.6.4"
@@ -69487,23 +69703,24 @@ in
sources."@types/request-2.48.6"
sources."@types/ws-7.4.6"
sources."bn.js-5.2.0"
+ sources."cbor-7.0.5"
sources."form-data-2.5.1"
sources."lightning-3.3.16"
+ sources."ln-service-51.9.0"
+ (sources."ln-sync-0.4.6" // {
+ dependencies = [
+ sources."@grpc/grpc-js-1.3.4"
+ sources."@grpc/proto-loader-0.6.3"
+ sources."@types/express-4.17.12"
+ sources."@types/node-15.12.5"
+ sources."@types/request-2.48.5"
+ sources."@types/ws-7.4.5"
+ sources."lightning-3.3.12"
+ ];
+ })
sources."ws-7.5.3"
];
})
- (sources."ln-sync-0.4.6" // {
- dependencies = [
- sources."@grpc/grpc-js-1.3.4"
- sources."@grpc/proto-loader-0.6.3"
- sources."@types/node-15.12.5"
- sources."@types/ws-7.4.5"
- sources."bn.js-5.2.0"
- sources."cbor-7.0.5"
- sources."lightning-3.3.12"
- ];
- })
- sources."ln-telegram-3.2.9"
sources."lodash-4.17.21"
sources."lodash.camelcase-4.3.0"
sources."lodash.clonedeep-4.5.0"
@@ -69626,7 +69843,7 @@ in
sources."process-nextick-args-2.0.1"
(sources."protobufjs-6.11.2" // {
dependencies = [
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
];
})
sources."proxy-addr-2.0.7"
@@ -70344,10 +70561,10 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/parser-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@kwsites/file-exists-1.1.1"
sources."@kwsites/promise-deferred-1.1.1"
sources."@types/minimist-1.2.2"
@@ -70806,7 +71023,7 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.1"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.2.16"
sources."ajv-6.12.6"
@@ -71240,7 +71457,7 @@ in
sources."color-name-1.1.4"
sources."colors-1.4.0"
sources."commonmark-0.29.3"
- sources."constructs-3.3.98"
+ sources."constructs-3.3.99"
sources."date-format-3.0.0"
sources."debug-4.3.2"
sources."decamelize-5.0.0"
@@ -71313,13 +71530,13 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.301" // {
+ (sources."jsii-srcmak-0.1.302" // {
dependencies = [
sources."fs-extra-9.1.0"
];
})
sources."json-schema-0.3.0"
- sources."json2jsii-0.1.270"
+ sources."json2jsii-0.1.272"
sources."jsonfile-6.1.0"
sources."jsonschema-1.4.0"
sources."locate-path-5.0.0"
@@ -71355,7 +71572,7 @@ in
sources."snake-case-3.0.4"
sources."sort-json-2.0.0"
sources."spdx-license-list-6.4.0"
- sources."sscaff-1.2.21"
+ sources."sscaff-1.2.22"
(sources."streamroller-2.2.4" // {
dependencies = [
sources."date-format-2.1.0"
@@ -71470,7 +71687,7 @@ in
sources."commonmark-0.29.3"
sources."compress-commons-4.1.1"
sources."concat-map-0.0.1"
- sources."constructs-3.3.98"
+ sources."constructs-3.3.99"
sources."convert-to-spaces-1.0.2"
sources."core-util-is-1.0.2"
sources."crc-32-1.2.0"
@@ -71589,7 +71806,7 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.301" // {
+ (sources."jsii-srcmak-0.1.302" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -71672,7 +71889,7 @@ in
sources."slice-ansi-3.0.0"
sources."sort-json-2.0.0"
sources."spdx-license-list-6.4.0"
- sources."sscaff-1.2.21"
+ sources."sscaff-1.2.22"
sources."stack-utils-2.0.3"
sources."stream-buffers-3.0.2"
(sources."streamroller-2.2.4" // {
@@ -72147,10 +72364,10 @@ in
coc-java = nodeEnv.buildNodePackage {
name = "coc-java";
packageName = "coc-java";
- version = "1.5.3";
+ version = "1.5.4";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.3.tgz";
- sha512 = "St4Vg5DSHaBW0zqXoSKlKL0KJiASSGMIKDUX2zp/l8ImJd6YI5+SoEwYjCxA2c5x01hZ7k3prXDdfgpKp304RA==";
+ url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.4.tgz";
+ sha512 = "6/dloBU+OuRHO/YxX/vWYEFykCQSyN+ASTiwIw0O/l5CyDh9E967sLtodN9uH/MAyExOYfl5i65zI20CMZ6zDQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -72473,7 +72690,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.11"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
@@ -72552,7 +72769,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-2.1.1"
sources."camelcase-keys-2.1.0"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."capture-stack-trace-1.0.1"
sources."ccount-1.1.0"
(sources."chalk-4.1.1" // {
@@ -72650,7 +72867,7 @@ in
sources."domutils-1.7.0"
sources."dot-prop-5.3.0"
sources."duplexer3-0.1.4"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."enquirer-2.3.6"
@@ -73607,31 +73824,31 @@ in
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- sources."@babel/core-7.14.6"
- sources."@babel/generator-7.14.5"
+ sources."@babel/core-7.14.8"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-compilation-targets-7.14.5"
sources."@babel/helper-function-name-7.14.5"
sources."@babel/helper-get-function-arity-7.14.5"
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
@@ -73661,7 +73878,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
(sources."chalk-4.1.1" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -73699,7 +73916,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -73986,7 +74203,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/highlight-7.14.5"
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
@@ -74101,7 +74318,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.11"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
@@ -75159,14 +75376,14 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/highlight-7.14.5"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/glob-7.1.4"
sources."@types/minimatch-3.0.5"
sources."@types/minimist-1.2.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/normalize-package-data-2.4.1"
sources."aggregate-error-3.1.0"
sources."ansi-styles-3.2.1"
@@ -75537,7 +75754,7 @@ in
sources."@cycle/run-3.4.0"
sources."@cycle/time-0.10.1"
sources."@types/cookiejar-2.1.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/superagent-3.8.2"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-2.1.1"
@@ -76852,7 +77069,7 @@ in
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.2"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/responselike-1.0.0"
sources."@types/yauzl-2.9.2"
sources."abbrev-1.1.1"
@@ -77291,7 +77508,7 @@ in
sources."request-2.88.2"
sources."require-directory-2.1.1"
sources."resolve-1.20.0"
- sources."resolve-alpn-1.1.2"
+ sources."resolve-alpn-1.2.0"
sources."resolve-dir-1.0.1"
sources."resolve-package-1.0.1"
sources."responselike-2.0.0"
@@ -77447,12 +77664,12 @@ in
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- (sources."@babel/core-7.14.6" // {
+ (sources."@babel/core-7.14.8" // {
dependencies = [
sources."semver-6.3.0"
];
})
- sources."@babel/generator-7.14.5"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-annotate-as-pure-7.14.5"
(sources."@babel/helper-compilation-targets-7.14.5" // {
dependencies = [
@@ -77464,17 +77681,17 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-plugin-utils-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/plugin-proposal-object-rest-spread-7.14.7"
sources."@babel/plugin-syntax-jsx-7.14.5"
sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
@@ -77482,15 +77699,15 @@ in
sources."@babel/plugin-transform-parameters-7.14.5"
sources."@babel/plugin-transform-react-jsx-7.14.5"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@sindresorhus/is-4.0.1"
sources."@szmarczak/http-timer-4.0.6"
sources."@types/cacheable-request-6.0.2"
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.2"
sources."@types/minimist-1.2.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/normalize-package-data-2.4.1"
sources."@types/responselike-1.0.0"
sources."@types/yoga-layout-1.9.2"
@@ -77525,7 +77742,7 @@ in
sources."quick-lru-4.0.1"
];
})
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."chalk-2.4.2"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.1"
@@ -77562,7 +77779,7 @@ in
})
sources."defer-to-connect-2.0.1"
sources."dot-prop-5.3.0"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."emoji-regex-8.0.0"
sources."emojilib-2.4.0"
sources."end-of-stream-1.4.4"
@@ -77715,7 +77932,7 @@ in
})
sources."redent-3.0.0"
sources."resolve-1.20.0"
- sources."resolve-alpn-1.1.2"
+ sources."resolve-alpn-1.2.0"
sources."resolve-from-3.0.0"
sources."responselike-2.0.0"
sources."restore-cursor-3.1.0"
@@ -77805,7 +78022,7 @@ in
src = ../../applications/video/epgstation;
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -79507,7 +79724,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.11"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
@@ -79668,7 +79885,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.11"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
@@ -79856,7 +80073,7 @@ in
sources."semver-5.7.1"
];
})
- sources."@babel/generator-7.14.5"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-annotate-as-pure-7.14.5"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5"
(sources."@babel/helper-compilation-targets-7.14.5" // {
@@ -79864,7 +80081,7 @@ in
sources."semver-6.3.0"
];
})
- sources."@babel/helper-create-class-features-plugin-7.14.6"
+ sources."@babel/helper-create-class-features-plugin-7.14.8"
sources."@babel/helper-create-regexp-features-plugin-7.14.5"
(sources."@babel/helper-define-polyfill-provider-0.2.3" // {
dependencies = [
@@ -79877,24 +80094,24 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-plugin-utils-7.14.5"
sources."@babel/helper-remap-async-to-generator-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
sources."@babel/helper-wrap-function-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/plugin-proposal-async-generator-functions-7.14.7"
sources."@babel/plugin-proposal-class-properties-7.12.13"
sources."@babel/plugin-proposal-dynamic-import-7.14.5"
@@ -79976,10 +80193,10 @@ in
})
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-typescript-7.12.17"
- sources."@babel/runtime-7.14.6"
+ sources."@babel/runtime-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@expo/apple-utils-0.0.0-alpha.20"
sources."@expo/bunyan-4.0.0"
sources."@expo/config-5.0.5"
@@ -80399,7 +80616,7 @@ in
})
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."caseless-0.12.0"
(sources."chalk-4.1.1" // {
dependencies = [
@@ -80668,7 +80885,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -81464,7 +81681,7 @@ in
})
sources."plist-3.0.2"
sources."pngjs-3.4.0"
- sources."pnp-webpack-plugin-1.6.4"
+ sources."pnp-webpack-plugin-1.7.0"
(sources."portfinder-1.0.28" // {
dependencies = [
sources."async-2.6.3"
@@ -81720,7 +81937,7 @@ in
})
sources."requires-port-1.0.0"
sources."resolve-1.20.0"
- sources."resolve-alpn-1.1.2"
+ sources."resolve-alpn-1.2.0"
(sources."resolve-cwd-2.0.0" // {
dependencies = [
sources."resolve-from-3.0.0"
@@ -81741,7 +81958,7 @@ in
];
})
sources."ripemd160-2.0.2"
- sources."rollup-2.53.2"
+ sources."rollup-2.53.3"
(sources."rollup-plugin-terser-7.0.2" // {
dependencies = [
sources."commander-2.20.3"
@@ -82274,7 +82491,7 @@ in
sources."workbox-broadcast-update-6.1.5"
(sources."workbox-build-6.1.5" // {
dependencies = [
- (sources."@babel/core-7.14.6" // {
+ (sources."@babel/core-7.14.8" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -82390,8 +82607,8 @@ in
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- sources."@babel/core-7.14.6"
- sources."@babel/generator-7.14.5"
+ sources."@babel/core-7.14.8"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-annotate-as-pure-7.14.5"
sources."@babel/helper-compilation-targets-7.14.5"
sources."@babel/helper-function-name-7.14.5"
@@ -82399,17 +82616,17 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-plugin-utils-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/plugin-proposal-object-rest-spread-7.14.7"
sources."@babel/plugin-syntax-jsx-7.14.5"
sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
@@ -82417,10 +82634,10 @@ in
sources."@babel/plugin-transform-parameters-7.14.5"
sources."@babel/plugin-transform-react-jsx-7.14.5"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@types/minimist-1.2.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/normalize-package-data-2.4.1"
sources."@types/yauzl-2.9.2"
sources."@types/yoga-layout-1.9.2"
@@ -82447,7 +82664,7 @@ in
sources."callsites-2.0.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."chalk-2.4.2"
sources."chownr-1.1.4"
sources."ci-info-2.0.0"
@@ -82472,7 +82689,7 @@ in
})
sources."delay-5.0.0"
sources."devtools-protocol-0.0.869402"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."error-ex-1.3.2"
@@ -82664,17 +82881,17 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/generator-7.14.5"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-function-name-7.14.5"
sources."@babel/helper-get-function-arity-7.14.5"
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
(sources."@heroku-cli/color-1.1.14" // {
dependencies = [
sources."ansi-regex-4.1.0"
@@ -83292,7 +83509,7 @@ in
sources."@google-cloud/precise-date-2.0.3"
sources."@google-cloud/projectify-2.1.0"
sources."@google-cloud/promisify-2.0.3"
- (sources."@google-cloud/pubsub-2.16.0" // {
+ (sources."@google-cloud/pubsub-2.16.1" // {
dependencies = [
sources."google-auth-library-7.3.0"
];
@@ -83326,7 +83543,7 @@ in
sources."@types/json-schema-7.0.8"
sources."@types/long-4.0.1"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
sources."abort-controller-3.0.0"
@@ -83542,7 +83759,7 @@ in
];
})
sources."duplexer3-0.1.4"
- sources."duplexify-4.1.1"
+ sources."duplexify-4.1.2"
sources."ecc-jsbn-0.1.2"
sources."ecdsa-sig-formatter-1.0.11"
sources."ee-first-1.1.1"
@@ -84252,7 +84469,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -84432,7 +84649,7 @@ in
dependencies = [
sources."@types/atob-2.1.2"
sources."@types/inquirer-6.5.0"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/through-0.0.30"
sources."ajv-6.12.6"
sources."ansi-escapes-4.3.2"
@@ -85119,10 +85336,10 @@ in
gatsby-cli = nodeEnv.buildNodePackage {
name = "gatsby-cli";
packageName = "gatsby-cli";
- version = "3.9.0";
+ version = "3.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.9.0.tgz";
- sha512 = "mfd+e5dNzQ8CkjggrYw3PkQwizJmK1+hR6VWmstDkc5+h1c6xFFNFfauexllDFi8H1SMokAEV4TQRDYDilpByw==";
+ url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.10.0.tgz";
+ sha512 = "RgHTA2qdxhdUugoi+S6BCv6LFDYxuV7P8QfbG0QRmmIAybtmpgfse6oLspWgtXwR4liRDZh/hRgwVA4y48JmlA==";
};
dependencies = [
(sources."@ardatan/aggregate-error-0.0.6" // {
@@ -85132,13 +85349,13 @@ in
})
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- (sources."@babel/core-7.14.6" // {
+ (sources."@babel/core-7.14.8" // {
dependencies = [
sources."semver-6.3.0"
sources."source-map-0.5.7"
];
})
- (sources."@babel/generator-7.14.5" // {
+ (sources."@babel/generator-7.14.8" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -85154,22 +85371,22 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-plugin-utils-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/plugin-proposal-object-rest-spread-7.10.4"
sources."@babel/plugin-proposal-optional-chaining-7.14.5"
sources."@babel/plugin-syntax-jsx-7.14.5"
@@ -85177,11 +85394,11 @@ in
sources."@babel/plugin-syntax-optional-chaining-7.8.3"
sources."@babel/plugin-transform-parameters-7.14.5"
sources."@babel/plugin-transform-react-jsx-7.14.5"
- sources."@babel/runtime-7.14.6"
- sources."@babel/standalone-7.14.7"
+ sources."@babel/runtime-7.14.8"
+ sources."@babel/standalone-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@graphql-tools/schema-7.1.5"
sources."@graphql-tools/utils-7.10.0"
sources."@hapi/address-2.1.4"
@@ -85217,7 +85434,7 @@ in
sources."@types/istanbul-lib-report-3.0.0"
sources."@types/istanbul-reports-1.1.2"
sources."@types/json-patch-0.0.30"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/node-fetch-2.5.11"
sources."@types/unist-2.0.6"
sources."@types/yargs-15.0.14"
@@ -85284,7 +85501,7 @@ in
sources."call-bind-1.0.2"
sources."camel-case-4.1.2"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."ccount-1.1.0"
(sources."chalk-4.1.1" // {
dependencies = [
@@ -85345,7 +85562,7 @@ in
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
sources."cors-2.8.5"
- sources."create-gatsby-1.9.0"
+ sources."create-gatsby-1.10.0"
(sources."cross-spawn-6.0.5" // {
dependencies = [
sources."semver-5.7.1"
@@ -85380,7 +85597,7 @@ in
sources."dotenv-8.6.0"
sources."duplexer3-0.1.4"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
@@ -85392,13 +85609,12 @@ in
sources."escape-string-regexp-1.0.5"
sources."estree-util-is-identifier-name-1.1.0"
sources."etag-1.8.1"
- (sources."execa-3.4.0" // {
+ (sources."execa-5.1.1" // {
dependencies = [
sources."cross-spawn-7.0.3"
- sources."get-stream-5.2.0"
+ sources."get-stream-6.0.1"
sources."is-stream-2.0.0"
sources."npm-run-path-4.0.1"
- sources."p-finally-2.0.1"
sources."path-key-3.1.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
@@ -85433,7 +85649,7 @@ in
})
sources."fast-copy-2.1.1"
sources."figures-3.2.0"
- sources."file-type-16.5.1"
+ sources."file-type-16.5.2"
sources."fill-range-7.0.1"
sources."filter-obj-1.1.0"
(sources."finalhandler-1.1.2" // {
@@ -85452,22 +85668,13 @@ in
sources."fs.realpath-1.0.0"
sources."fsevents-2.3.2"
sources."function-bind-1.1.1"
- sources."gatsby-core-utils-2.9.0"
- (sources."gatsby-recipes-0.20.0" // {
+ sources."gatsby-core-utils-2.10.0"
+ (sources."gatsby-recipes-0.21.0" // {
dependencies = [
- sources."cross-spawn-7.0.3"
- sources."execa-4.1.0"
- sources."get-stream-5.2.0"
- sources."is-stream-2.0.0"
- sources."npm-run-path-4.0.1"
- sources."path-key-3.1.1"
- sources."shebang-command-2.0.0"
- sources."shebang-regex-3.0.0"
sources."strip-ansi-6.0.0"
- sources."which-2.0.2"
];
})
- sources."gatsby-telemetry-2.9.0"
+ sources."gatsby-telemetry-2.10.0"
sources."gensync-1.0.0-beta.2"
sources."get-caller-file-2.0.5"
sources."get-intrinsic-1.1.1"
@@ -85498,7 +85705,7 @@ in
sources."inherits-2.0.3"
];
})
- sources."human-signals-1.1.1"
+ sources."human-signals-2.1.0"
sources."iconv-lite-0.4.24"
sources."ieee754-1.2.1"
sources."import-lazy-2.1.0"
@@ -85661,7 +85868,7 @@ in
sources."path-key-2.0.1"
sources."path-parse-1.0.7"
sources."path-to-regexp-0.1.7"
- sources."peek-readable-4.0.0"
+ sources."peek-readable-3.1.4"
sources."picomatch-2.3.0"
sources."pkg-dir-4.2.0"
sources."prepend-http-2.0.0"
@@ -85791,7 +85998,7 @@ in
sources."strip-final-newline-2.0.0"
sources."strip-indent-3.0.0"
sources."strip-json-comments-2.0.1"
- sources."strtok3-6.2.2"
+ sources."strtok3-6.1.3"
sources."style-to-object-0.3.0"
sources."supports-color-5.5.0"
sources."term-size-2.2.1"
@@ -85801,7 +86008,7 @@ in
sources."to-readable-stream-1.0.0"
sources."to-regex-range-5.0.1"
sources."toidentifier-1.0.0"
- sources."token-types-2.1.1"
+ sources."token-types-3.1.0"
sources."trim-0.0.1"
sources."trim-trailing-lines-1.1.4"
sources."trough-1.0.5"
@@ -86156,7 +86363,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -86513,7 +86720,7 @@ in
dependencies = [
sources."@ardatan/aggregate-error-0.0.6"
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -86607,7 +86814,7 @@ in
sources."@nodelib/fs.walk-1.2.8"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/parse-json-4.0.0"
sources."@types/websocket-1.0.2"
sources."abort-controller-3.0.0"
@@ -89693,7 +89900,7 @@ in
sources."async-mutex-0.1.4"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.949.0" // {
+ (sources."aws-sdk-2.951.0" // {
dependencies = [
sources."sax-1.2.1"
sources."uuid-3.3.2"
@@ -89980,7 +90187,7 @@ in
sources."json-stringify-safe-5.0.1"
sources."jsonfile-4.0.0"
sources."jsprim-1.4.1"
- sources."katex-0.13.11"
+ sources."katex-0.13.13"
sources."keytar-7.7.0"
sources."khroma-1.4.1"
sources."klaw-1.3.1"
@@ -90410,7 +90617,7 @@ in
sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw==";
};
dependencies = [
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."argparse-1.0.10"
sources."bluebird-3.7.2"
sources."catharsis-0.9.0"
@@ -91687,10 +91894,10 @@ in
katex = nodeEnv.buildNodePackage {
name = "katex";
packageName = "katex";
- version = "0.13.11";
+ version = "0.13.13";
src = fetchurl {
- url = "https://registry.npmjs.org/katex/-/katex-0.13.11.tgz";
- sha512 = "yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw==";
+ url = "https://registry.npmjs.org/katex/-/katex-0.13.13.tgz";
+ sha512 = "cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ==";
};
dependencies = [
sources."commander-6.2.1"
@@ -91717,7 +91924,7 @@ in
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.1"
sources."@types/cors-2.8.12"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."accepts-1.3.7"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
@@ -92739,7 +92946,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -92861,19 +93068,19 @@ in
];
})
sources."@octokit/graphql-4.6.4"
- sources."@octokit/openapi-types-8.3.0"
+ sources."@octokit/openapi-types-9.1.0"
sources."@octokit/plugin-enterprise-rest-6.0.1"
sources."@octokit/plugin-paginate-rest-2.14.0"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.4.1"
+ sources."@octokit/plugin-rest-endpoint-methods-5.5.0"
(sources."@octokit/request-5.6.0" // {
dependencies = [
sources."is-plain-object-5.0.0"
];
})
sources."@octokit/request-error-2.1.0"
- sources."@octokit/rest-18.6.7"
- sources."@octokit/types-6.19.0"
+ sources."@octokit/rest-18.7.0"
+ sources."@octokit/types-6.21.0"
sources."@tootallnate/once-1.1.2"
sources."@types/minimatch-3.0.5"
sources."@types/minimist-1.2.2"
@@ -94404,12 +94611,12 @@ in
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- sources."@babel/core-7.14.6"
- sources."@babel/generator-7.14.5"
+ sources."@babel/core-7.14.8"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-annotate-as-pure-7.14.5"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5"
sources."@babel/helper-compilation-targets-7.14.5"
- sources."@babel/helper-create-class-features-plugin-7.14.6"
+ sources."@babel/helper-create-class-features-plugin-7.14.8"
sources."@babel/helper-create-regexp-features-plugin-7.14.5"
sources."@babel/helper-define-polyfill-provider-0.2.3"
sources."@babel/helper-explode-assignable-expression-7.14.5"
@@ -94418,24 +94625,24 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-plugin-utils-7.14.5"
sources."@babel/helper-remap-async-to-generator-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
sources."@babel/helper-wrap-function-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5"
sources."@babel/plugin-external-helpers-7.8.3"
sources."@babel/plugin-proposal-async-generator-functions-7.14.7"
@@ -94502,13 +94709,13 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.14.5"
sources."@babel/plugin-transform-unicode-escapes-7.14.5"
sources."@babel/plugin-transform-unicode-regex-7.14.5"
- sources."@babel/preset-env-7.14.7"
+ sources."@babel/preset-env-7.14.8"
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-stage-2-7.8.3"
- sources."@babel/runtime-7.14.6"
+ sources."@babel/runtime-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@cnakazawa/watch-1.0.4"
sources."@comandeer/babel-plugin-banner-5.0.0"
sources."@istanbuljs/load-nyc-config-1.1.0"
@@ -94529,7 +94736,7 @@ in
sources."@types/istanbul-lib-report-3.0.0"
sources."@types/istanbul-reports-1.1.2"
sources."@types/json-schema-7.0.8"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/normalize-package-data-2.4.1"
sources."@types/resolve-0.0.8"
sources."@types/yargs-15.0.14"
@@ -94702,7 +94909,7 @@ in
sources."cached-path-relative-1.0.2"
sources."call-bind-1.0.2"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."capture-exit-2.0.0"
sources."caseless-0.12.0"
(sources."chalk-3.0.0" // {
@@ -94826,7 +95033,7 @@ in
sources."duplexer2-0.1.4"
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -96074,7 +96281,7 @@ in
};
dependencies = [
sources."@braintree/sanitize-url-3.1.0"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/yauzl-2.9.2"
sources."agent-base-6.0.2"
sources."ansi-styles-4.3.0"
@@ -96732,20 +96939,20 @@ in
netlify-cli = nodeEnv.buildNodePackage {
name = "netlify-cli";
packageName = "netlify-cli";
- version = "4.4.4";
+ version = "5.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.4.tgz";
- sha512 = "vDyRF0MxUCccnk/nttQtWSE+KrcHgqjT0s/SyK7Hw06dAKg9X5kDyvDXjHQl2Dmc8Nc68050xc9ql36xUid2dQ==";
+ url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.2.0.tgz";
+ sha512 = "Jwy74SaN5rM4xTE2QSZijF0qN1a/ZGh1PJWUmzmVFX1RnEgA1QMZ7MVHW04UXxZ3igx+G03GGzC071+FRLKT6g==";
};
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- (sources."@babel/core-7.14.6" // {
+ (sources."@babel/core-7.14.8" // {
dependencies = [
sources."semver-6.3.0"
];
})
- sources."@babel/generator-7.14.5"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-annotate-as-pure-7.14.5"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5"
(sources."@babel/helper-compilation-targets-7.14.5" // {
@@ -96753,7 +96960,7 @@ in
sources."semver-6.3.0"
];
})
- sources."@babel/helper-create-class-features-plugin-7.14.6"
+ sources."@babel/helper-create-class-features-plugin-7.14.8"
sources."@babel/helper-create-regexp-features-plugin-7.14.5"
(sources."@babel/helper-define-polyfill-provider-0.2.3" // {
dependencies = [
@@ -96766,18 +96973,18 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-plugin-utils-7.14.5"
sources."@babel/helper-remap-async-to-generator-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
sources."@babel/helper-wrap-function-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -96787,7 +96994,7 @@ in
sources."supports-color-5.5.0"
];
})
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5"
sources."@babel/plugin-proposal-async-generator-functions-7.14.7"
sources."@babel/plugin-proposal-class-properties-7.14.5"
@@ -96850,16 +97057,16 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.14.5"
sources."@babel/plugin-transform-unicode-escapes-7.14.5"
sources."@babel/plugin-transform-unicode-regex-7.14.5"
- (sources."@babel/preset-env-7.14.7" // {
+ (sources."@babel/preset-env-7.14.8" // {
dependencies = [
sources."semver-6.3.0"
];
})
sources."@babel/preset-modules-0.1.4"
- sources."@babel/runtime-7.14.6"
+ sources."@babel/runtime-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@bugsnag/browser-7.10.5"
sources."@bugsnag/core-7.10.0"
sources."@bugsnag/cuid-3.0.0"
@@ -96869,7 +97076,7 @@ in
sources."@dabh/diagnostics-2.0.2"
sources."@jest/types-24.9.0"
sources."@mrmlnc/readdir-enhanced-2.2.1"
- (sources."@netlify/build-15.11.5" // {
+ (sources."@netlify/build-16.1.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."boxen-4.2.0"
@@ -96891,7 +97098,7 @@ in
sources."slash-3.0.0"
];
})
- (sources."@netlify/config-12.6.0" // {
+ (sources."@netlify/config-13.0.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-3.0.0"
@@ -96920,6 +97127,19 @@ in
sources."to-regex-range-5.0.1"
];
})
+ sources."@netlify/local-functions-proxy-0.1.0"
+ sources."@netlify/local-functions-proxy-darwin-arm64-0.1.0"
+ sources."@netlify/local-functions-proxy-darwin-x64-0.1.0"
+ sources."@netlify/local-functions-proxy-freebsd-arm64-0.1.0"
+ sources."@netlify/local-functions-proxy-freebsd-x64-0.1.0"
+ sources."@netlify/local-functions-proxy-linux-arm-0.1.0"
+ sources."@netlify/local-functions-proxy-linux-arm64-0.1.0"
+ sources."@netlify/local-functions-proxy-linux-ia32-0.1.0"
+ sources."@netlify/local-functions-proxy-linux-ppc64-0.1.0"
+ sources."@netlify/local-functions-proxy-linux-x64-0.1.0"
+ sources."@netlify/local-functions-proxy-openbsd-x64-0.1.0"
+ sources."@netlify/local-functions-proxy-win32-ia32-0.1.0"
+ sources."@netlify/local-functions-proxy-win32-x64-0.1.0"
sources."@netlify/open-api-2.5.0"
(sources."@netlify/plugin-edge-handlers-1.11.22" // {
dependencies = [
@@ -96927,7 +97147,7 @@ in
];
})
sources."@netlify/plugins-list-2.19.3"
- sources."@netlify/routing-local-proxy-0.30.2"
+ sources."@netlify/routing-local-proxy-0.31.0"
(sources."@netlify/run-utils-1.0.7" // {
dependencies = [
sources."execa-3.4.0"
@@ -97060,18 +97280,18 @@ in
];
})
sources."@octokit/graphql-4.6.4"
- sources."@octokit/openapi-types-8.3.0"
+ sources."@octokit/openapi-types-9.1.0"
sources."@octokit/plugin-paginate-rest-2.14.0"
sources."@octokit/plugin-request-log-1.0.4"
- sources."@octokit/plugin-rest-endpoint-methods-5.4.1"
+ sources."@octokit/plugin-rest-endpoint-methods-5.5.0"
(sources."@octokit/request-5.6.0" // {
dependencies = [
sources."is-plain-object-5.0.0"
];
})
sources."@octokit/request-error-2.1.0"
- sources."@octokit/rest-18.6.7"
- sources."@octokit/types-6.19.0"
+ sources."@octokit/rest-18.7.0"
+ sources."@octokit/types-6.21.0"
sources."@rollup/plugin-babel-5.3.0"
(sources."@rollup/plugin-commonjs-18.1.0" // {
dependencies = [
@@ -97108,7 +97328,7 @@ in
sources."@types/istanbul-reports-1.1.2"
sources."@types/keyv-3.1.2"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/node-fetch-2.5.11"
sources."@types/normalize-package-data-2.4.1"
sources."@types/resolve-1.17.1"
@@ -97267,7 +97487,7 @@ in
sources."call-me-maybe-1.0.1"
sources."callsite-1.0.0"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."cardinal-2.1.1"
(sources."chalk-4.1.1" // {
dependencies = [
@@ -97533,7 +97753,7 @@ in
})
sources."duplexer3-0.1.4"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."elegant-spinner-1.0.1"
sources."elf-cam-0.1.1"
sources."emoji-regex-8.0.0"
@@ -98263,7 +98483,7 @@ in
];
})
sources."posix-character-classes-0.1.1"
- sources."postcss-8.3.5"
+ sources."postcss-8.3.6"
sources."postcss-values-parser-2.0.1"
sources."precinct-8.1.0"
sources."precond-0.2.3"
@@ -98351,7 +98571,7 @@ in
sources."reusify-1.0.4"
sources."rfdc-1.3.0"
sources."rimraf-3.0.2"
- sources."rollup-2.53.2"
+ sources."rollup-2.53.3"
(sources."rollup-plugin-inject-3.0.2" // {
dependencies = [
sources."estree-walker-0.6.1"
@@ -99237,7 +99457,7 @@ in
sha512 = "r+wpPLWySuj/toc1mMkR8++mpFoTm9RZwsqe6guFc/IwEpQdDpmYkT11OGmTqjUqr8WdteOP+MNvdgNgtTzyxQ==";
};
dependencies = [
- sources."@babel/runtime-7.14.6"
+ sources."@babel/runtime-7.14.8"
sources."@mapbox/node-pre-gyp-1.0.5"
sources."@node-red/editor-api-2.0.1"
sources."@node-red/editor-client-2.0.1"
@@ -99262,7 +99482,7 @@ in
sources."@types/cacheable-request-6.0.2"
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/responselike-1.0.0"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
@@ -99374,7 +99594,7 @@ in
sources."domelementtype-2.2.0"
sources."domhandler-4.2.0"
sources."domutils-2.7.0"
- (sources."duplexify-4.1.1" // {
+ (sources."duplexify-4.1.2" // {
dependencies = [
sources."readable-stream-3.6.0"
sources."string_decoder-1.3.0"
@@ -99554,7 +99774,7 @@ in
sources."regenerator-runtime-0.13.8"
sources."reinterval-1.1.0"
sources."require-from-string-2.0.2"
- sources."resolve-alpn-1.1.2"
+ sources."resolve-alpn-1.2.0"
sources."responselike-2.0.0"
sources."retry-0.6.1"
sources."rimraf-3.0.2"
@@ -99996,7 +100216,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -100022,7 +100242,7 @@ in
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.2"
sources."@types/minimist-1.2.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/normalize-package-data-2.4.1"
sources."@types/parse-json-4.0.0"
sources."@types/responselike-1.0.0"
@@ -100901,6 +101121,24 @@ in
bypassCache = true;
reconstructLock = true;
};
+ npm-merge-driver = nodeEnv.buildNodePackage {
+ name = "npm-merge-driver";
+ packageName = "npm-merge-driver";
+ version = "2.3.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.6.tgz";
+ sha512 = "uPjCEWZ93f379zw0AMEgFtZIlpSSnpXc8BEIcs8yYHEZs5Y3d85OZHisLjNhjbYnbdAznxTq+VbyBWAQZDEm9w==";
+ };
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "git merge driver for automatically merging lockfiles";
+ homepage = "https://github.com/npm/npm-merge-driver#readme";
+ license = "ISC";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
"npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage {
name = "npm2nix";
packageName = "npm2nix";
@@ -101127,14 +101365,14 @@ in
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- (sources."@babel/core-7.14.6" // {
+ (sources."@babel/core-7.14.8" // {
dependencies = [
sources."json5-2.2.0"
sources."semver-6.3.0"
sources."source-map-0.5.7"
];
})
- (sources."@babel/generator-7.14.5" // {
+ (sources."@babel/generator-7.14.8" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -101146,7 +101384,7 @@ in
sources."semver-6.3.0"
];
})
- sources."@babel/helper-create-class-features-plugin-7.14.6"
+ sources."@babel/helper-create-class-features-plugin-7.14.8"
sources."@babel/helper-create-regexp-features-plugin-7.14.5"
(sources."@babel/helper-define-polyfill-provider-0.2.3" // {
dependencies = [
@@ -101159,20 +101397,20 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-plugin-utils-7.14.5"
sources."@babel/helper-remap-async-to-generator-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
sources."@babel/helper-wrap-function-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5"
sources."@babel/plugin-proposal-async-generator-functions-7.14.7"
sources."@babel/plugin-proposal-class-properties-7.14.5"
@@ -101239,16 +101477,16 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.14.5"
sources."@babel/plugin-transform-unicode-escapes-7.14.5"
sources."@babel/plugin-transform-unicode-regex-7.14.5"
- (sources."@babel/preset-env-7.14.7" // {
+ (sources."@babel/preset-env-7.14.8" // {
dependencies = [
sources."semver-6.3.0"
];
})
sources."@babel/preset-modules-0.1.4"
- sources."@babel/runtime-7.14.6"
+ sources."@babel/runtime-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@iarna/toml-2.2.5"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
@@ -101370,7 +101608,7 @@ in
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -101508,7 +101746,7 @@ in
sources."duplexer2-0.1.4"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -103173,7 +103411,7 @@ in
sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w==";
};
dependencies = [
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/parser-7.13.13"
sources."@babel/types-7.13.12"
sources."@nodelib/fs.scandir-2.1.5"
@@ -103631,10 +103869,10 @@ in
postcss = nodeEnv.buildNodePackage {
name = "postcss";
packageName = "postcss";
- version = "8.3.5";
+ version = "8.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz";
- sha512 = "NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==";
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz";
+ sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==";
};
dependencies = [
sources."colorette-1.2.2"
@@ -104508,15 +104746,15 @@ in
sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q==";
};
dependencies = [
- sources."@babel/cli-7.14.5"
+ sources."@babel/cli-7.14.8"
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- (sources."@babel/core-7.14.6" // {
+ (sources."@babel/core-7.14.8" // {
dependencies = [
sources."semver-6.3.0"
];
})
- sources."@babel/generator-7.14.5"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-annotate-as-pure-7.14.5"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5"
(sources."@babel/helper-compilation-targets-7.14.5" // {
@@ -104524,7 +104762,7 @@ in
sources."semver-6.3.0"
];
})
- sources."@babel/helper-create-class-features-plugin-7.14.6"
+ sources."@babel/helper-create-class-features-plugin-7.14.8"
sources."@babel/helper-create-regexp-features-plugin-7.14.5"
(sources."@babel/helper-define-polyfill-provider-0.2.3" // {
dependencies = [
@@ -104537,20 +104775,20 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-plugin-utils-7.14.5"
sources."@babel/helper-remap-async-to-generator-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
sources."@babel/helper-wrap-function-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5"
sources."@babel/plugin-proposal-async-generator-functions-7.14.7"
sources."@babel/plugin-proposal-class-properties-7.14.5"
@@ -104625,7 +104863,7 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.14.5"
sources."@babel/plugin-transform-unicode-escapes-7.14.5"
sources."@babel/plugin-transform-unicode-regex-7.14.5"
- (sources."@babel/preset-env-7.14.7" // {
+ (sources."@babel/preset-env-7.14.8" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -104634,16 +104872,16 @@ in
sources."@babel/preset-react-7.14.5"
sources."@babel/preset-stage-0-7.8.3"
sources."@babel/register-7.14.5"
- sources."@babel/runtime-7.14.6"
+ sources."@babel/runtime-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@reach/router-1.3.4"
sources."@sindresorhus/is-0.7.0"
sources."@types/glob-7.1.4"
sources."@types/json-schema-7.0.8"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/parse-json-4.0.0"
sources."@types/q-1.5.5"
sources."@webassemblyjs/ast-1.9.0"
@@ -104831,7 +105069,7 @@ in
sources."camel-case-3.0.0"
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."case-sensitive-paths-webpack-plugin-2.4.0"
sources."caw-2.0.1"
(sources."chalk-2.4.2" // {
@@ -105060,7 +105298,7 @@ in
sources."duplexify-3.7.1"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -106423,7 +106661,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- (sources."@babel/generator-7.14.5" // {
+ (sources."@babel/generator-7.14.8" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -106434,13 +106672,13 @@ in
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-module-imports-7.14.5"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/highlight-7.14.5"
- sources."@babel/parser-7.14.7"
- sources."@babel/runtime-7.14.6"
+ sources."@babel/parser-7.14.8"
+ sources."@babel/runtime-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@emotion/is-prop-valid-0.8.8"
sources."@emotion/memoize-0.7.4"
sources."@emotion/stylis-0.8.5"
@@ -106930,10 +107168,10 @@ in
rollup = nodeEnv.buildNodePackage {
name = "rollup";
packageName = "rollup";
- version = "2.53.2";
+ version = "2.53.3";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz";
- sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz";
+ sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA==";
};
dependencies = [
sources."fsevents-2.3.2"
@@ -106955,7 +107193,7 @@ in
src = ../../misc/vscode-extensions/rust-analyzer/build-deps;
dependencies = [
sources."@babel/code-frame-7.12.11"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
@@ -107259,7 +107497,7 @@ in
sources."resolve-from-4.0.0"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
- sources."rollup-2.53.2"
+ sources."rollup-2.53.3"
sources."run-parallel-1.2.0"
sources."safe-buffer-5.2.1"
sources."semver-7.3.5"
@@ -107673,7 +107911,7 @@ in
];
})
sources."@serverless/component-metrics-1.0.8"
- (sources."@serverless/components-3.13.4" // {
+ (sources."@serverless/components-3.14.0" // {
dependencies = [
(sources."@serverless/utils-4.1.0" // {
dependencies = [
@@ -107716,7 +107954,7 @@ in
];
})
sources."@serverless/template-1.1.4"
- (sources."@serverless/utils-5.4.0" // {
+ (sources."@serverless/utils-5.6.0" // {
dependencies = [
sources."get-stream-6.0.1"
sources."jwt-decode-3.1.2"
@@ -107734,7 +107972,7 @@ in
sources."@types/keyv-3.1.2"
sources."@types/lodash-4.14.171"
sources."@types/long-4.0.1"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/request-2.48.6"
sources."@types/request-promise-native-1.0.18"
sources."@types/responselike-1.0.0"
@@ -107795,7 +108033,7 @@ in
sources."async-2.6.3"
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
- (sources."aws-sdk-2.949.0" // {
+ (sources."aws-sdk-2.951.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -107977,7 +108215,7 @@ in
sources."dotenv-10.0.0"
sources."dotenv-expand-5.1.0"
sources."duplexer3-0.1.4"
- sources."duplexify-4.1.1"
+ sources."duplexify-4.1.2"
sources."duration-0.2.2"
sources."ecc-jsbn-0.1.2"
sources."emoji-regex-8.0.0"
@@ -108024,7 +108262,7 @@ in
sources."fd-slicer-1.1.0"
sources."fecha-4.2.1"
sources."figures-3.2.0"
- sources."file-type-16.5.1"
+ sources."file-type-16.5.2"
sources."file-uri-to-path-1.0.0"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-4.3.0"
@@ -108270,7 +108508,7 @@ in
sources."path-loader-1.0.10"
sources."path-type-4.0.0"
sources."path2-0.1.0"
- sources."peek-readable-4.0.0"
+ sources."peek-readable-3.1.4"
sources."pend-1.2.0"
sources."performance-now-2.1.0"
sources."picomatch-2.3.0"
@@ -108318,7 +108556,7 @@ in
})
sources."request-promise-core-1.1.4"
sources."request-promise-native-1.0.9"
- sources."resolve-alpn-1.1.2"
+ sources."resolve-alpn-1.2.0"
sources."responselike-1.0.2"
sources."restore-cursor-3.1.0"
sources."retry-0.10.1"
@@ -108381,7 +108619,7 @@ in
sources."strip-dirs-2.1.0"
sources."strip-json-comments-2.0.1"
sources."strip-outer-1.0.1"
- sources."strtok3-6.2.2"
+ sources."strtok3-6.1.3"
(sources."superagent-3.8.3" // {
dependencies = [
sources."debug-3.2.7"
@@ -108442,7 +108680,7 @@ in
sources."to-buffer-1.1.1"
sources."to-readable-stream-1.0.0"
sources."to-regex-range-5.0.1"
- sources."token-types-2.1.1"
+ sources."token-types-3.1.0"
sources."tough-cookie-2.5.0"
sources."traverse-0.6.6"
sources."trim-repeated-1.0.0"
@@ -109657,7 +109895,7 @@ in
sources."readable-stream-3.6.0"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
- sources."resolve-alpn-1.1.2"
+ sources."resolve-alpn-1.2.0"
sources."responselike-2.0.0"
sources."restore-cursor-3.1.0"
sources."reusify-1.0.4"
@@ -109911,7 +110149,7 @@ in
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.1"
sources."@types/cors-2.8.12"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."accepts-1.3.7"
sources."base64-arraybuffer-0.1.4"
sources."base64id-2.0.0"
@@ -111177,7 +111415,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.949.0" // {
+ (sources."aws-sdk-2.951.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -111961,31 +112199,31 @@ in
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/compat-data-7.14.7"
- sources."@babel/core-7.14.6"
- sources."@babel/generator-7.14.5"
+ sources."@babel/core-7.14.8"
+ sources."@babel/generator-7.14.8"
sources."@babel/helper-compilation-targets-7.14.5"
sources."@babel/helper-function-name-7.14.5"
sources."@babel/helper-get-function-arity-7.14.5"
sources."@babel/helper-hoist-variables-7.14.5"
sources."@babel/helper-member-expression-to-functions-7.14.7"
sources."@babel/helper-module-imports-7.14.5"
- sources."@babel/helper-module-transforms-7.14.5"
+ sources."@babel/helper-module-transforms-7.14.8"
sources."@babel/helper-optimise-call-expression-7.14.5"
sources."@babel/helper-replace-supers-7.14.5"
- sources."@babel/helper-simple-access-7.14.5"
+ sources."@babel/helper-simple-access-7.14.8"
sources."@babel/helper-split-export-declaration-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/helper-validator-option-7.14.5"
- sources."@babel/helpers-7.14.6"
+ sources."@babel/helpers-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.14.7"
+ sources."@babel/parser-7.14.8"
sources."@babel/template-7.14.5"
- sources."@babel/traverse-7.14.7"
- sources."@babel/types-7.14.5"
+ sources."@babel/traverse-7.14.8"
+ sources."@babel/types-7.14.8"
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
@@ -112015,7 +112253,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
(sources."chalk-4.1.1" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -112053,7 +112291,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -112295,7 +112533,7 @@ in
sources."@emmetio/abbreviation-2.2.2"
sources."@emmetio/css-abbreviation-2.1.4"
sources."@emmetio/scanner-1.0.0"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/pug-2.0.5"
sources."@types/sass-1.16.1"
sources."anymatch-3.1.2"
@@ -112368,6 +112606,74 @@ in
bypassCache = true;
reconstructLock = true;
};
+ svelte-check = nodeEnv.buildNodePackage {
+ name = "svelte-check";
+ packageName = "svelte-check";
+ version = "2.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.3.tgz";
+ sha512 = "mqe/lgF0Ew+54YI4bPW5D26sMolh+MofQiz41U0c1GvUsP3bKsLLH0mjs4P4Xc+ajUFJtvGBo5PWaf0dd46sIQ==";
+ };
+ dependencies = [
+ sources."@types/node-16.4.0"
+ sources."@types/pug-2.0.5"
+ sources."@types/sass-1.16.1"
+ sources."ansi-styles-4.3.0"
+ sources."anymatch-3.1.2"
+ sources."balanced-match-1.0.2"
+ sources."binary-extensions-2.2.0"
+ sources."brace-expansion-1.1.11"
+ sources."braces-3.0.2"
+ sources."callsites-3.1.0"
+ sources."chalk-4.1.1"
+ sources."chokidar-3.5.2"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
+ sources."concat-map-0.0.1"
+ sources."detect-indent-6.1.0"
+ sources."fill-range-7.0.1"
+ sources."fs.realpath-1.0.0"
+ sources."fsevents-2.3.2"
+ sources."glob-7.1.7"
+ sources."glob-parent-5.1.2"
+ sources."has-flag-4.0.0"
+ sources."import-fresh-3.3.0"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.4"
+ sources."is-binary-path-2.1.0"
+ sources."is-extglob-2.1.1"
+ sources."is-glob-4.0.1"
+ sources."is-number-7.0.0"
+ sources."min-indent-1.0.1"
+ sources."minimatch-3.0.4"
+ sources."minimist-1.2.5"
+ sources."mri-1.1.6"
+ sources."normalize-path-3.0.0"
+ sources."once-1.4.0"
+ sources."parent-module-1.0.1"
+ sources."path-is-absolute-1.0.1"
+ sources."picomatch-2.3.0"
+ sources."readdirp-3.6.0"
+ sources."resolve-from-4.0.0"
+ sources."sade-1.7.4"
+ sources."source-map-0.7.3"
+ sources."strip-indent-3.0.0"
+ sources."supports-color-7.2.0"
+ sources."svelte-preprocess-4.7.4"
+ sources."to-regex-range-5.0.1"
+ sources."typescript-4.3.5"
+ sources."wrappy-1.0.2"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Svelte Code Checker Terminal Interface";
+ homepage = "https://github.com/sveltejs/language-tools#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
svgo = nodeEnv.buildNodePackage {
name = "svgo";
packageName = "svgo";
@@ -113643,7 +113949,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/highlight-7.14.5"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
@@ -114453,7 +114759,7 @@ in
sources."@types/cacheable-request-6.0.2"
sources."@types/http-cache-semantics-4.0.1"
sources."@types/keyv-3.1.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/responselike-1.0.0"
sources."abbrev-1.1.1"
sources."abstract-logging-2.0.1"
@@ -114781,7 +115087,7 @@ in
sources."uuid-3.4.0"
];
})
- sources."resolve-alpn-1.1.2"
+ sources."resolve-alpn-1.2.0"
sources."responselike-2.0.0"
sources."rimraf-2.7.1"
sources."safe-buffer-5.2.1"
@@ -115991,7 +116297,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.11"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."chalk-2.4.2"
@@ -116391,7 +116697,7 @@ in
sources."buffer-from-1.1.1"
sources."call-bind-1.0.2"
sources."camelcase-6.2.0"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
(sources."chalk-4.1.1" // {
dependencies = [
sources."supports-color-7.2.0"
@@ -116431,7 +116737,7 @@ in
sources."domelementtype-2.2.0"
sources."domhandler-4.2.0"
sources."domutils-2.7.0"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."emoji-regex-8.0.0"
sources."emojis-list-3.0.0"
sources."enhanced-resolve-5.8.2"
@@ -116981,7 +117287,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.14.5"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
sources."@babel/highlight-7.14.5"
sources."@emmetio/extract-abbreviation-0.1.6"
sources."@mrmlnc/readdir-enhanced-2.2.1"
@@ -116998,7 +117304,7 @@ in
sources."@starptech/rehype-webparser-0.10.0"
sources."@starptech/webparser-0.10.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/unist-2.0.6"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
@@ -117921,7 +118227,7 @@ in
sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w==";
};
dependencies = [
- sources."@babel/runtime-corejs3-7.14.7"
+ sources."@babel/runtime-corejs3-7.14.8"
sources."@mapbox/node-pre-gyp-1.0.5"
sources."@tootallnate/once-1.1.2"
sources."@types/raf-3.4.0"
@@ -118144,7 +118450,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.11"
- sources."@babel/helper-validator-identifier-7.14.5"
+ sources."@babel/helper-validator-identifier-7.14.8"
(sources."@babel/highlight-7.14.5" // {
dependencies = [
sources."ansi-styles-3.2.1"
@@ -118170,7 +118476,7 @@ in
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/yauzl-2.9.1"
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.2"
@@ -118470,7 +118776,7 @@ in
sources."lcid-3.1.1"
sources."levn-0.4.1"
sources."lie-3.3.0"
- sources."lighthouse-logger-1.2.0"
+ sources."lighthouse-logger-1.3.0"
sources."lines-and-columns-1.1.6"
sources."lodash.clonedeep-4.5.0"
sources."lodash.includes-4.3.0"
@@ -118733,7 +119039,7 @@ in
sources."@types/eslint-scope-3.7.1"
sources."@types/estree-0.0.50"
sources."@types/json-schema-7.0.8"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@webassemblyjs/ast-1.11.1"
sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
sources."@webassemblyjs/helper-api-error-1.11.1"
@@ -118756,11 +119062,11 @@ in
sources."ajv-keywords-3.5.2"
sources."browserslist-4.16.6"
sources."buffer-from-1.1.1"
- sources."caniuse-lite-1.0.30001245"
+ sources."caniuse-lite-1.0.30001246"
sources."chrome-trace-event-1.0.3"
sources."colorette-1.2.2"
sources."commander-2.20.3"
- sources."electron-to-chromium-1.3.780"
+ sources."electron-to-chromium-1.3.782"
sources."enhanced-resolve-5.8.2"
sources."es-module-lexer-0.7.1"
sources."escalade-3.1.1"
@@ -118898,7 +119204,7 @@ in
dependencies = [
sources."@types/glob-7.1.4"
sources."@types/minimatch-3.0.5"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."accepts-1.3.7"
sources."ajv-6.12.6"
sources."ajv-errors-1.0.1"
@@ -119552,7 +119858,7 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.1"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.3.0"
sources."ansi-regex-5.0.0"
@@ -119988,7 +120294,7 @@ in
sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA==";
};
dependencies = [
- sources."@babel/runtime-7.14.6"
+ sources."@babel/runtime-7.14.8"
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
@@ -120926,7 +121232,7 @@ in
dependencies = [
sources."@types/fs-extra-9.0.12"
sources."@types/minimist-1.2.2"
- sources."@types/node-16.3.3"
+ sources."@types/node-16.4.0"
sources."@types/node-fetch-2.5.11"
sources."ansi-styles-4.3.0"
sources."asynckit-0.4.0"
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix
new file mode 100644
index 0000000000..f9bc677721
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub, buildDunePackage, core, core_kernel, pkg-config, sqlite
+}:
+buildDunePackage rec {
+ pname = "hack_parallel";
+ version = "1.0.1";
+ useDune2 = true;
+ minimumOcamlVersion = "4.04.1";
+
+ src = fetchFromGitHub {
+ owner = "rvantonder";
+ repo = "hack_parallel";
+ rev = version;
+ sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ core core_kernel sqlite ];
+
+ meta = {
+ description =
+ "Core parallel and shared memory library used by Hack, Flow, and Pyre";
+ license = lib.licenses.mit;
+ homepage = "https://github.com/rvantonder/hack_parallel";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/http/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
deleted file mode 100644
index f762e9c7b2..0000000000
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{lib, stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}:
-
-if lib.versionAtLeast ocaml.version "4.06"
-then throw "ocaml-http is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation {
- name = "ocaml-http-0.1.5";
-
- src = fetchurl {
- url = "https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz";
- sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws";
- };
-
- buildInputs = [ocaml findlib camlp4];
- propagatedBuildInputs = [ocaml_pcre ocamlnet];
-
- createFindlibDestdir = true;
-
- prePatch = ''
- BASH=$(type -tp bash)
- echo $BASH
- substituteInPlace Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
- '';
-
- dontConfigure = true; # Skip configure phase
-
- buildPhase = ''
- make all opt
- '';
-
- meta = with lib; {
- homepage = "http://ocaml-http.forge.ocamlcore.org/";
- platforms = ocaml.meta.platforms or [];
- description = "Do it yourself (OCaml) HTTP daemon";
- license = licenses.lgpl2;
- maintainers = with maintainers; [ roconnor vbgl ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix
index 41fdbc4eed..8aaf1bcbdd 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix
@@ -6,12 +6,12 @@
buildDunePackage rec {
pname = "luv";
- version = "0.5.8";
+ version = "0.5.9";
useDune2 = true;
src = fetchurl {
url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
- sha256 = "1y3g7jvb72frckjl92zyn7hzmzjy1fy4a48992jdk80vphsdzgmk";
+ sha256 = "0bbv28vgv5mnfbn1gag5fh3n4d9nkffqy3bif3pf47677c493ym2";
};
postConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
index 7051c51cc5..c8035eea42 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
@@ -1,16 +1,16 @@
-{ lib, fetchurl, buildDunePackage, opaline, ocaml
+{ lib, fetchurl, buildDunePackage, ocaml
, alcotest
, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc, ocaml_lwt, re, result, csexp
, pandoc}:
buildDunePackage rec {
pname = "mdx";
- version = "1.8.1";
+ version = "1.10.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
- sha256 = "1szik1lyg2vs8jrisnvjdc29n0ifls8mghimff4jcz6f48haa3cv";
+ sha256 = "10d4sfv4qk9569kj46pcaw6cih40v6bkgd44lmsp7cyfhvl8pa9x";
};
nativeBuildInputs = [ cppo ];
@@ -23,7 +23,9 @@ buildDunePackage rec {
outputs = [ "bin" "lib" "out" ];
installPhase = ''
- ${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib
+ runHook preInstall
+ dune install --prefix=$bin --libdir=$lib/lib/ocaml/${ocaml.version}/site-lib ${pname}
+ runHook postInstall
'';
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix
index 90c24718dd..5f63a98a13 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mparser/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
+{ lib, fetchFromGitHub, buildDunePackage }:
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-mparser-1.2.3";
- src = fetchzip {
- url = "https://github.com/cakeplus/mparser/archive/1.2.3.tar.gz";
- sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw";
+buildDunePackage rec {
+ pname = "mparser";
+ version = "1.3";
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "murmour";
+ repo = "mparser";
+ rev = version;
+ sha256 = "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx";
};
- buildInputs = [ ocaml findlib ocamlbuild ];
-
- configurePhase = "ocaml setup.ml -configure";
- buildPhase = "ocaml setup.ml -build";
- installPhase = "ocaml setup.ml -install";
-
- createFindlibDestdir = true;
-
meta = {
description = "A simple monadic parser combinator OCaml library";
license = lib.licenses.lgpl21Plus;
- homepage = "https://github.com/cakeplus/mparser";
+ homepage = "https://github.com/murmour/mparser";
maintainers = [ lib.maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mparser/pcre.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mparser/pcre.nix
new file mode 100644
index 0000000000..0f26e140ed
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mparser/pcre.nix
@@ -0,0 +1,12 @@
+{ fetchFromGitHub, buildDunePackage, ocaml_pcre, mparser }:
+
+buildDunePackage rec {
+ pname = "mparser-pcre";
+ useDune2 = true;
+
+ inherit (mparser) src version;
+
+ propagatedBuildInputs = [ ocaml_pcre mparser ];
+
+ meta = mparser.meta // { description = "PCRE-based regular expressions"; };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
index b501282c15..6e172dee6e 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
@@ -1,4 +1,5 @@
{ buildDunePackage
+, cppo
, stdlib-shims
, ppx_yojson_conv_lib
, ocaml-syntax-shims
@@ -26,16 +27,20 @@ buildDunePackage {
'';
buildInputs = [
- stdlib-shims
+ cppo
ppx_yojson_conv_lib
ocaml-syntax-shims
octavius
- uutf
- csexp
dune-build-info
omd
cmdliner
+ ];
+
+ propagatedBuildInputs = [
+ csexp
jsonrpc
+ stdlib-shims
+ uutf
];
meta = jsonrpc.meta // {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
index 69fa4cba85..9a6dd1f7cb 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
@@ -1,10 +1,10 @@
{ lib, fetchFromGitHub, buildDunePackage
-, ocaml-migrate-parsetree, ppx_tools_versioned
+, ppxlib
}:
buildDunePackage rec {
pname = "ocaml-monadic";
- version = "0.4.1";
+ version = "0.5.0";
useDune2 = true;
@@ -12,11 +12,10 @@ buildDunePackage rec {
owner = "zepalmer";
repo = pname;
rev = version;
- sha256 = "1zcwydypk5vwfn1g7srnl5076scwwq5a5y8xwcjl70pc4cpzszll";
+ sha256 = "1ynv3yhdqmkhkgnz6c5kv6ryjcc934sdvw9rhh8rjg2dlzlffgbw";
};
- buildInputs = [ ppx_tools_versioned ];
- propagatedBuildInputs = [ ocaml-migrate-parsetree ];
+ buildInputs = [ ppxlib ];
meta = {
inherit (src.meta) homepage;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix
index fad5917a5a..68c06cc4c6 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix
@@ -5,13 +5,13 @@
buildDunePackage rec {
pname = "odoc";
- version = "1.5.2";
+ version = "1.5.3";
minimumOCamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz";
- sha256 = "0wa87h8q6izcc6rkzqn944vrb3hmc21lf0d0rmr8rhhbcvr66i6j";
+ sha256 = "0idzidmz7y10xkwcf4aih0mdvkipxk1gzi4anhnbbi2q2s0nzdzj";
};
useDune2 = true;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix
index a4378016b4..6892a7a2e4 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix
@@ -2,15 +2,16 @@
buildDunePackage rec {
pname = "parany";
- version = "8.0.0";
+ version = "12.0.3";
useDune2 = true;
+ minimumOCamlVersion = "4.03.0";
src = fetchFromGitHub {
owner = "UnixJunkie";
- repo = pname;
- rev = "v${version}";
- sha256 = "19yz1yqyqx6gawy93jlh3x6vji2p9qsy6nsbj65q5pii8p1fjlsm";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1j962ak68kvv62bczjqxwlwvdgcvjfcs36qwq12nnm0pwlzkhg33";
};
propagatedBuildInputs = [ ocamlnet cpu ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
index 210b7d5885..ea853c4648 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
@@ -1,26 +1,26 @@
-{ lib, stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }:
+{ lib, buildDunePackage, fetchurl, pcre, dune-configurator }:
-stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-pcre-${version}";
- version = "7.2.3";
+buildDunePackage rec {
+ pname = "pcre";
+ version = "7.4.6";
+
+ useDune2 = true;
+
+ minimalOCamlVersion = "4.08";
src = fetchurl {
- url = "https://github.com/mmottl/pcre-ocaml/releases/download/v${version}/pcre-ocaml-${version}.tar.gz";
- sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3";
+ url = "https://github.com/mmottl/pcre-ocaml/releases/download/${version}/pcre-${version}.tbz";
+ sha256 = "17ajl0ra5xkxn5pf0m0zalylp44wsfy6mvcq213djh2pwznh4gya";
};
- buildInputs = [ ocaml findlib ocamlbuild ];
- propagatedBuildInputs = [pcre];
+ buildInputs = [ dune-configurator ];
- createFindlibDestdir = true;
-
- dontConfigure = true; # Skip configure phase
+ propagatedBuildInputs = [ pcre ];
meta = with lib; {
- homepage = "https://bitbucket.org/mmottl/pcre-ocaml";
+ homepage = "https://mmottl.github.io/pcre-ocaml";
description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
- license = licenses.lgpl21;
- platforms = ocaml.meta.platforms or [];
+ license = licenses.lgpl21Plus;
maintainers = with maintainers; [ maggesi vbmithr ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/base.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/base.nix
new file mode 100644
index 0000000000..2f5d765813
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/base.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-crypto
+, tezos-micheline
+, ptime
+, ezjsonm
+, ipaddr
+, qcheck-alcotest
+, crowbar
+}:
+
+buildDunePackage {
+ pname = "tezos-base";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-crypto
+ tezos-micheline
+ ptime
+ ezjsonm
+ ipaddr
+ ];
+
+ checkInputs = [
+ qcheck-alcotest
+ crowbar
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: meta-package and pervasive type definitions for Tezos";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/clic.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/clic.nix
new file mode 100644
index 0000000000..d69174e5f2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/clic.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-stdlib-unix
+, alcotest
+, alcotest-lwt
+}:
+
+buildDunePackage {
+ pname = "tezos-clic";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-stdlib-unix
+ ];
+
+ checkInputs = [
+ alcotest
+ alcotest-lwt
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: library of auto-documented command-line-parsing combinators";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/crypto.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/crypto.nix
new file mode 100644
index 0000000000..9c5bd45f94
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/crypto.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-clic
+, tezos-rpc
+, bls12-381
+, hacl-star
+, secp256k1-internal
+, uecc
+, ringo
+, ff
+, alcotest
+, alcotest-lwt
+}:
+
+buildDunePackage {
+ pname = "tezos-crypto";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-clic
+ tezos-rpc
+ bls12-381
+ hacl-star
+ secp256k1-internal
+ uecc
+ ringo
+ ];
+
+ checkInputs = [
+ alcotest
+ alcotest-lwt
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: library with all the cryptographic primitives used by Tezos";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/error-monad.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/error-monad.nix
new file mode 100644
index 0000000000..70cdff0c0a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/error-monad.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, data-encoding
+, lwt
+, lwt-canceler
+, alcotest
+, alcotest-lwt
+}:
+
+buildDunePackage {
+ pname = "tezos-error-monad";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-stdlib
+ data-encoding
+ lwt
+ lwt-canceler
+ ];
+
+ checkInputs = [
+ alcotest
+ alcotest-lwt
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: error monad";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/event-logging.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/event-logging.nix
new file mode 100644
index 0000000000..30d6c12087
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/event-logging.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-lwt-result-stdlib
+, lwt_log
+, alcotest
+, alcotest-lwt
+}:
+
+buildDunePackage {
+ pname = "tezos-event-logging";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-lwt-result-stdlib
+ lwt_log
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: event logging library";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix
new file mode 100644
index 0000000000..960b2532c3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix
@@ -0,0 +1,51 @@
+{ lib
+, fetchFromGitLab
+, pkg-config
+, buildDunePackage
+, lmdb
+, rresult
+, cstruct
+, alcotest
+}:
+
+buildDunePackage rec {
+ pname = "tezos-lmdb";
+ version = "7.4";
+ src = fetchFromGitLab {
+ owner = "tezos";
+ repo = "tezos";
+ rev = "v${version}";
+ sha256 = "18q02j74aa8mxv233kvyb62xbhjngzpgppp6kgr4m53d7a78wgsm";
+ };
+
+ useDune2 = true;
+
+ preBuild = ''
+ rm dune
+ rm -rf src
+ rm -rf docs
+ ls vendors | grep -v ocaml-lmdb |xargs rm -rf
+ '';
+
+ buildInputs = [
+ pkg-config
+ ];
+
+ propagatedBuildInputs = [
+ rresult
+ lmdb
+ ];
+
+ checkInputs = [
+ cstruct
+ alcotest
+ ];
+
+ doCheck = false;
+
+ meta = {
+ description = "Legacy Tezos OCaml binding to LMDB (Consider ocaml-lmdb instead)";
+ license = lib.licenses.isc;
+ maintainers = [ lib.maintainers.ulrikstrid ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/micheline.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/micheline.nix
new file mode 100644
index 0000000000..a729cdef15
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/micheline.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-error-monad
+, uutf
+, alcotest
+, alcotest-lwt
+, ppx_inline_test
+}:
+
+buildDunePackage {
+ pname = "tezos-micheline";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-error-monad
+ uutf
+ ];
+
+ checkInputs = [
+ alcotest
+ alcotest-lwt
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: internal AST and parser for the Michelson language";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p-services.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p-services.nix
new file mode 100644
index 0000000000..b4243f589f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p-services.nix
@@ -0,0 +1,18 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-base
+}:
+
+buildDunePackage {
+ pname = "tezos-p2p-services";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-base
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: descriptions of RPCs exported by `tezos-p2p`";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p.nix
new file mode 100644
index 0000000000..b75c03debf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-p2p-services
+, alcotest-lwt
+, lwt-watcher
+}:
+
+buildDunePackage {
+ pname = "tezos-p2p";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-p2p-services
+ lwt-watcher
+ ];
+
+ checkInputs = [
+ alcotest-lwt
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: library for a pool of P2P connections";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix
new file mode 100644
index 0000000000..5b043eede9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix
@@ -0,0 +1,19 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-protocol-008-PtEdo2Zk
+, qcheck-alcotest
+}:
+
+buildDunePackage {
+ pname = "tezos-protocol-008-PtEdo2Zk-parameters";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-protocol-008-PtEdo2Zk
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos/Protocol: parameters";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix
new file mode 100644
index 0000000000..49a7f0e638
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-protocol-compiler
+}:
+
+buildDunePackage {
+ pname = "tezos-protocol-008-PtEdo2Zk";
+ inherit (tezos-stdlib) version src useDune2 doCheck;
+
+ preBuild = ''
+ rm -rf vendors
+ substituteInPlace src/proto_008_PtEdo2Zk/lib_protocol/dune.inc --replace "-nostdlib" ""
+ '';
+
+ propagatedBuildInputs = [
+ tezos-protocol-compiler
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos/Protocol: economic-protocol definition";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix
new file mode 100644
index 0000000000..a43356d9cb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildDunePackage
+, ocaml
+, tezos-stdlib
+, tezos-protocol-environment
+, ocp-ocamlres
+, pprint
+}:
+
+if lib.versionAtLeast ocaml.version "4.12" then
+ throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.10"
+else
+
+buildDunePackage {
+ pname = "tezos-protocol-compiler";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ minimalOCamlVersion = "4.09";
+
+ propagatedBuildInputs = [
+ tezos-protocol-environment
+ ocp-ocamlres
+ pprint
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: economic-protocol compiler";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix
new file mode 100644
index 0000000000..51efe69418
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix
@@ -0,0 +1,18 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-protocol-compiler
+}:
+
+buildDunePackage {
+ pname = "tezos-protocol-demo-noops";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-protocol-compiler
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos/Protocol: demo_noops economic-protocol definition";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix
new file mode 100644
index 0000000000..42662105b9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix
@@ -0,0 +1,15 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+}:
+
+buildDunePackage {
+ pname = "tezos-protocol-environment-packer";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ minimalOCamlVersion = "4.03";
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: sigs/structs packer for economic protocol environment";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix
new file mode 100644
index 0000000000..79b84360a9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildDunePackage
+, ocaml
+, tezos-stdlib
+, tezos-protocol-environment-packer
+, zarith
+}:
+
+buildDunePackage {
+ pname = "tezos-protocol-environment-sigs";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-protocol-environment-packer
+ ];
+
+ checkInputs = [
+ tezos-stdlib
+ ];
+
+ postPatch = ''
+ cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./src/lib_protocol_environment/sigs/v1/z.mli
+ sed -i 's/out_channel/Stdlib.out_channel/g' ./src/lib_protocol_environment/sigs/v1/z.mli
+ sed -i 's/Buffer/Stdlib.Buffer/g' ./src/lib_protocol_environment/sigs/v1/z.mli
+ '';
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: restricted typing environment for the economic protocols";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix
new file mode 100644
index 0000000000..feddca046f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix
@@ -0,0 +1,20 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-crypto
+, tezos-protocol-environment-packer
+}:
+
+buildDunePackage {
+ pname = "tezos-protocol-environment-structs";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-crypto
+ tezos-protocol-environment-packer
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: restricted typing environment for the economic protocols";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment.nix
new file mode 100644
index 0000000000..60d9ae2922
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-base
+, tezos-sapling
+, tezos-protocol-environment-sigs
+, tezos-protocol-environment-structs
+, zarith
+, alcotest-lwt
+, crowbar
+}:
+
+buildDunePackage {
+ pname = "tezos-protocol-environment";
+ inherit (tezos-stdlib) version src useDune2 doCheck preBuild;
+
+ propagatedBuildInputs = [
+ tezos-sapling
+ tezos-base
+ tezos-protocol-environment-sigs
+ tezos-protocol-environment-structs
+ zarith # this might break, since they actually want 1.11
+ ];
+
+ checkInputs = [
+ alcotest-lwt
+ crowbar
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/requester.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/requester.nix
new file mode 100644
index 0000000000..d4a2b69eaa
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/requester.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-base
+, tezos-test-services
+, lwt-watcher
+, alcotest-lwt
+}:
+
+buildDunePackage {
+ pname = "tezos-requester";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-base
+ lwt-watcher
+ ];
+
+ checkInputs = [
+ alcotest-lwt
+ tezos-test-services
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: generic resource fetching service";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc.nix
new file mode 100644
index 0000000000..33450bdf16
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-error-monad
+, resto
+, resto-directory
+}:
+
+buildDunePackage {
+ pname = "tezos-rpc";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-error-monad
+ resto
+ resto-directory
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/sapling.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/sapling.nix
new file mode 100644
index 0000000000..40665e3805
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/sapling.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildDunePackage
+, ocaml
+, tezos-stdlib
+, tezos-crypto
+, tezos-rust-libs
+, alcotest-lwt
+}:
+
+buildDunePackage {
+ pname = "tezos-sapling";
+ inherit (tezos-stdlib) version src useDune2 preBuild;
+
+ propagatedBuildInputs = [
+ tezos-crypto
+ tezos-rust-libs
+ ];
+
+ checkInputs = [
+ alcotest-lwt
+ ];
+
+ doCheck = false;
+
+ # This is a hack to work around the hack used in the dune files
+ OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos/Protocol: economic-protocol definition";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-services.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-services.nix
new file mode 100644
index 0000000000..4e2f40497e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-services.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-workers
+, tezos-p2p-services
+, tezos-version
+}:
+
+buildDunePackage {
+ pname = "tezos-shell-services";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-workers
+ tezos-p2p-services
+ tezos-version
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: descriptions of RPCs exported by `tezos-shell`";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix
new file mode 100644
index 0000000000..2b3a01469a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-event-logging
+, lwt
+, ptime
+, mtime
+, ipaddr
+, re
+, alcotest
+, alcotest-lwt
+}:
+
+buildDunePackage {
+ pname = "tezos-stdlib-unix";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-event-logging
+ lwt
+ ptime
+ mtime
+ ipaddr
+ re
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: yet-another local-extension of the OCaml standard library (unix-specific fragment)";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib.nix
new file mode 100644
index 0000000000..d0a734800c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib.nix
@@ -0,0 +1,53 @@
+{ lib
+, fetchFromGitLab
+, buildDunePackage
+, hex
+, lwt
+, zarith
+, alcotest
+, alcotest-lwt
+, crowbar
+, bigstring
+, lwt_log
+}:
+
+buildDunePackage rec {
+ pname = "tezos-stdlib";
+ version = "8.3";
+ src = fetchFromGitLab {
+ owner = "tezos";
+ repo = "tezos";
+ rev = "v${version}";
+ sha256 = "12cv2cssnw60jbpnh6xjysxgsgcj7d72454k4zs2b8fjx7mkgksk";
+ };
+
+ minimalOCamlVersion = "4.0.8";
+
+ useDune2 = true;
+
+ preBuild = ''
+ rm -rf vendors
+ '';
+
+ propagatedBuildInputs = [
+ hex
+ lwt
+ zarith
+ ];
+
+ checkInputs = [
+ alcotest
+ alcotest-lwt
+ crowbar
+ bigstring
+ lwt_log
+ ];
+
+ doCheck = true;
+
+ meta = {
+ description = "Tezos: yet-another local-extension of the OCaml standard library";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.ulrikstrid ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-services.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-services.nix
new file mode 100644
index 0000000000..ba30b922d1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-services.nix
@@ -0,0 +1,20 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-base
+, alcotest-lwt
+}:
+
+buildDunePackage {
+ pname = "tezos-test-services";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-base
+ alcotest-lwt
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: Alcotest-based test services";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/version.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/version.nix
new file mode 100644
index 0000000000..3b4bdd4bf6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/version.nix
@@ -0,0 +1,18 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-base
+}:
+
+buildDunePackage {
+ pname = "tezos-version";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-base
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: version information generated from Git";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/workers.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/workers.nix
new file mode 100644
index 0000000000..ca659f8adf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/workers.nix
@@ -0,0 +1,18 @@
+{ lib
+, buildDunePackage
+, tezos-stdlib
+, tezos-base
+}:
+
+buildDunePackage {
+ pname = "tezos-workers";
+ inherit (tezos-stdlib) version src useDune2 preBuild doCheck;
+
+ propagatedBuildInputs = [
+ tezos-base
+ ];
+
+ meta = tezos-stdlib.meta // {
+ description = "Tezos: worker library";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
index 07025be296..2be9ce1b02 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix
@@ -1,48 +1,22 @@
-{ lib, stdenv, fetchzip, ocaml, findlib, dune_2, cppo, easy-format, biniou }:
-let
+{ lib, fetchurl, buildDunePackage, cppo, easy-format, biniou }:
+
+buildDunePackage rec {
pname = "yojson";
- param =
- if lib.versionAtLeast ocaml.version "4.02" then rec {
- version = "1.7.0";
+ version = "1.7.0";
+ useDune2 = true;
+
+ src = fetchurl {
url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
- sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd";
- nativeBuildInputs = [ dune_2 ];
- extra = {
- installPhase = ''
- dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname}
- '';
- };
- } else rec {
- version = "1.2.3";
- url = "https://github.com/ocaml-community/yojson/archive/v${version}.tar.gz";
- sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl";
- extra = {
- createFindlibDestdir = true;
-
- makeFlags = [ "PREFIX=$(out)" ];
-
- preBuild = "mkdir $out/bin";
- };
- };
-in
-stdenv.mkDerivation ({
-
- name = "ocaml${ocaml.version}-${pname}-${param.version}";
-
- src = fetchzip {
- inherit (param) url sha256;
+ sha256 = "1iich6323npvvs8r50lkr4pxxqm9mf6w67cnid7jg1j1g5gwcvv5";
};
- nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []);
- propagatedNativeBuildInputs = [ cppo ];
+ nativeBuildInputs = [ cppo ];
propagatedBuildInputs = [ easy-format biniou ];
- configurePlatforms = [];
meta = with lib; {
description = "An optimized parsing and printing library for the JSON format";
homepage = "https://github.com/ocaml-community/${pname}";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
- platforms = ocaml.meta.platforms or [];
};
-} // param.extra)
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
index 1a27c8c1f0..a4083707a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix
@@ -6,7 +6,7 @@
, pytestCheckHook
, pytest-asyncio
, pytest-tornado
-, pytestcov
+, pytest-cov
, sqlalchemy
, tornado
, twisted
@@ -38,7 +38,7 @@ buildPythonPackage rec {
pytest-asyncio
pytest-tornado
pytestCheckHook
- pytestcov
+ pytest-cov
sqlalchemy
tornado
twisted
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix
index 22e4a67ff2..47a70940e9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "adb-shell";
- version = "0.3.4";
+ version = "0.4.0";
disabled = !isPy3k;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "adb_shell";
rev = "v${version}";
- sha256 = "sha256-H1GVbMeaVUZh8T1jgZP2o+emEkK4fOi5k4aL9ayVesA=";
+ sha256 = "1dzpgpvjvss4mk2kp1s9g1gg0d008pbmfdsi9b98q9fax9syk725";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/addict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/addict/default.nix
new file mode 100644
index 0000000000..2bb531cff9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/addict/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "addict";
+ version = "2.4.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "addict" ];
+
+ meta = with lib; {
+ description = "Module that exposes a dictionary subclass that allows items to be set like attributes";
+ homepage = "https://github.com/mewwts/addict";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
index a6c99e72c0..3ddd3d366e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.0.9031";
+ version = "9.0.9166";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xyNTcGTGH8030CJif6an+kDZIfOUVDMiRhFamVajAzk=";
+ sha256 = "09qbqn57h92f81xv35f645ai7nkkqf7cidkg3qrwfpxcwc2g9kdz";
};
propagatedBuildInputs = [ pyvex ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix
index 728f2b5fa6..dc70baab9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pytestrunner
+, pytest-runner
, pytest
, pytest-asyncio
, contextvars
@@ -23,7 +23,7 @@ buildPythonPackage rec {
};
buildInputs = [
- pytestrunner
+ pytest-runner
];
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
index 896b9c71a7..6d468b5f48 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -1,22 +1,34 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }:
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, protobuf
+, zeroconf
+}:
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "2.9.0";
+ version = "5.0.1";
+ format = "setuptools";
- disabled = !isPy3k;
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "11259cd1f115d31b91512a209779fa813dded747408100805bc8ecf7c1c1fa82";
+ sha256 = "sha256-2IxXhAysQiqqEd4Mfjgc5vX0+D60rof2nPJDXy9tRVs=";
};
- propagatedBuildInputs = [ attrs protobuf zeroconf ];
+ propagatedBuildInputs = [
+ protobuf
+ zeroconf
+ ];
# no tests implemented
doCheck = false;
- pythonImportsCheck = [ "aioesphomeapi" ];
+ pythonImportsCheck = [
+ "aioesphomeapi"
+ ];
meta = with lib; {
description = "Python Client for ESPHome native API";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix
index e3ca13859a..a610dba766 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix
@@ -4,7 +4,7 @@
, isPy27
, pytest
, pytest-asyncio
-, pytestcov
+, pytest-cov
, trustme
, async-timeout
}:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
pytest-asyncio
- pytestcov
+ pytest-cov
trustme
async-timeout
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
index 74ff8fb3fd..71e1fb43dd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "aioguardian";
- version = "1.0.7";
+ version = "1.0.8";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-KMhq86hcqoYloS/6VHsl+3KVEZBbN97ABrZlmEr32Z8=";
+ sha256 = "0nqsacg0yrsqr6qax4486ffk8r88ra5yixxd6r88jwscm2bmjg3p";
};
format = "pyproject";
@@ -45,15 +45,6 @@ buildPythonPackage rec {
pytestCheckHook
];
- postPatch = ''
- # https://github.com/bachya/aioguardian/pull/66
- substituteInPlace pyproject.toml \
- --replace 'asyncio_dgram = "^1.0.1"' 'asyncio_dgram = "^2.0.0"'
- # https://github.com/bachya/aioguardian/pull/67
- substituteInPlace pyproject.toml \
- --replace "poetry>=0.12" "poetry-core"
- '';
-
disabledTestPaths = [ "examples/" ];
pythonImportsCheck = [ "aioguardian" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix
index f1c018989c..f720cdf9b1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix
@@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
+, commentjson
, cryptography
, fetchFromGitHub
, poetry-core
@@ -11,14 +12,14 @@
buildPythonPackage rec {
pname = "aiohomekit";
- version = "0.3.0";
+ version = "0.5.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "Jc2k";
repo = pname;
rev = version;
- sha256 = "sha256-chRUQyCDXW4of0XBdmKuQEzUE3Gt4A2uGlPNy+oEoco=";
+ sha256 = "sha256-Fo9KWBcN6Y/fa7vkWugSer5L7+hOWz99+hw6Hz1LAMM=";
};
nativeBuildInputs = [
@@ -26,6 +27,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
+ commentjson
cryptography
zeroconf
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 0a939dfb00..589aa14509 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytestcov }:
+{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }:
buildPythonPackage rec {
pname = "aiohttp-jinja2";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ aiohttp jinja2 ];
- checkInputs = [ pytest pytest-aiohttp pytestcov ];
+ checkInputs = [ pytest pytest-aiohttp pytest-cov ];
checkPhase = ''
pytest -W ignore::DeprecationWarning
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix
index 8a8f7c4b31..f3abbddfd9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchpatch, buildPythonPackage, fetchPypi
-, aiohttp, pytest, pytestcov, pytest-aiohttp
+, aiohttp, pytest, pytest-cov, pytest-aiohttp
}:
buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ aiohttp ];
- checkInputs = [ pytest pytestcov pytest-aiohttp ];
+ checkInputs = [ pytest pytest-cov pytest-aiohttp ];
checkPhase = ''
python -m pytest
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix
index 078184275e..459a06d57d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aionotion";
- version = "3.0.1";
+ version = "3.0.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "1ydrazg7gcwf53006n1fvxh9zm77by6zi36haq1bmy5skqccyiki";
+ sha256 = "1328g2245h9gcrnzrbcxaxw78723d0skznrrj8k77fbijxdc4kwv";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix
index 0d3fe5bbae..983ff77169 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aiorecollect";
- version = "1.0.5";
+ version = "1.0.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "0h76l0pahnmls0radknzm8dw79qx9dv0xhxqnn6011j9fwyviyqm";
+ sha256 = "0vm19rcy14fdsfddjskxh0nlph10jrj3qh6xqwv73wgcmbdpr91i";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix
index 0bdab3bb28..e15271bafd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
-, pytestcov
+, pytest-cov
, pytest-asyncio
}:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
sha256 = "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13";
};
- checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ];
+ checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ];
meta = with lib; {
description = "Generator-based operators for asynchronous iteration";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix
index 81502a470a..9c7244b3c0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, pytest, pytestcov, mock, coverage, setuptools
+, pytest, pytest-cov, mock, coverage, setuptools
, Mako, sqlalchemy, python-editor, python-dateutil
}:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51";
};
- buildInputs = [ pytest pytestcov mock coverage ];
+ buildInputs = [ pytest pytest-cov mock coverage ];
propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ];
# no traditional test suite
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
index 285a125a72..acad9cb0f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix
@@ -43,14 +43,14 @@ in
buildPythonPackage rec {
pname = "angr";
- version = "9.0.9031";
+ version = "9.0.9166";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-qWAz9SHfQU0cdk4yVekJn5OIDPJPbi63CDdlHDq1Opw=";
+ sha256 = "1h1jb57zp8wy24xy60j76sl4hrzhhwfsvfx26zhbnhqzmwghpd5x";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix
index e5ab195427..1ab86c1820 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "angrop";
- version = "9.0.9031";
+ version = "9.0.9166";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-3q/3iFR0FFOcvgmNVXtgi1Spu5xfXNJFy+QoIh8amOY=";
+ sha256 = "1myrzp5axg0dj7kxqc2mz3kfqlds3vzvavcncrj5y9xpx8m7l71m";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix
index 61cfed3dbb..04a3e11be3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, installShellFiles
, Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography
-, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytestcov, tox, gntp, sleekxmpp
+, pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp
}:
buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
];
checkInputs = [
- pytestrunner coverage flake8 mock pytestCheckHook pytestcov tox gntp sleekxmpp
+ pytest-runner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp
];
disabledTests = [ "test_apprise_cli_nux_env" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
index 60c3e8905b..40583a12ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.0.9031";
+ version = "9.0.9166";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-pzBMyw5FwQV1FyhvOxUq39s96p0KKSrkEvJzhJQdS4E=";
+ sha256 = "0y77lyz019rm9zgxpam6dbb006c7j66hwy985h3fg6nbz74pcml5";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix
index 6c62fd104f..cf2f925572 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix
@@ -3,7 +3,7 @@
, importlib-metadata
, pexpect
, prettytable
-, requests_toolbelt
+, requests-toolbelt
}:
buildPythonPackage rec {
pname = "argcomplete";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
importlib-metadata
pexpect
prettytable
- requests_toolbelt
+ requests-toolbelt
];
pythonImportsCheck = [ "argcomplete" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix
index 9ea4fdf64b..2a7e6cb0df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, aria2, poetry, pytest, pytestcov, pytest_xdist, responses
+, aria2, poetry, pytest, pytest-cov, pytest-xdist, responses
, asciimatics, loguru, requests, setuptools, websocket-client
}:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
export HOME=$TMPDIR
'';
- checkInputs = [ aria2 responses pytest pytestcov pytest_xdist ];
+ checkInputs = [ aria2 responses pytest pytest-cov pytest-xdist ];
# Tests are not all stable/deterministic,
# they rely on actually running an aria2c daemon and communicating with it,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix
index 97718a3006..5ad433413c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, glibcLocales
-, pytestrunner
+, pytest-runner
, pytestCheckHook
}:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
LC_ALL = "en_US.UTF-8";
buildInputs = [ glibcLocales ];
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arrow/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/arrow/2.nix
index d87f1ede3c..88864ec78b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/arrow/2.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/arrow/2.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, nose, chai, simplejson, backports_functools_lru_cache
-, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov
+, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytest-cov
, pytestCheckHook
}:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
checkInputs = [
dateparser
pytestCheckHook
- pytestcov
+ pytest-cov
pytest-mock
pytz
simplejson
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix
index 369288293e..13c78783ed 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "async-upnp-client";
- version = "0.19.0";
+ version = "0.19.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
- sha256 = "0xj3j54nasl59gs1k84h3fixjsaqn7whg33h6wi99l5yfbwfqv8p";
+ sha256 = "sha256-qxEn9UrQuwRaP7sZlu3854gDI7Gqku055DF8KvsU6p4=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix
index 522f406da4..d8a378b082 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "asyncio_mqtt";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0550229cecde6ff1751c49dd5ea26b02bf52b7e9bbe9bf763da765f35bb281de";
+ sha256 = "0s94dvgh1fazycppki5m6f9d60hc4ykhqfznlzpwl4dzknxplpsz";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
index 5f00955eef..4d96bcbe26 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
@@ -1,6 +1,6 @@
{ lib, isPy3k, pythonOlder, fetchPypi, buildPythonPackage
, pytest
-, pytestcov
+, pytest-cov
, sybil
, typing-extensions
}:
@@ -20,7 +20,7 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest pytestcov sybil
+ pytest pytest-cov sybil
];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
index 3783f9776c..ce9f1eabc7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, numpy
-, pytestrunner
+, pytest-runner
, pytestCheckHook
}:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ numpy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix
index fd92351c4d..c7d1d5373f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "backoff";
- version = "1.10.0";
+ version = "1.11.1";
src = fetchFromGitHub {
owner = "litl";
repo = pname;
rev = "v${version}";
- sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0";
+ sha256 = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4=";
};
format = "pyproject";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix
index 586176300b..cb5665363f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix
@@ -6,7 +6,7 @@
, pytest
, pytest-black
, pytest-flake8
-, pytestcov
+, pytest-cov
}:
buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ];
- checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ];
+ checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ];
# ironically, they fail a linting test, and pytest.ini forces that test suite
checkPhase = ''
rm backports/functools_lru_cache.py
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix
index e07b02a08e..8a1e6771b1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub
-, wheel, pytestCheckHook, pytestrunner, pythonAtLeast }:
+, wheel, pytestCheckHook, pytest-runner, pythonAtLeast }:
buildPythonPackage rec {
version = "0.18.4";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ wheel ];
# Using pytes instead of setuptools check hook allows disabling specific tests
- checkInputs = [ pytestCheckHook pytestrunner ];
+ checkInputs = [ pytestCheckHook pytest-runner ];
dontUseSetuptoolsCheck = true;
disabledTests = [
# Test fails with a an error: AssertionError: assert 30 == 31
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix
index 7df23d1a25..7d8e6ff5be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "bellows";
- version = "0.24.0";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
rev = version;
- sha256 = "00sa4x1qzv861z9d83lk4lp1g2pqiv9hpawj92w4qn1wnqxbz6rw";
+ sha256 = "1836wm8whbryp31zdaj3b6w40sx1wjsxgpjdb1x9rgmwff4d1hc0";
};
prePatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix
index 459d3c51d7..087329d103 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/betamax-matchers/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, betamax, requests_toolbelt }:
+, betamax, requests-toolbelt }:
buildPythonPackage rec {
pname = "betamax-matchers";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43";
};
- buildInputs = [ betamax requests_toolbelt ];
+ buildInputs = [ betamax requests-toolbelt ];
meta = with lib; {
homepage = "https://github.com/sigmavirus24/betamax_matchers";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix
index 53319466d3..d68318355d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytest
-, pytestrunner
+, pytest-runner
, six
, html5lib
, setuptools
@@ -18,7 +18,7 @@ buildPythonPackage rec {
sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM=";
};
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [ packaging six html5lib setuptools ];
# Disable network tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/0_9.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/0_9.nix
index bd7bde4290..84c1767bc2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/0_9.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/0_9.nix
@@ -8,7 +8,7 @@
, makeFontsConf
, freefont_ttf
, pytest
-, pytestrunner
+, pytest-runner
, glibcLocales
, cairo
, cffi
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
index 5c561af2f1..9b64dbeb66 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
@@ -8,7 +8,7 @@
, makeFontsConf
, freefont_ttf
, pytest
-, pytestrunner
+, pytest-runner
, glibcLocales
, cairo
, cffi
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/generic.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/generic.nix
index 8b674f3baa..cdcdbad339 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/generic.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
fontDirectories = [ freefont_ttf ];
};
- checkInputs = [ numpy pytest pytestrunner glibcLocales ];
+ checkInputs = [ numpy pytest pytest-runner glibcLocales ];
propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib;
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix
index 0e8732f69a..2495040887 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }:
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook }:
buildPythonPackage rec {
pname = "capturer";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix
index 7c324e646a..61ec6c2125 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix
@@ -2,9 +2,9 @@
, buildPythonPackage
, python, runCommand
, fetchFromGitHub
-, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
+, configargparse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
, dialog, gnureadline
-, pytest_xdist, pytestCheckHook, python-dateutil
+, pytest-xdist, pytestCheckHook, python-dateutil
}:
buildPythonPackage rec {
@@ -21,7 +21,7 @@ buildPythonPackage rec {
sourceRoot = "source/${pname}";
propagatedBuildInputs = [
- ConfigArgParse
+ configargparse
acme
configobj
cryptography
@@ -42,7 +42,7 @@ buildPythonPackage rec {
checkInputs = [
python-dateutil
pytestCheckHook
- pytest_xdist
+ pytest-xdist
];
pytestFlagsArray = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix
index da04ecf688..bf3eab19d4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix
@@ -5,8 +5,8 @@
# pythonPackages
, click
, pytest
-, pytestcov
-, pytestrunner
+, pytest-cov
+, pytest-runner
, pyyaml
, six
}:
@@ -30,8 +30,8 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
- pytestrunner
+ pytest-cov
+ pytest-runner
];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix
index bec5f03cd8..46fad656ca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix
@@ -2,7 +2,7 @@
, fetchPypi
, pytestCheckHook
, coveralls
-, pytestcov
+, pytest-cov
, cython
, numpy
, python
@@ -20,7 +20,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
coveralls
- pytestcov
+ pytest-cov
];
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chardet/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/chardet/2.nix
index 65381d4026..5f6fe0a672 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chardet/2.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/chardet/2.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch
-, pytest, pytestrunner, hypothesis }:
+, pytest, pytest-runner, hypothesis }:
buildPythonPackage rec {
pname = "chardet";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
})
];
- checkInputs = [ pytest pytestrunner hypothesis ];
+ checkInputs = [ pytest pytest-runner hypothesis ];
meta = with lib; {
homepage = "https://github.com/chardet/chardet";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
index 50f6d33791..6e9256ffac 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
@@ -9,7 +9,7 @@
, portend
, pyopenssl
, pytestCheckHook
-, pytestcov
+, pytest-cov
, pytest-mock
, requests
, requests-toolbelt
@@ -46,7 +46,7 @@ buildPythonPackage rec {
portend
pyopenssl
pytestCheckHook
- pytestcov
+ pytest-cov
pytest-mock
requests
requests-toolbelt
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix
index df50219fb1..2ae180a8ba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, buildPythonPackage, fetchPypi
, setuptools-scm
, cheroot, contextlib2, portend, routes, six, zc_lockfile
-, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt
+, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests-toolbelt
}:
buildPythonPackage rec {
@@ -21,7 +21,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ];
checkInputs = [
- backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt
+ backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests-toolbelt
];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
index 033ead0912..8f56743f96 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
@@ -2,7 +2,7 @@
, setuptools-scm
, cheroot, portend, more-itertools, zc_lockfile, routes
, jaraco_collections
-, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services
+, objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services
, fetchpatch
}:
@@ -47,7 +47,7 @@ buildPythonPackage rec {
];
checkInputs = [
- objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
+ objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services
];
# Keyboard interrupt ends test suite run
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ci-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ci-py/default.nix
index 30220b48b7..61e1760f37 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ci-py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ci-py/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
-, pytest, pytestrunner, pytestCheckHook }:
+, pytest, pytest-runner, pytestCheckHook }:
buildPythonPackage rec {
version = "1.0.0";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "12ax07n81vxbyayhwzi1q6x7gfmwmvrvwm1n4ii6qa6fqlp9pzj7";
};
- nativeBuildInputs = [ pytestrunner ]; # pytest-runner included in setup-requires
+ nativeBuildInputs = [ pytest-runner ]; # pytest-runner included in setup-requires
checkInputs = [ pytest pytestCheckHook ];
pythonImportsCheck = [ "ci" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
index 2c25d258e5..3dc930473f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.0.9031";
+ version = "9.0.9166";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-UCmt2Vm8OWyKa0fmPlGuvzaFddUWs6quavUgIZasoJg=";
+ sha256 = "0rwl5q7z16agcykn0an2lyqfn2z5yvmg0xcvxfpvndf6zpnbqhx0";
};
# Use upstream z3 implementation
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
index d673126093..0110625eba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
- version = "9.0.9031";
+ version = "9.0.9166";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-+9aW7J8FXuKtU20dpqnoj37McPxzbkjKuYZIO8QeFF0=";
+ sha256 = "1mvdcwzim52mc7vjrr2cq8xwwi0v0ai3z608mg5nfbbf4zjji76c";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickclick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
index d829f43dc0..8aeb73bb25 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/clickclick/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytest-cov }:
buildPythonPackage rec {
pname = "clickclick";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0";
};
- checkInputs = [ pytestCheckHook pytestcov ];
+ checkInputs = [ pytestCheckHook pytest-cov ];
propagatedBuildInputs = [ flake8 click pyyaml six ];
# test_cli asserts on exact quoting style of output
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
index b2a13cdbb6..de42f72841 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPyPy
-, pytest, pytestcov, pytest-mock, freezegun
+, pytest, pytest-cov, pytest-mock, freezegun
, jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests
, python-slugify }:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "sha256-a5pNcoguJDvgd6c5fQ8fdv5mzz35HzEV27UzDiFPpFc=";
};
- checkInputs = [ pytest pytestcov pytest-mock freezegun ];
+ checkInputs = [ pytest pytest-cov pytest-mock freezegun ];
propagatedBuildInputs = [
jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix
index 5d5b07ffd0..1096675821 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix
@@ -4,7 +4,7 @@
, isPy27
, mock
, pytest
-, pytestrunner
+, pytest-runner
, sh
, coverage
, docopt
@@ -33,7 +33,7 @@ buildPythonPackage rec {
];
buildInputs = [
- pytestrunner
+ pytest-runner
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
index eadc3eb32b..25bb35eab2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
@@ -4,8 +4,8 @@
, fetchPypi
, tinycss2
, pytest
-, pytestrunner
-, pytestcov
+, pytest-runner
+, pytest-cov
, pytest-flake8
, pytest-isort
}:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ tinycss2 ];
- checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ];
+ checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ];
meta = with lib; {
description = "CSS selectors for Python ElementTree";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix
new file mode 100644
index 0000000000..67b1722be5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "dacite";
+ version = "1.6.0";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "konradhalas";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0nv2bnj3bq2v08ac4p583cnpjq2d6bv5isycgji5i5wg1y082a3d";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "dacite" ];
+
+ meta = with lib; {
+ description = "Python helper to create data classes from dictionaries";
+ homepage = "https://github.com/konradhalas/dacite";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix
index f6d7fcac62..90b108e3bc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub
-, asgiref, autobahn, twisted, pytestrunner
+, asgiref, autobahn, twisted, pytest-runner
, hypothesis, pytest, pytest-asyncio, service-identity, pyopenssl
}:
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI=";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ asgiref autobahn twisted service-identity pyopenssl ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
index 58920b4064..5a611c989f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
@@ -31,14 +31,14 @@
buildPythonPackage rec {
pname = "datasette";
- version = "0.57.1";
+ version = "0.58.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "simonw";
repo = pname;
rev = version;
- sha256 = "sha256-BHsf3GOganPhsDiZlRxvAsRZH/Sq+Jr+CZcc2ubce+8=";
+ sha256 = "sha256-dtKqp7LV1fRjwOMAlmmAnC19j8hLA1oixGextATW6z0=";
};
nativeBuildInputs = [ pytest-runner ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
index d7cf79f9d0..ba27b633fe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, python
-, dbus, dbus-python, pytest, pytestcov, pytest-asyncio, pytest-timeout
+, dbus, dbus-python, pytest, pytest-cov, pytest-asyncio, pytest-timeout
}:
buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
dbus
dbus-python
pytest
- pytestcov
+ pytest-cov
pytest-asyncio
pytest-timeout
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
index da1f25ad2c..2836827088 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
@@ -8,7 +8,7 @@
, flask
, psutil
, pytest-timeout
-, pytest_xdist
+, pytest-xdist
, pytestCheckHook
, requests
, isPy27
@@ -75,7 +75,7 @@ buildPythonPackage rec {
flask
psutil
pytest-timeout
- pytest_xdist
+ pytest-xdist
pytestCheckHook
requests
] ++ lib.optionals (!isPy27) [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix
index 100c7ee6fc..30853aa41a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder
, fonttools, setuptools-scm
-, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens
+, pytest, pytest-runner, lxml, fs, unicodedata2, fontpens
}:
buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestrunner
+ pytest-runner
lxml
fs
unicodedata2
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix
new file mode 100644
index 0000000000..32050acfdf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix
@@ -0,0 +1,28 @@
+{ buildPythonPackage, pythonOlder, fetchFromGitHub, lib, pygments
+, pytestCheckHook, pytest-mock }:
+
+buildPythonPackage rec {
+ pname = "devtools";
+ version = "0.6.1";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "samuelcolvin";
+ repo = "python-${pname}";
+ rev = "v${version}";
+ sha256 = "0s1d2jwijini7y1a3318yhb98mh1mw4pzlfx2zck3a8nqw984ki3";
+ };
+
+ propagatedBuildInputs = [ pygments ];
+
+ checkInputs = [ pytestCheckHook pytest-mock ];
+
+ pythonImportsCheck = [ "devtools" ];
+
+ meta = with lib; {
+ description = "Python's missing debug print command and other development tools";
+ homepage = "https://python-devtools.helpmanual.io/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jdahm ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix
index 8e35eabfb0..d519aa76c8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, pytestrunner
+, pytest-runner
, setuptools
, coverage, pytest
}:
@@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
index ed6007f87e..0264c0ff10 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
@@ -3,8 +3,8 @@
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
-, pytestcov
-, pytest_xdist
+, pytest-cov
+, pytest-xdist
, pytest-django
, mock
}:
@@ -22,8 +22,8 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestcov
- pytest_xdist
+ pytest-cov
+ pytest-xdist
pytest-django
mock
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix
index 8ee903bedc..cbe5dfbaa7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix
@@ -5,7 +5,7 @@
, mock
, pygments
, pytest
-, pytestcov
+, pytest-cov
, pytest-django
, python-dateutil
, shortuuid
@@ -40,7 +40,7 @@ buildPythonPackage rec {
mock
pygments # not explicitly declared in setup.py, but some tests require it
pytest
- pytestcov
+ pytest-cov
pytest-django
python-dateutil
shortuuid
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix
index 0e3eaff6cb..9685e55bb1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django_guardian/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, django_environ, mock, django
-, pytest, pytestrunner, pytest-django
+, pytest, pytest-runner, pytest-django
}:
buildPythonPackage rec {
pname = "django-guardian";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0";
};
- checkInputs = [ pytest pytestrunner pytest-django django_environ mock ];
+ checkInputs = [ pytest pytest-runner pytest-django django_environ mock ];
propagatedBuildInputs = [ django ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
index 7afe92b433..e9a31b461f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
+{ lib, buildPythonPackage, fetchPypi, six, pytest-cov, pytest }:
buildPythonPackage rec {
version = "1.2.0";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ];
- checkInputs = [ pytestcov pytest ];
+ checkInputs = [ pytest-cov pytest ];
meta = with lib; {
description = "Python library for parsing Dockerfile files";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
index 6e14355c29..05eb173c55 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, pythonOlder
, pytest
-, pytestcov
+, pytest-cov
, mock
, Mako
, decorator
@@ -33,7 +33,7 @@ buildPythonPackage rec {
pytest
'';
- checkInputs = [ pytest pytestcov mock Mako ];
+ checkInputs = [ pytest pytest-cov mock Mako ];
propagatedBuildInputs = [ decorator stevedore ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
index c6751eede2..f5a9274a0d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, pytestrunner, requests, urllib3, mock, setuptools, stone }:
+, pytest-runner, requests, urllib3, mock, setuptools, stone }:
buildPythonPackage rec {
pname = "dropbox";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
# Set DROPBOX_TOKEN environment variable to a valid token.
doCheck = false;
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ requests urllib3 mock setuptools stone ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
index a9af41c499..eacaa00f15 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
@@ -15,12 +15,12 @@
}:
buildPythonPackage rec {
- version = "0.20.23";
+ version = "0.20.24";
pname = "dulwich";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-QC5WtcB/BAR50RiOXC9AbiwAaqOUMIAVXUxtBeX8qGU=";
+ sha256 = "1wacchqxxwbhwnfnnhlb40s66f92lkvz6423j4c1w6wb585aqqbb";
};
LC_ALL = "en_US.UTF-8";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix
index 7cddb324f3..8db7f6c916 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix
@@ -1,5 +1,5 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, mock
-, pytest_xdist, covCore, glibcLocales }:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock
+, pytest-xdist, covCore, glibcLocales }:
buildPythonPackage rec {
pname = "dyn";
@@ -14,9 +14,9 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
+ pytest-cov
mock
- pytest_xdist
+ pytest-xdist
covCore
];
# Disable checks because they are not stateless and require internet access.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix
index 11b13d8325..c55bf52a66 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/easysnmp/default.nix
@@ -5,7 +5,7 @@
, net-snmp
, openssl
, pytest
-, pytestcov
+, pytest-cov
, pytest-flake8
, pytest-sugar
, termcolor
@@ -27,7 +27,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
+ pytest-cov
pytest-flake8
pytest-sugar
termcolor
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix
new file mode 100644
index 0000000000..8f58720bd2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, blessed
+, prefixed
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "enlighten";
+ version = "1.10.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984";
+ };
+
+ propagatedBuildInputs = [
+ blessed
+ prefixed
+ ];
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "enlighten" ];
+ disabledTests =
+ # https://github.com/Rockhopper-Technologies/enlighten/issues/44
+ lib.optional stdenv.isDarwin "test_autorefresh"
+ ;
+
+ meta = with lib; {
+ description = "Enlighten Progress Bar for Python Console Apps";
+ homepage = "https://github.com/Rockhopper-Technologies/enlighten";
+ license = with licenses; [ mpl20 ];
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix
index 3beb01e3b1..22894ab9f2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "env-canada";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "michaeldavie";
repo = "env_canada";
rev = "v${version}";
- sha256 = "0y4yjzmg6ns7a13j1cxqvrff4fd6k97cpc1xjwqrwp7gq49rzhy7";
+ sha256 = "0v1wmjvi05i6mjh6yxqigbf2spf7842198yp98f7h0nyfjmz96hn";
};
propagatedBuildInputs = [
@@ -42,6 +42,7 @@ buildPythonPackage rec {
"test_get_latest_frame"
"test_get_loop"
"test_get_ec_sites"
+ "test_ecradar"
];
pythonImportsCheck = [ "env_canada" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix
index b804d4943b..3b14560eb9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "fastapi";
- version = "0.65.2";
+ version = "0.67.0";
format = "flit";
src = fetchFromGitHub {
owner = "tiangolo";
repo = "fastapi";
rev = version;
- sha256 = "032srvbfdy02m1b664x67lkdcx6b2bd4c9a9cb176lscjk213240";
+ sha256 = "15zbalyib7ndcbxvf9prj0n9n6qb4bfzhmaacsjrvdmjzmqdjgw0";
};
postPatch = ''
@@ -51,7 +51,11 @@ buildPythonPackage rec {
];
# disabled tests require orjson which requires rust nightly
- pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" ];
+
+ # ignoring deprecation warnings to avoid test failure from
+ # tests/test_tutorial/test_testing/test_tutorial001.py
+
+ pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" "-W ignore::DeprecationWarning"];
disabledTests = [ "test_get_custom_response" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix
index eaf1a78520..45d9976896 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest, scipy, pytestCheckHook }:
buildPythonPackage {
pname = "fastpair";
@@ -11,7 +11,7 @@ buildPythonPackage {
sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
checkInputs = [ pytest pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix
index c0694a58cb..155f3b6e82 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix
@@ -5,7 +5,7 @@
, numba
, numpy
, pandas
-, pytestrunner
+, pytest-runner
, cramjam
, fsspec
, thrift
@@ -23,7 +23,7 @@ buildPythonPackage rec {
hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY=";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ];
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/favicon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/favicon/default.nix
index 5af3be420b..1a3917fbdb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/favicon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/favicon/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock,
- pytestrunner }:
+ pytest-runner }:
buildPythonPackage rec {
pname = "favicon";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8";
};
- buildInputs = [ pytestrunner ];
+ buildInputs = [ pytest-runner ];
checkInputs = [ pytest requests-mock ];
propagatedBuildInputs = [ requests beautifulsoup4 ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix
index f845ca6a5d..1f8c6983cb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix
@@ -5,7 +5,7 @@
, pytestCheckHook
, ffmpeg
, future
-, pytestrunner
+, pytest-runner
, pytest-mock
}:
@@ -27,7 +27,7 @@ buildPythonPackage rec {
})
];
- buildInputs = [ pytestrunner ];
+ buildInputs = [ pytest-runner ];
propagatedBuildInputs = [ future ];
checkInputs = [ pytestCheckHook pytest-mock ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix
index b6f287669c..0110db18c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder
-, mock, pytest, pytestrunner
+, mock, pytest, pytest-runner
, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing ? null, importlib-metadata
}:
@@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b";
};
- checkInputs = [ pytest mock pytestrunner ];
+ checkInputs = [ pytest mock pytest-runner ];
propagatedBuildInputs = [ pyflakes pycodestyle mccabe ]
++ lib.optionals (pythonOlder "3.2") [ configparser functools32 ]
++ lib.optionals (pythonOlder "3.4") [ enum34 ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix
index 708c5c351e..9fd80ac6d6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytestcov, pytest-xprocess, pytestcache }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytest-cov, pytest-xprocess, pytestcache }:
buildPythonPackage rec {
pname = "Flask-Caching";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ flask ];
- checkInputs = [ pytestCheckHook pytestcov pytest-xprocess pytestcache ];
+ checkInputs = [ pytestCheckHook pytest-cov pytest-xprocess pytestcache ];
disabledTests = [
# backend_cache relies on pytest-cache, which is a stale package from 2013
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix
index cfcc4d3629..d7d20f19ea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix
@@ -2,11 +2,11 @@
, buildPythonPackage
, fetchPypi
, requests
-, requests_toolbelt
+, requests-toolbelt
, requests_oauthlib
, pytest
-, pytestrunner
-, pytestcov
+, pytest-runner
+, pytest-cov
, responses
}:
@@ -19,9 +19,9 @@ buildPythonPackage rec {
sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz";
};
- propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ];
+ propagatedBuildInputs = [ requests requests-toolbelt requests_oauthlib ];
- checkInputs = [ pytest pytestrunner pytestcov responses ];
+ checkInputs = [ pytest pytest-runner pytest-cov responses ];
doCheck = false; # Otherwise:
# ========================= no tests ran in 0.01 seconds =========================
# builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix
index ce2ead246f..40ce524c66 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook
-, atpublic, psutil, pytestcov, sybil
+, atpublic, psutil, pytest-cov, sybil
}:
buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ atpublic psutil ];
- checkInputs = [ pytestCheckHook pytestcov sybil ];
+ checkInputs = [ pytestCheckHook pytest-cov sybil ];
# disable code coverage checks for all OS. Upstream does not enforce these
# checks on Darwin, and code coverage cannot be improved downstream nor is it
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix
index a6982037c1..d9516ceb88 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, fonttools, setuptools-scm
-, pytest, pytestrunner
+, pytest, pytest-runner
}:
buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ fonttools ];
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
meta = with lib; {
description = "A collection of objects that implement fast font, glyph, etc. math";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fritzprofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fritzprofiles/default.nix
new file mode 100644
index 0000000000..b998f99498
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fritzprofiles/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, lxml
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "fritzprofiles";
+ version = "0.7.3";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-VoKgLJWF9x8dW8A6CNwLtK+AmehtgZP41nUGQO819es=";
+ };
+
+ propagatedBuildInputs = [
+ lxml
+ requests
+ ];
+
+ pythonImportsCheck = [
+ "fritzprofiles"
+ ];
+
+ # no tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Tool to switch the online time of profiles in the AVM Fritz!Box";
+ homepage = "https://github.com/AaronDavidSchneider/fritzprofiles";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix
index 7e8d9f8d4a..6d18a7ba6d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix
@@ -1,16 +1,36 @@
-{ lib, fetchPypi, buildPythonPackage, astunparse }:
+{ lib
+, fetchFromGitHub
+, fetchpatch
+, buildPythonPackage
+, astunparse
+}:
buildPythonPackage rec {
pname = "gast";
- version = "0.5.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "8109cbe7aa0f7bf7e4348379da05b8137ea1f059f073332c3c1cedd57db8541f";
+ version = "0.5.0";
+
+ # TODO: remove this patch on the next release, this fixes a bug with parsing
+ # assignment expressions e.g., `x := 1`.
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/serge-sans-paille/gast/commit/3cc9b4d05a80e4bb42882de00df314aaa1e6e591.patch";
+ sha256 = "0ylpn0x0a4y6139vd048blsh77yd08npjcn4b5ydf89xnji5mlm1";
+ })
+ ];
+
+ src = fetchFromGitHub {
+ owner = "serge-sans-paille";
+ repo = "gast";
+ rev = version;
+ sha256 = "0qsg36knv0k2ppzbr5m4w6spxxw7a77lw88y8vjx7m176bajnsbw";
};
- checkInputs = [ astunparse ] ;
+
+ checkInputs = [ astunparse ];
+
meta = with lib; {
description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module.";
+ homepage = "https://github.com/serge-sans-paille/gast/";
license = licenses.bsd3;
- maintainers = with maintainers; [ jyp ];
+ maintainers = with maintainers; [ jyp cpcloud ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix
index f755bb8cf8..2c54bc4910 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
-, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner
+, cached-property, frozendict, pystache, pyyaml, pytest, pytest-runner
}:
buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- pytestrunner
+ pytest-runner
cached-property
frozendict
pystache
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix
index a65de61b6d..691af2eda8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, pythonOlder
, setuptools
-, pytestrunner
+, pytest-runner
, pytest
, pytest-asyncio
, twisted
@@ -25,7 +25,7 @@ buildPythonPackage rec {
sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682";
};
- nativeBuildInputs = [ setuptools pytestrunner ];
+ nativeBuildInputs = [ setuptools pytest-runner ];
checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ];
propagatedBuildInputs = [
uritemplate
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix
index 71aae7b66a..3c5de1295c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "gios";
- version = "1.0.1";
+ version = "1.0.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
- sha256 = "031z5j1j961pcw8s4ajj5z2xn2jxb2hyfn3x3bxbaagwl9a5qkvn";
+ sha256 = "sha256-7+np1lUbBFSTJNAD6OT5k89MM+kzEj90JlulXGm36k8=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
index 92ddbbd73f..57b58699ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
@@ -15,7 +15,7 @@
, pyopenssl
, pyyaml
, requests
-, requests_toolbelt
+, requests-toolbelt
, terminaltables
, websocket-client
}:
@@ -53,7 +53,7 @@ buildPythonPackage rec {
pyopenssl
pyyaml
requests
- requests_toolbelt
+ requests-toolbelt
terminaltables
websocket-client
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix
index 2d2658e00f..6056d215d2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix
@@ -4,7 +4,7 @@
, pyparsing
, future
, pytest
-, pytestrunner
+, pytest-runner
}:
buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
future
];
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
patches = [ ./no-setup-requires-pytestrunner.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphqlclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphqlclient/default.nix
new file mode 100644
index 0000000000..2f09897d4f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/graphqlclient/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "graphqlclient";
+ version = "0.2.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0b6r3ng78qsn7c9zksx4rgdkmp5296d40kbmjn8q614cz0ymyc5k";
+ };
+
+ propagatedBuildInputs = [
+ six
+ ];
+
+ # Project has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "graphqlclient" ];
+
+ meta = with lib; {
+ description = "Simple GraphQL client for Python";
+ homepage = "https://github.com/prisma-labs/python-graphql-client";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lde ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix
index 758f988a23..37ff849a3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix
@@ -3,7 +3,7 @@
, isPy27
, fetchFromGitHub
, pytestCheckHook
-, pytestcov
+, pytest-cov
, hyppo
, matplotlib
, networkx
@@ -36,7 +36,7 @@ buildPythonPackage rec {
seaborn
];
- checkInputs = [ pytestCheckHook pytestcov ];
+ checkInputs = [ pytestCheckHook pytest-cov ];
pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ];
disabledTests = [ "gridplot_outputs" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
index 7236f7c22e..0e09512667 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
- version = "1.38.1";
+ version = "1.39.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cd85f58038b92e1961f8127d79691e84e151390d35cae73c4c0cbe2042f76b77";
+ sha256 = "39dfe7415bc0d3860fdb8dd90607594b046b88b57dbe64284efa4820f951c805";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix
index adb131868c..0e8d074659 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytestrunner
+, pytest-runner
, python-dateutil
, babelfish
, rebulk
@@ -18,7 +18,7 @@ buildPythonPackage rec {
# Tests require more packages.
doCheck = false;
- buildInputs = [ pytestrunner ];
+ buildInputs = [ pytest-runner ];
propagatedBuildInputs = [
python-dateutil babelfish rebulk
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix
index 7d43ce95a7..a7a418afa1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/19.nix
@@ -2,7 +2,7 @@
, coverage
, mock
, pytest
-, pytestcov
+, pytest-cov
, setuptools
}:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ setuptools ];
- checkInputs = [ pytest mock pytestcov coverage ];
+ checkInputs = [ pytest mock pytest-cov coverage ];
prePatch = ''
substituteInPlace requirements_test.txt --replace "==" ">=" \
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix
index c1f36c2056..ba948a6891 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix
@@ -2,7 +2,7 @@
, coverage
, mock
, pytest
-, pytestcov
+, pytest-cov
, setuptools
}:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ setuptools ];
- checkInputs = [ pytest mock pytestcov coverage ];
+ checkInputs = [ pytest mock pytest-cov coverage ];
prePatch = ''
substituteInPlace requirements_test.txt --replace "==" ">=" \
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix
index 888dbf4534..1bda1d8ac2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix
@@ -29,6 +29,11 @@ buildPythonPackage rec {
scipy
];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "Pillow<=8.2.0" "Pillow"
+ '';
+
# The test needs MuJoCo that is not free library.
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix
index 946f0039a0..cba02387be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix
@@ -17,15 +17,15 @@
buildPythonPackage rec {
pname = "hap-python";
- version = "3.5.0";
- disabled = pythonOlder "3.5";
+ version = "3.5.1";
+ disabled = pythonOlder "3.6";
# pypi package does not include tests
src = fetchFromGitHub {
owner = "ikalchev";
repo = "HAP-python";
rev = "v${version}";
- sha256 = "1vzlfx0gpidl0rzv4z94pziwm6rj4lrilly5pykgq984y708pcqf";
+ sha256 = "sha256-ZHTqlb7LIDp8MFNW8MFg6jX7QwaxT40cLi3H13ONLCI=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix
index abfc452396..9a7ab056a3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "hatasmota";
- version = "0.2.14";
+ version = "0.2.19";
src = fetchFromGitHub {
owner = "emontnemery";
repo = pname;
rev = version;
- sha256 = "sha256-sCGUlEN1ejWhc2+9JRQ7UPqueq30u8gGSPRxbs4cnLE=";
+ sha256 = "sha256-h1idJJd2lPV3+tAE59gzITa7jmtBhcEpRuyflf76EAk=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix
index 1d6d6b39d0..21af8addaa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix
@@ -9,8 +9,8 @@
, pandas
, codecov
, pytest
-, pytestcov
-, pytestrunner
+, pytest-cov
+, pytest-runner
, coveralls
, twine
, check-manifest
@@ -36,7 +36,7 @@ buildPythonPackage rec {
doCheck = false; # incompatible with latest astropy
checkInputs = [
- pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov
+ pytest pytest-cov pytest-runner coveralls scipy pandas astropy twine check-manifest codecov
];
pythonImportsCheck = [ "hickle" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix
index e09b957425..48892b8d79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "holidays";
- version = "0.11.1";
+ version = "0.11.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-f6/YRvZ/Drfh+cGcOPSnlnvweu1d7S3XqKovk3sOoBs=";
+ sha256 = "0nqxan6nr3jp63i3sbb9s1v5dlig22bl927a6pl1ahks8cnr7rkn";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix
index 680c4a5a72..7870247e2f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "homepluscontrol";
- version = "0.0.5";
+ version = "0.0.61";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "chemaaa";
repo = pname;
rev = version;
- sha256 = "1nd3a7nhh1xb70cdh2h2bimwbffvpc3457smyzr9fqkjwfbcrr93";
+ sha256 = "1g61xj417dz1nz5g5ic8rs34fp424zvbgsymry1zldg3gskaqgvk";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
index de2f9b00f5..c6c7b33721 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
@@ -8,7 +8,7 @@
, pproxy
, pytest-asyncio
, pytestCheckHook
-, pytestcov
+, pytest-cov
, sniffio
, trio
, trustme
@@ -38,7 +38,7 @@ buildPythonPackage rec {
pproxy
pytest-asyncio
pytestCheckHook
- pytestcov
+ pytest-cov
trio
trustme
uvicorn
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
index b45c3e85f5..e5db065def 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
@@ -11,7 +11,7 @@
, pytestCheckHook
, pytest-asyncio
, pytest-trio
-, pytestcov
+, pytest-cov
, trustme
, uvicorn
}:
@@ -41,7 +41,7 @@ buildPythonPackage rec {
pytestCheckHook
pytest-asyncio
pytest-trio
- pytestcov
+ pytest-cov
trustme
uvicorn
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/2.nix
index 5b086d5f1a..47bc8860bc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/2.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/2.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub
, isPy3k, attrs, coverage, enum34, pexpect
-, doCheck ? true, pytest, pytest_xdist, flaky, mock
+, doCheck ? true, pytest, pytest-xdist, flaky, mock
, sortedcontainers
}:
buildPythonPackage rec {
@@ -29,7 +29,7 @@ buildPythonPackage rec {
sortedcontainers
] ++ lib.optional (!isPy3k) enum34;
- checkInputs = [ pytest pytest_xdist flaky mock pexpect ];
+ checkInputs = [ pytest pytest-xdist flaky mock pexpect ];
inherit doCheck;
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix
index 9fdeca082b..8dcca1983b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, isPy27
, fetchFromGitHub
-, pytestCheckHook , pytestcov , numba
+, pytestCheckHook , pytest-cov , numba
, numpy
, scikit-learn
, scipy
@@ -30,7 +30,7 @@ buildPythonPackage rec {
scipy
];
- checkInputs = [ pytestCheckHook pytestcov matplotlib seaborn ];
+ checkInputs = [ pytestCheckHook pytest-cov matplotlib seaborn ];
disabledTestPaths = [
"docs"
"benchmarks"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
index a63617ba2a..8e7f4832c2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
@@ -5,7 +5,7 @@
, pyjwt
, pylint
, pytestCheckHook
-, pytestcov
+, pytest-cov
, python-dateutil
, requests
, responses
@@ -25,7 +25,7 @@ buildPythonPackage rec {
codecov
pylint
pytestCheckHook
- pytestcov
+ pytest-cov
responses
tox
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix
index b82fe568e2..432767b9f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
-, pytest_xdist
+, pytest-xdist
, pythonOlder
, matplotlib
, mock
@@ -23,7 +23,7 @@ buildPythonPackage rec {
sha256 = "057v8v5p2picmgiidr9lzjbh7nj54pv95m6lyya3y7dw4vzaamij";
};
- checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ];
+ checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist ];
propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ];
# runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/image-match/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/image-match/default.nix
index ed5179d6db..a59f7e08b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/image-match/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/image-match/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikitimage }:
buildPythonPackage {
pname = "image-match";
@@ -11,7 +11,7 @@ buildPythonPackage {
sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5";
};
- buildInputs = [ pytestrunner ];
+ buildInputs = [ pytest-runner ];
propagatedBuildInputs = [
scikitimage
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix
index 86bad819a6..9f78d86a2b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix
@@ -3,7 +3,7 @@
, six
, hypothesis
, pytest
-, pytestrunner
+, pytest-runner
, pytestCheckHook
}:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ arrow six ];
checkInputs = [ pytest hypothesis ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
index e55fd8f39d..84e381f0b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }:
+{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytest-cov, pexpect, pytest-mock }:
buildPythonPackage rec {
pname = "inquirer";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
--replace "readchar==2.0.1" "readchar>=2.0.0"
'';
- checkInputs = [ pytest pytestcov pexpect pytest-mock ];
+ checkInputs = [ pytest pytest-cov pexpect pytest-mock ];
checkPhase = ''
pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iocapture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iocapture/default.nix
index 0f0466c8b3..cc56f8d0bd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/iocapture/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/iocapture/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, flexmock
, pytest
-, pytestcov
+, pytest-cov
, six
}:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
checkInputs = [
flexmock
pytest
- pytestcov
+ pytest-cov
six
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix
index a0efa9b575..3f8811f4f3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, isPy27
, pytest
-, pytestcov
+, pytest-cov
, nbval
, ipywidgets
, numpy
@@ -29,7 +29,7 @@ buildPythonPackage rec {
traittypes
];
- checkInputs = [ pytest pytestcov nbval ];
+ checkInputs = [ pytest pytest-cov nbval ];
checkPhase = "pytest ipydatawidgets/tests";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix
index 305b9f6c6b..0dba5e8f19 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
+{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }:
buildPythonPackage rec {
pname = "jedi";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
fetchSubmodules = true;
};
- checkInputs = [ pytest glibcLocales tox pytestcov ];
+ checkInputs = [ pytest glibcLocales tox pytest-cov ];
propagatedBuildInputs = [ parso ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix
index 78aaadf690..a3f790abfc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
-, pytest, pytestrunner, pbr, glibcLocales , pytestcov
-, requests, requests_oauthlib, requests_toolbelt, defusedxml
+, pytest, pytest-runner, pbr, glibcLocales , pytest-cov
+, requests, requests_oauthlib, requests-toolbelt, defusedxml
, ipython
}:
@@ -15,8 +15,8 @@ buildPythonPackage rec {
sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93";
};
- buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ];
- propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ];
+ buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ];
+ propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ];
# impure tests because of connectivity attempts to jira servers
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
index 82ddb3bf23..d16fa89a97 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, buildPythonPackage, six
-, flake8, pep8-naming, pytest, pytestcov }:
+, flake8, pep8-naming, pytest, pytest-cov }:
buildPythonPackage rec {
pname = "jsonlines";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ];
- checkInputs = [ flake8 pep8-naming pytest pytestcov ];
+ checkInputs = [ flake8 pep8-naming pytest pytest-cov ];
checkPhase = ''
pytest
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix
index 7f1a729b5b..2c60d7b3b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -10,7 +10,6 @@
, jupyter_server
, openapi-core
, pytest-tornasync
-, pytestcov
, ruamel-yaml
, strict-rfc3339
}:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix
index e90dd1a806..28b09222b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, pytest, pytestcov, pytest_xdist
+, pytest, pytest-cov, pytest-xdist
, six, numpy, scipy, pyyaml, h5py
, keras-applications, keras-preprocessing
}:
@@ -15,8 +15,8 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
- pytest_xdist
+ pytest-cov
+ pytest-xdist
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix
index 4134c47084..3d1575d8c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytestrunner, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytest-runner, pytest }:
buildPythonPackage rec {
pname = "keyutils";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
};
buildInputs = [ keyutils ];
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
meta = {
description = "A set of python bindings for keyutils";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix
index 60eba0577b..fe35126ea2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, pytest
-, pytest_xdist
+, pytest-xdist
, six }:
buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytest_xdist
+ pytest-xdist
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix
new file mode 100644
index 0000000000..fa71abd735
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix
@@ -0,0 +1,24 @@
+{ buildPythonPackage, fetchFromGitHub, pytestCheckHook, lib }:
+
+buildPythonPackage rec {
+ pname = "leb128";
+ version = "1.0.4";
+
+ # fetchPypi doesn't include files required for tests
+ src = fetchFromGitHub {
+ owner = "mohanson";
+ repo = "leb128";
+ rev = "v${version}";
+ sha256 = "040l6fxyzqal841kirf783kk1840gcy1gjd374jfr46v96qc8scm";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+ pythonImportsCheck = [ "leb128" ];
+
+ meta = with lib; {
+ description = "A utility to encode and decode Little Endian Base 128";
+ homepage = "https://github.com/mohanson/leb128";
+ license = licenses.mit;
+ maintainers = with maintainers; [ urlordjames ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix
index 5334513e23..24d8ada589 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
- unidecode, mock, pytest , backports-shutil-which, ConfigArgParse,
+ unidecode, mock, pytest , backports-shutil-which, configargparse,
python-daemon, pymsgbox }:
buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "16y1y9ahcv3wj7f0v4mfiwzkmn2hz1iv7y13cgr57sxa3ymyqx6c";
};
- propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse
+ propagatedBuildInputs = [ unidecode backports-shutil-which configargparse
python-daemon pymsgbox ecdsa ed25519 mnemonic semver ];
checkInputs = [ mock pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix
index 33710c6682..8985e8fbcf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi,
- six, pytest, pytestrunner, pytestcov, coverage
+ six, pytest, pytest-runner, pytest-cov, coverage
}:
buildPythonPackage rec {
pname = "libais";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
# data files missing
doCheck = false;
- checkInputs = [ pytest pytestrunner pytestcov coverage ];
+ checkInputs = [ pytest pytest-runner pytest-cov coverage ];
propagatedBuildInputs = [ six ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix
index 52c1cf9a9d..c59e026fe4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/2.nix
@@ -5,7 +5,7 @@
, mock
, pycrypto
, requests
-, pytestrunner
+, pytest-runner
, pytest
, requests-mock
, typing
@@ -21,7 +21,7 @@ buildPythonPackage rec {
sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6";
};
- checkInputs = [ mock pytest pytestrunner requests-mock ];
+ checkInputs = [ mock pytest pytest-runner requests-mock ];
propagatedBuildInputs = [ pycrypto requests ]
++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
index 0449f60995..78afad13dd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
@@ -5,7 +5,7 @@
, mock
, pycrypto
, requests
-, pytestrunner
+, pytest-runner
, pytest
, requests-mock
, typing
@@ -20,7 +20,7 @@ buildPythonPackage rec {
sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d";
};
- checkInputs = [ mock pytest pytestrunner requests-mock ];
+ checkInputs = [ mock pytest pytest-runner requests-mock ];
propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ];
preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix
index 669f16e5f9..3efe41e007 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix
@@ -1,5 +1,5 @@
{ buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook
-, pytest-mock, pytestrunner, six, tornado_4 }:
+, pytest-mock, pytest-runner, six, tornado_4 }:
buildPythonPackage rec {
pname = "lomond";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ six ];
checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ];
# Makes HTTP requests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix
index a5ea55c39c..19bb14419a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }:
+{ lib, fetchPypi, buildPythonPackage, pytest-runner, six, beautifulsoup4, requests, }:
buildPythonPackage rec {
pname = "lyricwikia";
version = "0.1.11";
@@ -8,7 +8,7 @@ buildPythonPackage rec {
sha256 = "0l5lkvr3299x79i7skdiggp67rzgax3s00psd1zqkxfysq27jvc8";
};
- buildInputs = [ pytestrunner ];
+ buildInputs = [ pytest-runner ];
propagatedBuildInputs = [ six beautifulsoup4 requests ];
# upstream has no code tests
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix
index 01ff1458c0..decad482be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytestcov }:
+{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytest-cov }:
buildPythonPackage rec {
pname = "m3u8";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "0cmg993icpsa1b19kljxvjwhs167bsqrs0ad4wnwsi8qq6na5d4p";
};
- checkInputs = [ bottle pytest pytestcov ];
+ checkInputs = [ bottle pytest pytest-cov ];
checkPhase = ''
pytest tests/test_{parser,model,variant_m3u8}.py
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix
index 69f272c409..ade031409b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, cython
-, pytestrunner
+, pytest-runner
, pytestCheckHook
, hypothesis
}:
@@ -23,7 +23,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
cython
- pytestrunner
+ pytest-runner
];
preBuild = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
index 94cfb637a1..04e59287a8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, markdown,
- pytest, pytestrunner, pytestcov, coverage }:
+ pytest, pytest-runner, pytest-cov, coverage }:
buildPythonPackage rec {
pname = "MarkdownSuperscript";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
sed 's/=.*//' -i requirements/*.txt
'';
- checkInputs = [ pytest pytestrunner pytestcov coverage ];
+ checkInputs = [ pytest pytest-runner pytest-cov coverage ];
meta = with lib; {
description = "An extension to the Python Markdown package enabling superscript text";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix
index e3b629b303..aa2784cd1d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix
@@ -4,7 +4,7 @@
, marshmallow
# Check Inputs
, pytestCheckHook
-, pytestcov
+, pytest-cov
}:
buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
];
# setuptools check can run, but won't find tests
- checkInputs = [ pytestCheckHook pytestcov ];
+ checkInputs = [ pytestCheckHook pytest-cov ];
meta = with lib; {
description = "An unofficial extension to Marshmallow to allow for polymorphic fields";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
index 794b2c8f4a..8ee3d60f80 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
@@ -5,7 +5,7 @@
, hopcroftkarp
, multiset
, pytest
-, pytestrunner
+, pytest-runner
, hypothesis
, setuptools-scm
, isPy27
@@ -36,7 +36,7 @@ buildPythonPackage rec {
--replace "pytest>=3.0,<4.0" "pytest"
'';
- buildInputs = [ setuptools-scm pytestrunner ];
+ buildInputs = [ setuptools-scm pytest-runner ];
checkInputs = [ pytest hypothesis ];
propagatedBuildInputs = [ hopcroftkarp multiset ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix
index b8439a0c23..354eace504 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, requests
-, pytest, pytestrunner, responses
+, pytest, pytest-runner, responses
}:
buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw";
};
- checkInputs = [ pytest pytestrunner responses ];
+ checkInputs = [ pytest pytest-runner responses ];
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
index f61ace8960..9ab850ed01 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
- version = "0.9.6";
+ version = "0.9.8";
src = fetchPypi {
inherit pname version;
- sha256 = "1810deb7f780700e7e0734e1844c1b4b2525ee990b8665f7b98e3f335a31bbcf";
+ sha256 = "1yx9ybpw9ppym8k2ky5pxh3f2icpmk887i8ipwixrcrnml3q136p";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
index 03343aec16..f20cb18b48 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner }:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner }:
buildPythonPackage rec {
pname = "mccabe";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx";
};
- buildInputs = [ pytest pytestrunner ];
+ buildInputs = [ pytest pytest-runner ];
meta = with lib; {
description = "McCabe checker, plugin for flake8";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix
index c3ce875b4f..3096950121 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k
-, sympy, pytest, pytestrunner, sphinx, setuptools-scm }:
+, sympy, pytest, pytest-runner, sphinx, setuptools-scm }:
buildPythonPackage rec {
pname = "measurement";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
sed -i 's|use_scm_version=True|version="${version}"|' setup.py
'';
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
nativeBuildInputs = [ sphinx setuptools-scm ];
propagatedBuildInputs = [ sympy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix
index 77e6f9c246..2dfe06d517 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix
@@ -5,7 +5,7 @@
, numpy
, scipy
, pytestCheckHook
-, pytestcov
+, pytest-cov
, pytest-timeout
, h5py
, matplotlib
@@ -34,7 +34,7 @@ buildPythonPackage rec {
doCheck = false;
checkInputs = [
pytestCheckHook
- pytestcov
+ pytest-cov
pytest-timeout
h5py
matplotlib
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix
index 555011a314..ec19843ab9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix
@@ -1,7 +1,7 @@
{ lib
, fetchPypi
, buildPythonPackage
-, pytestCheckHook, pytestrunner, pytestcov
+, pytestCheckHook, pytest-runner, pytest-cov
, isPy3k
}:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5";
};
- checkInputs = [ pytestCheckHook pytestrunner pytestcov ];
+ checkInputs = [ pytestCheckHook pytest-runner pytest-cov ];
disabled = !isPy3k;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix
index e183031b8d..fa2fa87d0e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, setuptools-scm
-, pytestrunner
+, pytest-runner
, pytest
}:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7";
};
- buildInputs = [ setuptools-scm pytestrunner ];
+ buildInputs = [ setuptools-scm pytest-runner ];
checkInputs = [ pytest ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
index 2eed1eefee..bffc424763 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub
, requests, requests_oauthlib, six
-, pytest, pytestcache, pytestcov, responses, mock
+, pytest, pytestcache, pytest-cov, responses, mock
}:
buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj";
};
- checkInputs = [ pytest pytestcache pytestcov responses mock ];
+ checkInputs = [ pytest pytestcache pytest-cov responses mock ];
propagatedBuildInputs = [ requests requests_oauthlib six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix
index 8c29971afe..c1e57be4de 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
-, pytestrunner
+, pytest-runner
}:
buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestrunner
+ pytest-runner
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
index d475f21fcb..e7a2a6808a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
@@ -3,7 +3,7 @@
, pythonOlder
, fetchPypi
, pytest
-, pytestcov
+, pytest-cov
, pytest-mock
, hypothesis
, glibcLocales
@@ -17,7 +17,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
+ pytest-cov
pytest-mock
hypothesis
glibcLocales
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix
index 221915efca..96fc94d43e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix
@@ -5,7 +5,7 @@
, attrs
, py
, setuptools
-, pytestcov
+, pytest-cov
, pytest-timeout
, pytest-tornado
, mock
@@ -34,7 +34,7 @@ buildPythonPackage rec {
checkInputs = [
hypothesis
- pytestcov
+ pytest-cov
pytest-timeout
pytest-tornado
jsonschema
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix
index b9a336f7fb..1769864925 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix
@@ -11,7 +11,7 @@
, glibcLocales
, matplotlib
, sympy
-, pytestcov
+, pytest-cov
}:
buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
pytestCheckHook
matplotlib
sympy
- pytestcov
+ pytest-cov
];
buildInputs = [ glibcLocales ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix
index b69e8401eb..cd70025d61 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, watchdog, flake8
-, pytest, pytestrunner, coverage, sphinx, twine }:
+, pytest, pytest-runner, coverage, sphinx, twine }:
buildPythonPackage rec {
pname = "ndjson";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
};
- checkInputs = [ pytest pytestrunner flake8 twine sphinx coverage watchdog ];
+ checkInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ];
meta = with lib; {
homepage = "https://github.com/rhgrant10/ndjson";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nengo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nengo/default.nix
new file mode 100644
index 0000000000..566540a4c9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nengo/default.nix
@@ -0,0 +1,36 @@
+{ lib, fetchFromGitHub, buildPythonPackage
+, numpy
+, scipySupport ? false, scipy
+, scikitSupport ? false, scikit-learn
+}:
+
+buildPythonPackage rec {
+ pname = "nengo";
+ version = "3.1.0";
+
+ src = fetchFromGitHub {
+ owner = "nengo";
+ repo = "nengo";
+ rev = "v${version}";
+ sha256 = "1wkayimf2jqkbr6piikh5zd6yw8gf2qv4v4bfrprs4laa6wzh2qh";
+ };
+
+ propagatedBuildInputs = [ numpy ]
+ ++ lib.optionals scipySupport [ scipy ]
+ ++ lib.optionals scikitSupport [ scikit-learn ];
+
+ # checks req missing:
+ # pytest-allclose
+ # pytest-plt
+ # pytest-rng
+ doCheck = false;
+
+ pythonImportsCheck = [ "nengo" ];
+
+ meta = with lib; {
+ description = "A Python library for creating and simulating large-scale brain models";
+ homepage = "https://nengo.ai/";
+ license = licenses.unfreeRedistributable;
+ maintainers = with maintainers; [ arjix ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix
index 9cf8618bb3..4787d9d6f7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix
@@ -2,6 +2,7 @@
, aiohttp
, aioresponses
, buildPythonPackage
+, dacite
, fetchFromGitHub
, pytest-asyncio
, pytest-error-for-skips
@@ -11,18 +12,19 @@
buildPythonPackage rec {
pname = "nettigo-air-monitor";
- version = "0.2.6";
+ version = "1.0.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
- sha256 = "0zs14g02m1ahyrhl2ihk74fp390g4672r1jjiaawmkxrvib07dvp";
+ sha256 = "sha256-VTKIUo3rR/HyEW/d/Nm0fm7wbgSdLGf02i8R3om1oCE=";
};
propagatedBuildInputs = [
aiohttp
+ dacite
];
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix
index 5e07d6331a..b9553765fb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "nexia";
- version = "0.9.9";
+ version = "0.9.10";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = version;
- sha256 = "sha256-OamQ6p8o23lVeOB/KyNQI7G8xZaAaVNYacoRfbNKJtk=";
+ sha256 = "0k97i243ap1sap5smvfmpsjqzkx5adjvi14awv82pcp52ckzkbi9";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix
index 078c455a63..8d0c597a1a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix
@@ -19,14 +19,14 @@
, pybids
, pydot
, pytest
-, pytest_xdist
+, pytest-xdist
, pytest-forked
, rdflib
, scipy
, simplejson
, traits
, xvfbwrapper
-, pytestcov
+, pytest-cov
, codecov
, sphinx
# other dependencies
@@ -93,8 +93,8 @@ buildPythonPackage rec {
mock
pytest
pytest-forked
- pytest_xdist
- pytestcov
+ pytest-xdist
+ pytest-cov
which
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix
index 597b681428..0821e0b763 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix
@@ -6,7 +6,7 @@
, effect
, git
, pytestCheckHook
-, pytestcov
+, pytest-cov
, pythonOlder
}:
@@ -29,7 +29,7 @@ buildPythonPackage rec {
effect
];
- checkInputs = [ pytestCheckHook pytestcov git ];
+ checkInputs = [ pytestCheckHook pytest-cov git ];
# ignore tests which are impure
disabledTests = [ "network" "requires_nix_build" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix
index c2f484cb3a..7d29428d93 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix
@@ -1,5 +1,5 @@
{ blinker, buildPythonPackage, fetchFromGitHub, lib, isPy27, six, mock, pytest
-, webtest, pytestcov, pytest-django, pytest-pythonpath, flake8, sqlalchemy
+, webtest, pytest-cov, pytest-django, pytest-pythonpath, flake8, sqlalchemy
, flask_sqlalchemy, peewee }:
buildPythonPackage rec {
@@ -31,7 +31,7 @@ buildPythonPackage rec {
mock
pytest
webtest
- pytestcov
+ pytest-cov
pytest-django
pytest-pythonpath
flake8
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
index 53577567bf..f9c27b4c79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytestrunner, python-utils, enum34 }:
+{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytest-runner, python-utils, enum34 }:
buildPythonPackage rec {
pname = "numpy-stl";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742";
};
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
checkPhase = "py.test";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix
index ad9da46243..42249e9337 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }:
+, pytest, pytest-runner, pyyaml, six, pathlib2, isPy27 }:
buildPythonPackage rec {
pname = "omegaconf";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
};
checkInputs = [ pytest ];
- buildInputs = [ pytestrunner ];
+ buildInputs = [ pytest-runner ];
propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix
index f09a42ddd6..18e357c1f2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix
@@ -5,7 +5,7 @@
, isodate
, jsonschema
, pytest-flake8
-, pytestcov
+, pytest-cov
, rfc3339-validator
, six
, strict-rfc3339
@@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ];
- checkInputs = [ pytestCheckHook pytestcov pytest-flake8 ];
+ checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ];
pythonImportsCheck = [ "openapi_schema_validator" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix
index b431ef5075..4e61a86a50 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, isPy27, fetchPypi
, jsonschema, openapi-schema-validator, pyyaml, six, pathlib
-, mock, pytest, pytestcov, pytest-flake8, tox, setuptools }:
+, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools }:
buildPythonPackage rec {
pname = "openapi-spec-validator";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ]
++ (lib.optionals (isPy27) [ pathlib ]);
- checkInputs = [ mock pytest pytestcov pytest-flake8 tox ];
+ checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ];
meta = with lib; {
homepage = "https://github.com/p1c2u/openapi-spec-validator";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix
index 872a540761..f2dd196be9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix
@@ -5,7 +5,7 @@
, typesystem
, aiosqlite
, pytestCheckHook
-, pytestcov
+, pytest-cov
, typing-extensions
}:
@@ -28,7 +28,7 @@ buildPythonPackage rec {
checkInputs = [
aiosqlite
pytestCheckHook
- pytestcov
+ pytest-cov
typing-extensions
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
index 1bbb713f40..c63c6df86f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
@@ -6,7 +6,7 @@
# For tests/setup.py
, pytest
-, pytestrunner
+, pytest-runner
, requests-mock
}:
@@ -17,11 +17,11 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "4af12f2fbcc9713878ab4ed571e9fda028bc68add34cde0e7226af4d833a4d38";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ requests ];
checkInputs = [
pytest
- pytestrunner
+ pytest-runner
requests-mock
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix
index 92f8f5d90f..e8344e88f1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, stdenv, pytestrunner, pytest, mock }:
+, stdenv, pytest-runner, pytest, mock }:
buildPythonPackage rec {
pname = "paho-mqtt";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
substituteInPlace setup.cfg --replace "--pylama" ""
'';
- checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock;
+ checkInputs = [ pytest-runner pytest ] ++ lib.optional (!isPy3k) mock;
doCheck = !stdenv.isDarwin;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix
index 9af09d5694..5b9a6d8e96 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix
@@ -19,7 +19,7 @@
, backports_tempfile
, isPy27
, pytest
-, pytestcov
+, pytest-cov
, pytest-mock
}:
@@ -54,7 +54,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
+ pytest-cov
pytest-mock
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix
index 3e7c6ae001..72eb9a185d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix
@@ -3,7 +3,7 @@
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, click, python-slugify, habanero, isbnlib, typing-extensions
, prompt_toolkit, pygments, stevedore, tqdm, lxml
-, python-doi, isPy3k, pytestcov
+, python-doi, isPy3k, pytest-cov
#, optional, dependencies
, whoosh, pytest
, stdenv
@@ -43,7 +43,7 @@ buildPythonPackage rec {
doCheck = !stdenv.isDarwin;
checkInputs = ([
- pytest pytestcov
+ pytest pytest-cov
]) ++ [
xdg-utils
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix
index decb15ff5e..709b257e33 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchPypi
, buildPythonPackage, pythonOlder
-, pytest, pytestrunner
+, pytest, pytest-runner
, parse, six, enum34
}:
@@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz";
};
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34;
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
index 77196a7c0e..ba3662a44b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, isPy27
, pytest
-, pytestrunner
+, pytest-runner
, future
}:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455";
};
- buildInputs = [ pytest pytestrunner ];
+ buildInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [ future ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix
index 533a4dc3a3..71b670b707 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, six
-, pytestrunner
+, pytest-runner
, pytest
}:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ];
- checkInputs = [ pytestrunner pytest ];
+ checkInputs = [ pytest-runner pytest ];
# Certain tests require network
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
index 672708b0fd..b5d429de08 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytestrunner
+, pytest-runner
, pytest
}:
@@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817";
};
- buildInputs = [ pytestrunner ];
+ buildInputs = [ pytest-runner ];
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix
index 783d85b6c0..7c08468c03 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytestcov, pytestCheckHook }:
+{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytest-cov, pytestCheckHook }:
buildPythonPackage rec {
pname = "periodictable";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23";
};
- checkInputs = [ pytestcov pytestCheckHook ];
+ checkInputs = [ pytest-cov pytestCheckHook ];
meta = {
homepage = "https://www.reflectometry.org/danse/software.html";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix
index 6a0f894078..8184c6d0d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, isPy3k
, setuptools
-, pytestcov
+, pytest-cov
, pytest
}:
@@ -24,7 +24,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ setuptools ];
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
pythonImportsCheck = [ "pglast" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
index 8eab09046d..54a8166438 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
@@ -7,7 +7,7 @@
, attrs
, espeak-ng
, pytestCheckHook
-, pytestcov
+, pytest-cov
}:
buildPythonApplication rec {
@@ -45,7 +45,7 @@ buildPythonApplication rec {
checkInputs = [
pytestCheckHook
- pytestcov
+ pytest-cov
];
# We tried to package festvial, but were unable to get the backend running,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix
index 262bdceb5d..75bc033807 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix
@@ -1,6 +1,6 @@
{ buildPythonPackage, fetchPypi, fetchpatch
, plaster, PasteDeploy
-, pytest, pytestcov
+, pytest, pytest-cov
}:
buildPythonPackage rec {
@@ -26,5 +26,5 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [ plaster PasteDeploy ];
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix
index 82aaebb100..749ffdb7f3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix
@@ -1,5 +1,5 @@
{ buildPythonPackage, fetchPypi
-, pytest, pytestcov
+, pytest, pytest-cov
}:
buildPythonPackage rec {
@@ -15,5 +15,5 @@ buildPythonPackage rec {
py.test
'';
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
index 5c41c3308b..d2e04586e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "PlexAPI";
- version = "4.5.2";
+ version = "4.6.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
- sha256 = "sha256-9rdpisEuLUO7oO7+7SQb4fXqRG30rf4R7bSFY+QpMhM=";
+ sha256 = "sha256-WL5UBsvAdtfOCkVX9NI0Z2fJ2CAO+NwD8wvkvkJ2uww=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix
index c37c428805..7287797ef3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix
@@ -13,7 +13,7 @@
, pkginfo
, poetry-core
, pytestCheckHook
-, pytestcov
+, pytest-cov
, pytest-mock
, requests
, requests-toolbelt
@@ -71,7 +71,7 @@ buildPythonPackage rec {
"$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish"
'';
- checkInputs = [ pytestCheckHook httpretty pytest-mock pytestcov ];
+ checkInputs = [ pytestCheckHook httpretty pytest-mock pytest-cov ];
preCheck = "export HOME=$TMPDIR";
disabledTests = [
# touches network
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
index 4a9fdfa426..857f971625 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
@@ -1,9 +1,7 @@
-{ stdenv
-, lib
+{ lib
, buildPythonPackage
, isPy3k
, fetchPypi
-, pythonPackages
, sip
, qtbase
, qmake
@@ -42,11 +40,8 @@ buildPythonPackage rec {
postPatch = ''
cat <> pyproject.toml
- sip-include-dirs = ["${pyqt5}/share/sip/PyQt5"]
-
[tool.sip.bindings.Poppler-Qt5]
include-dirs = ["${poppler.dev}/include/poppler"]
- tags = ["${sip.platform_tag}"]
EOF
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix
index 7b4fc177bc..eee4a1047f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix
@@ -1,7 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
, pytestCheckHook
-, pytestcov
-, pytest-flake8
, pytest-mypy
, redis
}:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix
index da27dd3cd9..d48f387400 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, pytest, setuptools-scm, tempora, pytest-black, pytestcov }:
+, pytest, setuptools-scm, tempora, pytest-black, pytest-cov }:
buildPythonPackage rec {
pname = "portend";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ tempora ];
- checkInputs = [ pytest pytest-black pytestcov ];
+ checkInputs = [ pytest pytest-black pytest-cov ];
checkPhase = ''
py.test --deselect=test_portend.py::TestChecker::test_check_port_listening
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
index b13808f1a9..0f18a6ad20 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
@@ -7,8 +7,8 @@
, six
, semver
, pytestCheckHook
-, pytestcov
-, pytestrunner
+, pytest-cov
+, pytest-runner
, openapi-spec-validator
}:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
};
buildInputs = [
- pytestrunner
+ pytest-runner
];
propagatedBuildInputs = [
@@ -35,7 +35,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestcov
+ pytest-cov
openapi-spec-validator
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/praw/6.3.nix b/third_party/nixpkgs/pkgs/development/python-modules/praw/6.3.nix
index 242300949e..13ecab806c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/praw/6.3.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/praw/6.3.nix
@@ -4,7 +4,7 @@
, betamax-matchers
, mock
, six
-, pytestrunner
+, pytest-runner
, prawcore
, pytest
, requests-toolbelt
@@ -24,7 +24,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
- pytestrunner
+ pytest-runner
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
index 686487c025..cb72e69af7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix
@@ -4,7 +4,7 @@
, requests
, testfixtures
, mock
-, requests_toolbelt
+, requests-toolbelt
, betamax
, betamax-serializers
, betamax-matchers
@@ -32,7 +32,7 @@ buildPythonPackage rec {
betamax
betamax-serializers
betamax-matchers
- requests_toolbelt
+ requests-toolbelt
pytestCheckHook
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prefixed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prefixed/default.nix
new file mode 100644
index 0000000000..d5837fd90a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prefixed/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "prefixed";
+ version = "0.3.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ca48277ba5fa8346dd4b760847da930c7b84416387c39e93affef086add2c029";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "prefixed" ];
+
+ meta = with lib; {
+ description = "Prefixed alternative numeric library";
+ homepage = "https://github.com/Rockhopper-Technologies/prefixed";
+ license = with licenses; [ mpl20 ];
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix
index ad47163e48..f50f9625fd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytestcov }:
+{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytest-cov }:
buildPythonPackage rec {
pname = "property-manager";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ];
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
meta = with lib; {
description = "Useful property variants for Python programming";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
index 01b249e1c7..ff312cbff8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
@@ -2,7 +2,7 @@
, fonttools
, lxml, fs # for fonttools extras
, setuptools-scm
-, pytestCheckHook, pytestcov, pytest_xdist
+, pytestCheckHook, pytest-cov, pytest-xdist
}:
buildPythonPackage rec {
@@ -31,8 +31,8 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestcov
- pytest_xdist
+ pytest-cov
+ pytest-xdist
];
disabledTests = [
# Test that fails on pytest >= v6
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix
index 2f494dcb70..869aea01a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix
@@ -1,5 +1,5 @@
{ buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests
-, prometheus_client, py-air-control, pytestCheckHook, pytestcov, pytestrunner
+, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytest-runner
, setuptools-scm }:
buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ setuptools-scm ];
- checkInputs = [ pytestCheckHook pytestcov pytestrunner ];
+ checkInputs = [ pytestCheckHook pytest-cov pytest-runner ];
propagatedBuildInputs = [ flask prometheus_client py-air-control ];
passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; };
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix
index b229361917..87cfd6b8e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix
@@ -4,7 +4,7 @@
, lib
, morphys
, pytest
-, pytestrunner
+, pytest-runner
, python-baseconv
, six
}:
@@ -24,7 +24,7 @@ buildPythonPackage rec {
'';
nativeBuildInputs = [
- pytestrunner
+ pytest-runner
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix
new file mode 100644
index 0000000000..2c7dc8e52e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, aiohttp
+, aresponses
+, async-timeout
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, pytz
+}:
+
+buildPythonPackage rec {
+ pname = "py17track";
+ version = "3.3.0";
+ format = "pyproject";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "bachya";
+ repo = pname;
+ rev = version;
+ sha256 = "1rnq9ybzj2l3699mjyplc29mxla8fayh52x52cnsz21ixlfd9fky";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ async-timeout
+ attrs
+ pytz
+ ];
+
+ checkInputs = [
+ aresponses
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace ">=19.3,<21.0" ">=19.3,<22.0"
+ '';
+
+ # Ignore the examples directory as the files are prefixed with test_
+ disabledTestPaths = [ "examples/" ];
+
+ pythonImportsCheck = [ "py17track" ];
+
+ meta = with lib; {
+ description = "Python library to track package info from 17track.com";
+ homepage = "https://github.com/bachya/py17track";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybtex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
index 0ce28e5749..2e178163c1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
@@ -1,11 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, latexcodec
+, pyyaml
+, setuptools
+}:
buildPythonPackage rec {
version = "0.24.0";
pname = "pybtex";
doCheck = false;
- propagatedBuildInputs = [ latexcodec pyyaml ];
+ pythonImportsCheck = [ "pybtex" ];
+
+ propagatedBuildInputs = [
+ latexcodec
+ pyyaml
+ setuptools
+ ];
src = fetchPypi {
inherit version pname;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycategories/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycategories/default.nix
index 55f30f9e55..ec902e0b38 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycategories/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycategories/default.nix
@@ -1,11 +1,11 @@
{ buildPythonPackage
, callPackage
-, pytestcov
+, pytest-cov
, fetchPypi
, lib
, pytest
, pythonOlder
-, pytestrunner
+, pytest-runner
}:
buildPythonPackage rec {
@@ -18,13 +18,13 @@ buildPythonPackage rec {
sha256 = "bd70ecb5e94e7659e564ea153f0c7673291dc37c526c246800fc08d6c5378099";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
# Is private because the author states it's unmaintained
# and shouldn't be used in production code
propagatedBuildInputs = [ (callPackage ./infix.nix { }) ];
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
meta = with lib; {
homepage = "https://gitlab.com/danielhones/pycategories";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix
index c202e5df19..fb0852e2bf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pydeconz";
- version = "79";
+ version = "82";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Kane610";
repo = "deconz";
rev = "v${version}";
- sha256 = "sha256-I29UIyHjsIymZxcE084hQoyaEMTXIIQPFcB8lsxY+UI=";
+ sha256 = "sha256-DdZ6bf+2rMjgjm5aRxcSRI/hN0zfP7uV8PaM40c9IJo=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
index a0924fa7f6..539fb9b929 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
@@ -3,7 +3,7 @@
, buildPythonPackage
, fetchFromGitHub
, isPy27
-, pytestrunner
+, pytest-runner
, pytestCheckHook
, numpy
, pillow
@@ -36,7 +36,7 @@ buildPythonPackage {
propagatedBuildInputs = [ numpy pillow ];
- checkInputs = [ pytestrunner pytestCheckHook ];
+ checkInputs = [ pytest-runner pytestCheckHook ];
# Setting $HOME to prevent pytest to try to create a folder inside
# /homeless-shelter which is read-only.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix
index 833b83b391..f4afd49bbc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix
@@ -2,7 +2,7 @@
, fetchPypi
, lib
, vcversioner
-, pytestrunner
+, pytest-runner
, mock
, pytest
, pytest-asyncio
@@ -35,7 +35,7 @@ buildPythonPackage rec {
pytest
pytest-asyncio
pytest-trio
- pytestrunner
+ pytest-runner
twisted
] ++ lib.optional isPy27 [
attrs
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix
index a714bbfaba..dc390120f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pyeight";
- version = "0.1.7";
+ version = "0.1.9";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "mezz64";
repo = "pyEight";
rev = version;
- sha256 = "sha256-kTxd6nRsPvCjrXApjKcoghOISIMho5x9/kK7OvHjKQM=";
+ sha256 = "1ybhs09wyzzaryghd6ijxhajp3677x63c4qzqsgln1mmxhj8wm5k";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix
index 9d917a4801..9f6d85fc56 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pyfireservicerota";
- version = "0.0.40";
+ version = "0.0.43";
src = fetchPypi {
inherit pname version;
- sha256 = "8d8173f6682ef2a61367660a15559c8c7a7e00db3f98092e0fa52e771df356f4";
+ sha256 = "sha256-3+QK1BVuWYii0oYT4xXMOYJZmVKrB4EmqE0EkdFlZvE=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix
index ec4cff2de6..eb6734649b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix
@@ -6,7 +6,7 @@
, flask
, pyquery
, pytest
-, pytestrunner
+, pytest-runner
, cairosvg
, tinycss
, cssselect
@@ -38,7 +38,7 @@ buildPythonPackage rec {
# Should be a check input, but upstream lists it under "setup_requires".
# https://github.com/Kozea/pygal/issues/430
- pytestrunner
+ pytest-runner
];
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix
new file mode 100644
index 0000000000..58f65b6d0f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, pkgs
+, buildPythonPackage
+, fetchFromGitHub
+, pygame
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pygame-gui";
+ version = "0.5.7";
+
+ src = fetchFromGitHub {
+ owner = "MyreMylar";
+ repo = "pygame_gui";
+ rev = "v_${lib.replaceStrings ["."] [""] version}";
+ sha256 = "4P2PT8/7oA5Q7H4+pm7BOET7w05pQYQltXVV3+YVrVE=";
+ };
+
+ propagatedBuildInputs = [ pygame ];
+
+ postPatch = ''
+ substituteInPlace pygame_gui/core/utility.py \
+ --replace "xsel" "${pkgs.xsel}/bin/xsel"
+ '';
+
+ checkInputs = [ pytestCheckHook ];
+
+ preCheck = ''
+ export HOME=$TMPDIR
+ export SDL_VIDEODRIVER=dummy
+ '';
+
+ disabledTests = [
+ # Clipboard doesn't exist in test environment
+ "test_process_event_text_ctrl_c"
+ "test_process_event_text_ctrl_v"
+ "test_process_event_text_ctrl_v_nothing"
+ "test_process_event_ctrl_v_over_limit"
+ "test_process_event_ctrl_v_at_limit"
+ "test_process_event_ctrl_v_over_limit_select_range"
+ "test_process_event_text_ctrl_v_select_range"
+ "test_process_event_text_ctrl_a"
+ "test_process_event_text_ctrl_x"
+ ];
+
+ meta = with lib; {
+ description = "A GUI system for pygame";
+ homepage = "https://github.com/MyreMylar/pygame_gui";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ angustrau ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix
index 333312d6aa..bcdce070c6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix
@@ -1,5 +1,6 @@
{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11
, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype
+, fontconfig
}:
buildPythonPackage rec {
@@ -20,9 +21,6 @@ buildPythonPackage rec {
portmidi libX11 freetype
];
- # Tests fail because of no audio device and display.
- doCheck = false;
-
preConfigure = ''
sed \
-e "s/origincdirs = .*/origincdirs = []/" \
@@ -39,9 +37,18 @@ buildPythonPackage rec {
LOCALBASE=/ ${python.interpreter} buildconfig/config.py
'';
+ checkInputs = [ fontconfig ];
+
+ preCheck = ''
+ # No audio or video device in test environment
+ export SDL_VIDEODRIVER=dummy
+ export SDL_AUDIODRIVER=disk
+ export SDL_DISKAUDIOFILE=/dev/null
+ '';
+
meta = with lib; {
description = "Python library for games";
- homepage = "http://www.pygame.org/";
+ homepage = "https://www.pygame.org/";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
index efc06ad0c9..1b8ee80675 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyhaversion";
- version = "21.5.0";
+ version = "21.07.0";
# Only 3.8.0 and beyond are supported
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
- sha256 = "sha256-/F4UMFUs60o3QazfFYEWgTGHg4z5knzNWolUpk5SIeM=";
+ sha256 = "sha256-LcuMLYekeK9HR+SR8+R+EvuxxaN3RCh7KV969RngZjw=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
index be746ae279..4a0e04943b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyinsteon";
- version = "1.0.11";
+ version = "1.0.12";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-dT01nKXDjkFSIf2BmrIcC8a9n00hlyd59oPwXn1CBaw=";
+ sha256 = "sha256-IlRCUogs78kbKY8gp22YzIkNrXhSCLJDDDtFAucrQxE=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix
index 64573a1a52..5dbb3d6750 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/1.9.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort,
mccabe, configparser, backports_functools_lru_cache, singledispatch,
- pytest, pytestrunner, setuptools }:
+ pytest, pytest-runner, setuptools }:
buildPythonPackage rec {
pname = "pylint";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "004kfapkqxqy2s85pmddqv0fabxdxywxrlbi549p0v237pr2v94p";
};
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix
index 9390461a2f..4e22d52a4c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pylitterbot";
- version = "2021.5.0";
+ version = "2021.7.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "natekspencer";
repo = pname;
rev = version;
- sha256 = "sha256-EiHdyjGYddtvciiwu2kpIBfUGvIJr38/8oJLFVzoRKE=";
+ sha256 = "0hnjqj9n2sq1jhiwdrw2aayhyz94cwjxniiak2h1nxh2q0nzigh3";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-flake8/default.nix
new file mode 100644
index 0000000000..495c54d585
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyls-flake8/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flake8
+, python-lsp-server
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pyls-flake8";
+ version = "0.4.0";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "emanspeaks";
+ repo = "pyls-flake8";
+ rev = "3df8606ad821100e64743f457c77c20170bde722";
+ sha256 = "14wkmwh8mqr826vdzxhvhdwrnx2akzmnbv3ar391qs4imwqfjx3l";
+ };
+
+ propagatedBuildInputs = [ flake8 python-lsp-server ];
+
+ meta = with lib; {
+ homepage = "https://github.com/emanspeaks/pyls-flake8";
+ description = "A Flake8 plugin for the Python LSP Server.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cpcloud ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix
index 35b43969e5..8ec10735ca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix
@@ -1,29 +1,31 @@
{ lib, buildPythonPackage, fetchFromGitHub
-, python-language-server, isort
+, python-lsp-server, isort
}:
buildPythonPackage rec {
pname = "pyls-isort";
- version = "0.1.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "paradoxxxzero";
repo = "pyls-isort";
- rev = version;
- sha256 = "0mf8c6dw5lsj9np20p0vrhr1yfycq2awjk2pil28l579xj9nr0dc";
+ rev = "v${version}";
+ sha256 = "0xba0aiyjfdi9swjzxk26l94dwlwvn17kkfjfscxl8gvspzsn057";
};
# no tests
doCheck = false;
+ pythonImportsCheck = [ "pyls_isort" ];
+
propagatedBuildInputs = [
- isort python-language-server
+ isort python-lsp-server
];
meta = with lib; {
homepage = "https://github.com/paradoxxxzero/pyls-isort";
- description = "Isort plugin for python-language-server";
+ description = "Isort plugin for python-lsp-server";
license = licenses.mit;
- maintainers = [ ];
+ maintainers = with maintainers; [ cpcloud ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix
index f919ac21cb..acce4469ee 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
, future, python-language-server, mypy, configparser
-, pytestCheckHook, mock, pytestcov, coverage
+, pytestCheckHook, mock, pytest-cov, coverage
, fetchpatch
}:
@@ -34,7 +34,7 @@ buildPythonPackage rec {
})
];
- checkInputs = [ mock pytestcov coverage pytestCheckHook ];
+ checkInputs = [ mock pytest-cov coverage pytestCheckHook ];
propagatedBuildInputs = [
mypy python-language-server configparser
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix
index a6778a4aa7..80fa5bff32 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix
@@ -11,7 +11,7 @@
, pyflakes
, pytest
, pytestcache
-, pytestcov
+, pytest-cov
, covCore
, pytest-flakes
, sphinx
@@ -33,7 +33,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
checkInputs = [
- flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore
+ flask httpretty oauthlib pyflakes pytest pytestcache pytest-cov covCore
pytest-flakes sphinx mock chalice
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix
index 72f362f85c..87d46a35fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix
@@ -2,7 +2,7 @@
, fetchurl
, buildPythonPackage
, pymatgen
-, pytestrunner
+, pytest-runner
, pytestCheckHook
, isPy3k
}:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "0shldl8is3195jmji7dr3zsh1bzxlahaqrmpr28niks7nnfj80fx";
};
- buildInputs = [ pytestrunner ];
+ buildInputs = [ pytest-runner ];
checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ pymatgen ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix
index f4b9f0b1f0..66ab62d927 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pymazda";
- version = "0.1.6";
+ version = "0.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-fQcycOMNYCO6bP344DTLxNf/YoliEITyxsnIDyTPO5E=";
+ sha256 = "sha256-tEe70gvEglxqECiPjS3k29zZi70OSGMv6JxhrXqPhnY=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix
new file mode 100644
index 0000000000..92918efa8e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, cffi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pymunk";
+ version = "6.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "04jqqd2y0wzzkqppbl08vyzgbcpl5qj946w8da2ilypqdx7j2akp";
+ };
+
+ propagatedBuildInputs = [ cffi ];
+
+ preBuild = ''
+ ${python.interpreter} setup.py build_ext --inplace
+ '';
+
+ checkInputs = [ pytestCheckHook ];
+ pytestFlagsArray = [
+ "pymunk/tests"
+ ];
+
+ meta = with lib; {
+ description = "2d physics library";
+ homepage = "https://www.pymunk.org";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ angustrau ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix
index 244b366081..67079a8c1d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvim/default.nix
@@ -6,7 +6,7 @@
, greenlet
, pythonOlder
, isPyPy
-, pytestrunner
+, pytest-runner
}:
buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
- pytestrunner
+ pytest-runner
];
# Tests require pkgs.neovim,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyosf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyosf/default.nix
index c25b1b1143..07c657bf22 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyosf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyosf/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, isPy27
-, pytestrunner
+, pytest-runner
, requests
}:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
};
preBuild = "export HOME=$TMP";
- buildInputs = [ pytestrunner ]; # required via `setup_requires`
+ buildInputs = [ pytest-runner ]; # required via `setup_requires`
propagatedBuildInputs = [ requests ];
doCheck = false; # requires network access
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix
index 8a6452fb66..4f04038d65 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pysma";
- version = "0.6.0";
+ version = "0.6.4";
src = fetchPypi {
inherit pname version;
- sha256 = "8e997cf28c3ae7ccc90caa84aa3a3ed9245fac3e9cf76efb1467e4f4800143dc";
+ sha256 = "sha256-hnvbQOilsoHn1qc/pKJ2Eq1VwJi+HbGlAAJwiME1Pgc=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix
index 63dbe76253..132c904dc3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pysonos";
- version = "0.0.51";
+ version = "0.0.54";
disabled = !isPy3k;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "amelchio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MjsbqrH4SWnnwGe9BVHaValoQEiaaZVhFdn6MDoEyZs=";
+ sha256 = "sha256-gBOknYHL5nQWFVhCbLN0Ah+1fovcNY4P2myryZnUadk=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix
index b8570427d3..4f295dfc7c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix
@@ -1,7 +1,7 @@
{ lib
, fetchPypi
, buildPythonPackage
-, pytestrunner
+, pytest-runner
, numpy
, pyyaml
}:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "ada088f73f7e1a3bf085206e81e0f83ed89c1d0b23a789ecd0ba0a250724aee8";
};
- buildInputs = [ pytestrunner ];
+ buildInputs = [ pytest-runner ];
propagatedBuildInputs = [ numpy pyyaml ];
# Tests require git lfs download of repository
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysyncthru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysyncthru/default.nix
index d3fed5dc4b..3fc0600f6d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysyncthru/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysyncthru/default.nix
@@ -1,7 +1,7 @@
{ lib
, isPy27
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, aiohttp
, demjson
, python
@@ -13,10 +13,11 @@ buildPythonPackage rec {
disabled = isPy27;
- src = fetchPypi {
- pname = "PySyncThru";
- inherit version;
- sha256 = "13564018a7de4fe013e195e19d7bae92aa224e0f3a32373576682722d3dbee52";
+ src = fetchFromGitHub {
+ owner = "nielstron";
+ repo = "pysyncthru";
+ rev = "release-${version}";
+ sha256 = "122zxwqwx03vaxbhmp3cjibjnkirayz0w68gvslsdr7n9nqv3pgz";
};
propagatedBuildInputs = [
@@ -28,9 +29,6 @@ buildPythonPackage rec {
${python.interpreter} -m unittest
'';
- # no tests on PyPI, no tags on GitHub
- doCheck = false;
-
pythonImportsCheck = [ "pysyncthru" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix
index 963e621986..acc5550358 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, fetchpatch
, pytest
-, pytestcov
+, pytest-cov
, pytestCheckHook
, numpy
, astropy
@@ -37,7 +37,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestcov
+ pytest-cov
numpy
scipy
h5py
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
index 0253ed5a51..47cc882f54 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
@@ -5,7 +5,7 @@
, django
, setuptools-scm
, django-configurations
-, pytest_xdist
+, pytest-xdist
, six
}:
buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ pytest setuptools-scm ];
- checkInputs = [ pytest django-configurations pytest_xdist six ];
+ checkInputs = [ pytest django-configurations pytest-xdist six ];
propagatedBuildInputs = [ django ];
# Complicated. Requires Django setup.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
index 39d6bc127e..eea6c61a72 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix
@@ -7,7 +7,7 @@
, pytest
, pytestcache
, pytestCheckHook
-, pytestcov
+, pytest-cov
}:
buildPythonPackage rec {
@@ -32,7 +32,7 @@ buildPythonPackage rec {
mock
pytestCheckHook
pytestcache
- pytestcov
+ pytest-cov
];
pytestFlagsArray = [ "--ignore=docs" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
index 148b2c7185..df152eaa5e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytest
-, pytestcov
+, pytest-cov
, pytest-doctestplus
, pytestCheckHook
, setuptools-scm
@@ -25,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pytest-doctestplus
- pytestcov
+ pytest-cov
pytestCheckHook
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
index 16a1fb92dd..e03e0fbe62 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
@@ -5,7 +5,7 @@
, pytest
, pylint
, six
-, pytestrunner
+, pytest-runner
, toml
}:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27";
};
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
buildInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix
index f8e240ca57..0020a4bf43 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, factory_boy, faker, numpy, backports-entry-points-selectable
-, pytestCheckHook, pytest_xdist
+, pytestCheckHook, pytest-xdist
}:
buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytest_xdist
+ pytest-xdist
numpy
factory_boy
faker
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytestrunner/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/2.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/python-modules/pytestrunner/2.nix
rename to third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/2.nix
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/python-modules/pytestrunner/default.nix
rename to third_party/nixpkgs/pkgs/development/python-modules/pytest-runner/default.nix
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix
index 0483063c53..e43a837d6a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -1,5 +1,5 @@
{ lib, isPyPy, buildPythonPackage, fetchPypi
-, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet
+, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, pathpy, execnet
, contextlib2, termcolor }:
buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
buildInputs = [ pytest ];
checkInputs = [ cmdline pytest ];
- propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ];
+ propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ];
checkPhase = ''
py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
index 8c59b6ee2c..40f67eb0b0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -4,7 +4,7 @@
, pytest
, pytestCheckHook
, pexpect
-, pytestcov
+, pytest-cov
}:
buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
buildInputs = [ pytest ];
- checkInputs = [ pytestCheckHook pexpect pytestcov ];
+ checkInputs = [ pytestCheckHook pexpect pytest-cov ];
disabledTests = [
"test_suppresses_timeout_when_pdb_is_entered"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix
index 8ea981ba2e..c4a66cc48e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }:
+, pytest, pytest-cov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }:
buildPythonPackage rec {
pname = "pytest-virtualenv";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12";
};
- checkInputs = [ pytest pytestcov mock cmdline ];
+ checkInputs = [ pytest pytest-cov mock cmdline ];
propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ];
checkPhase = "py.test tests/unit ";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
index c8f1179bc6..861addf81e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }:
+{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytest-cov }:
buildPythonPackage rec {
pname = "python-hosts";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
substituteInPlace python_hosts/utils.py --replace "import win_inet_pton" ""
'';
- checkInputs = [ pyyaml pytest pytestcov ];
+ checkInputs = [ pyyaml pytest pytest-cov ];
# Removing 1 test file (it requires internet connection) and keeping the other two
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index e641a943f8..a6d0bf800e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
-, pytestCheckHook, mock, pytestcov, coverage
+, pytestCheckHook, mock, pytest-cov, coverage
, future, futures ? null, ujson, isPy38
}:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
'';
checkInputs = [
- pytestCheckHook mock pytestcov coverage
+ pytestCheckHook mock pytest-cov coverage
];
propagatedBuildInputs = [ future ujson ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
index 3ed9b75ef9..f022eba585 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast, pythonOlder, isPy27
, backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8
-, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky
+, pytestCheckHook, mock, pytest-cov, coverage, setuptools, ujson, flaky
, # Allow building a limited set of providers, e.g. ["pycodestyle"].
providers ? ["*"]
# The following packages are optional and
@@ -55,7 +55,7 @@ buildPythonPackage rec {
doCheck = providers == ["*"];
checkInputs = [
- pytestCheckHook mock pytestcov coverage flaky
+ pytestCheckHook mock pytest-cov coverage flaky
# Do not propagate flake8 or it will enable pyflakes implicitly
flake8
# rope is technically a dependency, but we don't add it by default since we
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix
new file mode 100644
index 0000000000..3c18d291e3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, black
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, python-lsp-server
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "python-lsp-black";
+ version = "1.0.0";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "python-lsp";
+ repo = "python-lsp-black";
+ rev = "v${version}";
+ sha256 = "1blxhj70jxb9xfbd4dxqikd262n6dn9dw5qhyml5yvdwxbv0bybc";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ propagatedBuildInputs = [ black python-lsp-server ];
+
+ meta = with lib; {
+ homepage = "https://github.com/python-lsp/python-lsp-black";
+ description = "Black plugin for the Python LSP Server";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cpcloud ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix
index 95208c7b94..180264f102 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lz4/default.nix
@@ -6,8 +6,8 @@
, pkgconfig
, psutil
, pytest
-, pytestcov
-, pytestrunner
+, pytest-cov
+, pytest-runner
, setuptools-scm
}:
@@ -23,8 +23,8 @@ buildPythonPackage rec {
sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf";
};
- nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ];
- checkInputs = [ pytest pytestcov psutil ];
+ nativeBuildInputs = [ setuptools-scm pkgconfig pytest-runner ];
+ checkInputs = [ pytest pytest-cov psutil ];
propagatedBuildInputs = lib.optionals (!isPy3k) [ future ];
# give a hint to setuptools-scm on package version
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix
index c279234248..ccac3e8b3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, pytest
-, pytestcov
+, pytest-cov
, mock
, pyyaml
, six
@@ -19,7 +19,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
+ pytest-cov
mock
pyyaml
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
index fd488f4be9..14d15df16f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
@@ -1,25 +1,40 @@
-{ lib, fetchPypi, buildPythonPackage, python, text-unidecode }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, python
+, pythonOlder
+, text-unidecode
+, unidecode
+}:
buildPythonPackage rec {
- pname = "python-slugify";
- version = "4.0.1";
+ pname = "python-slugify";
+ version = "5.0.2";
+ disabled = pythonOlder "3.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270";
- };
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-8TODoLn8vmSaGJK5yOtPjqsdbYS4S7emJDF6+pgVnKs=";
+ };
- propagatedBuildInputs = [ text-unidecode ];
+ propagatedBuildInputs = [
+ text-unidecode
+ unidecode
+ ];
- checkPhase = ''
- ${python.interpreter} test.py
- '';
+ checkInputs = [
+ pytestCheckHook
+ ];
- meta = with lib; {
- homepage = "https://github.com/un33k/python-slugify";
- description = "A Python Slugify application that handles Unicode";
- license = licenses.mit;
- platforms = platforms.all;
- maintainers = with maintainers; [ vrthra ];
- };
+ pytestFlagsArray = [ "test.py" ];
+
+ pythonImportsCheck = [ "slugify" ];
+
+ meta = with lib; {
+ description = "Python Slugify application that handles Unicode";
+ homepage = "https://github.com/un33k/python-slugify";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vrthra ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix
index c368d97633..f6814a8d0f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
-, pytestrunner
+, pytest-runner
, future
, requests
, responses
@@ -31,7 +31,7 @@ buildPythonPackage rec {
})
];
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ future requests requests_oauthlib ];
checkInputs = [ pytest responses hypothesis ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix
index 10dc9f3057..cb25b09dad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pythran/default.nix
@@ -2,7 +2,7 @@
, python
, buildPythonPackage
, fetchFromGitHub
-, pytestrunner
+, pytest-runner
, ply
, networkx
, decorator
@@ -39,7 +39,7 @@ in buildPythonPackage rec {
];
nativeBuildInputs = [
- pytestrunner
+ pytest-runner
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
index d021b6b06d..a6c2b1d381 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.0.9031";
+ version = "9.0.9166";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-bl6bWv4c+tlaWcxrYCiljC9C+wAZZVyk+1O0rlb4kxA=";
+ sha256 = "0h7jw7blr4bal7pw711cxmwm4jjypchshc8ks04z2lyziy83ywja";
};
postPatch = lib.optionalString stdenv.isDarwin ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix
index 1a01eda244..ea40fc573b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, pytestrunner, pytestCheckHook, glib, vips, cffi
+{ buildPythonPackage, fetchPypi, pytest-runner, pytestCheckHook, glib, vips, cffi
, pkg-config, pkgconfig, lib }:
buildPythonPackage rec {
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2";
};
- nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ];
+ nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ];
buildInputs = [ glib vips ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix
index ceb190fe75..ad2574bd86 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, fetchpatch
, ifaddr
, lxml
, poetry-core
@@ -14,7 +13,7 @@
buildPythonPackage rec {
pname = "pywemo";
- version = "0.6.4";
+ version = "0.6.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,19 +21,13 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1hm1vs6m65vqar0lcjnynz0d9y9ri5s75fzhvp0yfjkcnp06gnfa";
+ sha256 = "sha256-8nLzNEle5eR5qc/tC1CX+Kh3WkPuKyy9VDMiAVbOykA=";
};
- patches = [
- (fetchpatch {
- # https://github.com/pywemo/pywemo/issues/264
- url = "https://github.com/pywemo/pywemo/commit/4fd7af8ccc7cb2412f61d5e04b79f83c9ca4753c.patch";
- sha256 = "1x0rm5dxr0z5llmv446bx3i1wvgcfhx22zn78qblcr0m4yv3mif4";
- })
+ nativeBuildInputs = [
+ poetry-core
];
- nativeBuildInputs = [ poetry-core ];
-
propagatedBuildInputs = [
ifaddr
requests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix
index 3a3e9bced0..b6e0684a2d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix
@@ -1,12 +1,12 @@
{ buildPythonPackage, lib, fetchPypi, numpy
-, pydantic, pint, networkx, pytestrunner, pytestcov, pytest
+, pydantic, pint, networkx, pytest-runner, pytest-cov, pytest
} :
buildPythonPackage rec {
pname = "qcelemental";
version = "0.21.0";
- checkInputs = [ pytestrunner pytestcov pytest ];
+ checkInputs = [ pytest-runner pytest-cov pytest ];
propagatedBuildInputs = [ numpy pydantic pint networkx ];
src = fetchPypi {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix
index 847eeb23c9..0dd24112bd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix
@@ -1,5 +1,5 @@
{ buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic
-, py-cpuinfo, psutil, pytestrunner, pytest, pytestcov
+, py-cpuinfo, psutil, pytest-runner, pytest, pytest-cov
} :
buildPythonPackage rec {
@@ -7,8 +7,8 @@ buildPythonPackage rec {
version = "0.19.0";
checkInputs = [
- pytestrunner
- pytestcov
+ pytest-runner
+ pytest-cov
pytest
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix
index ecb33f6adb..d7f93b3a47 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix
@@ -9,19 +9,23 @@
buildPythonPackage rec {
pname = "questionary";
- version = "1.9.0";
+ version = "1.10.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "tmbo";
repo = pname;
rev = version;
- sha256 = "1x748bz7l2r48031dj6vr6jvvac28pv6vx1bina4lz60h1qac1kf";
+ sha256 = "14k24fq2nmk90iv0k7pnmmdhmk8z261397wg52sfcsccyhpdw3i7";
};
- nativeBuildInputs = [ poetry ];
+ nativeBuildInputs = [
+ poetry
+ ];
- propagatedBuildInputs = [ prompt_toolkit ];
+ propagatedBuildInputs = [
+ prompt_toolkit
+ ];
checkInputs = [
pytest-cov
@@ -32,7 +36,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to build command line user prompts";
- homepage = "https://github.com/bachya/regenmaschine";
+ homepage = "https://github.com/tmbo/questionary";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix
index 85d5d5d0b7..1ec6448d74 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix
@@ -1,7 +1,7 @@
{ buildPythonPackage, lib, fetchFromGitHub, isPy3k
, cython, setuptools
, numpy, affine, attrs, cligj, click-plugins, snuggs, gdal
-, pytest, pytestcov, packaging, hypothesis, boto3, mock
+, pytest, pytest-cov, packaging, hypothesis, boto3, mock
, certifi, shapely
}:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc=";
};
- checkInputs = [ boto3 pytest pytestcov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock;
+ checkInputs = [ boto3 pytest pytest-cov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock;
nativeBuildInputs = [ cython gdal ];
propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix
index ea13c7083f..c83a2bba1c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }:
+{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytest-cov, pexpect }:
buildPythonPackage rec {
pname = "readchar";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ flake8 ];
- checkInputs = [ pytest pytestcov pexpect ];
+ checkInputs = [ pytest pytest-cov pexpect ];
meta = with lib; {
homepage = "https://github.com/magmax/python-readchar";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rebulk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
index fae0bf08e5..f422934f02 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex}:
buildPythonPackage rec {
pname = "rebulk";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
# Some kind of trickery with imports that doesn't work.
doCheck = false;
- buildInputs = [ pytest pytestrunner ];
+ buildInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [ six regex ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix
index e9b8beadd1..9f5024daf7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, lib
, pytestCheckHook
-, pytestrunner
+, pytest-runner
}:
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo=";
};
- propagatedBuildInputs = [ cffi pytestrunner ];
+ propagatedBuildInputs = [ cffi pytest-runner ];
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix
index 896bc8e02f..873a39244f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix
@@ -2,7 +2,7 @@
, fetchPypi
, buildPythonPackage
, sphinx
-, pytestcov
+, pytest-cov
, pytest
, Mako
, numpy
@@ -20,7 +20,7 @@ buildPythonPackage rec {
sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7";
};
- checkInputs = [ sphinx pytestcov pytest ];
+ checkInputs = [ sphinx pytest-cov pytest ];
propagatedBuildInputs = [ Mako numpy funcsigs ]
++ lib.optional withCuda pycuda
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix
index 64dafa7bca..ce1dfc366f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "requests-cache";
- version = "0.7.1";
+ version = "0.7.2";
disabled = pythonOlder "3.6";
format = "pyproject";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "reclosedev";
repo = "requests-cache";
rev = "v${version}";
- sha256 = "sha256-Ai/8l2p3S/NE+uyz3eQ+rJSD/xYCsXf89aYijINQ18I=";
+ sha256 = "055dfyjm8dqwr62v86lyvq4r04692gmvlgp86218vwvzgm7p3p2c";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-futures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-futures/default.nix
new file mode 100644
index 0000000000..cc6eb31243
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-futures/default.nix
@@ -0,0 +1,25 @@
+{ buildPythonPackage, fetchPypi, requests, lib }:
+
+buildPythonPackage rec {
+ pname = "requests-futures";
+ version = "1.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ # tests are disabled because they require being online
+ doCheck = false;
+
+ pythonImportsCheck = [ "requests_futures" ];
+
+ meta = with lib; {
+ description = "Asynchronous Python HTTP Requests for Humans using Futures";
+ homepage = "https://github.com/ross/requests-futures";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ applePrincess ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix
index 551c7f5b93..e7e7ed5a73 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, pytest
-, pytestcov
+, pytest-cov
, numpy
, scipy
, cython
@@ -22,7 +22,7 @@ buildPythonPackage rec {
sha256 = "0qmkxl5sbgh0j73n667vyi7ywzh09iaync91yp1j5rrcmwsn0qfs";
};
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
propagatedBuildInputs = [ numpy scipy cython numba six ];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix
index eb9afc8353..03aed296aa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix
@@ -3,7 +3,7 @@
, isPy27
, fetchFromGitHub
, pytestCheckHook
-, pytestcov
+, pytest-cov
, dill
, numpy
, pytorch
@@ -25,7 +25,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ];
- checkInputs = [ dill pytestcov pytestCheckHook ];
+ checkInputs = [ dill pytest-cov pytestCheckHook ];
disabledTests = [ "test_affine" ]; # deprecated division operator '/'
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix
index c47054632c..4e062d9928 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix
@@ -20,7 +20,7 @@
, wget
, deepdiff
, pytestCheckHook
-, pytestcov
+, pytest-cov
, websocket-client
}:
@@ -61,7 +61,7 @@ buildPythonPackage rec {
checkInputs = [
deepdiff
pytestCheckHook
- pytestcov
+ pytest-cov
websocket-client
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix
index 7f3e6527d0..5f0653236a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix
@@ -6,7 +6,7 @@
, pytest
, requests-mock
, mock
-, pytestcov
+, pytest-cov
, pytest-timeout
, testtools
}:
@@ -25,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ defusedxml requests ];
- checkInputs = [ pytest requests-mock mock pytestcov pytest-timeout testtools ];
+ checkInputs = [ pytest requests-mock mock pytest-cov pytest-timeout testtools ];
checkPhase = ''
pytest
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix
index 6694c3abe4..42f10aedf3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix
@@ -15,9 +15,9 @@
, ninja
, pathpy
, pytest
-, pytestcov
+, pytest-cov
, pytest-mock
-, pytestrunner
+, pytest-runner
, pytest-virtualenv
, requests
, six
@@ -48,9 +48,9 @@ buildPythonPackage rec {
ninja
pathpy
pytest
- pytestcov
+ pytest-cov
pytest-mock
- pytestrunner
+ pytest-runner
pytest-virtualenv
requests
six
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
index f9f896a563..643afd6dc8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }:
+{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytest-cov, pytest-mock, fake-useragent, faker, scrapy }:
buildPythonPackage rec {
pname = "scrapy-fake-useragent";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ fake-useragent faker ];
- checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ];
+ checkInputs = [ pytestCheckHook scrapy pytest-cov pytest-mock ];
meta = with lib; {
description = "Random User-Agent middleware based on fake-useragent";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
index bb5cc138a7..58fa81b444 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, pkg-config
, pytest
-, pytestrunner
+, pytest-runner
, cffi
, secp256k1
}:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ pkg-config ];
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [ cffi secp256k1 ];
# Tests are not included in archive
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix
index 26b8d732be..f959458d26 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, pytest
, virtualenv
-, pytestrunner
+, pytest-runner
, pytest-virtualenv
, twisted
, pathlib2
@@ -18,7 +18,7 @@ buildPythonPackage rec {
sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12";
};
- buildInputs = [ pytest virtualenv pytestrunner pytest-virtualenv ];
+ buildInputs = [ pytest virtualenv pytest-runner pytest-virtualenv ];
propagatedBuildInputs = [ twisted pathlib2 ];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix
index dacd589b12..bf73e7561a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix
@@ -18,12 +18,12 @@
buildPythonPackage rec {
name = "sfepy";
- version = "2020.4";
+ version = "2021.2";
disabled = pythonOlder "3.8";
src = fetchurl {
url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz";
- sha256 = "1wb0ik6kjg3mksxin0abr88bhsly67fpg36qjdzabhj0xn7j1yaz";
+ sha256 = "1vnynxzbspj900wjyy6020l71jdv2l1wkyax7nhi6w5wvav4kfwz";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix
index 3e2a90b496..9128018825 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix
@@ -1,7 +1,8 @@
{ lib
, aiohttp
-, aresponses
+, aioresponses
, asynctest
+, backoff
, buildPythonPackage
, fetchFromGitHub
, poetry-core
@@ -14,7 +15,7 @@
buildPythonPackage rec {
pname = "simplisafe-python";
- version = "10.0.0";
+ version = "11.0.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,19 +23,20 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-VF8R+dty54GuWvYs/OqWhfGtOVieuxtfndQUxHhu5lc=";
+ sha256 = "sha256-sIv7zoLp+1CfeyhVYWMp93TkNk+h14WawOJOQMhwAp8=";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
aiohttp
+ backoff
pytz
voluptuous
];
checkInputs = [
- aresponses
+ aioresponses
asynctest
pytest-asyncio
pytestCheckHook
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix
index db3b8ed431..3bbf28d288 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, pytestCheckHook
, pytest
-, pytestcov
+, pytest-cov
, flaky
, numpy
, pandas
@@ -24,7 +24,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ];
- checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ];
+ checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ];
disabledTests = [
# on CPU, these expect artifacts from previous GPU run
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix
index d22d610995..d98d23fada 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, rustPlatform, setuptools-rust }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }:
buildPythonPackage rec {
pname = "skytemple-rust";
@@ -17,6 +17,7 @@ buildPythonPackage rec {
sha256 = "1ypcsf9gbq1bz29kfn7g4kg8741mxg1lfcbb14a0vfhjq4d6pnx9";
};
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
doCheck = false; # there are no tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
index e96161228a..c82eba66ac 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix
@@ -10,7 +10,7 @@
, pytest-cov
, pytest-mock
, pytestCheckHook
-, pytestrunner
+, pytest-runner
, requests
, responses
, six
@@ -45,7 +45,7 @@ buildPythonPackage rec {
pytest-cov
pytest-mock
pytestCheckHook
- pytestrunner
+ pytest-runner
responses
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
index edadde8995..af22267413 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "soco";
- version = "0.22.6";
+ version = "0.23.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
- sha256 = "06qar4syi6g3x84klnk0mg6w5ryl50c5k3s1hag4rimbkap3x6ks";
+ sha256 = "15q82fq10d162xanypn1k51y15r38l7sj0417jzbjx40zz6c93f7";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix
index 3c2a5e2a35..78ecb3face 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix
@@ -9,7 +9,7 @@
, pygments
, urllib3
, pytest
-, pytestcov
+, pytest-cov
, mock
, sphinx
, testtools
@@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ];
- checkInputs = [ pytest pytestcov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ];
+ checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ];
checkPhase = ''
pytest
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-copybutton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-copybutton/default.nix
new file mode 100644
index 0000000000..8d408d300c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-copybutton/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, sphinx
+}:
+
+buildPythonPackage rec {
+ pname = "sphinx-copybutton";
+ version = "0.4.0";
+
+ src = fetchFromGitHub {
+ owner = "executablebooks";
+ repo = "sphinx-copybutton";
+ rev = "v${version}";
+ sha256 = "sha256-vrEIvQeP7AMXSme1PBp0ox5k8Q1rz+1cbHIO+o17Jqc=";
+ fetchSubmodules = true;
+ };
+
+ propagatedBuildInputs = [
+ sphinx
+ ];
+
+ doCheck = false; # no tests
+
+ pythonImportsCheck = [ "sphinx_copybutton" ];
+
+ meta = with lib; {
+ description = "A small sphinx extension to add a \"copy\" button to code blocks";
+ homepage = "https://github.com/executablebooks/sphinx-copybutton";
+ license = licenses.mit;
+ maintainers = with maintainers; [ Luflosi ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
index 6c576f0b85..3aaff20a9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -9,7 +9,6 @@
, mock
, pysqlite ? null
, pytestCheckHook
-, pytest_xdist
}:
buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
index 67a6dba1a8..35f7d7c07c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -7,7 +7,7 @@
, sqlite-fts4
, tabulate
, pytestCheckHook
-, pytestrunner
+, pytest-runner
, black
, hypothesis
, sqlite
@@ -32,7 +32,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestrunner
+ pytest-runner
black
hypothesis
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix
index 68ca009d9d..5339529f3d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }:
+{ lib, buildPythonPackage, fetchPypi, six, pytest, pytest-runner }:
buildPythonPackage rec {
pname = "srptools";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ];
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
meta = with lib; {
description = "Python-Tools to implement Secure Remote Password (SRP) authentication";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix
index 904595865b..510bbbac95 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix
@@ -5,7 +5,7 @@
, cffi
, six
, pytest
-, pytestrunner
+, pytest-runner
}:
buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "0px8k4fjbkjb717bg2v7rjhm4iclrxzq7sh0hfqs55f4ddqi0m8v";
};
- buildInputs = [ pkgs.ssdeep pytestrunner ];
+ buildInputs = [ pkgs.ssdeep pytest-runner ];
checkInputs = [ pytest ];
propagatedBuildInputs = [ cffi six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix
index 6bbeb23ed1..a9fdfe2050 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, requests, six
-, backports_unittest-mock, pytestCheckHook, pytestrunner }:
+, backports_unittest-mock, pytestCheckHook, pytest-runner }:
buildPythonPackage rec {
pname = "sseclient";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
# some tests use python3 strings
doCheck = !isPy27;
- checkInputs = [ backports_unittest-mock pytestCheckHook pytestrunner ];
+ checkInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ];
# tries to open connection to wikipedia
disabledTests = [ "event_stream" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix
index 21c92fcee7..8ea42d1f27 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix
@@ -2,7 +2,7 @@
, coverage
, mock
, ply
-, pytestrunner
+, pytest-runner
, pytestCheckHook
, six
}:
@@ -24,7 +24,7 @@ buildPythonPackage rec {
--replace "coverage==5.3" "coverage"
'';
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ ply six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
index cfdc173995..7aa955e99e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytestcov, pytest-mock, pytest_xdist }:
+{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest-xdist }:
buildPythonPackage rec {
pname = "stripe";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ requests ];
- checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ];
+ checkInputs = [ pytest pytest-cov pytest-mock pytest-xdist ];
meta = with lib; {
description = "Stripe Python bindings";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix
index 35aaf45ed1..97a7d6ebbd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix
@@ -5,7 +5,7 @@
, dnspython
, requests
, pytest
-, pytestcov
+, pytest-cov
, isPy3k
}:
@@ -31,7 +31,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
+ pytest-cov
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix
index 5f51112324..8628c83334 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix
@@ -5,7 +5,7 @@
, stups-cli-support
, stups-zign
, pytest
-, pytestcov
+, pytest-cov
, isPy3k
}:
@@ -33,7 +33,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
+ pytest-cov
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix
index aaa0499164..92cd344edb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix
@@ -5,7 +5,7 @@
, stups-cli-support
, stups-zign
, pytest
-, pytestcov
+, pytest-cov
, hypothesis
, isPy3k
}:
@@ -34,7 +34,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
+ pytest-cov
hypothesis
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix
index 3e785d8feb..62dec6f348 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix
@@ -4,7 +4,7 @@
, requests
, mock
, pytest
-, pytestcov
+, pytest-cov
, isPy3k
}:
@@ -27,7 +27,7 @@ buildPythonPackage rec {
checkInputs = [
mock
pytest
- pytestcov
+ pytest-cov
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix
index 6b80f55636..e7f6c2805d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix
@@ -5,7 +5,7 @@
, stups-tokens
, stups-cli-support
, pytest
-, pytestcov
+, pytest-cov
, isPy3k
}:
@@ -40,7 +40,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- pytestcov
+ pytest-cov
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
index cedbb7bcf7..e334608bd4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix
@@ -19,8 +19,8 @@
, vcrpy
, pytest
, pytest-flakes
-, pytestcov
-, pytestrunner
+, pytest-cov
+, pytest-runner
}:
buildPythonPackage rec {
@@ -40,7 +40,7 @@ buildPythonPackage rec {
checkInputs = [
sympy vcrpy pytest pytest-flakes
- pytestcov pytestrunner
+ pytest-cov pytest-runner
];
# https://github.com/Diaoul/subliminal/pull/963
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
index c8fd82043a..0079b44cfd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
@@ -19,7 +19,7 @@
, parfive
, pytest-astropy
, pytest-mock
-, pytestcov
+, pytest-cov
, python-dateutil
, scikitimage
, scipy
@@ -68,7 +68,7 @@ buildPythonPackage rec {
checkInputs = [
hypothesis
pytest-astropy
- pytestcov
+ pytest-cov
pytest-mock
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix
index 39be204a3d..e983dfc0e7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/surepy/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "surepy";
- version = "0.6.0";
+ version = "0.7.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "benleb";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU=";
+ sha256 = "04ywkbgs1lnnlhxakbr96crwc8hl97px8w7yigps2ki69md0xf60";
};
postPatch = ''
@@ -35,7 +35,9 @@ buildPythonPackage rec {
--replace 'attrs = "^20.3.0"' 'attrs = "*"'
'';
- nativeBuildInputs = [ poetry-core ];
+ nativeBuildInputs = [
+ poetry-core
+ ];
propagatedBuildInputs = [
aiodns
@@ -53,6 +55,7 @@ buildPythonPackage rec {
# Project has no tests
doCheck = false;
+
pythonImportsCheck = [ "surepy" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix
index b6754e15ad..404edac7e5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix
@@ -4,7 +4,7 @@
, pandas
, setuptools-scm
, pytest
-, pytestcov
+, pytest-cov
, pyyaml
, unicodecsv
, xlrd
@@ -23,7 +23,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ];
- checkInputs = [ pytest pytestcov unicodecsv pandas ];
+ checkInputs = [ pytest pytest-cov unicodecsv pandas ];
# test_tablib needs MarkupPy, which isn't packaged yet
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
index d5dfda53c0..83f6d9ac06 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, colorama, regex
-, pytestrunner, pytestCheckHook, pytest-mypy
+, pytest-runner, pytestCheckHook, pytest-mypy
}:
buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
disabled = pythonOlder "3.8";
- nativeBuildInputs = [ pytestrunner ];
+ nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ colorama regex ];
checkInputs = [ pytestCheckHook pytest-mypy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix
index b06a53cb33..8da8d622a7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchPypi
, setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock
, six, pytz, jaraco_functools, pythonOlder
-, pytest-flake8, pytestcov, pytest-black, pytest-mypy
+, pytest-flake8, pytest-cov, pytest-black, pytest-mypy
}:
buildPythonPackage rec {
@@ -21,7 +21,7 @@ buildPythonPackage rec {
checkInputs = [
pytest-freezegun pytest freezegun backports_unittest-mock
- pytest-flake8 pytestcov pytest-black pytest-mypy
+ pytest-flake8 pytest-cov pytest-black pytest-mypy
];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix
index df1b022830..0b21e17f96 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "tesserocr";
- version = "2.5.1";
+ version = "2.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0cc7d4r11z26rhcwpmcc42fi9kr3f20nq5pk84jrczr18i0g99mh";
+ sha256 = "1bmj76gi8401lcqdaaznfmz9yf11myy1bzivqwwq08z3dwzxswck";
};
nativeBuildInputs = [ cython pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix
index 791479b69e..995a62230b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix
@@ -4,7 +4,7 @@
, tox
, pytest
, coverage
-, pytestcov
+, pytest-cov
}:
buildPythonPackage rec {
@@ -21,7 +21,7 @@ buildPythonPackage rec {
tox
pytest
coverage
- pytestcov
+ pytest-cov
];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix
index fb2c6094b3..20fad7c18a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix
@@ -4,7 +4,7 @@
, fetchFromGitHub
, flit
, pytestCheckHook
-, pytestcov
+, pytest-cov
, numpy
, scipy
}:
@@ -23,7 +23,7 @@ buildPythonPackage rec {
sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df";
};
- checkInputs = [ pytestCheckHook pytestcov numpy scipy ];
+ checkInputs = [ pytestCheckHook pytest-cov numpy scipy ];
meta = with lib; {
homepage = "https://github.com/joblib/threadpoolctl";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix
index 48aff396aa..1cd055588c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix
@@ -5,7 +5,7 @@
, numba
, numpy
, pytestCheckHook
-, pytestcov
+, pytest-cov
}:
buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
numpy
];
- checkInputs = [ numba pytestCheckHook pytestcov ];
+ checkInputs = [ numba pytestCheckHook pytest-cov ];
meta = with lib; {
description = "fast python package for finding the timezone of any point on earth (coordinates) offline";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix
index 35c0f76b08..05ca81772d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix
@@ -6,8 +6,8 @@
, webencodings
# Check inputs
, pytest
-, pytestrunner
-, pytestcov
+, pytest-runner
+, pytest-cov
, pytest-flake8
, pytest-isort
}:
@@ -34,7 +34,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ webencodings ];
- checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ];
+ checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ];
# https://github.com/PyCQA/pycodestyle/issues/598
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
index d8225e7031..fb39831a0d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder, click
, click-completion, factory_boy, faker, inquirer, notify-py, pbr, pendulum
-, ptable, pytestCheckHook, pytestcov, pytest-mock, requests, twine
+, ptable, pytestCheckHook, pytest-cov, pytest-mock, requests, twine
, validate-email }:
buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
'';
nativeBuildInputs = [ pbr twine ];
- checkInputs = [ pbr pytestCheckHook pytestcov pytest-mock faker factory_boy ];
+ checkInputs = [ pbr pytestCheckHook pytest-cov pytest-mock faker factory_boy ];
preCheck = ''
export TOGGL_API_TOKEN=your_api_token
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix
index f1e90114ac..508e38da45 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pytestrunner
+, pytest-runner
, pytestCheckHook
}:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
- pytestrunner
+ pytest-runner
];
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix
index dbfad336d0..2c289f8526 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, isPy27
-, pytestrunner
+, pytest-runner
, pytestCheckHook
, pytorch
}:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pytorch ];
- checkInputs = [ pytestrunner pytestCheckHook ];
+ checkInputs = [ pytest-runner pytestCheckHook ];
disabledTests = [
"test_inplace_on_requires_grad"
"test_input_requiring_grad"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix
index b78f38c46c..da5c4a9c3f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix
@@ -5,7 +5,7 @@
, pyblake2
, readme_renderer
, requests
-, requests_toolbelt
+, requests-toolbelt
, setuptools-scm
, tqdm
, colorama
@@ -30,7 +30,7 @@ buildPythonPackage rec {
pyblake2
readme_renderer
requests
- requests_toolbelt
+ requests-toolbelt
tqdm
colorama
rfc3986
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
index 166e42ced8..cf3ec977d0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "twitterapi";
- version = "2.7.4";
+ version = "2.7.5";
src = fetchFromGitHub {
owner = "geduldig";
repo = "TwitterAPI";
rev = "v${version}";
- sha256 = "sha256-HDPRpM1LDTtUbldzfCrsdh/GpbzNCVVUVGwohyMe/YE=";
+ sha256 = "1s5q3gzd69syk8khlyy7ap8gpymvhgqrlv3vp6vdmwnaafjvvyy3";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix
index 61adcf9254..5b7b17c8bb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix
@@ -4,8 +4,8 @@
, click
, pytestCheckHook
, shellingham
-, pytestcov
-, pytest_xdist
+, pytest-cov
+, pytest-xdist
, pytest-sugar
, coverage
, mypy
@@ -26,8 +26,8 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestcov
- pytest_xdist
+ pytest-cov
+ pytest-xdist
pytest-sugar
shellingham
coverage
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typesentry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typesentry/default.nix
index ef3b1c78c3..a4d8125b5d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typesentry/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/typesentry/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, colorama
, pytest
-, pytestcov
+, pytest-cov
}:
buildPythonPackage {
@@ -19,7 +19,7 @@ buildPythonPackage {
};
propagatedBuildInputs = [ colorama ];
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
checkPhase = ''
pytest
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
index c278680404..f7dcf33ea7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, isPy27
, pytestCheckHook
-, pytestcov
+, pytest-cov
, jinja2
, pyyaml
}:
@@ -27,7 +27,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestcov
+ pytest-cov
];
disabledTests = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix
index 32a8775823..4d7fe6b034 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix
@@ -7,7 +7,7 @@
, astunparse
, typing-extensions
, pytestCheckHook
-, pytestcov
+, pytest-cov
}:
buildPythonPackage rec {
@@ -30,7 +30,7 @@ buildPythonPackage rec {
}
)];
- checkInputs = [ pytestCheckHook pytestcov ];
+ checkInputs = [ pytestCheckHook pytest-cov ];
propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ];
# Tests must be run from outside the source directory
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/variants/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/variants/default.nix
index a9345b374a..2055a48134 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/variants/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/variants/default.nix
@@ -1,7 +1,7 @@
{ buildPythonPackage
, isPy27
, fetchPypi
-, pytestrunner
+, pytest-runner
, setuptools-scm
, singledispatch ? null
, pytest
@@ -18,7 +18,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
- pytestrunner
+ pytest-runner
setuptools-scm
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix
index 1dd80b52d1..cdd8ff02b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -6,7 +6,7 @@
, click
, click-log
, click-threading
-, requests_toolbelt
+, requests-toolbelt
, requests
, requests_oauthlib # required for google oauth sync
, atomicwrites
@@ -34,7 +34,7 @@ buildPythonPackage rec {
click-threading
requests
requests_oauthlib # required for google oauth sync
- requests_toolbelt
+ requests-toolbelt
];
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/venusian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/venusian/default.nix
index 82e291ae46..f13bd4cbdc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/venusian/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/venusian/default.nix
@@ -3,7 +3,7 @@
, fetchPypi
, isPy27
, pytest
-, pytestcov
+, pytest-cov
}:
buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38";
};
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
checkPhase = ''
pytest
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vultr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vultr/default.nix
index 975e409811..b6f8a407b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vultr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/vultr/default.nix
@@ -5,26 +5,29 @@
}:
buildPythonPackage rec {
- version = "0.1.2";
+ version = "1.0.1";
pname = "vultr";
src = fetchFromGitHub {
- owner = "spry-group";
- repo = "python-vultr";
- rev = version;
- sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h";
+ owner = "spry-group";
+ repo = "python-vultr";
+ rev = "v${version}";
+ sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7";
};
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [
+ requests
+ ];
# Tests disabled. They fail because they try to access the network
doCheck = false;
+ pythonImportsCheck = [ "vultr" ];
+
meta = with lib; {
description = "Vultr.com API Client";
homepage = "https://github.com/spry-group/python-vultr";
license = licenses.mit;
maintainers = with maintainers; [ lihop ];
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
index 8f946c4778..ecc13b1d63 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
@@ -13,10 +13,10 @@
fontconfig,
lib, stdenv,
pytest,
- pytestrunner,
+ pytest-runner,
pytest-isort,
pytest-flake8,
- pytestcov,
+ pytest-cov,
isPy3k,
substituteAll
}:
@@ -39,7 +39,7 @@ buildPythonPackage rec {
--replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501'
'';
- checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytestcov ];
+ checkInputs = [ pytest pytest-runner pytest-isort pytest-flake8 pytest-cov ];
FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webexteamssdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webexteamssdk/default.nix
index 21c9e352bf..e70cdfd96c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/webexteamssdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/webexteamssdk/default.nix
@@ -4,7 +4,7 @@
, future
, pyjwt
, requests
-, requests_toolbelt
+, requests-toolbelt
}:
buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
future
pyjwt
requests
- requests_toolbelt
+ requests-toolbelt
];
# Tests require a Webex Teams test domain
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix
index 73bebd8366..d03909d191 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/1.nix
@@ -17,7 +17,29 @@ buildPythonPackage rec {
propagatedBuildInputs = [ itsdangerous ];
checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ];
- disabledTests = lib.optionals stdenv.isDarwin [
+ disabledTests = [
+ "test_save_to_pathlib_dst"
+ "test_cookie_maxsize"
+ "test_cookie_samesite_attribute"
+ "test_cookie_samesite_invalid"
+ "test_range_parsing"
+ "test_content_range_parsing"
+ "test_http_date_lt_1000"
+ "test_best_match_works"
+ "test_date_to_unix"
+ "test_easteregg"
+
+ # Seems to be a problematic test-case:
+ #
+ # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg))
+ # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]>
+ # E
+ # E Traceback (most recent call last):
+ # E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers
+ # E return Headers(result)
+ # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True>
+ "TestMultiPart"
+ ] ++ lib.optionals stdenv.isDarwin [
"test_get_machine_id"
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix
index 6f06c8dba9..e38d43ef56 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "wled";
- version = "0.6.0";
+ version = "0.7.1";
disabled = pythonOlder "3.8";
format = "pyproject";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-wled";
rev = "v${version}";
- sha256 = "sha256-aFBcSGPCT49TbqzjUv/d8agdPOCC090rNxDnE9y91Pk=";
+ sha256 = "02xrml9mpq3akwyryg1m7xjmgnlgi5kjvx7vkq6110ai0f9hzpwi";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix
index b078231c94..1272916d41 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix
@@ -9,7 +9,7 @@
, setuptools-scm
, gcc
, pytest
-, pytestcov
+, pytest-cov
, isPy27
}:
let
@@ -32,7 +32,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ cython numpy scikit-learn six ];
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
# Checks require test data downloaded separately
# See project source Makefile:test-data rule for reference
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix
index 80f22efbda..e04f17c214 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix
@@ -4,7 +4,7 @@
, numpy
, pillow
, cython
-, pytestcov
+, pytest-cov
, pytest
, fetchpatch
}:
@@ -25,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ matplotlib numpy pillow ];
# Tests require extra dependencies
- checkInputs = [ mock pytest pytestcov ];
+ checkInputs = [ mock pytest pytest-cov ];
checkPhase = ''
PATH=$out/bin:$PATH pytest test
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
index 9837128a7f..c975218e5b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address
-, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs
+, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, configargparse, appdirs
}:
buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
pypdf2
dict2xml
weasyprint
- ConfigArgParse
+ configargparse
appdirs
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix
index 0aeb85e6ca..66d219f934 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix
@@ -3,7 +3,7 @@
, buildPythonPackage
, pythonOlder
, multidict
-, pytestrunner
+, pytest-runner
, pytest
, typing-extensions
, idna
@@ -18,7 +18,7 @@ buildPythonPackage rec {
sha256 = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10";
};
- checkInputs = [ pytest pytestrunner ];
+ checkInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [ multidict idna ]
++ lib.optionals (pythonOlder "3.8") [
typing-extensions
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix
index 7c72d25003..16fb277746 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix
@@ -19,7 +19,7 @@
, pythonOlder
, pytz
, requests
-, requests_toolbelt
+, requests-toolbelt
, requests-file
, requests-mock
, xmlsec
@@ -47,7 +47,7 @@ buildPythonPackage rec {
lxml
pytz
requests
- requests_toolbelt
+ requests-toolbelt
requests-file
xmlsec
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
index 313f121510..fc869efe08 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
@@ -1,32 +1,41 @@
{ stdenv
, lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, ifaddr
+, pytest-asyncio
, pythonOlder
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "zeroconf";
- version = "0.31.0";
+ version = "0.32.1";
+ format = "setuptools";
disabled = pythonOlder "3.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-U6GAJIRxxvgb0f/8vOA+2T19jq8QkFyRIaweqZbRmEQ=";
+ # no tests in pypi sdist
+ src = fetchFromGitHub {
+ owner = "jstasiak";
+ repo = "python-zeroconf";
+ rev = version;
+ sha256 = "02fvh5ii73rf6pg9x93pc0sl1isx2ivg3d80l6s8h35w2f4g4azf";
};
- propagatedBuildInputs = [ ifaddr ];
+ propagatedBuildInputs = [
+ ifaddr
+ ];
- checkInputs = [ pytestCheckHook ];
-
- pytestFlagsArray = [ "zeroconf/test.py" ];
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
disabledTests = [
- # disable tests that expect some sort of networking in the build container
+ # tests that require network interaction
"test_close_multiple_times"
"test_launch_and_close"
+ "test_launch_and_close_context_manager"
"test_launch_and_close_v4_v6"
"test_launch_and_close_v6_only"
"test_integration_with_listener_ipv6"
@@ -36,7 +45,10 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;
- pythonImportsCheck = [ "zeroconf" ];
+ pythonImportsCheck = [
+ "zeroconf"
+ "zeroconf.asyncio"
+ ];
meta = with lib; {
description = "Python implementation of multicast DNS service discovery";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
index 37fbc87f3f..89db9de12b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "zha-quirks";
- version = "0.0.58";
+ version = "0.0.59";
src = fetchFromGitHub {
owner = "zigpy";
repo = "zha-device-handlers";
rev = version;
- sha256 = "sha256-QU5ssbnT3/gioQ3vM9zvlbwxqSWyKIylsV9NuFkNe+Q=";
+ sha256 = "1x6s44apl393as847ghbqr26h0y0h4w3wp53bs0m2nfbzjwin3i7";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
index 894539a3e2..71f102f366 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -4,6 +4,7 @@
, buildPythonPackage
, coloredlogs
, fetchFromGitHub
+, fetchpatch
, jsonschema
, pyserial
, pyserial-asyncio
@@ -27,6 +28,14 @@ buildPythonPackage rec {
sha256 = "152d803jfrvkj4namni41fnbbnq85wd7zsqjhmkwrrmn2gvqjiln";
};
+ patches = [
+ (fetchpatch {
+ # Fixes tests/application/test_joining.py::test_new_device_join_and_bind_complex[FormedLaunchpadCC26X2R1]
+ url = "https://github.com/zigpy/zigpy-znp/commit/582cffb68fdf0c5bc14d55efca2a683222d7fed7.patch";
+ sha256 = "0qsfziqqjnnf21gdqv3wwk50vni46i0h1liw5ysq641yjfnas9az";
+ })
+ ];
+
propagatedBuildInputs = [
async-timeout
coloredlogs
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
index f03b9e9675..8d393606fb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "zigpy";
- version = "0.33.0";
+ version = "0.35.2";
src = fetchFromGitHub {
owner = "zigpy";
repo = "zigpy";
rev = version;
- sha256 = "sha256-oEf4GnvbQ6LY4NaNFWRmnNz1TK2tMpIVUxskhU38g4w=";
+ sha256 = "sha256-p0q0wGp3NaBO7gBTsPAt7FEAHW0MDPJCKqLklY21zBQ=";
};
propagatedBuildInputs = [
@@ -40,6 +40,21 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTests = [
+ # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited
+ "test_remigrate_forcibly_downgraded_v4"
+ # RuntimeError: Event loop is closed
+ "test_startup"
+ ];
+
+ pythonImportsCheck = [
+ "zigpy.application"
+ "zigpy.config"
+ "zigpy.exceptions"
+ "zigpy.types"
+ "zigpy.zcl"
+ ];
+
meta = with lib; {
description = "Library implementing a ZigBee stack";
homepage = "https://github.com/zigpy/zigpy";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix
index 778f9c448e..18cb2a9871 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
- version = "0.27.0";
+ version = "0.27.1";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
- sha256 = "sha256-ClZ9B20NphN5XewqEtHpUMNHuuVxs1RJBcxWi6TzT1Y=";
+ sha256 = "sha256-Q02S0jEFZe4qOkRok/sY0UPrMpmD13off85UL3+8o/o=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix
index 61aee21503..f880d8fa7b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
patchShebangs cpplint_unittest.py
'';
- checkInputs = with python3Packages; [ pytest pytestrunner ];
+ checkInputs = with python3Packages; [ pytest pytest-runner ];
checkPhase = ''
./cpplint_unittest.py
'';
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
index 661025a5f5..62c0543964 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
@@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
- version = "0.50.3";
+ version = "0.51.2";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "1hah13icvwnaim628q6q88wbipwz1gwgnxgr3i8cnky9cx4qd3ig";
+ sha256 = "18qblimn78w17gydy7h9sjl9ri1wkvzi5phsqz1dkk43i3ryjg3s";
};
goPackagePath = "github.com/aquasecurity/tfsec";
diff --git a/third_party/nixpkgs/pkgs/development/tools/asn2quickder/default.nix b/third_party/nixpkgs/pkgs/development/tools/asn2quickder/default.nix
index 9ffcbb172d..1341017df0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/asn2quickder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/asn2quickder/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake
-, pytestrunner, pytest, six, pyparsing, asn1ate }:
+, pytest-runner, pytest, six, pyparsing, asn1ate }:
buildPythonApplication rec {
pname = "asn2quickder";
@@ -19,7 +19,7 @@ buildPythonApplication rec {
dontUseCmakeConfigure = true;
nativeBuildInputs = [ makeWrapper cmake ];
- checkInputs = [ pytestrunner pytest ];
+ checkInputs = [ pytest-runner pytest ];
propagatedBuildInputs = [ pyparsing asn1ate six ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix
index 66177d3a34..3f31b92183 100644
--- a/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "async-profiler";
- version = "1.8.5";
+ version = "1.8.6";
src = fetchFromGitHub {
owner = "jvm-profiling-tools";
repo = "async-profiler";
rev = "v${version}";
- sha256 = "sha256-vSBueRNraMgLcaprPsBUriX3WZ7N0UrllnSVLL2F738=";
+ sha256 = "sha256-MtRO0tbo4kDHcQmir8ulv0q1Qh+KnKIshb1NDtu1SKg=";
};
buildInputs = [ jdk8 ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
index 3b2c8ac2ce..2de586f97c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
version = "3.19.7";
src = fetchurl {
- url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
+ url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "sha256-WKFfDVagr8zDzFNxI0/Oc/zGyPnb13XYmOUQuDF1WI4=";
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix
index 13ae74db97..c92b229f05 100644
--- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
- version = "1.21.3";
+ version = "1.21.4";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "sha256-f39UXQXUje6j8bRWVaX9ELCwO1vaeNuGnlmPhyyVoV8=";
+ sha256 = "sha256-eVXNkQJ3/T4KFiGeE8o4kFBOONfHc6v+tNEOsOnEYRA=";
};
outputs = [ "out" "man" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/cask/default.nix b/third_party/nixpkgs/pkgs/development/tools/cask/default.nix
index 1c5f316cea..f9e7d215f3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cask/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/cask/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3, emacs }:
+{ lib, stdenv, python3, emacs, bash }:
stdenv.mkDerivation rec {
pname = "cask";
@@ -13,15 +13,19 @@ stdenv.mkDerivation rec {
noflet ert-async shell-split-string git package-build
] ++ [
python3
+ bash
];
strictDeps = true;
buildPhase = ''
+ runHook preBuild
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
+ runHook postBuild
'';
installPhase = ''
+ runHook preInstall
mkdir -p $out/bin
mkdir -p $out/templates
mkdir -p $out/share/emacs/site-lisp/cask/bin
@@ -30,6 +34,7 @@ stdenv.mkDerivation rec {
install -Dm644 templates/* $out/templates/
touch $out/.no-upgrade
ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix
index 8de2bc1aee..8d36c89908 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
colorama
future
requests
- requests_toolbelt
+ requests-toolbelt
semver
simplejson
six
diff --git a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix
new file mode 100644
index 0000000000..ca0a241330
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix
@@ -0,0 +1,77 @@
+{ ocamlPackages, fetchFromGitHub, lib, zlib, pkg-config, cacert, gmp, libev
+, autoconf, sqlite, stdenv }:
+let
+ mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }:
+ ocamlPackages.buildDunePackage rec {
+ inherit pname;
+ version = "1.5.1";
+ useDune2 = true;
+ minimumOcamlVersion = "4.08.1";
+ doCheck = true;
+
+ src = fetchFromGitHub {
+ owner = "comby-tools";
+ repo = "comby";
+ rev = version;
+ sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf";
+ };
+
+ nativeBuildInputs = [
+ ocamlPackages.ppx_deriving
+ ocamlPackages.ppx_deriving_yojson
+ ocamlPackages.ppx_sexp_conv
+ ocamlPackages.ppx_sexp_message
+ ] ++ extraNativeInputs;
+
+ buildInputs = [
+ ocamlPackages.core
+ ocamlPackages.ocaml_pcre
+ ocamlPackages.mparser
+ ocamlPackages.mparser-pcre
+ ocamlPackages.angstrom
+ ] ++ extraBuildInputs;
+
+ checkInputs = [ cacert ];
+
+ meta = {
+ description = "Tool for searching and changing code structure";
+ license = lib.licenses.asl20;
+ homepage = "https://comby.dev";
+ };
+ };
+
+ combyKernel = mkCombyPackage { pname = "comby-kernel"; };
+in mkCombyPackage {
+ pname = "comby";
+
+ extraBuildInputs = [
+ zlib
+ gmp
+ libev
+ sqlite
+ ocamlPackages.shell # This input must appear before `parany` or any other input that propagates `ocamlnet`
+ ocamlPackages.lwt
+ ocamlPackages.patience_diff
+ ocamlPackages.toml
+ ocamlPackages.cohttp-lwt-unix
+ ocamlPackages.opium
+ ocamlPackages.textutils
+ ocamlPackages.jst-config
+ ocamlPackages.parany
+ ocamlPackages.conduit-lwt-unix
+ ocamlPackages.lwt_react
+ ocamlPackages.tls
+ combyKernel
+ ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then
+ [ ocamlPackages.hack_parallel ]
+ else
+ [ ]);
+
+ extraNativeInputs = [
+ autoconf
+ pkg-config
+ ocamlPackages.ppx_jane
+ ocamlPackages.ppx_expect
+ ocamlPackages.dune-configurator
+ ];
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index a8d35a44bb..b32eed9a16 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -3,13 +3,13 @@
nixosTests }:
buildGoModule rec {
name = "buildkite-agent-${version}";
- version = "3.30.0";
+ version = "3.31.0";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
- sha256 = "sha256-U2UnT41IpICy08jPQkr25wjAL1kBxiQCD4lysYnLAPk=";
+ sha256 = "sha256-Rot5A2zSEleTifadHEvAlydchzCdDo/VPZELostDfng=";
};
vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix
index b03dcc89d4..e2d4063090 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix
@@ -20,7 +20,7 @@
}:
let
pname = "github-actions-runner";
- version = "2.278.0";
+ version = "2.279.0";
deps = (import ./deps.nix { inherit fetchurl; });
nugetPackages = map
@@ -41,6 +41,10 @@ let
# Online tests
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
[
+ "CompositeActionWithActionfile_CompositeContainerNested"
+ "CompositeActionWithActionfile_CompositePrestepNested"
+ "CompositeActionWithActionfile_MaxLimit"
+ "CompositeActionWithActionfile_Node"
"DownloadActionFromGraph"
"DownloadActionFromGraph_Legacy"
"NotPullOrBuildImagesMultipleTimes"
@@ -80,8 +84,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
- rev = "62d926efce35d3ea16d7624a25aaa5b300737def"; # v${version}
- sha256 = "sha256-KAb14739DYnuNIf7ZNZk5CShye6XFGn8aLu8BAcuT/c=";
+ rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version}
+ sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms=";
};
nativeBuildInputs = [
@@ -123,6 +127,11 @@ stdenv.mkDerivation rec {
--replace 'dotnet test Test/Test.csproj' \
"dotnet test Test/Test.csproj --filter '${testFilterXml}'"
+ # We don't use a Git checkout
+ substituteInPlace src/dir.proj \
+ --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
+ 'echo Patched out.'
+
# Fix FHS path
substituteInPlace src/Test/L0/Util/IOUtilL0.cs \
--replace '/bin/ln' '${coreutils}/bin/ln'
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index e89c784df7..ff5799df4a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "14.0.1";
+ version = "14.1.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64";
- sha256 = "1i1fddsz7cr0kg4bxqisx29cwyd07zqfbpmh5mhvi5zqy0gfmcn8";
+ sha256 = "09p0biig07plf9qiwpsdllh6midi8kzpzk2s71rmms491g4634k2";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm";
- sha256 = "1d2ywc3cikffiwpql2kp5zg21vjinz51f76c6wdn0v35wl705fz4";
+ sha256 = "0z5q5y9lsznwglpg7sd5af51v9640m85v4x4dcj5j37w24bi4wq0";
};
in
buildGoPackage rec {
@@ -30,7 +30,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "1prvmppq5w897bd9ch5z0h6h8mndy6myv8al24cr0bjc27c6wyn7";
+ sha256 = "1v2yxs92awwn4m6hq6wc53whfmk6fr4l6j87amcbdzcm4ikzxcvk";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
index 2e361076ae..ef95263185 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -79,6 +79,6 @@ in
homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ ardumont ma27 ];
+ maintainers = with maintainers; [ ardumont ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix
index 9a0d19840e..57f30ec3ae 100644
--- a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "delve";
- version = "1.6.1";
+ version = "1.7.0";
goPackagePath = "github.com/go-delve/delve";
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "go-delve";
repo = "delve";
rev = "v${version}";
- sha256 = "sha256-bTVCasemE8Vyjcs8wZBiiXEsW3UBndjpPQ5bi+4vQkw=";
+ sha256 = "sha256-RfBDeBuI/Yk24Q2jX/Re7fvx1bhYWJjqLhRkNHCaM9k=";
};
subPackages = [ "cmd/dlv" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix
index 2984de4c5e..48d4059277 100644
--- a/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "efm-langserver";
- version = "0.0.32";
+ version = "0.0.36";
src = fetchFromGitHub {
owner = "mattn";
repo = "efm-langserver";
rev = "v${version}";
- sha256 = "sha256-zjjzdHlWEDDmPaDPuyk1ZoXwEFBogf51KjOmRmhFAdc=";
+ sha256 = "sha256-X2z49KmJiKh1QtcDBZcqNiMhq5deVamS47w6gyVq7Oo=";
};
vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix
index 2cc5e6b7ca..6b3690de91 100644
--- a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix
@@ -4,19 +4,18 @@
, lib }:
python.pkgs.buildPythonApplication rec {
- version = "1.1.9";
+ version = "2.0.3";
pname = "fdroidserver";
src = fetchFromGitLab {
owner = "fdroid";
repo = "fdroidserver";
rev = version;
- sha256 = "098dcg8jdi4q1prfjmd2lbhcyzb8fmmfhbxhid4kqx8vcv7r0iql";
+ sha256 = "sha256-/tX45t/DsWd0/R9VJJsqNjoOkgGIvqvq05YaVp0pLf0=";
};
- patchPhase = ''
+ postPatch = ''
substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'"
- substituteInPlace setup.py --replace "pyasn1-modules == 0.2.1" "pyasn1-modules"
'';
preConfigure = ''
@@ -33,8 +32,6 @@ python.pkgs.buildPythonApplication rec {
androguard
clint
defusedxml
- docker
- docker-py
GitPython
libcloud
mwclient
@@ -47,16 +44,19 @@ python.pkgs.buildPythonApplication rec {
qrcode
requests
ruamel_yaml
+ yamllint
];
# no tests
doCheck = false;
+ pythonImportsCheck = [ "fdroidserver" ];
+
meta = with lib; {
homepage = "https://f-droid.org";
description = "Server and tools for F-Droid, the Free Software repository system for Android";
license = licenses.agpl3;
- maintainers = [ lib.maintainers.pmiddend ];
+ maintainers = [ lib.maintainers.obfusk ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix
index c563d9bef0..5c86b9a240 100644
--- a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
- sha256 = "sha256-uNlKxcU1iCR4JzNfBatEeKMMdu9ZqvOqna0sGrcwK30=";
+ sha256 = "sha256-jv5IhTxusB74pnpoopl+fKnXDJI/65D8PSuhGVgbDyo=";
};
- cargoSha256 = "sha256-4Xo17HlYvJLf90R0gS9EFJSJKmNHClXqAJTx9mY29KA=";
+ cargoSha256 = "sha256-6SaW3wqhn251GaH3GRNaSqRLnbQimDBRSt+RPgJG1M8=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix
index fe43da91b5..8c43fe7f59 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "go-md2man";
- version = "2.0.0";
+ version = "2.0.1";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}";
owner = "cpuguy83";
repo = "go-md2man";
- sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv";
+ sha256 = "sha256-DnXWnHWtczNnLaQg9Wnp9U/K4h/FbhqGgba44P6VNBQ=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
index f48c6f9e0b..86afbcc942 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
- version = "0.19.0";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-q97N9I1EzpcFlMuHe3X5rfZHt6XTytYO1inpGEvv1IQ=";
+ sha256 = "sha256-ag8Dq3lhLoKE4rgrnWLHtKRHEnw/ytyXI+pRt5CgZJI=";
};
- vendorSha256 = "sha256-7XcAt0+slNIjxxf7pUl7XO/PAN2z8WmzTuI0FsjgrBM=";
+ vendorSha256 = "sha256-/lpjlThr6HPkuJ6om9ifBsdsh0x4kVXM6PAonk7GJCY=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
index c4b0546ec3..c48cf727d2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "packer";
- version = "1.7.3";
+ version = "1.7.4";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
- sha256 = "sha256-k5GCUFzjf0mipIQlnf7VCUS2j7cFwoGCeM7T6qgGnJA=";
+ sha256 = "sha256-VNOq9uhtzf1hdEn+bkAOYy4gZxP5ek0WaaS/71uJzrA=";
};
- vendorSha256 = "sha256-5Wb7WAUGXJ7VMWiQyboH3PXJazsqitD9N0Acd+WItaY=";
+ vendorSha256 = "sha256-WYA/wZJg93+X4IAX9hOMRHVRQRyA4N4aDaScDgkGUIE=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 7875138557..58a634ee86 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -499,7 +499,7 @@ self: super:
old: {
inherit (pkgs.python3Packages.jira) patches;
buildInputs = (old.buildInputs or [ ]) ++ [
- self.pytestrunner
+ self.pytest-runner
self.cryptography
self.pyjwt
];
@@ -1269,8 +1269,6 @@ self: super:
}
);
- pytest-runner = super.pytest-runner or super.pytestrunner;
-
pytest-pylint = super.pytest-pylint.overridePythonAttrs (
old: {
buildInputs = [ self.pytest-runner ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix
index 14518939dc..483a85db02 100644
--- a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pscale";
- version = "0.58.0";
+ version = "0.60.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-9XVvdAt/TWQdCY8s//QHZC6THFAf+pMYQpjHjUR3wrc=";
+ sha256 = "sha256-hrWSieWeVAg28f3Fh9mElr+mDh4v4T5JI1c3+Hrm7c0=";
};
- vendorSha256 = "sha256-m6eQ843aP68TO4W5Nq4zKqcf2wgdH/7Srzt37t/NSdk=";
+ vendorSha256 = "sha256-h4YUQWmFYouEvHup8Pu6OqfHf1EoPszVFzklU9SbJZQ=";
meta = with lib; {
homepage = "https://www.planetscale.com/";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix
index 7b49a83b1c..7b8ac88de6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix
@@ -12,22 +12,22 @@
, libX11
, libxcb
, libXi
-, ncurses5
+, ncurses
, qtbase
, qtdeclarative
, zlib
}:
let
- buildNum = "2021-03-31-696";
+ buildNum = "2021-06-30-819";
in
stdenv.mkDerivation rec {
pname = "rgp";
- version = "1.10";
+ version = "1.11";
src = fetchurl {
url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz";
- sha256 = "1GUV75KpYbeq7KkE86QqTfGnf/t3VEgviaAsbg/LWJI=";
+ sha256 = "ru+e/oY844x4nvSVRBrTGDdnzUOBhwkaIrnftBITyE8=";
};
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
@@ -42,17 +42,12 @@ stdenv.mkDerivation rec {
libX11
libxcb
libXi
- ncurses5
+ ncurses
qtbase
qtdeclarative
zlib
];
- runtimeDependencies = [
- "${placeholder "out"}/opt/rgp"
- "${placeholder "out"}/opt/rgp/qt"
- ];
-
dontWrapQtApps = true;
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix
index 017fb7d484..c7cdf92dcd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-watch";
- version = "7.8.0";
+ version = "7.8.1";
src = fetchFromGitHub {
owner = "passcod";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZbVBwSg3roIMA+5LVP3omtTgbAJ7HAdJDXyAybWuRLw=";
+ sha256 = "sha256-g6k/7jo8pvTn5snU05uSGzprNMt8/x+bJsLb/y0jHRg=";
};
- cargoSha256 = "sha256-6aoi/CLla/yKa5RuVgn8RJ9AK1j1wtZeBn+6tpXrJvA=";
+ cargoSha256 = "sha256-pfjWTkDw4D7eMADkPX01vapka8I6o0ZvkNjQt5X2pUk=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix b/third_party/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix
index 2e1ca55dad..93650c9027 100644
--- a/third_party/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/sourcetrail/jedi.nix
@@ -1,6 +1,6 @@
# Taken from a past commit of nixpkgs
-{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
+{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }:
buildPythonPackage rec {
pname = "jedi";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20";
};
- checkInputs = [ pytest glibcLocales tox pytestcov ];
+ checkInputs = [ pytest glibcLocales tox pytest-cov ];
propagatedBuildInputs = [ parso ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/turbogit/default.nix b/third_party/nixpkgs/pkgs/development/tools/turbogit/default.nix
index 7d3e88f6cb..30ce29ffe6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/turbogit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/turbogit/default.nix
@@ -1,16 +1,16 @@
{ fetchFromGitHub, buildGoModule, lib, installShellFiles, libgit2, pkg-config }:
buildGoModule rec {
pname = "turbogit";
- version = "2.0.0";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "b4nst";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-UIPI1r6BnfD5ukk5yGg3VJHMyaMp30MXhJfOkoNT6vs=";
+ sha256 = "sha256-A1hVpapp6yIpUVnDQ1yLLHiYdLcQlr/JcTOmt5sr3Oo=";
};
- vendorSha256 = "sha256-SX0VPENcfw8ysL+dDGPSJ/FNdyecjENx4+UHXdu71O8=";
+ vendorSha256 = "sha256-1AEcBq7wiENWQ5HZEEXpIgA6Bf2T28zm/MwYTke/f9s=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix b/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix
index fcab1f952f..a6d28b36bf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix
@@ -14,7 +14,7 @@ buildPythonApplication rec {
# For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails.
disabled = ! pythonAtLeast "3.5";
- checkInputs = [ pytest pytestcov ];
+ checkInputs = [ pytest pytest-cov ];
propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ];
# Unpin test dependency versions. This is fixed in master but not yet released.
diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix
index f6cd67d70b..d1a6330df7 100644
--- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix
@@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.12.0";
+ version = "1.12.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-heri1vb0KykEqef8uBfEazPzTgz8jjYSUB0dpPiDJ7g=";
+ sha256 = "sha256-kNwRnoUkX2dmj6ii9fRu/Hv4V3/sz6ag+wUPf93tmTQ=";
};
- cargoSha256 = "sha256-v/yafzfAy1SBjeFwaMEWVTGJH3Fv1CYYU70TA7AUUsk=";
+ cargoSha256 = "sha256-5ukTSzDFCkBQ1UFfnpz1fFzJSHBYUoZAvhPGMkr/fIs=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
index 3c61121b03..8828b0222c 100644
--- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
- version = "0.0.228";
+ version = "0.0.229";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
- sha256 = "sha256-h8ZiAabB0IIJoeQMMvOO1lQNMdFYAoTXKcTAPmLP5Sw=";
+ sha256 = "sha256-mw+rTMFj41+T6lDe/MOQpmRcjt/gJhOCfaHcBkpjcsg=";
};
preBuild = ''
diff --git a/third_party/nixpkgs/pkgs/games/cdogs-sdl/default.nix b/third_party/nixpkgs/pkgs/games/cdogs-sdl/default.nix
index 30abb71a12..c34c9efb16 100644
--- a/third_party/nixpkgs/pkgs/games/cdogs-sdl/default.nix
+++ b/third_party/nixpkgs/pkgs/games/cdogs-sdl/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cdogs";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
repo = "cdogs-sdl";
owner = "cxong";
rev = version;
- sha256 = "sha256-qbMR7otsC+uz+9mwgFaD2Z5fC6rj8ueYG3KwpPiqL98=";
+ sha256 = "sha256-7wNiDA/gOpqzSFWw8Bn6suC/f5RXdDTxPV49nCvOxas=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/games/cgoban/default.nix b/third_party/nixpkgs/pkgs/games/cgoban/default.nix
new file mode 100644
index 0000000000..162de112fb
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/cgoban/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, writers
+, adoptopenjdk-jre-bin
+, fetchurl
+, makeWrapper
+}:
+stdenv.mkDerivation rec {
+ pname = "cgoban";
+ version = "3.5.23";
+
+ nativeBuildInputs = [ adoptopenjdk-jre-bin makeWrapper ];
+
+ src = fetchurl {
+ url = "https://web.archive.org/web/20210116034119/https://files.gokgs.com/javaBin/cgoban.jar";
+ sha256 = "0srw1hqr9prgr9dagfbh2j6p9ivaj40kdpyhs6zjkg7lhnnrrrcv";
+ };
+
+ dontConfigure = true;
+ dontUnpack = true;
+ dontBuild = true;
+ dontPatchELF = true;
+
+ installPhase = ''
+ runHook preInstall
+ install -D $src $out/lib/cgoban.jar
+ makeWrapper ${adoptopenjdk-jre-bin}/bin/java $out/bin/cgoban --add-flags "-jar $out/lib/cgoban.jar"
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Client for the KGS Go Server";
+ homepage = "https://www.gokgs.com/";
+ license = licenses.free;
+ maintainers = with maintainers; [ savannidgerinel ];
+ platforms = adoptopenjdk-jre-bin.meta.platforms;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json
index 98c58191f1..500181ff70 100644
--- a/third_party/nixpkgs/pkgs/games/factorio/versions.json
+++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json
@@ -10,12 +10,12 @@
"version": "1.1.36"
},
"stable": {
- "name": "factorio_alpha_x64-1.1.35.tar.xz",
+ "name": "factorio_alpha_x64-1.1.36.tar.xz",
"needsAuth": true,
- "sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk",
+ "sha256": "1x9a2lv6zbqawqlxg8bcbx04hjy0pq40macfa4sqi8w6h14wgww8",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.35/alpha/linux64",
- "version": "1.1.35"
+ "url": "https://factorio.com/get-download/1.1.36/alpha/linux64",
+ "version": "1.1.36"
}
},
"demo": {
@@ -28,12 +28,12 @@
"version": "1.1.35"
},
"stable": {
- "name": "factorio_demo_x64-1.1.35.tar.xz",
+ "name": "factorio_demo_x64-1.1.36.tar.xz",
"needsAuth": false,
- "sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f",
+ "sha256": "15fl4pza7n107rrmmdm26kkc12fnrmpn6rjb4ampgzqzn1fq854s",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.35/demo/linux64",
- "version": "1.1.35"
+ "url": "https://factorio.com/get-download/1.1.36/demo/linux64",
+ "version": "1.1.36"
}
},
"headless": {
@@ -46,12 +46,12 @@
"version": "1.1.36"
},
"stable": {
- "name": "factorio_headless_x64-1.1.35.tar.xz",
+ "name": "factorio_headless_x64-1.1.36.tar.xz",
"needsAuth": false,
- "sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94",
+ "sha256": "1s8g030xp5nrlmnn21frrd8n4nd7jjmb5hbpj1vhxjrk6vpijh24",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.35/headless/linux64",
- "version": "1.1.35"
+ "url": "https://factorio.com/get-download/1.1.36/headless/linux64",
+ "version": "1.1.36"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/games/gnonograms/default.nix b/third_party/nixpkgs/pkgs/games/gnonograms/default.nix
new file mode 100644
index 0000000000..7a696001a1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/gnonograms/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, vala
+, meson
+, ninja
+, pkg-config
+, desktop-file-utils
+, appstream
+, python3
+, shared-mime-info
+, wrapGAppsHook
+, gtk3
+, pantheon
+, libgee
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gnonograms";
+ version = "1.4.5";
+
+ src = fetchFromGitHub {
+ owner = "jeremypw";
+ repo = "gnonograms";
+ rev = "v${version}";
+ sha256 = "1ly3inp6dvjrixdysz5hdfwlhbs49ks0lf8062z2iq6gaf8ivkb2";
+ };
+
+ postPatch = ''
+ patchShebangs meson/post_install.py
+ '';
+
+ nativeBuildInputs = [
+ vala
+ meson
+ ninja
+ pkg-config
+ desktop-file-utils
+ appstream
+ python3
+ shared-mime-info
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk3
+ pantheon.granite
+ libgee
+ ];
+
+ meta = with lib; {
+ description = "Nonograms puzzle game";
+ longDescription = ''
+ An implementation of the Japanese logic puzzle "Nonograms" written in
+ Vala, allowing the user to:
+ * Draw puzzles
+ * Generate random puzzles of chosen difficulty
+ '';
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ fgaz ];
+ homepage = "https://github.com/jeremypw/gnonograms";
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix
index 1cb27f7b8c..586d93151e 100644
--- a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix
+++ b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix
@@ -15,13 +15,13 @@
python3Packages.buildPythonApplication rec {
pname = "grapejuice";
- version = "3.12.5";
+ version = "3.40.14";
src = fetchFromGitLab {
owner = "BrinkerVII";
repo = "grapejuice";
rev = "v${version}";
- sha256 = "1xgxyfwwghy9l17i6y40axdrpp4fgxgdr5y97flwmfivif01ifs1";
+ sha256 = "1bmkkmi1gx5kc39cjnz5bzwqaicxs0zb6bcv4iny9qccbqf3icrd";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/games/simutrans/default.nix b/third_party/nixpkgs/pkgs/games/simutrans/default.nix
index fc2654fd8e..60b2bc5faf 100644
--- a/third_party/nixpkgs/pkgs/games/simutrans/default.nix
+++ b/third_party/nixpkgs/pkgs/games/simutrans/default.nix
@@ -11,28 +11,28 @@ let
else map (name: pakSpec.${name}) (splitString " " paksets)
);
- ver1 = "120";
- ver2 = "4";
- ver3 = "1";
- version = "${ver1}.${ver2}.${ver3}";
- ver_dash = "${ver1}-${ver2}-${ver3}";
+ ver1 = "121";
+ ver2 = "0";
+ ver3 = "";
+ version = "${ver1}.${ver2}${lib.optionalString (ver3 != "") ".${ver3}"}";
+ ver_dash = "${ver1}-${ver2}${lib.optionalString (ver3 != "") "-${ver3}"}";
binary_src = fetchurl {
url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip";
- sha256 = "0yw7vjvmczp022mgk35swwhpbiszpz91mwsgicxglwivgc30vvic";
+ sha256 = "1f463r6kr5ig0zd3mncc74k93xbjywsq3d06j5r17831jyc9bzb9";
};
- # As of 2015/03, many packsets still didn't have a release for version 120.
+ # As of 2021/07, many of these paksets have not been updated for years, so are on old versions.
pakSpec = lib.mapAttrs
(pakName: attrs: mkPak (attrs // {inherit pakName;}))
{
pak64 = {
- srcPath = "121-0/simupak64-121-0";
+ srcPath = "${ver_dash}/simupak64-${ver_dash}";
sha256 = "1k335kh8dhm1hdn5iwn3sdgnrlpk0rqxmmgqgqcwsi09cmw45m5c";
};
"pak64.japan" = {
- # No release for 120.2 yet!
+ # No release for 121.0 yet!
srcPath = "120-0/simupak64.japan-120-0-1";
sha256 = "14swy3h4ij74bgaw7scyvmivfb5fmp21nixmhlpk3mav3wr3167i";
};
diff --git a/third_party/nixpkgs/pkgs/games/zandronum/sqlite.nix b/third_party/nixpkgs/pkgs/games/zandronum/sqlite.nix
index c9baefcf0a..e38dedbb7f 100644
--- a/third_party/nixpkgs/pkgs/games/zandronum/sqlite.nix
+++ b/third_party/nixpkgs/pkgs/games/zandronum/sqlite.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation {
sha256 = "0p5cx7nbjxk7glcm277ypi5w4gv144qazw79ql47svlpccj62mrp";
};
- phases = [ "unpackPhase" "buildPhase" ];
-
buildPhase = ''
mkdir -p $out
cp sqlite3.c $out/
diff --git a/third_party/nixpkgs/pkgs/misc/acpilight/default.nix b/third_party/nixpkgs/pkgs/misc/acpilight/default.nix
index b5a385ab40..d6fead938a 100644
--- a/third_party/nixpkgs/pkgs/misc/acpilight/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/acpilight/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
pyenv = python3.withPackages (pythonPackages: with pythonPackages; [
- ConfigArgParse
+ configargparse
]);
postConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/bsnes-hd/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/bsnes-hd/default.nix
new file mode 100644
index 0000000000..6494185958
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/emulators/bsnes-hd/default.nix
@@ -0,0 +1,55 @@
+{ lib, stdenv, fetchFromGitHub
+, pkg-config
+, libX11, libXv
+, udev
+, SDL2
+, gtk2, gtksourceview
+, alsa-lib, libao, openal, libpulseaudio
+, libicns, Cocoa, OpenAL
+}:
+
+stdenv.mkDerivation {
+ pname = "bsnes-hd";
+ version = "10.6-beta";
+
+ src = fetchFromGitHub {
+ owner = "DerKoun";
+ repo = "bsnes-hd";
+ rev = "beta_10_6";
+ sha256 = "0f3cd89fd0lqskzj98cc1pzmdbscq0psdjckp86w94rbchx7iw4h";
+ };
+
+ patches = [
+ # Replace invocation of `sips` with an equivalent invocation of `png2icns`
+ # while assembling the .app directory hierarchy in the macos build. The
+ # `sips` executable isn't in our environment during the build, but
+ # `png2icns` is available by way of the dependency on libicns.
+ ./macos-replace-sips-with-png2icns.patch
+
+ # During `make install` on macos the Makefile wants to move the .app into
+ # the current user's home directory. This patches the Makefile such that
+ # the .app ends up in $(prefix)/Applications. The $(prefix) variable will
+ # be set to $out, so this will result in the .app ending up in the
+ # Applications directory in the current nix profile.
+ ./macos-copy-app-to-prefix.patch
+ ];
+
+ nativeBuildInputs = [ pkg-config ]
+ ++ lib.optionals stdenv.isDarwin [ libicns ];
+
+ buildInputs = [ SDL2 libao ]
+ ++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk2 gtksourceview alsa-lib openal libpulseaudio ]
+ ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ];
+
+ enableParallelBuilding = true;
+
+ makeFlags = [ "-C" "bsnes" "prefix=$(out)" ];
+
+ meta = with lib; {
+ description = "A fork of bsnes that adds HD video features";
+ homepage = "https://github.com/DerKoun/bsnes-hd";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ stevebob ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/third_party/nixpkgs/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch
new file mode 100644
index 0000000000..d38efbc99b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch
@@ -0,0 +1,18 @@
+diff --git a/bsnes/target-bsnes/GNUmakefile b/bsnes/target-bsnes/GNUmakefile
+index 7a3ab9f..ec8a1a4 100644
+--- a/bsnes/target-bsnes/GNUmakefile
++++ b/bsnes/target-bsnes/GNUmakefile
+@@ -43,11 +43,8 @@ ifeq ($(platform),windows)
+ else ifeq ($(shell id -un),root)
+ $(error "make install should not be run as root")
+ else ifeq ($(platform),macos)
+- mkdir -p ~/Library/Application\ Support/$(name)/
+- mkdir -p ~/Library/Application\ Support/$(name)/Database/
+- mkdir -p ~/Library/Application\ Support/$(name)/Firmware/
+- mkdir -p ~/Library/Application\ Support/$(name)/Shaders/
+- cp -R out/$(name).app /Applications/$(name).app
++ mkdir -p $(prefix)/Applications
++ cp -R out/$(name).app $(prefix)/Applications
+ else ifneq ($(filter $(platform),linux bsd),)
+ mkdir -p $(prefix)/bin/
+ mkdir -p $(prefix)/share/applications/
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/third_party/nixpkgs/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch
new file mode 100644
index 0000000000..85adb33e3a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch
@@ -0,0 +1,13 @@
+diff --git a/bsnes/target-bsnes/GNUmakefile b/bsnes/target-bsnes/GNUmakefile
+index 4c67bde..7a3ab9f 100644
+--- a/bsnes/target-bsnes/GNUmakefile
++++ b/bsnes/target-bsnes/GNUmakefile
+@@ -33,7 +33,7 @@ ifeq ($(platform),macos)
+ cp Database/* out/$(name).app/Contents/MacOS/Database/
+ cp -r ../shaders/* out/$(name).app/Contents/macOS/Shaders/
+ cp $(ui)/resource/$(name).plist out/$(name).app/Contents/Info.plist
+- sips -s format icns $(ui)/resource/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns
++ png2icns out/$(name).app/Contents/Resources/$(name).icns $(ui)/resource/$(name).png
+ endif
+
+ verbose: hiro.verbose ruby.verbose nall.verbose all;
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/punes/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/punes/default.nix
index c0bf7a223a..d3ad2f6819 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/punes/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/punes/default.nix
@@ -12,18 +12,20 @@
, ffmpeg
, libGLU
, alsa-lib
+, libX11
+, libXrandr
, sndio
}:
mkDerivation rec {
pname = "punes";
- version = "unstable-2021-06-05";
+ version = "unstable-2021-07-19";
src = fetchFromGitHub {
owner = "punesemu";
repo = "puNES";
- rev = "07fd123f62b2d075894a0cc966124db7b427b791";
- sha256 = "1wxff7b397ayd2s2v14w6a0zfgklc7y0kv3mkz1gg5x47mnll24l";
+ rev = "15ab85dabb220889419df0c249c06f3db2b09dc0";
+ sha256 = "1w0c5lfdl9ha4sxxva6hcpcaa444px6x25471q37l69n71rmjpy8";
};
postPatch = ''
@@ -34,7 +36,7 @@ mkDerivation rec {
nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ];
buildInputs = [ ffmpeg qtbase qtsvg libGLU ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libX11 libXrandr ]
++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ];
dontUseCmakeConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix
index 3ecf17f023..0e4fe692ae 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix
@@ -16,13 +16,13 @@ in {
};
early-access = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-ea";
- version = "1855";
+ version = "1874";
branchName = branch;
src = fetchFromGitHub {
owner = "pineappleEA";
repo = "pineapple-src";
rev = "EA-${version}";
- sha256 = "0civ63zi23cym3kii4v3aiqrsg2zzj0w6sp6sa14ixysagqxsd4a";
+ sha256 = "0ryrz7dl1sg30vvd7wrf05pjj8swah86055fn7qm6mr2bfslww0h";
};
};
}.${branch}
diff --git a/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix b/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix
index 1bac8b0fe0..6a8786be6e 100644
--- a/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = with python3.pkgs; [
- pytestrunner
+ pytest-runner
];
propagatedBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix
index 60d6545ae5..b4978e200a 100644
--- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix
@@ -127,12 +127,12 @@ in rec {
dracula = mkTmuxPlugin rec {
pluginName = "dracula";
- version = "1.0.1";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "dracula";
repo = "tmux";
rev = "v${version}";
- sha256 = "sha256-hq+sKA/EkiKia/31SY1zYPz/bxLuwm6sSrGlip1DULw=";
+ sha256 = "ILs+GMltb2AYNUecFMyQZ/AuETB0PCFF2InSnptVBos=";
};
meta = with lib; {
homepage = "https://draculatheme.com/tmux";
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
index 7522050774..65ec5d2209 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
@@ -77,12 +77,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-07-17";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "f83a1f70d542ac885b72d1161140d6d999e2d7b2";
- sha256 = "0mx9g2j32hbpg5gyxn4apkfm28myzpasj4w7dpq6p61c90hwhgq4";
+ rev = "530b38de342a21cce330a32af0c1b66671d335c2";
+ sha256 = "1qvdywgn79fvjdyk2bj7ym9fa65l96dcnp69yhravb9rinrawb5i";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -425,12 +425,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-07-19";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "7ae9ada3866e05a25be1899dfb68fa2dc17f5466";
- sha256 = "0plydss60in6zsgjrgrsvxgkz59bmn89ngm015prqp1w8izlwc82";
+ rev = "a33313899a56b936c889f9faaad798d429997042";
+ sha256 = "1mqcwvmnn4lbl4901gh5rsfagcx464zdaw0rq0sn0fkyx4ydq9s0";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -533,12 +533,12 @@ final: prev:
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2021-07-17";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "75b97dfdd641d530b86dee603308aea0079736e9";
- sha256 = "1rmlz74ssf9mpg4fbxinrmxnqcb4p37wi4pz96d6niiii0vj71b2";
+ rev = "b9b2b1c0991ab1a5d3b5822296c341815da00f6c";
+ sha256 = "1f6g0vhd8x90j75f60j4k7ii1zi9y0nhzrahk5h04gr2qm9pnvsf";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -569,12 +569,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-07-16";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "9c3c84735c9bcfd62507d6e2a137f90b1ddaa98a";
- sha256 = "0g479ffpiqz15wwam4vwi8x0w7hbdnk2dxcwzryaf1cqnn6ip6in";
+ rev = "479b4ac1d09cec838a232e49ad54b79f2217ad4c";
+ sha256 = "0lxpcyvgii8xal6s16aw6y4430709xsba3kn1jwm1lbnrz5mhqwb";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -690,12 +690,12 @@ final: prev:
compe-tmux = buildVimPluginFrom2Nix {
pname = "compe-tmux";
- version = "2021-07-16";
+ version = "2021-07-19";
src = fetchFromGitHub {
owner = "andersevenrud";
repo = "compe-tmux";
- rev = "fcb7c80bc6b3df11d5c0d8cde4f12aa9d3653cdd";
- sha256 = "18v1g8l11caqlag3d55vvn1v7k99600jzlzzmp6bv5pmi4lmhq0g";
+ rev = "82d2139de0279a20a70da61320042adf31b94798";
+ sha256 = "06dyrknc6gap8ybsjai4ndr4cdhzkwz1hnxilz9ffcbplzwldhs5";
};
meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
};
@@ -786,12 +786,12 @@ final: prev:
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
- version = "2021-07-19";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
- rev = "c651b5af9e30b9d88290ca30b0374b064e1a278d";
- sha256 = "1qycvbkr6axl5vcwwf5m6svag511p97h2xzcbh68arqa1kqx208l";
+ rev = "8dedf17ad815ce78122c22d25e93777e3f2d8cfe";
+ sha256 = "0061x13jznqqvpci1f6x9r0qrn2bakvvp2ai1nbrb1ynvbgkh3mf";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@@ -822,12 +822,12 @@ final: prev:
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2021-07-19";
+ version = "2021-07-21";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "9c1aa175762884812b9f3c3436ef6e26639b9589";
- sha256 = "1xhbnad098a6h3vf05rkha7qpj4nb4jaxjcnll91wzvf4lngq4p0";
+ rev = "2cad943df739c1fcf4d923854ae642fde38b477f";
+ sha256 = "1j761zpa41p9hmh4bxapaqjvxx9d3nhcf2bifsibcjghcxblj1xb";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -1316,12 +1316,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview-nvim";
- version = "2021-07-19";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "63d7052686732a910b7355761193fdb55a521cd3";
- sha256 = "13r743m9x2mbi0qvfgv8vqfjgxnrmvic09ps484m39bxsbdywzvv";
+ rev = "dea0e244bca3a89479e9225b531a319cd812cd52";
+ sha256 = "0gf1x10ix3p6ls1g1cbx57fxd5ln13p3abhv52wqy2gkdl3syvw4";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -1400,12 +1400,12 @@ final: prev:
editorconfig-vim = buildVimPluginFrom2Nix {
pname = "editorconfig-vim";
- version = "2021-04-04";
+ version = "2021-07-20";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-vim";
- rev = "f305bc77faef4b418aee65682d7d147f64cfd5a9";
- sha256 = "1yr8jni3z9sf348d8zw532vj4s1ww62yfslfcdgkgwhba1l2vy53";
+ rev = "1c4f781f2439469e5342217131886260c9445fc6";
+ sha256 = "0m39if0n4kijqzxk91r1a1fnyhr2p4b9nx1yzvwzkj21snysi4w8";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@@ -1486,12 +1486,12 @@ final: prev:
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
- version = "2021-07-14";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
- rev = "0a67fda0cb7908a43ea4d3c7b8d3d413e305c2be";
- sha256 = "1yjdj6n74z34lq7aayxnngkvyrcpgii9mh92l50jyq22mbqng4hj";
+ rev = "f734d08b7d8c59be372f0364cbdbb2e3b8884574";
+ sha256 = "1gfswql15fpndxmkqgw5l3c15kpv2892bhmcc8hg3wwi6d8c8g3i";
};
meta.homepage = "https://github.com/fenetikm/falcon/";
};
@@ -1510,12 +1510,12 @@ final: prev:
fastfold = buildVimPluginFrom2Nix {
pname = "fastfold";
- version = "2020-03-23";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "konfekt";
repo = "fastfold";
- rev = "5872cbe9d921eb3ec79dce14a1f492f44c1cbaaf";
- sha256 = "07mls0yczg2cmia2jn0s2rvgwl07yxlm4hyvjd941p1knvn88x8q";
+ rev = "b5977da87ab7725d5bd9f46fd691eca433503835";
+ sha256 = "1j5b2nhmc4kq23dzhwsspwqx9shxpqp57175j0zr53phx01q3qcr";
};
meta.homepage = "https://github.com/konfekt/fastfold/";
};
@@ -1619,12 +1619,12 @@ final: prev:
floating-nvim = buildVimPluginFrom2Nix {
pname = "floating-nvim";
- version = "2021-05-08";
+ version = "2021-07-19";
src = fetchFromGitHub {
owner = "fhill2";
repo = "floating.nvim";
- rev = "c47af010aa8e88758995858f0ed2771a99cd3e98";
- sha256 = "0cvs6c903bq4jk4l197vvdrk8q85rl7z7iy7cvd5m4k7yd937r50";
+ rev = "11e75c2a201b9d73f03bd3c2db1fc94021c231eb";
+ sha256 = "172ak3macqmkz4jvic1xcnfpp6wafq33afyvcx4za170qh30sydj";
};
meta.homepage = "https://github.com/fhill2/floating.nvim/";
};
@@ -1713,6 +1713,18 @@ final: prev:
meta.homepage = "https://github.com/rktjmp/fwatch.nvim/";
};
+ fzf-checkout-vim = buildVimPluginFrom2Nix {
+ pname = "fzf-checkout-vim";
+ version = "2021-06-25";
+ src = fetchFromGitHub {
+ owner = "stsewd";
+ repo = "fzf-checkout.vim";
+ rev = "4d5ecae74460de8fed4f743f6bd53c4c31d32797";
+ sha256 = "0mia7p2z8l3lrid0v8ml4i8y190gh4ll9898yyg4gcghhxp83zpm";
+ };
+ meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/";
+ };
+
fzf-lsp-nvim = buildVimPluginFrom2Nix {
pname = "fzf-lsp-nvim";
version = "2021-06-20";
@@ -1859,12 +1871,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-07-19";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "66638c929c61f950246f3d292b6157a9596241de";
- sha256 = "1wqspsx83sy2qmmg0idi7j66swm23hnhxx630j114vh6a70vai00";
+ rev = "22a1d6db29a2c6b485a48512d2c38ac84d6a78bb";
+ sha256 = "1dxz6zjhf2z4n2pqdk95ifdj379fravfr55k401plgy223hmpkip";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -2436,24 +2448,24 @@ final: prev:
lazygit-nvim = buildVimPluginFrom2Nix {
pname = "lazygit-nvim";
- version = "2021-07-14";
+ version = "2021-07-21";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "lazygit.nvim";
- rev = "3dc36a82276d4ff88badadf3dfdcc34b57d0e0fd";
- sha256 = "18sl35wi7zq2y4y4bny5pz160m584c8mli1b6vjvr84gvjmyg7sv";
+ rev = "c1840692c17b6994bb3b96b33e48040d0cb2da99";
+ sha256 = "07mwa2bbny73s60as5s1schk4zhk6m6rv26ljbcl14mx45z9m8r8";
};
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
};
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
- version = "2021-07-03";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
- rev = "64a941e317fb9a432d8924eb3a124627c71c0d18";
- sha256 = "10d6fr2kasm13js7k85a9mm6q7ga6b3h6z9mys6wwaphzsm7vli1";
+ rev = "321f1995211b05d5abd73732262432e70eba1218";
+ sha256 = "1bg0vjf6pnbjmj76mzcbcrm7gdhsxqi040xspyizfykj72qjqyd4";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@@ -2724,12 +2736,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2021-07-12";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "d7638d0a72686ca3e0e2ff019aae8cb9073d7980";
- sha256 = "0fsd4azmmjjqqm6sb492bp02fvddalklmbyn1a07xql35fj5cq89";
+ rev = "726aac6f8f05c94418cd3e9d6c05705e8b1ae743";
+ sha256 = "0v5lpcbmlghyfifwys51acihbhawg87bmapjay52g591cjzcd9ak";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@@ -2820,12 +2832,12 @@ final: prev:
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
- version = "2021-07-16";
+ version = "2021-07-21";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "2d61b880aba6e4e0b730303e0e980bf0afd73961";
- sha256 = "01az8gkhhvndnrjavk7jzi5wy03ybca97cbxpdimx2wpvxly484j";
+ rev = "d389e2b0c67f5cedd5ec5edfe53afc847f8daf61";
+ sha256 = "180grx6317ic6ip98awvqnfjc4zkzqh91rglls5pvwcq1w5m5vwb";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -3132,12 +3144,12 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
- version = "2021-06-30";
+ version = "2021-07-20";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
- rev = "3fdfd45119be64945e635bf2406fdb0430cb85df";
- sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4";
+ rev = "f9fa0e31f9e5c7aaa2ea2091ca64b28d84d485c0";
+ sha256 = "1bv75ijvs63r88nghjk5ljjz06r6xbp3923r3c17p1d3ks2qsfxa";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
@@ -3240,12 +3252,12 @@ final: prev:
neoterm = buildVimPluginFrom2Nix {
pname = "neoterm";
- version = "2021-05-26";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "kassio";
repo = "neoterm";
- rev = "cae4f19aeac40037039e914932da850443b7729f";
- sha256 = "0h3d36vj7sdx10f9gndplwkyqmjxq9frafyj9vmsjhj117nn8agh";
+ rev = "a626942b2a87a865c73e1d62391ef7e85ddf8bce";
+ sha256 = "0145gxpaq8zidrsksq1d40y5g3l2f1ac5z9n5p21b32x512d4diz";
};
meta.homepage = "https://github.com/kassio/neoterm/";
};
@@ -3408,12 +3420,12 @@ final: prev:
nord-nvim = buildVimPluginFrom2Nix {
pname = "nord-nvim";
- version = "2021-07-17";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "shaunsingh";
repo = "nord.nvim";
- rev = "02a07af329b9cb42187a2dd74aef8563f5957bfc";
- sha256 = "10yzlv3433dfdm5n1q8r4yzwx0h73nd81w60fqkfx4cl4l7l9085";
+ rev = "4308ebe128e25704bc1b1ef20133d68d8fba2db0";
+ sha256 = "07wcm7gjv48b1z33qixb52bvq7qj44dalmzjbms2wlg00zgq38kf";
};
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
@@ -3444,12 +3456,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls-nvim";
- version = "2021-07-14";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "56d4b76203d2b442353e25c247f49fa5ca70f42e";
- sha256 = "0kmgln5ra2lpdvj9866a11l9h04zc1dmvxcw8gbra6f72ars3jwr";
+ rev = "2c2aec89bb85cc38e9fd6f83a93bb748ae462a01";
+ sha256 = "11qfbn54h7ckggf9va2qawpl81mbm985lr893gvimfkwl6v3zqlp";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -3492,12 +3504,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-07-19";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "b0bbe8d9089cbb045fd15d217ac5a5ec0f4f5066";
- sha256 = "173nkjfkqklg8zk4vs69c0avrw0v6hngj0szxj7xs3yh2wfnhqnh";
+ rev = "5a86b4f83c1f17b27a02c191dcebb0441c0531bb";
+ sha256 = "1c4jcdjmafkpcq2vma39vsdm93al8yi3q8n6i4hfvmw8lvsxcfy6";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@@ -3540,12 +3552,12 @@ final: prev:
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
- version = "2021-07-17";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
- rev = "b90cbdef2d7eab5fa8b3693bb321305e4455f329";
- sha256 = "16n168z9gdy0p0yljpx3lv958ix1369qgqc65pjs9ib5sij03q2s";
+ rev = "789c204cbec3ec060eb345a8820c3788c0ac4335";
+ sha256 = "14h1h47fijw4r76pdav6p3nrl4chhf6l4vmml89chill34lspdab";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@@ -3576,12 +3588,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-07-16";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "ef97a9b17c655d8b603c5fa9abf6fbb623a1dad4";
- sha256 = "0lrna8ryw391dpvi64x3q2gj484mf5s6wlqqg6a52a5s3ganh41n";
+ rev = "73529ce61611c9ee3821e18ecc929c422416c462";
+ sha256 = "1r55z5abg7ha3xh84ypbbnc3fs7a1718zqmypc49f3wa6ln2rjxz";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3600,12 +3612,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2021-07-14";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "344b6f0b581dd72e40bbbb78b4f147e5003e0ce6";
- sha256 = "1xdcdwjqk2r2cg47gxld2c06yfnbpj6nnm2j5nskqa3nbyrpf27c";
+ rev = "9dc887db1c266aab2ebddf3845d22587f15e92a6";
+ sha256 = "10klagr9ybk96ayhsxd1qp2mjpkrv0a70lh571ixmdf90a6zkg4y";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@@ -3648,12 +3660,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
- version = "2021-07-06";
+ version = "2021-07-19";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
- rev = "85c931fa18cb9a7c54b0a6bde54924741bdb296c";
- sha256 = "0fw59qgfaskwv8k8pjq1xb8b4k55rgr04311xma4arki9gjrv128";
+ rev = "8e1d114f3d855653bc71fba9e5a22a05d3a1b1a2";
+ sha256 = "1dm6rwx3w8hbgg20ay4bcdd3c87bqpqvl64zfc673p81m76b3s86";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@@ -3708,12 +3720,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-07-18";
+ version = "2021-07-20";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "38e0003d0c40d506e9e46ff55978b78220a76b71";
- sha256 = "0r3zicx8gkj5jd0kxs1i5inxpi9jmg3nwb0km4xcj55fb3x2vbky";
+ rev = "4f72377143fc0961391fb0e42e751b9f677fca4e";
+ sha256 = "1w9gjnv98gv8jwkkw1x5jsnc8366w1jcllipxlrij97z6hspqc8m";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3756,12 +3768,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-07-07";
+ version = "2021-07-20";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "2216837c0178dc81cca3d47aff9699ac1b2aec8e";
- sha256 = "0n1p7abd08k28c30pzk51vm1j3wghyjxbw0c8j0jwxiyzaf3p865";
+ rev = "b7ca5298fd75700cc74b122654241f5ed24ecf96";
+ sha256 = "0pywghia4hv9pa8g1irmqc1qrbvbhhibazx8z6kcqrrmsb3026g5";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -3780,36 +3792,36 @@ final: prev:
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
- version = "2021-07-12";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
- rev = "96af0fa98252ab3543ff1464c6452930f242c615";
- sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh";
+ rev = "895f8e2485267640ccd11fe3fbf1ab5fe178bc4c";
+ sha256 = "1jmg13618r9yxidb2y6fs1y342qqnqa19m1srfkczsxgqr89wrsh";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
};
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-07-10";
+ version = "2021-07-19";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "f178c8c8c5cb994326578a24d3296dde6f2e9bd3";
- sha256 = "1xdakhjsjfx7y3dqi99ldgwmh69jyyvisqainlkiz63g0nsy81ay";
+ rev = "d3e76b81e5b169af192dea4da0bd6f64faad2c36";
+ sha256 = "0hw50yyikndx1260a50j6izjsa4m709r7v3qzrpwz482d7fq700j";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-07-19";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "17cf76de8a16c1e459fbe916491f258371837a8d";
- sha256 = "1fzm655q6xw3qqpvzx36wj5v9js1jiwb8295cccdc65irg8r6zfw";
+ rev = "65a059b34d5bc77db01372c589f582b17524a2f9";
+ sha256 = "1f0iig48frgd75ccan8yqlxh5j84ywb6im1qsmq17gyfjs4vbqbx";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3852,24 +3864,24 @@ final: prev:
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2021-07-08";
+ version = "2021-07-20";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "379bc8f48256c07139241e1c7a70f22dd4344c4f";
- sha256 = "0bmy6rzmh3jfqd567wiavwfm9j2dpb0asmcgkyvj5j5qy2xfmi5l";
+ rev = "7f36db566c66998e04ea569723174c42d8190903";
+ sha256 = "1j2vjlfrvvvxzqq2z6z9mdlanq8q8zhfhffbrygv1zgrp6izhhkx";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2021-07-19";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "038cda43f4b7e8819c230de2bbe943972ed2f37c";
- sha256 = "0kdzfi5dm1lm1bzagf60c8dd1a3zz0x4qp28nns6nhiv7kljj3zy";
+ rev = "fabcc1ac8392cc9a5beae8020b6c80538a725077";
+ sha256 = "1a3871n3kwvwgz40a74c74lyy5p2l4rih75asb6rnjrrknkk47fb";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@@ -4020,12 +4032,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-07-17";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "b6a904b341c56c5386bdd5c991439a834d061874";
- sha256 = "1ja6k5cw6v5nhi91s643r6c38a15rgi4n8cb0k5pc5q252q8km04";
+ rev = "fdf005f5697742da121391d31ad42a47842264f9";
+ sha256 = "15amdgzdiaf0srzzwy2pgk7d44bwls5pzj2088xf1206754znsas";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -4177,12 +4189,12 @@ final: prev:
presence-nvim = buildVimPluginFrom2Nix {
pname = "presence-nvim";
- version = "2021-07-09";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "andweeb";
repo = "presence.nvim";
- rev = "080d24394b9abc93b6cd7635cb96c7d6601759a3";
- sha256 = "19xc61xfdyi21k9wbs63iynkfysqi3v28897bqig8myjr1mifbpb";
+ rev = "a695e5d653e3a864e11a5ad777e1274eaae90494";
+ sha256 = "0ahvklrll8wswzzhqqc6qqp1f023njrkqbry439l8s21zsnq63dh";
};
meta.homepage = "https://github.com/andweeb/presence.nvim/";
};
@@ -4357,12 +4369,12 @@ final: prev:
Recover-vim = buildVimPluginFrom2Nix {
pname = "Recover-vim";
- version = "2021-05-18";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "Recover.vim";
- rev = "097b098e62d6499967e44091689c104165ad5e22";
- sha256 = "12qizfs7d0xh10vzm7spcqsi53k3iqvbfp5nhb3qh3xdsavzyp0m";
+ rev = "48b6bc12b560d3013cd30c7959e235993374c24b";
+ sha256 = "1ia2bv7yigcv944rkqy7jlrzi71m3k9kzj1hjhyrk0c2rg738r94";
};
meta.homepage = "https://github.com/chrisbra/Recover.vim/";
};
@@ -4417,12 +4429,12 @@ final: prev:
rnvimr = buildVimPluginFrom2Nix {
pname = "rnvimr";
- version = "2021-05-19";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "rnvimr";
- rev = "dacb2ba386d982d4466aa469799376c38ddcfd2a";
- sha256 = "1b8zb6k92iwmvdny5g16d5y5zl8fc235vlgvxrnipcfj4m3ch0yy";
+ rev = "6bd1b891ecf6c5c054442c6934965714d5ffe834";
+ sha256 = "1a5dw5y359jbvd3yr9sjxjbjwqrgvmwdv9y1jifqk7s5p0y0b4jg";
};
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
};
@@ -4465,12 +4477,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools-nvim";
- version = "2021-07-17";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
- rev = "a22eec84aaa5b31b5c708eed24a5c09f21ca46c0";
- sha256 = "14lwhdbpjrq2xyy9kfihjasvqg83bb13fl0r7aw95hngayx69l7k";
+ rev = "a0be4f89830210c5203ea2bee1373041400a59d1";
+ sha256 = "1f5s9shmlpixw6lkywbnbfcqhqvaczmbhys243pn96pv4bsy09r5";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@@ -4815,24 +4827,24 @@ final: prev:
sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim";
- version = "2021-07-17";
+ version = "2021-07-19";
src = fetchFromGitHub {
owner = "tami5";
repo = "sql.nvim";
- rev = "76277236829ca77dd41d285c794ab8878129e3f8";
- sha256 = "1vqxn02xy8j7ij4zm7x55zzch1bl8k6313l06mb60zxvw77i5a81";
+ rev = "9983108bc9941af842d3b847b60564d180fc8e4b";
+ sha256 = "1f1f1v107w61b86pdrs9qvchyg286nif31c5cp3yx6rq22fynbgd";
};
meta.homepage = "https://github.com/tami5/sql.nvim/";
};
srcery-vim = buildVimPluginFrom2Nix {
pname = "srcery-vim";
- version = "2021-07-19";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "srcery-colors";
repo = "srcery-vim";
- rev = "b2780ad5078c24519ba1e6ae3a1b3bd2218870cc";
- sha256 = "1r0v4l9rvb3w42fnj1fmcfvy04gyp0lv3mis7jl716r8kvbaqwpj";
+ rev = "e47e911d4fba1c584cfb31dd710c1f2a03961561";
+ sha256 = "0bb1bsswffp45g38fn41dcbr5dx2gfaz1xhr470h5ln7ywkwv2hi";
};
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
};
@@ -4863,12 +4875,12 @@ final: prev:
suda-vim = buildVimPluginFrom2Nix {
pname = "suda-vim";
- version = "2021-02-20";
+ version = "2021-07-21";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "suda.vim";
- rev = "fbb138f5090c3db4dabeba15326397a09df6b73b";
- sha256 = "01kys8q3gycxqf760ydq1k8wq20brjvl1gxpl8j87jvnyx87kmnf";
+ rev = "bfafa2722178bdb8898e014a7e95b60d497960d9";
+ sha256 = "1cjj6d6zkd2b9hv77saz8p7xcw06rj0svdhycc4df8bcdrvvmi39";
};
meta.homepage = "https://github.com/lambdalisue/suda.vim/";
};
@@ -4921,6 +4933,18 @@ final: prev:
meta.homepage = "https://github.com/keith/swift.vim/";
};
+ symbols-outline-nvim = buildVimPluginFrom2Nix {
+ pname = "symbols-outline-nvim";
+ version = "2021-07-21";
+ src = fetchFromGitHub {
+ owner = "simrat39";
+ repo = "symbols-outline.nvim";
+ rev = "6a51c637dd8deb4c1e398932651b3a635d1694e2";
+ sha256 = "1hxdklzbci1cxaq6mvy6f2zih8cxyp4s8y6yrnz9w2587pxh0c7j";
+ };
+ meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";
+ };
+
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
version = "2021-07-19";
@@ -5141,12 +5165,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-07-19";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "46e03a935f1d080a9bd856d5a8acfcc093cd1461";
- sha256 = "14ra8p9alnmvzry3iw3ghyk7nx44dh0qm82lvg6wfg5bhw1hpnnj";
+ rev = "79644ab67731c7ba956c354bf0545282f34e10cc";
+ sha256 = "0v7qpblbgs298aj0p5fs4q8b8zc36ib427aq78c0500988p6hr3d";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -5262,24 +5286,24 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight-nvim";
- version = "2021-07-09";
+ version = "2021-07-21";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
- rev = "e3ad6032a7e2c54dd7500335b43c7d353a19ede9";
- sha256 = "1slb67kirb0jfgjsw09dhimmxagsk2aii6w461y1w8nj3fkl6p28";
+ rev = "0ee0bcf14d8c7c70081a0e9967c211121c4300c7";
+ sha256 = "0rkw544dzgyp76ag3zrh8d3n0mri5c0cjpy8mvbfpgyj87w18m8d";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
traces-vim = buildVimPluginFrom2Nix {
pname = "traces-vim";
- version = "2021-07-18";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "markonm";
repo = "traces.vim";
- rev = "360361b093d21531c0781c5c4a61a1e6cb3edfac";
- sha256 = "052kbzx2rqpw5mhh6w1zcj5il642w1a2wi6w4nbcw7scj4gq85pd";
+ rev = "4b06ca24de8aeb8b512727a27f2d1b3ba7b20ff6";
+ sha256 = "0lyqbwjyb0sczzqhfd7nmg3hzqn9pqxbrg14szg56a14mmm59mxf";
};
meta.homepage = "https://github.com/markonm/traces.vim/";
};
@@ -5310,12 +5334,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble-nvim";
- version = "2021-07-16";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
- rev = "059ea2b999171f50019291ee776dd496799fdf3a";
- sha256 = "06v2jvlw8rjlarx89kfb7ys8y0jkm1f7c4vnws60nfbqgp9c9k98";
+ rev = "169b2ec3a4d0cac01f22cc8f7332f1d0a11f1fa4";
+ sha256 = "08r1ivzw6v5bfyhd7cy6kysryd123f68aa3kpamzy168ixvihbii";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@@ -5826,12 +5850,12 @@ final: prev:
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
- version = "2021-06-21";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "vim-autoformat";
repo = "vim-autoformat";
- rev = "d616fcf8a747f86bd3b26004b83ea5b7c7526df1";
- sha256 = "1292613i7yi38jsl1sly5i9bdi7bzaw2pg67gkymq2ln7zcpvims";
+ rev = "80ba8b13a9699db20754623a0933095be65fc203";
+ sha256 = "0crlkxc55lk37vy52yxwpp84bc3rd7a5am71xj9zl29a4xap5mdp";
};
meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
};
@@ -6018,12 +6042,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-07-19";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "3aa42d211ebae7471e8f9926aaeef5a1df475f2f";
- sha256 = "0f1adjn9x5jv541yzgqf67v9613xvkxzgc5bmkgqrfxn2l5j3vjn";
+ rev = "111ef624c0d39fe5fcf869fba01c16036e106fbd";
+ sha256 = "0xgdvk362fk6491pk5dv46a2cg77gk57gk6dvhzf3ldi5zshckfj";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -6798,12 +6822,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-07-17";
+ version = "2021-07-21";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "de6495ae846b2c5913fa85d5464c036c0acdfa34";
- sha256 = "184cbh2jxwpp4zgvlfhs4qx1mr4vyq5vvv6lvk8lcng40dxfr9fg";
+ rev = "a7c54990f031ab93b556ceb25c5afb8a45c3311a";
+ sha256 = "0ld8p75av2v9ki5sh7rh8cxj99k6lydhy6jp9x19fk8bzxsgff02";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -7568,12 +7592,12 @@ final: prev:
vim-liquid = buildVimPluginFrom2Nix {
pname = "vim-liquid";
- version = "2020-07-01";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-liquid";
- rev = "94bd2ea1fd45cf0a21edc3433231e7fcb7791323";
- sha256 = "0r8lisyhbzyw2w9xzbashlhnag98vws78xwmh03dpd8kbpcdiz0w";
+ rev = "447c69b59fadcf04f96d99873126953eae7aa235";
+ sha256 = "0cglf4kfb07jwz1v14gl83rnfjm4c1b69nih3g7yj001ddyj5amx";
};
meta.homepage = "https://github.com/tpope/vim-liquid/";
};
@@ -7616,12 +7640,12 @@ final: prev:
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-06-16";
+ version = "2021-07-20";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "fb0a72306e1fc42c1ce8909aa1e420ddfccf6fbf";
- sha256 = "0dzy7cvpmzvx6z5pifzj4y7biln5gcn4iic35ha58ixwgwcw784m";
+ rev = "7ba553effb021293c9ff5176b91e76da71797825";
+ sha256 = "1phfqzn94m2j7g10aifh12a4gyyrhqnj1vn2bpdp29lpm1n179yg";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -8299,6 +8323,18 @@ final: prev:
meta.homepage = "https://github.com/haya14busa/vim-poweryank/";
};
+ vim-prettier = buildVimPluginFrom2Nix {
+ pname = "vim-prettier";
+ version = "2021-06-29";
+ src = fetchFromGitHub {
+ owner = "prettier";
+ repo = "vim-prettier";
+ rev = "0e61e4a5b55d2740aa118db91a6671dcb11307e8";
+ sha256 = "0d83lx6kfpsi3d4q9wz8zwsgdn0vn16psqyngml6wspjyibh6pnf";
+ };
+ meta.homepage = "https://github.com/prettier/vim-prettier/";
+ };
+
vim-prettyprint = buildVimPluginFrom2Nix {
pname = "vim-prettyprint";
version = "2016-07-16";
@@ -8397,12 +8433,12 @@ final: prev:
vim-qf = buildVimPluginFrom2Nix {
pname = "vim-qf";
- version = "2021-06-08";
+ version = "2021-07-20";
src = fetchFromGitHub {
owner = "romainl";
repo = "vim-qf";
- rev = "4fe7e33a514874692d6897edd1acaaa46d9fb646";
- sha256 = "054p9f3a3yljng3r51asgyq2ifmmrr35ws5f8dv8ssmby2f7an1l";
+ rev = "65f115c350934517382ae45198a74232a9069c2a";
+ sha256 = "0pylxkmhcanks59imah3q2xyn8lp5735xm17p13yx9vx90779nwp";
};
meta.homepage = "https://github.com/romainl/vim-qf/";
};
@@ -8529,12 +8565,12 @@ final: prev:
vim-ruby = buildVimPluginFrom2Nix {
pname = "vim-ruby";
- version = "2021-07-18";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "vim-ruby";
repo = "vim-ruby";
- rev = "482e2cec5a742920eddf644f2f1efcb15f03967c";
- sha256 = "18b3hhb1sfgip80dp7wicrsqs59narj49qlmpnfhsy29imsxzb72";
+ rev = "5516e301a5c3cacac008342006a712f5fa80f6a1";
+ sha256 = "0fwy02mj0gafgv01qpgfyi5n0i0lrfzy8nw93hrpqwc97pckh1pp";
};
meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
};
@@ -9729,6 +9765,18 @@ final: prev:
meta.homepage = "https://github.com/preservim/vimux/";
};
+ vimway-lsp-diag-nvim = buildVimPluginFrom2Nix {
+ pname = "vimway-lsp-diag-nvim";
+ version = "2021-07-23";
+ src = fetchFromGitHub {
+ owner = "onsails";
+ repo = "vimway-lsp-diag.nvim";
+ rev = "28c23ed9dc499410b4bd0ac040e48c76560b18b7";
+ sha256 = "1fdmg6xhhqdhk4hykhhxw55d11gcb932b2iz2sk7f4bps8c2lgg9";
+ };
+ meta.homepage = "https://github.com/onsails/vimway-lsp-diag.nvim/";
+ };
+
vimwiki = buildVimPluginFrom2Nix {
pname = "vimwiki";
version = "2020-05-26";
@@ -9924,12 +9972,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
- version = "2021-07-05";
+ version = "2021-07-23";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
- rev = "c83c240e1397291bf1babcba173253d7f753a0b6";
- sha256 = "0lr2vl9rdjr2lgbs5vlbcjw3zrwv66w5bijlpk1xy45ccbrbq2nw";
+ rev = "8411859f48c8066a3b6f29c1a8e3bfa2d0653551";
+ sha256 = "0yx2aig7pk8f99d539p85q3csb3l7bf2575r24w3fvchwj8w2pqy";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
index 8ee937359c..60bd11803c 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
@@ -251,6 +251,14 @@ self: super: {
'';
});
+ fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs (old: {
+ # The plugin has a makefile which tries to run tests in a docker container.
+ # This prevents it.
+ prePatch = ''
+ rm Makefile
+ '';
+ });
+
fzf-vim = super.fzf-vim.overrideAttrs (old: {
dependencies = with self; [ fzfWrapper ];
});
@@ -635,7 +643,7 @@ self: super: {
libiconv
];
- cargoSha256 = "sha256-D54R7LK4CH5S7x0g+3K1EJ4b10P7wRAIkHYwCOFJtfg=";
+ cargoSha256 = "sha256-J5BCLcwOPB+EfOmdITCHgec9XDkm2oCGfRo/sKjEOIg=";
};
in
''
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
index 39e2a2bd47..d55ce35789 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
@@ -506,6 +506,7 @@ Olical/aniseed
Olical/conjure
olimorris/onedark.nvim
onsails/lspkind-nvim
+onsails/vimway-lsp-diag.nvim
OrangeT/vim-csharp
osyo-manga/shabadou.vim
osyo-manga/vim-anzu
@@ -537,6 +538,7 @@ preservim/tagbar
preservim/vim-pencil
preservim/vim-wordy
preservim/vimux
+prettier/vim-prettier
psliwka/vim-smoothie
ptzz/lf.vim
puremourning/vimspector
@@ -628,6 +630,7 @@ sickill/vim-pasta
SidOfc/mkdx
simnalamburt/vim-mundo
simrat39/rust-tools.nvim
+simrat39/symbols-outline.nvim
sindrets/diffview.nvim@main
SirVer/ultisnips
sjl/gundo.vim
@@ -643,6 +646,7 @@ steelsojka/pears.nvim
stefandtw/quickfix-reflector.vim
stephpy/vim-yaml
stevearc/aerial.nvim
+stsewd/fzf-checkout.vim
sunaku/vim-dasht
sunjon/Shade.nvim
svermeulen/vim-subversive
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
index c47e17b1c1..8c8ab911cc 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }:
+{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck, moreutils, racket-minimal }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
@@ -85,6 +85,23 @@ let
};
};
+ angular.ng-template = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "ng-template";
+ publisher = "Angular";
+ version = "12.1.2";
+ sha256 = "sha256-fIHh1eRmu4zSgrtZr0XwLB+1Ad6a/0ABC55akGr0DOA=";
+ };
+ meta = with lib; {
+ changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
+ description = "Editor services for Angular templates";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=Angular.ng-template";
+ homepage = "https://github.com/angular/vscode-ng-language-service";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ratsclub ];
+ };
+ };
+
antfu.icons-carbon = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "icons-carbon";
@@ -335,6 +352,23 @@ let
meta = { license = lib.licenses.mit; };
};
+ divyanshuagrawal.competitive-programming-helper = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "competitive-programming-helper";
+ publisher = "DivyanshuAgrawal";
+ version = "5.8.5";
+ sha256 = "25v2tdAX7fVl2B5nvOIKN9vP1G5rA0G67CiDQn9n9Uc=";
+ };
+ meta = with lib; {
+ changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
+ description = "Makes judging, compiling, and downloading problems for competitve programming easy. Also supports auto-submit for a few sites.";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=DivyanshuAgrawal.competitive-programming-helper";
+ homepage = "https://github.com/agrawal-d/cph";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ arcticlimer ];
+ };
+ };
+
donjayamanne.githistory = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/donjayamanne.githistory/changelog";
@@ -386,8 +420,8 @@ let
mktplcRef = {
name = "gitlens";
publisher = "eamodio";
- version = "11.5.1";
- sha256 = "sha256-Ic7eT8WX2GDYIj/aTu1d4m+fgPtXe4YQx04G0awbwnM=";
+ version = "11.6.0";
+ sha256 = "sha256-JxCNE/IL/v94xWmhebsRZo1Gw+nSSpDgZ41ZGongGVI=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
@@ -479,6 +513,28 @@ let
};
};
+ eugleo.magic-racket = buildVscodeMarketplaceExtension {
+ meta = with lib; {
+ changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog";
+ description = "The best coding experience for Racket in VS Code ";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket";
+ homepage = "https://github.com/Eugleo/magic-raket";
+ license = licenses.agpl3Only;
+
+ };
+ mktplcRef = {
+ name = "magic-racket";
+ publisher = "evzen-wybitul";
+ version = "0.5.7";
+ sha256 = "sha256-34/H0WgM73yzuOGU2w6Ipq7KuEBuN1bykcLGuvzY3mU=";
+ };
+ nativeBuildInputs = [ jq moreutils ];
+ postInstall = ''
+ cd "$out/$installPrefix"
+ jq '.contributes.configuration.properties."magic-racket.general.racketPath".default = "${racket-minimal}/bin/racket"' package.json | sponge package.json
+ '';
+ };
+
file-icons.file-icons = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog";
@@ -497,6 +553,12 @@ let
};
foam.foam-vscode = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "foam-vscode";
+ publisher = "foam";
+ version = "0.14.1";
+ sha256 = "sha256-w9xGkezS3A9z6sTk8WWgW7g8qYX6mJFfRV0lv5cu160=";
+ };
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
description = "A personal knowledge management and sharing system for VSCode ";
@@ -505,12 +567,6 @@ let
license = licenses.mit;
maintainers = with maintainers; [ ratsclub ];
};
- mktplcRef = {
- name = "foam-vscode";
- publisher = "foam";
- version = "0.13.7";
- sha256 = "Y2pcd4iXPiuhJdD/9d+tbTJN18O4+kRMqUdOtbx8xy8=";
- };
};
formulahendry.auto-close-tag = buildVscodeMarketplaceExtension {
@@ -1210,8 +1266,8 @@ let
mktplcRef = {
name = "markdown-memo";
publisher = "svsool";
- version = "0.3.8";
- sha256 = "eFiCCXxrOnXwJK1AOMfIDsPGsFG3ArLD1X/uAEH5lRY=";
+ version = "0.3.9";
+ sha256 = "sha256-BsKFHR3wkSRHS8QOi63vLwGj3T2CPzvqXhgtEOq6gJM=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix
index a4bad12b71..ca8905e624 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix
@@ -4,6 +4,7 @@
, pkg-config, meson, ninja
, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap
, doxygen, python3
+, withExamples ? []
, shared ? false }:
let
@@ -51,7 +52,8 @@ in stdenv.mkDerivation rec {
++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni"
++ lib.optional (!shared) "-Ddefault_library=static"
++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem"
- ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}";
+ ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}"
+ ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}";
# dpdk meson script does not support separate kernel source and installion
# dirs (except via destdir), so we temporarily link the former into the latter.
@@ -65,6 +67,10 @@ in stdenv.mkDerivation rec {
rm -f $kmod/lib/modules/${kernel.modDirVersion}/build
'';
+ postInstall = lib.optionalString (withExamples != []) ''
+ find examples -type f -executable -exec install {} $out/bin \;
+ '';
+
outputs = [ "out" ] ++ lib.optional mod "kmod";
meta = with lib; {
@@ -72,6 +78,6 @@ in stdenv.mkDerivation rec {
homepage = "http://dpdk.org/";
license = with licenses; [ lgpl21 gpl2 bsd2 ];
platforms = platforms.linux;
- maintainers = with maintainers; [ magenbluten orivej mic92 ];
+ maintainers = with maintainers; [ magenbluten orivej mic92 zhaofengli ];
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
index 5ff1221e3b..412e504150 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,32 +1,32 @@
{
"4.14": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.239-hardened1.patch",
- "sha256": "1yfg6c75y1dp627qn8c4795sc9vwywc5dl95ngg8zk15n5d7j9in",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.239-hardened1/linux-hardened-4.14.239-hardened1.patch"
+ "name": "linux-hardened-4.14.240-hardened1.patch",
+ "sha256": "0j5zp0f8s4w3f60yam2spg3bx56bdjvv0mh632zlhchz8rdk5zs4",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.240-hardened1/linux-hardened-4.14.240-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.197-hardened1.patch",
- "sha256": "1cbcas5kl6k8hn60p08pvw073mrv8lkrav3pc9sxvdcscdbwkkpr",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.197-hardened1/linux-hardened-4.19.197-hardened1.patch"
+ "name": "linux-hardened-4.19.198-hardened1.patch",
+ "sha256": "18c5j00xiwc0xn5klcrwazk6wvjiy3cixbfbrw4xj7zal9r5p6q9",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.198-hardened1/linux-hardened-4.19.198-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.51-hardened1.patch",
- "sha256": "0s9q7vlhnsd484kzg9mnqc7zab09ch3i3w654wvhkxk9zy4kgzhr",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.51-hardened1/linux-hardened-5.10.51-hardened1.patch"
+ "name": "linux-hardened-5.10.52-hardened1.patch",
+ "sha256": "062a32rb1g5xk1npiz9fa114k7g4x9pmygycn3alc0phngjmvr98",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.52-hardened1/linux-hardened-5.10.52-hardened1.patch"
},
"5.12": {
"extra": "-hardened1",
- "name": "linux-hardened-5.12.18-hardened1.patch",
- "sha256": "0mlff4ylnx1pvswamhsms9366jw618ic8w42rnzrwqhasfnwkqjb",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.18-hardened1/linux-hardened-5.12.18-hardened1.patch"
+ "name": "linux-hardened-5.12.19-hardened1.patch",
+ "sha256": "1nr3922gd6il69k5cpp9g3knpy6yjb6jsmpi9k4v02bkvypg86dc",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.19-hardened1/linux-hardened-5.12.19-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.133-hardened1.patch",
- "sha256": "0nnsyl2fxv7nnj7c47nnr753yh5x3wbny7ml8x23f5zdvjz43yfj",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.133-hardened1/linux-hardened-5.4.133-hardened1.patch"
+ "name": "linux-hardened-5.4.134-hardened1.patch",
+ "sha256": "0iay6dxwd1vqj02ljf0ghncrqpr6b0gby90xiza8kkk8wnh3r9hh",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.134-hardened1/linux-hardened-5.4.134-hardened1.patch"
}
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 5b94b7ea9b..ccecc433a4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.239";
+ version = "4.14.240";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "167zwm3giizv42m0xjz71xnb2swlwiaw0xw0dg8j8mb74hz1drx0";
+ sha256 = "1k65qwzlnqnh9ym0n2fxpa8nk2qwvykwhwgaixk3b7ndzmr8b6c8";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 3785c6b553..4ed06ee220 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.197";
+ version = "4.19.198";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "10kj442qaky6rpl65k5rrvd3p6mdgz4p321zvf4s312ixfdja0g6";
+ sha256 = "13k0r6a4n8nbni64a18wqzy0pg4vn1zw2li78xrm78rqcrnah85y";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 5b7050b706..6c2595386e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.4.275";
+ version = "4.4.276";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1aiwq6019sibsw5smj6ii28cr64dv24c19k4n8c09nakhmhcg94i";
+ sha256 = "1hf9h5kr1ws2lvinzq6cv7aps8af1kx4q8j4bsk2vv4i2zvmfr7y";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 71a5f5eec3..0dc5cfeae6 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.9.275";
+ version = "4.9.276";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "08mz7mzmhk5n1gwadrc5fw8s40jk0rayvdpjcricl4sv56574lb6";
+ sha256 = "16jp05jhmqcp8lawqga69gxn1acdkxsskn3a6wf0635863fky3hv";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 23e4099438..f59cca3e12 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.51";
+ version = "5.10.52";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1qkssvqk29svn10ws3lrnzfbmlvzrixkf7r7lslc7k3lqa9yiflm";
+ sha256 = "0ydf09wsg0pkjm9dk8y730ksg15p5rlbhq445zx8k191zah5g7kn";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix
index fe180d9556..e1e7aec2ce 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.12.18";
+ version = "5.12.19";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "12sjscf53z6fc1jah3i2578r3a0i7rkw2jmqi0w328a22i0paakg";
+ sha256 = "0wscz736n13m833cd12lskn47r0b8ki4fhgpjnwga0jsab9iqf79";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix
index 4bb0f5deef..82defad373 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.13.3";
+ version = "5.13.4";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1ir80wn019kslv6ysiqxdvarrjlr8b3skk1s43cwki3x2cjnxskq";
+ sha256 = "0v3x1q1r0r8lyjg5hsj7yayfxqcgfj01p86ya4s0i9jaclpwv4ki";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 318d0887fb..c4e08b685b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.133";
+ version = "5.4.134";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0c08jp5k5h4c2s4pbpyvnvzczr79jh833wy9jv15nkvqp3xnd8w9";
+ sha256 = "0haqw1w6f8p330ydbsl7iml1x0qqrv63az6921p2a70n88b8dyy9";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
index 04c17eac25..758f6fd998 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
- version = "5.13.1";
+ version = "5.13.4";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@@ -12,7 +12,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
- sha256 = "sha256-QC2BgsbytpKQs7TyuXt4aan8hUwd43pHj2ApYXv0HAA=";
+ sha256 = "sha256-jSV5dL6myB4WeokYBwoBtQaOfLaUgvseYtReyjLGOhU=";
};
structuredExtraConfig = with lib.kernel; {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
index 1b1acdb535..f88cdcda52 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/lsiutil/default.nix
@@ -1,41 +1,44 @@
-{ lib, stdenv, fetchurl, unzip }:
+{ lib
+, stdenv
+, fetchurl
+, kmod
+, coreutils
+}:
-let
-
- version = "1.60";
+stdenv.mkDerivation rec {
+ pname = "lsiutil";
+ version = "1.72";
src = fetchurl {
- name = "lsiutil-${version}.zip";
- url = "http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/hbas/fibre_channel/hardware_drivers/LSIUtil%20Kit_${version}.zip";
- sha256 = "1d4337faa56e24f7d98db87b9de94d6e2c17ab671f4e301b93833eea08b9e426";
+ url = "https://github.com/exactassembly/meta-xa-stm/raw/f96cf6e13f3c9c980f5651510dd96279b9b2af4f/recipes-support/lsiutil/files/lsiutil-${version}.tar.gz";
+ sha256 = "sha256-aTi+EogY1aDWYq3anjRkjz1mzINVfUPQbOPHthxrvS4=";
};
-in
+ buildPhase = ''
+ runHook preBuild
-stdenv.mkDerivation {
- pname = "lsiutils";
- inherit version;
+ substituteInPlace lsiutil.c \
+ --replace /sbin/modprobe "${kmod}/bin/modprobe" \
+ --replace /bin/mknod "${coreutils}/bin/mknod"
+ gcc -Wall -O lsiutil.c -o lsiutil
- srcs = [ src "Source/lsiutil.tar.gz" ];
+ runHook postBuild
+ '';
- nativeBuildInputs = [ unzip ];
+ installPhase = ''
+ runHook preInstall
- sourceRoot = "lsiutil";
+ mkdir -p "$out/bin"
+ install -Dm755 lsiutil "$out/bin/lsiutil"
- preBuild =
- ''
- mkdir -p $out/bin
- substituteInPlace Makefile --replace /usr/bin $out/bin
- substituteInPlace lsiutil.c \
- --replace /sbin/modprobe modprobe \
- --replace /bin/mknod $(type -P mknod)
- '';
+ runHook postInstall
+ '';
- installPhase = "true";
-
- meta = {
- homepage = "http://www.lsi.com/";
- description = "LSI Logic Fusion MPT command line management tool";
- license = lib.licenses.unfree;
+ meta = with lib; {
+ homepage = "https://github.com/exactassembly/meta-xa-stm/tree/master/recipes-support/lsiutil/files";
+ description = "Configuration utility for MPT adapters (FC, SCSI, and SAS/SATA)";
+ license = licenses.unfree;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ Luflosi ];
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix
index 5e2284b489..66b39b2c89 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -7,15 +7,18 @@
url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
sha256 = "sha256-RnEzlohDZ3uxwna7dKNFiqfAAswh4pXFHjvWVJexEqs=";
};
+ mesonFlags = old.mesonFlags ++ [
+ "-Denable_docs=false"
+ ];
});
in stdenv.mkDerivation rec {
pname = "odp-dpdk";
- version = "1.27.0.0_DPDK_19.11";
+ version = "1.30.1.0_DPDK_19.11";
src = fetchurl {
url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz";
- sha256 = "sha256-/4m2NqnEXyenNUrCq3c2ozJzPWFFs/Qp7MAVm9B2biA=";
+ sha256 = "sha256-R3PsqQiHlHPzIYYWTVEC7Ikg3KR5I0jWGgftDA9Jj1o=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ofp/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ofp/default.nix
deleted file mode 100644
index 5defafeba8..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ofp/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
-, openssl, libpcap, odp-dpdk, dpdk
-}:
-
-stdenv.mkDerivation rec {
- pname = "ofp";
- version = "2.0.0";
-
- src = fetchFromGitHub {
- owner = "OpenFastPath";
- repo = "ofp";
- rev = version;
- sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf";
- };
-
- nativeBuildInputs = [ pkg-config autoreconfHook ];
- buildInputs = [ openssl libpcap odp-dpdk dpdk ];
-
- dontDisableStatic = true;
-
- postPatch = ''
- substituteInPlace configure.ac --replace m4_esyscmd m4_esyscmd_s
- substituteInPlace scripts/git_hash.sh --replace /bin/bash ${stdenv.shell}
- echo ${version} > .scmversion
- '';
-
- configureFlags = [
- "--with-odp=${odp-dpdk}"
- "--with-odp-lib=odp-dpdk"
- "--disable-shared"
- ];
-
- meta = with lib; {
- description = "High performance TCP/IP stack";
- homepage = "http://www.openfastpath.org";
- license = licenses.bsd3;
- platforms = [ "x86_64-linux" ];
- maintainers = [ maintainers.abuibrahim ];
- broken = true;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
index c13f97fcde..a33bb3c1a1 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
@@ -157,6 +157,13 @@ stdenv.mkDerivation {
url = "https://github.com/systemd/systemd/commit/ab1aa6368a883bce88e3162fee2bea14aacedf23.patch";
sha256 = "1b280l5jrjsg8qhsang199mpqjhkpix4c8bm3blknjnq9iv43add";
})
+
+ # Fix CVE-2021-33910, disclosed 2021-07-20
+ (fetchpatch {
+ name = "CVE-2021-33910.patch";
+ url = "https://github.com/systemd/systemd/commit/441e0115646d54f080e5c3bb0ba477c892861ab9.patch";
+ sha256 = "1g1lk95igaadg67kah9bpi4zsc01rg398sd1247ghjsvl5hxn4v4";
+ })
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix b/third_party/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix
index 0a34299753..38293e65f7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, windows, fetchurl }:
let
- version = "6.0.0";
+ version = "9.0.0";
in stdenv.mkDerivation {
pname = "mingw-w64";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
- sha256 = "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0";
+ sha256 = "10a15bi4lyfi0k0haj0klqambicwma6yi7vssgbz8prg815vja8r";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix
index 7e73494088..d15844e682 100644
--- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bazarr";
- version = "0.9.5";
+ version = "0.9.6";
src = fetchurl {
url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
- sha256 = "sha256-N0HoZgAtWPgYPU9OWpMEXO2qUoNIGCsFn9vll0hLal0=";
+ sha256 = "sha256-aO9PIE/YlSIGEcntDCdxIYuuvV5jG266ldhC2QfT+e4=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/code-server/default.nix b/third_party/nixpkgs/pkgs/servers/code-server/default.nix
index 8370dfb16a..039f057856 100644
--- a/third_party/nixpkgs/pkgs/servers/code-server/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/code-server/default.nix
@@ -46,7 +46,6 @@ in stdenv.mkDerivation rec {
yarnCache = stdenv.mkDerivation {
name = "${pname}-${version}-${system}-yarn-cache";
inherit src;
- phases = ["unpackPhase" "buildPhase"];
nativeBuildInputs = [ yarn' git ];
buildPhase = ''
export HOME=$PWD
diff --git a/third_party/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix b/third_party/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix
index e65021599a..8128ec6f04 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/doh-proxy/default.nix
@@ -10,7 +10,7 @@ buildPythonApplication rec {
sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp";
};
- nativeBuildInputs = [ pytestrunner flake8];
+ nativeBuildInputs = [ pytest-runner flake8];
propagatedBuildInputs = [
aioh2
@@ -22,7 +22,7 @@ buildPythonApplication rec {
asynctest
unittest-data-provider
pytest
- pytestcov
+ pytest-cov
pytest-aiohttp
];
diff --git a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix
index f8a9875914..c441771157 100644
--- a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix
@@ -5,11 +5,11 @@ let
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "5.7";
+ version = "5.9";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz";
- sha256 = "sha256-pUPOYqgJKntQZRRodcyYeFNLCdxKhT8sK1bi3jl6b0s=";
+ sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY=";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
index 0d6ae781b7..4e3d36c33c 100644
--- a/third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
+++ b/third_party/nixpkgs/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
@@ -1,7 +1,7 @@
-From 7ed6c641cc501246931721700b73f40dce7e8f4b Mon Sep 17 00:00:00 2001
+From 035709eeac697945a26276cc17b996c1a0678ddc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch
Date: Tue, 22 Dec 2020 15:38:56 +0100
-Subject: [PATCH 1/2] Define configs with env vars
+Subject: [PATCH] Define configs with env vars
---
app.php | 4 ++--
@@ -11,32 +11,32 @@ Subject: [PATCH 1/2] Define configs with env vars
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app.php b/app.php
-index 8176ebe..04432ba 100644
+index 17ba6a99..89f48089 100644
--- a/app.php
+++ b/app.php
-@@ -10,7 +10,7 @@ use Slim\Factory\AppFactory;
+@@ -11,7 +11,7 @@ use Slim\Views\Blade;
require_once __DIR__ . '/vendor/autoload.php';
// Load config files
-require_once GROCY_DATAPATH . '/config.php';
+require_once getenv('GROCY_CONFIG_FILE');
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
+ require_once __DIR__ . '/helpers/ConfigurationValidator.php';
- // Definitions for dev/demo/prerelease mode
-@@ -37,7 +37,7 @@ $app = AppFactory::create();
+@@ -62,7 +62,7 @@ $app = AppFactory::create();
$container = $app->getContainer();
$container->set('view', function (Container $container) {
-- return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
-+ return new Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
+- return new Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
++ return new Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
});
+
$container->set('UrlManager', function (Container $container) {
- return new UrlManager(GROCY_BASE_URL);
diff --git a/services/DatabaseService.php b/services/DatabaseService.php
-index d1080b0..8bc4ee1 100644
+index dfcd5d4b..bc8d1a1d 100644
--- a/services/DatabaseService.php
+++ b/services/DatabaseService.php
-@@ -105,6 +105,6 @@ class DatabaseService
+@@ -107,6 +107,6 @@ class DatabaseService
return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';
}
@@ -45,23 +45,23 @@ index d1080b0..8bc4ee1 100644
}
}
diff --git a/services/FilesService.php b/services/FilesService.php
-index 8c1483e..8f74b4b 100644
+index 7d070350..fba2e923 100644
--- a/services/FilesService.php
+++ b/services/FilesService.php
-@@ -70,7 +70,7 @@ class FilesService extends BaseService
- {
- parent::__construct();
+@@ -103,7 +103,7 @@ class FilesService extends BaseService
-- $this->StoragePath = GROCY_DATAPATH . '/storage';
+ public function GetFilePath($group, $fileName)
+ {
+- $groupFolderPath = $this->StoragePath . '/' . $group;
+ $this->StoragePath = getenv('GROCY_STORAGE_DIR');
- if (!file_exists($this->StoragePath))
+ if (!file_exists($groupFolderPath))
{
diff --git a/services/StockService.php b/services/StockService.php
-index 4741b4b..6d4e748 100644
+index f73ac5bd..6b6e693a 100644
--- a/services/StockService.php
+++ b/services/StockService.php
-@@ -1374,8 +1374,7 @@ class StockService extends BaseService
+@@ -1589,8 +1589,7 @@ class StockService extends BaseService
throw new \Exception('No barcode lookup plugin defined');
}
@@ -72,5 +72,5 @@ index 4741b4b..6d4e748 100644
{
require_once $path;
--
-2.29.2
+2.31.1
diff --git a/third_party/nixpkgs/pkgs/servers/grocy/default.nix b/third_party/nixpkgs/pkgs/servers/grocy/default.nix
index bd9a02f7b9..96c7cbbdf7 100644
--- a/third_party/nixpkgs/pkgs/servers/grocy/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/grocy/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "grocy";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchurl {
url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
- sha256 = "sha256-Yjxv0LcLNtpYs4ntBano9NUxwdWgF5etA/M6hUVzOa8=";
+ sha256 = "sha256-ohviTI2np6z+SjV2CDScouI8Lh2Ru4+CE00KlgT40i8=";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix
index 8b9380c6ba..bece609fc4 100644
--- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "headscale";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
- sha256 = "0nf2l8l23wzn3l3x4698rfr3g6lkx5qfzsbfl0rv25q1pqgybdzj";
+ sha256 = "sha256-O8PJrowP9iDK4sQXHNi1eo44X/tRc7nyKZgJUB6fKC4=";
};
vendorSha256 = "sha256-0Lqr/tWk31S01vi21sG2gtlGouOhecL4u8ScKG0nWLo=";
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch b/third_party/nixpkgs/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch
new file mode 100644
index 0000000000..add0ea1d55
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch
@@ -0,0 +1,27 @@
+From 3e3f5c37252a33ea1e71c39f2ca0f13940c261ad Mon Sep 17 00:00:00 2001
+From: Martin Weinelt
+Date: Sat, 17 Jul 2021 16:11:23 +0200
+Subject: [PATCH] tests: ignore OSErrors in hass fixture
+
+The nix sandbox will cause OSErrors due to limitations imposed on
+network interaction. This change makes it so we forgive these cases.
+---
+ tests/conftest.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 1f5ffc80d0..b284727a0f 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -168,6 +168,8 @@ def hass(loop, load_registries, hass_storage, request):
+ continue
+ if isinstance(ex, ServiceNotFound):
+ continue
++ if isinstance(ex, OSError):
++ continue
+ raise ex
+
+
+--
+2.32.0
+
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index 123984e66a..cb74e1cecb 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2021.6.6";
+ version = "2021.7.4";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@@ -27,6 +27,7 @@
"almond" = ps: with ps; [ aiohttp-cors pyalmond ];
"alpha_vantage" = ps: with ps; [ alpha-vantage ];
"amazon_polly" = ps: with ps; [ boto3 ];
+ "ambee" = ps: with ps; [ ambee ];
"ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ];
"ambient_station" = ps: with ps; [ aioambient ];
"amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
@@ -90,7 +91,7 @@
"blueprint" = ps: with ps; [ ];
"bluesound" = ps: with ps; [ xmltodict ];
"bluetooth_le_tracker" = ps: with ps; [ pygatt ];
- "bluetooth_tracker" = ps: with ps; [ bt_proximity pybluez ];
+ "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ];
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
@@ -157,7 +158,7 @@
"deconz" = ps: with ps; [ pydeconz ];
"decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
- "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa home-assistant-frontend ifaddr netdisco pillow scapy sqlalchemy zeroconf ];
+ "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa home-assistant-frontend ifaddr pillow scapy sqlalchemy zeroconf ];
"delijn" = ps: with ps; [ pydelijn ];
"deluge" = ps: with ps; [ deluge-client ];
"demo" = ps: with ps; [ aiohttp-cors ];
@@ -176,7 +177,7 @@
"digital_ocean" = ps: with ps; [ digital-ocean ];
"digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower
"directv" = ps: with ps; [ directv ];
- "discogs" = ps: with ps; [ discogs_client ];
+ "discogs" = ps: with ps; [ discogs-client ];
"discord" = ps: with ps; [ discordpy ];
"discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ];
"dlib_face_detect" = ps: with ps; [ face_recognition ];
@@ -276,6 +277,7 @@
"folder" = ps: with ps; [ ];
"folder_watcher" = ps: with ps; [ watchdog ];
"foobot" = ps: with ps; [ foobot-async ];
+ "forecast_solar" = ps: with ps; [ forecast-solar ];
"forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java
"fortios" = ps: with ps; [ fortiosapi ];
"foscam" = ps: with ps; [ libpyfoscam ];
@@ -283,7 +285,8 @@
"free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
"freebox" = ps: with ps; [ freebox-api ];
"freedns" = ps: with ps; [ ];
- "fritz" = ps: with ps; [ fritzconnection ];
+ "freedompro" = ps: with ps; [ pyfreedompro ];
+ "fritz" = ps: with ps; [ aiohttp-cors fritzconnection fritzprofiles ifaddr xmltodict ];
"fritzbox" = ps: with ps; [ pyfritzhome ];
"fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
"fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
@@ -520,6 +523,7 @@
"mochad" = ps: with ps; [ ]; # missing inputs: pymochad
"modbus" = ps: with ps; [ pymodbus ];
"modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem
+ "modern_forms" = ps: with ps; [ aiomodernforms ];
"mold_indicator" = ps: with ps; [ ];
"monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
"moon" = ps: with ps; [ ];
@@ -732,6 +736,7 @@
"scsgate" = ps: with ps; [ ]; # missing inputs: scsgate
"search" = ps: with ps; [ aiohttp-cors ];
"season" = ps: with ps; [ ephem ];
+ "select" = ps: with ps; [ ];
"sendgrid" = ps: with ps; [ sendgrid ];
"sense" = ps: with ps; [ sense-energy ];
"sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
@@ -742,7 +747,7 @@
"serial_pm" = ps: with ps; [ pmsensor ];
"sesame" = ps: with ps; [ ]; # missing inputs: pysesame2
"seven_segments" = ps: with ps; [ pillow ];
- "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track
+ "seventeentrack" = ps: with ps; [ py17track ];
"sharkiq" = ps: with ps; [ sharkiqpy ];
"shell_command" = ps: with ps; [ ];
"shelly" = ps: with ps; [ aioshelly ];
@@ -788,7 +793,7 @@
"somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ];
"sonarr" = ps: with ps; [ sonarr ];
"songpal" = ps: with ps; [ python-songpal ];
- "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
+ "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket pysonos zeroconf ];
"sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
"soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ];
"spaceapi" = ps: with ps; [ aiohttp-cors ];
@@ -800,7 +805,7 @@
"sql" = ps: with ps; [ sqlalchemy ];
"squeezebox" = ps: with ps; [ pysqueezebox ];
"srp_energy" = ps: with ps; [ srpenergy ];
- "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr netdisco zeroconf ];
+ "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ];
"starline" = ps: with ps; [ starline ];
"starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
"startca" = ps: with ps; [ xmltodict ];
@@ -907,7 +912,7 @@
"upc_connect" = ps: with ps; [ connect-box ];
"upcloud" = ps: with ps; [ upcloud-api ];
"updater" = ps: with ps; [ distro ];
- "upnp" = ps: with ps; [ async-upnp-client ];
+ "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ];
"uptime" = ps: with ps; [ ];
"uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot
"uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus
@@ -972,13 +977,13 @@
"xeoma" = ps: with ps; [ pyxeoma ];
"xiaomi" = ps: with ps; [ ha-ffmpeg ];
"xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors ifaddr netdisco zeroconf ];
- "xiaomi_miio" = ps: with ps; [ construct python-miio ];
+ "xiaomi_miio" = ps: with ps; [ construct micloud python-miio ];
"xiaomi_tv" = ps: with ps; [ pymitv ];
"xmpp" = ps: with ps; [ slixmpp ];
"xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client
"yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ];
"yamaha" = ps: with ps; [ rxv ];
- "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast
+ "yamaha_musiccast" = ps: with ps; [ aiomusiccast ];
"yandex_transport" = ps: with ps; [ aioymaps ];
"yandextts" = ps: with ps; [ ];
"yeelight" = ps: with ps; [ yeelight ];
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
index c9a4a15a87..5601a6c0cd 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
@@ -22,19 +22,7 @@
let
defaultOverrides = [
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
-
- # Pinned due to API changes in aiopvpc>=2.2.0, remove after 2021.7.0
- (self: super: {
- aiopvpc = super.aiopvpc.overridePythonAttrs (oldAttr: rec {
- version = "2.1.2";
- src = fetchFromGitHub {
- owner = "azogue";
- repo = "aiopvpc";
- rev = "v${version}";
- sha256 = "0s8ki46dh39kw6qvsjcfcxa0gblyi33m3hry137kbi4lw5ws6qhr";
- };
- });
- })
+ (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270")
# Pinned due to API changes in iaqualink>=2.0, remove after
# https://github.com/home-assistant/core/pull/48137 was merged
@@ -70,32 +58,6 @@ let
(mkOverride "ring-doorbell" "0.6.2"
"fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560")
- # Pinned due to API changes in pyatmo>=5.1.0
- (self: super: {
- pyatmo = super.pyatmo.overridePythonAttrs (oldAttrs: rec {
- version = "5.0.1";
- src = fetchFromGitHub {
- owner = "jabesq";
- repo = "pyatmo";
- rev = "v${version}";
- sha256 = "0can9v602iqfn0l01fd7gr63qzvcngfm0qka4s1x0pldh6avxmfh";
- };
- });
- })
-
- # Pinned due to API changes in pyatv>=0.8.0
- (self: super: {
- pyatv = super.pyatv.overridePythonAttrs (olAttrs: rec {
- version = "0.7.7";
- src = fetchFromGitHub {
- owner = "postlund";
- repo = "pyatv";
- rev = "v${version}";
- sha256 = "sha256-dPnh8XZN7ZVR2rYNnj7GSYXW5I2GNQwD/KRDTgs2AtI=";
- };
- });
- })
-
# Pinned due to API changes in pyflunearyou>=2.0
(self: super: {
pyflunearyou = super.pyflunearyou.overridePythonAttrs (oldAttrs: rec {
@@ -149,8 +111,6 @@ let
});
})
- (mkOverride "pysma" "0.4.3" "sha256-vriMnJFS7yfTyDT1f4sx1xEBTQjqc4ZHmkdHp1vcd+Q=")
-
# Pinned due to API changes in eebrightbox>=0.0.5
(self: super: {
eebrightbox = super.eebrightbox.overridePythonAttrs (oldAttrs: rec {
@@ -197,7 +157,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2021.6.6";
+ hassVersion = "2021.7.4";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -214,11 +174,12 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "0r8l2qya9pdl65kq3xrnb1vhmbnxm3bj12hn1wyxmw56l8m9l5d5";
+ sha256 = "1y6p3hg487ishar1r8vir5cxfbaw4c86s5w3zn9bmbf6jbd51pyk";
};
# leave this in, so users don't have to constantly update their downstream patch handling
patches = [
+ ./0001-tests-ignore-OSErrors-in-hass-fixture.patch
];
postPatch = ''
@@ -673,7 +634,8 @@ in with py.pkgs; buildPythonApplication rec {
"somfy_mylink"
"sonarr"
"songpal"
- "sonos"
+ # disable sonos components test because they rely on ssdp, which doesn't work in our sandbox
+ # "sonos"
"soundtouch"
"spaceapi"
"speedtestdotnet"
@@ -735,7 +697,8 @@ in with py.pkgs; buildPythonApplication rec {
"upb"
"upcloud"
"updater"
- "upnp"
+ # disabled, because it tries to join a multicast group and fails to find a usable network interface
+ # "upnp"
"uptime"
"usgs_earthquakes_feed"
"utility_meter"
@@ -751,7 +714,8 @@ in with py.pkgs; buildPythonApplication rec {
"vizio"
"voicerss"
"volumio"
- "vultr"
+ # disabled, becaused AttributeError: does not have the attribute 'server_list'
+ # "vultr"
"wake_on_lan"
"wallbox"
"water_heater"
@@ -776,7 +740,8 @@ in with py.pkgs; buildPythonApplication rec {
"yandex_transport"
"yandextts"
"yeelight"
- "zeroconf"
+ # disabled, because it tries to join a multicast group and fails to find a usable network interface
+ # "zeroconf"
"zerproc"
"zha"
"zodiac"
@@ -826,6 +791,8 @@ in with py.pkgs; buildPythonApplication rec {
# wallbox/test_config_flow.py: Tries to connect to api.wall-box.cim: Failed to establish a new connection: [Errno -2] Name or service not known
"--deselect tests/components/wallbox/test_config_flow.py::test_form_invalid_auth"
"--deselect tests/components/wallbox/test_config_flow.py::test_form_cannot_connect"
+ # tests/components/default_config/test_init.py: Tries to check for updates and fails ungracefully without network access
+ "--deselect tests/components/default_config/test_init.py::test_setup"
# tests are located in tests/
"tests"
# dynamically add packages required for component tests
@@ -861,6 +828,10 @@ in with py.pkgs; buildPythonApplication rec {
"test_onboarding_core_no_rpi_power"
# hue/test_sensor_base.py: Race condition when counting events
"test_hue_events"
+ # homekit/test_homekit.py: Tries to use zeroconf, which tries to join a multicast group
+ "test_homekit_uses_system_zeroconf"
+ # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked'
+ "test_lock_update_via_pubnub"
];
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix
index f59f3943cd..a42b13a260 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20210603.0";
+ version = "20210707.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-2UhbtaxEcOkD9Z5g9gZs+QjuVLXZGCEcmKoxRtIEYxw=";
+ sha256 = "sha256-6RR+T4+vS6g00+MS1ty8aFVx6WM2dE+c17+wDoPxnGg=";
};
# there is nothing to strip in this package
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh b/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh
index 5ed865f411..8b17dabdfe 100755
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh
@@ -23,10 +23,16 @@ sed -i -e "s/version =.*/version = \"${TARGET_VERSION}\";/" \
sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \
default.nix
-./parse-requirements.py
(
+ # update the frontend before running parse-requirements, so it doesn't get shown as outdated
cd ../../..
nix-update --version "$FRONTEND_VERSION" home-assistant.python.pkgs.home-assistant-frontend
+)
+
+./parse-requirements.py
+
+(
+ cd ../../..
nix-update --version "$TARGET_VERSION" --build home-assistant
)
diff --git a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix
index ea6cd9ae04..594085d422 100644
--- a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix
@@ -4,6 +4,7 @@
, cairo
, fetchurl
, flac
+, gcc11
, gnome
, gssdp
, gupnp
@@ -16,13 +17,11 @@
stdenv.mkDerivation rec {
pname = "hqplayerd";
- version = "4.24.1-62";
+ version = "4.24.2-63";
src = fetchurl {
- # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
- # c.f. https://github.com/NixOS/nixpkgs/pull/111616
- url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm";
- sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs=";
+ url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm";
+ sha256 = "sha256-6JUgHDO+S73n/IVQhkmC0Nw4GQVzTLtiBbz/wZiflRg=";
};
unpackPhase = ''
@@ -35,6 +34,7 @@ stdenv.mkDerivation rec {
alsa-lib
cairo
flac
+ gcc11.cc.lib
gnome.rygel
gssdp
gupnp
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
# misc service support files
mkdir -p $out/var/lib/hqplayerd
- cp -r ./var/hqplayer/web $out/var/lib/hqplayerd
+ cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer
runHook postInstall
'';
diff --git a/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix b/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix
index 5baba23102..4f26610e10 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "2014-06-29-1";
pname = "nix-binary-cache";
- phases = ["installPhase"];
+ dontUnpack = true;
installPhase = ''
mkdir -p "$out/bin"
diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix
index 4ce0d63f6b..04be8c6359 100644
--- a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix
@@ -2,7 +2,6 @@
, lib
, fakeroot
, fetchurl
-, fetchpatch
, libfaketime
, substituteAll
## runtime dependencies
@@ -70,11 +69,7 @@ stdenv.mkDerivation {
};
patches = [
# adjust configure check to work with libtiff > 4.1
- (fetchpatch {
- name = "libtiff-4.2.patch";
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch?id=82e3eefd5447f36e5bb00068a54b91d8c891ccf6";
- sha256 = "0hhf4wpgj842gz4nxq8s55vnzmciqkyjjaaxdpqawns2746vx0sw";
- })
+ ./libtiff-4.patch
];
# Note that `configure` (and maybe `faxsetup`) are looking
# for a couple of standard binaries in the `PATH` and
diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch b/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch
new file mode 100644
index 0000000000..daf7b4f7d0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/706154
+--- a/configure
++++ b/configure
+@@ -2583,7 +2583,7 @@ EOF
+ echo '#define TIFFSTRIPBYTECOUNTS uint32'
+ echo '#define TIFFVERSION TIFF_VERSION'
+ echo '#define TIFFHEADER TIFFHeader';;
+- 4.[01]) tiff_runlen_t="uint32"
++ 4.[0-9]) tiff_runlen_t="uint32"
+ tiff_offset_t="uint64"
+ echo '#define TIFFSTRIPBYTECOUNTS uint64'
+ echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix
index 601e93a998..fc099e905e 100644
--- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix
@@ -3,12 +3,12 @@
buildGoModule rec {
pname = "imgproxy";
- version = "2.16.6";
+ version = "2.16.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- sha256 = "sha256-wrd8G2y8oepaHMJaU4Bcvkf91ABX4ZapQSlztq4Gg84=";
+ sha256 = "sha256-7UGIkYChXIht/dyMhvPeu8oeGQEA7/Ns7+e56wEmAwQ=";
rev = "v${version}";
};
diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
index 341c913048..a324dcb58b 100644
--- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.18.372";
+ version = "0.18.455";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "sha256-GkAKYxa5F0N9jg9TZrwt3hjkhybZTKU2Ia/gIxBRGuo=";
+ sha256 = "sha256-qEuhgtDtdMCHJtUcUDUmKI8FT0ti7veleI7UhwTAUfE=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix b/third_party/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix
index 28c54fc0fa..76b9229940 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mail/system-sendmail/default.nix
@@ -20,7 +20,9 @@ stdenv.mkDerivation {
src = script;
- phases = [ "buildPhase" ];
+ dontUnpack = true;
+ dontInstall = true;
+
buildPhase = ''
mkdir -p $out/bin
< $src sed "s#{{MYPATH}}#$out/bin/sendmail#" > $out/bin/sendmail
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index c7894529e2..b2e61d5065 100644
--- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
@@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.38.0";
+ version = "1.38.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-k9/enFktixO4zvgBW3zw0COBakDP1PHVWAlbMi+FiWQ=";
+ sha256 = "sha256-bGKGzhuDjKaNbjXSwvidk9SrRmJsLQyLe5jps4DXN+s=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix
index c7dc3ecad5..76897d9282 100644
--- a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix
@@ -1,29 +1,17 @@
{ lib, python3, fetchFromGitHub }:
-let
- python = python3.override {
- packageOverrides = self: super: {
- mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
- version = "0.8.18";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "32daf7a7dcf5d4013b37321df7b319f36523f38884ccc3e2e965917d0a5c73c1";
- };
- });
- };
- };
-in python.pkgs.buildPythonPackage rec {
+python3.pkgs.buildPythonPackage rec {
pname = "mautrix-signal";
- version = "0.1.1";
+ version = "unstable-2021-07-01";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-signal";
- rev = "v${version}";
- sha256 = "11snsl7i407855h39g1fgk26hinnq0inr8sjrgd319li0d3jwzxl";
+ rev = "56eb24412fcafb4836f29375fba9cc6db1715d6f";
+ sha256 = "10nbfl48yb7h23znkxvkqh1dgp2xgldvxsigwfmwa1qbq0l4dljl";
};
- propagatedBuildInputs = with python.pkgs; [
+ propagatedBuildInputs = with python3.pkgs; [
CommonMark
aiohttp
asyncpg
@@ -53,7 +41,7 @@ in python.pkgs.buildPythonPackage rec {
" > $out/bin/mautrix-signal
chmod +x $out/bin/mautrix-signal
wrapProgram $out/bin/mautrix-signal \
- --set PATH ${python}/bin \
+ --set PATH ${python3}/bin \
--set PYTHONPATH "$PYTHONPATH"
'';
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix
index c772b76cf0..4c9d0437d7 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grafana-agent";
- version = "0.16.1";
+ version = "0.17.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "agent";
- sha256 = "0kqbn6fqlrxjqdkkhbr7qmm2m05a7dlskfdb7y4gr5ggi65m6ik5";
+ sha256 = "sha256-rHJGVQWbvgcvwPzt8e2uWs1n4bbaAZz6lQjyvmqmLZw=";
};
- vendorSha256 = "0xi69a1zkcmi5q8m7lfwp3xb4cbkwc2dzqm24lfqsq13xj5jq6ph";
+ vendorSha256 = "sha256-jA8M8ZdJWmrGRQb0W1duVV+XwxqJVQ/ek0Yhw6JZvX8=";
patches = [
# https://github.com/grafana/agent/issues/731
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
index 4fa0032500..2c8ba20f6d 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
@@ -2,23 +2,23 @@
buildGoModule rec {
pname = "grafana";
- version = "8.0.5";
+ version = "8.0.6";
- excludedPackages = [ "release_publisher" ];
+ excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\)";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "sha256-tehqb86Mkg1dD4x34zHwLD9uV/PssslLDIs9bl28ap0=";
+ sha256 = "sha256-incw/Uv1Jeg/WAkWUgJGvdJ2OpZYfkCAvgLW/qXWXEo=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "sha256-aVZpTQ4ERrJV3YN4U0v/tJoYkTg7vlQVe6sIIK2NE0k=";
+ sha256 = "sha256-JSpNAi9NvZpo0HzdDmdi1i+lNGLylHgctT6PPWHNhkk=";
};
- vendorSha256 = "sha256-INvFZ9hNbtpaDXuhBPaSaqBZyi7QJ18tMk+AZjJtYjg=";
+ vendorSha256 = "sha256-72i2NgulRpdBZ9dwx+0VlKDzzNnBJgEKKizrLPwzUY4=";
preBuild = ''
# The testcase makes an API call against grafana.com:
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix
index 85b4c7069a..0ef2149759 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix
@@ -2,8 +2,8 @@
grafanaPlugin rec {
pname = "grafana-polystat-panel";
- version = "1.2.5";
- zipHash = "sha256-U9vNfK4ofNzwL7MVe43tGY85gI56Jt1eb7TrCkeNrOQ=";
+ version = "1.2.6";
+ zipHash = "sha256-gbMD2o8A2YYZzkpYiXNkv8Oj958RP47fL6DXj1SBYF0=";
meta = with lib; {
description = "Hexagonal multi-stat panel for Grafana";
license = licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
index b87817af43..f4ad8a8e7b 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,4 +1,10 @@
-{ stdenv, lib, go, buildGoModule, fetchFromGitHub, mkYarnPackage, nixosTests
+{ stdenv
+, lib
+, go
+, buildGoModule
+, fetchFromGitHub
+, mkYarnPackage
+, nixosTests
, fetchpatch
}:
@@ -27,7 +33,8 @@ let
installPhase = "mv build $out";
distPhase = "true";
};
-in buildGoModule rec {
+in
+buildGoModule rec {
pname = "prometheus";
inherit src version;
@@ -41,19 +48,21 @@ in buildGoModule rec {
'';
buildFlags = "-tags=builtinassets";
- buildFlagsArray = let
- t = "${goPackagePath}/vendor/github.com/prometheus/common/version";
- in [
- ''
- -ldflags=
- -X ${t}.Version=${version}
- -X ${t}.Revision=unknown
- -X ${t}.Branch=unknown
- -X ${t}.BuildUser=nix@nixpkgs
- -X ${t}.BuildDate=unknown
- -X ${t}.GoVersion=${lib.getVersion go}
- ''
- ];
+ buildFlagsArray =
+ let
+ t = "${goPackagePath}/vendor/github.com/prometheus/common/version";
+ in
+ [
+ ''
+ -ldflags=
+ -X ${t}.Version=${version}
+ -X ${t}.Revision=unknown
+ -X ${t}.Branch=unknown
+ -X ${t}.BuildUser=nix@nixpkgs
+ -X ${t}.BuildDate=unknown
+ -X ${t}.GoVersion=${lib.getVersion go}
+ ''
+ ];
# only run this in the real build, not during the vendor build
# this should probably be fixed in buildGoModule
@@ -67,7 +76,8 @@ in buildGoModule rec {
cp -a $src/console_libraries $src/consoles $out/etc/prometheus
'';
- doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1
+ # doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1
+ doCheck = false;
passthru.tests = { inherit (nixosTests) prometheus; };
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix
index 3aabe6e723..a439c84bca 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "openldap_exporter";
- version = "2.1";
+ version = "2.1.4";
src = fetchFromGitHub {
owner = "tomcz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Di1GiyVp/hGCFhqxhlqJSucGZK7f/FDDUFtJRaiAZu4=";
+ sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4=";
};
buildFlagsArray = ''
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/seyren/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/seyren/default.nix
index 4dd90cacb8..a94de966e4 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/seyren/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/seyren/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1fixij04n8hgmaj8kw8i6vclwyd6n94x0n6ify73ynm6dfv8g37x";
};
- phases = ["installPhase"];
+ dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix
index 14061974a9..77eae32e27 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "redis";
- version = "6.2.4";
+ version = "6.2.5";
src = fetchurl {
url = "https://download.redis.io/releases/${pname}-${version}.tar.gz";
- sha256 = "0vp1d9mlfsppry3nsj9f7bmh9wjgsy3jggp24sac1hhgl43c8cms";
+ sha256 = "1bjismh8lrvsjkm1wf5ak0igak5rr9cc39i0brwb6x0vk9q7b6jb";
};
# Cross-compiling fixes
diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix
index ff676b2776..1d527fb203 100644
--- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix
+++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix
@@ -12,24 +12,22 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.23.4.4805-186bae04e";
+ version = "1.23.5.4841-549599676";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
- sha256 = "161baz4klwb8wyvc3mnbvvwjcmdfp38rn270jwvmwzp6b70jclyx";
+ sha256 = "168aill68fcq3cv3a78yhqnfxziww8r80is179y9jxmhymnmzp9q";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
- sha256 = "0vj7k81fl8chaxqz287arvn9vva4cd4wcnybc5yvls3589h9x1zq";
+ sha256 = "0cp2likx2dqy6j5icp5n07kg1md9qvq9vsh4818m86r2p015qlvb";
};
outputs = [ "out" "basedb" ];
nativeBuildInputs = [ dpkg ];
- phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ];
-
unpackPhase = ''
dpkg-deb -R $src .
'';
@@ -90,6 +88,7 @@ stdenv.mkDerivation rec {
pjones
thoughtpolice
maxeaubrey
+ MayNiklas
];
description = "Media library streaming server";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix b/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix
index b0902feeea..d4ab51ce84 100644
--- a/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix
+++ b/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
];
checkInputs = with python3.pkgs; [
- pytestrunner
+ pytest-runner
pytest
];
diff --git a/third_party/nixpkgs/pkgs/servers/serviio/default.nix b/third_party/nixpkgs/pkgs/servers/serviio/default.nix
index f3c8fc2311..29c223a347 100644
--- a/third_party/nixpkgs/pkgs/servers/serviio/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/serviio/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0mxpdyhjf4w83q8ssmvpxm95hw4x7lfkh48vvdablccfndh82x2i";
};
- phases = ["unpackPhase" "installPhase"];
-
installPhase = ''
mkdir -p $out
cp -R config legal lib library plugins LICENCE.txt NOTICE.txt README.txt RELEASE_NOTES.txt $out
diff --git a/third_party/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix b/third_party/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix
index 01a9d5fa2e..36fba217e0 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/sqlite/jdbc/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "1xk5fi2wzq3jspvbdm5hvs78501i14jy3v7x6fjnh5fnpqdacpd4";
};
- phases = [ "installPhase" ];
-
installPhase = ''
install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar"
'';
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix
index bf408551a4..2cdd33a245 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix
@@ -26,12 +26,15 @@ let
mixFodDeps = beamPackages.fetchMixDeps {
pname = "${pname}-deps";
inherit src version;
- sha256 = "18h3hs69nw06msvs3nnymf6p94qd3x1f4d2zawqriy9fr5fz7zx6";
+ sha256 = "1x0if0ifk272vcqjlgf097pxsw13bhwy8vs0b89l0bssx1bzygsi";
# We need ecto 3.6 as this version checks whether the database exists before
# trying to create it. The creation attempt would always require super-user privileges
# and since 3.6 this isn't the case anymore.
- patches = [ ./ecto_sql-fix.patch ];
+ patches = [
+ ./ecto_sql-fix.patch
+ ./plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch
+ ];
};
yarnDeps = mkYarnModules {
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch
new file mode 100644
index 0000000000..b8aa7319a2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch
@@ -0,0 +1,26 @@
+From 127a77882879e5cdf32d908ee3b1b6cbdc9e482e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?=
+Date: Wed, 14 Jul 2021 01:20:29 +0200
+Subject: [PATCH] Bump `clickhouse_ecto` dependency to be compatible with ecto
+ 3.6
+
+---
+ mix.lock | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mix.lock b/mix.lock
+index ecae8ac..d42af1e 100644
+--- a/mix.lock
++++ b/mix.lock
+@@ -12,7 +12,7 @@
+ "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
+ "cachex": {:hex, :cachex, "3.3.0", "6f2ebb8f27491fe39121bd207c78badc499214d76c695658b19d6079beeca5c2", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "d90e5ee1dde14cef33f6b187af4335b88748b72b30c038969176cd4e6ccc31a1"},
+ "certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"},
+- "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "b30ccc93a4101a25ff0bba92113e18d8a9a8b28e", []},
++ "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "1969f14ecef7c357b2bd8bdc3e566234269de58c", []},
+ "clickhousex": {:git, "https://github.com/plausible/clickhousex", "0832dd4b1af1f0eba1d1018c231bf0d8d281f031", []},
+ "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
+ "comeonin": {:hex, :comeonin, "5.3.2", "5c2f893d05c56ae3f5e24c1b983c2d5dfb88c6d979c9287a76a7feb1e1d8d646", [:mix], [], "hexpm", "d0993402844c49539aeadb3fe46a3c9bd190f1ecf86b6f9ebd71957534c95f04"},
+--
+2.31.1
+
diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
index bf0b7472c5..bec5940410 100644
--- a/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
@@ -52,8 +52,6 @@ in stdenv.mkDerivation rec {
makeFlags = [ "deps" ];
- phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
-
installPhase = ''
for i in deps/*; do
( cd $i
diff --git a/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix b/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix
index d5bf7b9101..becd765fd8 100644
--- a/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
- phases = ["unpackPhase" "installPhase"];
-
installPhase = ''
runHook preInstall
mkdir -p $out
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix
index 1ce3cb452b..d84c1816fe 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3, groff, less, fetchFromGitHub }:
+{ lib, python3, groff, less, fetchFromGitHub, fetchpatch }:
let
py = python3.override {
packageOverrides = self: super: {
@@ -33,6 +33,13 @@ with py.pkgs; buildPythonApplication rec {
sha256 = "sha256-LU9Tqzdi8ULZ5y3FbfSXdrip4NcxFkXRCTpVGo05LcM=";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/mgorny/aws-cli/commit/85361123d2fa12eaedf912c046ffe39aebdd2bad.patch";
+ sha256 = "sha256-1Rb+/CY7ze1/DbJ6TfqHF01cfI2vixZ1dT91bmHTg/A=";
+ })
+ ];
+
postPatch = ''
substituteInPlace setup.py \
--replace "awscrt==0.11.13" "awscrt" \
diff --git a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix
index 48851c3784..ee2efb206a 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "docker-credential-gcr";
- version = "2.0.4";
+ version = "2.0.5";
goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "GoogleCloudPlatform";
repo = "docker-credential-gcr";
rev = "v${version}";
- sha256 = "sha256-yG8gpsD1KZBSbJnnNTXgZah/mcrOUH1O37s7AGpeHjQ=";
+ sha256 = "sha256-WrcGTXy5SMWDHJWddXUuvUvEWjOsJcoB1zBg02p5ggY=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
index 0bfedc2f03..6a28e18c7d 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.56.0";
+ version = "0.57.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "sha256-Wa6uvoAsPuswcrPgkLb8qTDEbUyeSeRSIO5t9z5/dqY=";
+ sha256 = "sha256-5Y//OD/UsqDnM8MPVJghrc5SbVwBEG/Eu761QWy5xK8=";
};
- vendorSha256 = "sha256-N2jdaz0lb4Ut8P+FgNNjgyUeJ731fTQ5XSQgOF8KCQs=";
+ vendorSha256 = "sha256-CQ7A4vwUrshKRZBdIJZlCXmcxS0O0CkE1tNkZskYu1E=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix
index 1711792ab2..65ca85b463 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
cached-property
- ConfigArgParse
+ configargparse
pyparsing
jinja2
nose
diff --git a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix
index 6c105cf9b3..c183e37414 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix
@@ -65,8 +65,8 @@ buildPythonApplication rec {
checkInputs = [
mock
pytest
- pytestcov
- pytest_xdist
+ pytest-cov
+ pytest-xdist
vcrpy
];
diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix
index e86bfb3110..0578bb4703 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
- version = "0.11.8";
+ version = "0.11.9";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZeCTUoi2HAMUeyze7LdxH0mi1Dd6q8Sw6+xPAVf3HTs=";
+ sha256 = "sha256-zqRjMCyFT7knI1/zH+RF1pA/OKaDhJZLLjWJhfmqopE=";
};
- cargoSha256 = "sha256-8myay5y4PGb/8s0vPLeg9xt6xqAQxGFXJz/GiV0ABlA=";
+ cargoSha256 = "sha256-W/ZMDbHC1VsllTSxCt77n4eb8Xgfj9YNx5NG5u+D+qA=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix
index 25d3eaa15f..31cb2861f3 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/salt/pepper/default.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = with python3Packages; [ setuptools setuptools-scm salt ];
checkInputs = with python3Packages; [
- pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado
+ pytest mock pyzmq pytest-rerunfailures pytest-cov cherrypy tornado
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix
index f69909d854..50ca76f0d6 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "trivy";
- version = "0.19.1";
+ version = "0.19.2";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oiaH0w7TEztR1i0wBuXXr+JN37UZOQ/zObBzQQvAnZY=";
+ sha256 = "sha256-aYPG0xvuijASKXBGgB+6UyF9bmeU8l5snOoPWI8Ewh8=";
};
- vendorSha256 = "sha256-bIQSZ+QQ0CnyOQ692Wpy4nXIPDSkD3LmnjwHZRG6soY=";
+ vendorSha256 = "sha256-4FO6/1eNyxy/CH7XMUkLfRqEg2+XUXL1gKleL6o4EoM=";
excludedPackages = "misc";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/virtscreen/default.nix b/third_party/nixpkgs/pkgs/tools/admin/virtscreen/default.nix
index ebfd6c2177..a1558248f8 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/virtscreen/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/virtscreen/default.nix
@@ -1,4 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, python3Packages
+, x11vnc
+, xrandr
+, libGL
+, qt5
+}:
python3Packages.buildPythonApplication rec {
pname = "virtscreen";
@@ -16,6 +24,8 @@ python3Packages.buildPythonApplication rec {
sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08";
};
+ nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+
propagatedBuildInputs = with python3Packages; [
netifaces
pyqt5
@@ -24,10 +34,17 @@ python3Packages.buildPythonApplication rec {
xrandr
];
- postPatch = let
- ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
+ dontWrapQtApps = true;
+
+ makeWrapperArgs = [
+ "\${qtWrapperArgs[@]}"
+ # import Qt.labs.platform failed without this
+ "--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}"
+ ];
+
+ postPatch = ''
substituteInPlace virtscreen/__main__.py \
- --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \
+ --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/arj/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/arj/default.nix
new file mode 100644
index 0000000000..e09e390fa4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/archivers/arj/default.nix
@@ -0,0 +1,150 @@
+{stdenv, lib, fetchurl, fetchpatch, autoreconfHook}:
+
+stdenv.mkDerivation rec {
+ pname = "arj";
+ version = "3.10.22";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+ sha256 = "1nx7jqxwqkihhdmdbahhzqhjqshzw1jcsvwddmxrwrn8rjdlr7jq";
+ };
+
+ patches = [
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/001_arches_align.patch";
+ sha256 = "0i3qclm2mh98c04rqpx1r4qagd3wpxlkj7lvq0ddpkmr8bm0fh0m";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/002_no_remove_static_const.patch";
+ sha256 = "0zfjqmjsj0y1kfzxbp29v6nxq5qwgazhb9clqc544sm5zn0bdp8n";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/003_64_bit_clean.patch";
+ sha256 = "0mda9fkaqf2s1xl6vlbkbq20362h3is9dpml9kfmacpbifl4dx3n";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/004_parallel_build.patch";
+ sha256 = "0gam6k7jknzmbjlf1r6c9kjh5s5h76pd31v59cnaqiycwiy8z6q9";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/005_use_system_strnlen.patch";
+ sha256 = "0q0ypm8mdsxd0rl1k0id6fdx5m7mvqgwcla4r250cmc6zqzpib6d";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/006_use_safe_strcpy.patch";
+ sha256 = "1garad95s34cix3kd77lz37andrcnz19glzkfdnkjaq7ldvzwikc";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/hurd_no_fcntl_getlk.patch";
+ sha256 = "0b3hpn4qypimrw9ar2n4h24886sl6pmim4lb4ly1wqcq0f73arva";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security_format.patch";
+ sha256 = "0q67cvln55p38bm0xwd2cgppqmkp2nfar2pg1zj78f7ncn35lbvf";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/doc_refer_robert_k_jung.patch";
+ sha256 = "1wxdx0m6a9vdvjlaycwsissn75l1ni7grg8n6qmkynz2vrcvgzb1";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix.patch";
+ sha256 = "19ycp1rak7l6ql28m50v95ls621w3sl8agw5r5va73svkgh8hc3g";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_flags.patch";
+ sha256 = "1jw1y9i9lw1idgi4l9cycwsql1hcz1m4f3k2iybwsgx0acaw695q";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_strip.patch";
+ sha256 = "1b18khj6cxnjyqk2ycygwqlcs20hrsbf4h6bckl99dxnpbq5blxi";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_pie.patch";
+ sha256 = "1jqswxgc1plipblf055n9175fbanfi6fb67lnzk8dcvxjn227fs3";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/self_integrity_64bit.patch";
+ sha256 = "0s5zdq81a0f83hdg9hy6lqn3xvckx9y9r20awczm9mbf11vi01cb";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-afl.patch";
+ sha256 = "0yajcwpghij8wg21a0kkp3f9x7anz5m121jx2vnkyn04bvi9541a";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-dir.patch";
+ sha256 = "10lv3867k0wm2s0cyf40hkxfqbjaxm4aph5ivk2q2rjkracrn2y4";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-symlink.patch";
+ sha256 = "095pdfskxwh0jnyy31dpz10s2ppv8n7lvvn4q722y3g71d0c79qq";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/out-of-bounds-read.patch";
+ sha256 = "0ps9lqkbqzlhzr2bnr47sir431z1nywr7nagkmk42iki4d96v0jq";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/remove_build_date.patch";
+ sha256 = "1vjlfq6firxpj068l9acyqs77mfydn1rwgr2jmxgsy9mq0fw1dsc";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/reproducible_help_archive.patch";
+ sha256 = "0l3qi9f140pwc6fk8qdbxx4g9d8zlf45asimmr8wfpbi4pf59n8i";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_cross.patch";
+ sha256 = "1vb0vbh3jbxj192q47vg3f41l343ghcz2ypbrrm2bkbpwm5cl8qr";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/fix-time_t-usage.patch";
+ sha256 = "012c6pnf5y4jwn715kxn3vjy088rm905959j6yh8bslyx84qaijv";
+ })
+
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix_autoreconf.patch";
+ sha256 = "0yhxbdasnbqcg1nyx2379fpbr7fmdlv4n2nlxrv1z1vbc7rlvw9d";
+ })
+ ];
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ preAutoreconf = ''
+ cd gnu
+ '';
+
+ postConfigure = ''
+ cd ..
+ '';
+
+ meta = with lib; {
+ description = "Open-source implementation of the world-famous ARJ archiver";
+ longDescription = ''
+ This version of ARJ has been created with an intent to preserve maximum
+ compatibility and retain the feature set of the original ARJ archiver as
+ provided by ARJ Software, Inc.
+ '';
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.sander ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/lha/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/lha/default.nix
new file mode 100644
index 0000000000..f6b5c2bd13
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/archivers/lha/default.nix
@@ -0,0 +1,27 @@
+{stdenv, lib, fetchFromGitHub, autoreconfHook}:
+
+stdenv.mkDerivation {
+ pname = "lha";
+ version = "unstable-2021-01-07";
+
+ src = fetchFromGitHub {
+ owner = "jca02266";
+ repo = "lha";
+ rev = "03475355bc6311f7f816ea9a88fb34a0029d975b";
+ sha256 = "18w2x0g5yq89yxkxh1fmb05lz4hw7a3b4jmkk95gvh11mwbbr5lm";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ meta = with lib; {
+ description = "LHa is an archiver and compressor using the LZSS and Huffman encoding compression algorithms";
+ platforms = platforms.unix;
+ maintainers = [ maintainers.sander ];
+ # Some of the original LhA code has been rewritten and the current author
+ # considers adopting a "true" free and open source license for it.
+ # However, old code is still covered by the original LHa license, which is
+ # not a free software license (it has additional requirements on commercial
+ # use).
+ license = licenses.unfree;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
index 08f8e03885..b94d514e8e 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "abcm2ps";
- version = "8.14.11";
+ version = "8.14.12";
src = fetchFromGitHub {
owner = "leesavide";
repo = "abcm2ps";
rev = "v${version}";
- sha256 = "0lzzr2nkfg27gljcrdxkmli1wp08vap3vgxq1zgkv7f43rbm0qnw";
+ sha256 = "sha256-RELWtI+S2cbG7cXCehXymvWRdair28UaDZRVr5xt9Tk=";
};
configureFlags = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://moinejf.free.fr/";
- license = licenses.gpl3;
+ license = licenses.lgpl3Plus;
description = "A command line program which converts ABC to music sheet in PostScript or SVG format";
platforms = platforms.unix;
maintainers = [ maintainers.dotlambda ];
diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix
index c218aa7e4e..059174ae0a 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix
@@ -133,7 +133,7 @@ in pythonPackages.buildPythonApplication rec {
++ lib.optional enableAcoustid pythonPackages.pyacoustid
++ lib.optional enableBeatport pythonPackages.requests_oauthlib
++ lib.optional enableConvert ffmpeg
- ++ lib.optional enableDiscogs pythonPackages.discogs_client
+ ++ lib.optional enableDiscogs pythonPackages.discogs-client
++ lib.optional (enableFetchart
|| enableDeezer
|| enableEmbyupdate
@@ -175,7 +175,7 @@ in pythonPackages.buildPythonApplication rec {
# https://github.com/beetbox/beets/blob/v1.4.9/setup.py
pylast
mpd2
- discogs_client
+ discogs-client
pyxdg
];
diff --git a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix
index 76b7d1da59..770a64b841 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix
@@ -7,13 +7,13 @@ let
in
stdenv.mkDerivation rec {
pname = "discordchatexporter-cli";
- version = "2.28";
+ version = "2.29";
src = fetchFromGitHub {
owner = "tyrrrz";
repo = "discordchatexporter";
rev = version;
- sha256 = "1bcq8mwjr8635g8mkgbxnszk20hnwf0zk672glrxjqga6f6fnykg";
+ sha256 = "0hbhDlGEK2rxuCByW8RaT/0vne8Z+q0ZobCkW1FBoG8=";
};
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ];
diff --git a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix
index a7703f2ba2..9849e6c636 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix
@@ -1,8 +1,8 @@
{ fetchNuGet }: [
(fetchNuGet {
name = "CliFx";
- version = "2.0.4";
- sha256 = "1wwpjli4y2545yi6k17mvjqy994wl3wm6nngszk87rbdwhkbncaj";
+ version = "2.0.6";
+ sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6";
})
(fetchNuGet {
name = "Gress";
@@ -46,8 +46,13 @@
})
(fetchNuGet {
name = "Spectre.Console";
- version = "0.40.0";
- sha256 = "17bb31nsvfk7m337zwqcz4v6cvayhfx51ri4yrv5i8nbp7f4rpb1";
+ version = "0.41.0";
+ sha256 = "104vyzwbbq5m75dm31xk7ilvmik8hw1cj3bc301a8w6gq8i0fpk3";
+ })
+ (fetchNuGet {
+ name = "Superpower";
+ version = "2.3.0";
+ sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm";
})
(fetchNuGet {
name = "System.Memory";
diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix
index ab6b7d8122..bd8af80193 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchFromGitLab
, fetchpatch
-, python38
+, python3
, librsync
, ncftp
, gnupg
@@ -13,7 +13,7 @@
, gettext
}:
let
- pythonPackages = python38.pkgs;
+ pythonPackages = python3.pkgs;
inherit (lib.versions) majorMinor splitVersion;
majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v));
in
@@ -100,7 +100,7 @@ pythonPackages.buildPythonApplication rec {
mock
pexpect
pytest
- pytestrunner
+ pytest-runner
]);
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix b/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix
index c167ad1fa0..fa2f69bb3e 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix
@@ -1,5 +1,5 @@
{ buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest
-, pytestcov, pytestrunner, lib, stringcase
+, pytest-cov, pytest-runner, lib, stringcase
}:
buildPythonApplication rec {
@@ -15,11 +15,11 @@ buildPythonApplication rec {
hypothesis
mypy
pytest
- pytestcov
+ pytest-cov
];
buildInputs = [
- pytestrunner
+ pytest-runner
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix b/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix
index af0cbc4fe2..dfac5af098 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, fetchpatch
, staticOnly ? stdenv.hostPlatform.isStatic
}:
@@ -11,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "google";
repo = "brotli";
- rev = "v" + version;
+ rev = "v${version}";
sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c=";
};
@@ -24,8 +28,7 @@ stdenv.mkDerivation rec {
sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0=";
});
- cmakeFlags = []
- ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";
+ cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF";
outputs = [ "out" "dev" "lib" ];
@@ -36,13 +39,13 @@ stdenv.mkDerivation rec {
# This breaks on Darwin because our cmake hook tries to make a build folder
# and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
prePatch = ''
- rm BUILD
+ rm BUILD
- # Upstream fixed this reference to runtime-path after the release
- # and with this references g++ complains about invalid option -R
- sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in
- cat scripts/libbrotli*.pc.in
- '';
+ # Upstream fixed this reference to runtime-path after the release
+ # and with this references g++ complains about invalid option -R
+ sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in
+ cat scripts/libbrotli*.pc.in
+ '';
# Don't bother with "man" output for now,
# it currently only makes the manpages hard to use.
@@ -53,10 +56,8 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- inherit (src.meta) homepage;
-
+ homepage = "https://github.com/google/brotli";
description = "A generic-purpose lossless compression algorithm and tool";
-
longDescription =
'' Brotli is a generic-purpose lossless compression algorithm that
compresses data using a combination of a modern variant of the LZ77
@@ -69,7 +70,6 @@ stdenv.mkDerivation rec {
in the following internet draft:
http://www.ietf.org/id/draft-alakuijala-brotli
'';
-
license = licenses.mit;
maintainers = with maintainers; [ freezeboy ];
platforms = platforms.all;
diff --git a/third_party/nixpkgs/pkgs/tools/compression/bsc/default.nix b/third_party/nixpkgs/pkgs/tools/compression/bsc/default.nix
index ac0c0544f0..93b715f853 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/bsc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/bsc/default.nix
@@ -1,30 +1,31 @@
-{ lib, stdenv, fetchurl, openmp ? null }:
+{ lib, stdenv, fetchFromGitHub, openmp }:
stdenv.mkDerivation rec {
pname = "bsc";
version = "3.1.0";
- src = fetchurl {
- url = "https://github.com/IlyaGrebnov/libbsc/archive/${version}.tar.gz";
- sha256 = "01yhizaf6qjv1plyrx0fcib264maa5qwvgfvvid9rzlzj9fxjib6";
+ src = fetchFromGitHub {
+ owner = "IlyaGrebnov";
+ repo = "libbsc";
+ rev = version;
+ sha256 = "0c0jmirh9y23kyi1jnrm13sa3xsjn54jazfr84ag45pai279fciz";
};
enableParallelBuilding = true;
buildInputs = lib.optional stdenv.isDarwin openmp;
- prePatch = ''
+ postPatch = ''
substituteInPlace makefile \
--replace 'g++' '$(CXX)'
'';
- preInstall = ''
- makeFlagsArray+=("PREFIX=$out")
- '';
+ makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "High performance block-sorting data compression library";
homepage = "http://libbsc.com/";
+ maintainers = with maintainers; [ ];
# Later commits changed the licence to Apache2 (no release yet, though)
license = with licenses; [ lgpl3Plus ];
platforms = platforms.unix;
diff --git a/third_party/nixpkgs/pkgs/tools/compression/bsdiff/default.nix b/third_party/nixpkgs/pkgs/tools/compression/bsdiff/default.nix
index 8b5dfe919c..8f8818781a 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/bsdiff/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/bsdiff/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "4.3";
src = fetchurl {
- url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz";
+ url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz";
sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq";
};
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
cp bspatch.1 $out/share/man/man1
'';
- meta = {
+ meta = with lib; {
description = "An efficient binary diff/patch tool";
- homepage = "http://www.daemonology.net/bsdiff";
- license = lib.licenses.bsd2;
- platforms = lib.platforms.unix;
- maintainers = [ lib.maintainers.thoughtpolice ];
+ homepage = "https://www.daemonology.net/bsdiff/";
+ license = licenses.bsd2;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.thoughtpolice ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix b/third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix
index 07b6a5979a..0dd703035f 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/dejsonlz4/default.nix
@@ -1,28 +1,30 @@
{ lib, stdenv, fetchFromGitHub }:
+
stdenv.mkDerivation rec {
- pname = "dejsonlz4";
- version = "1.1";
- src = fetchFromGitHub {
- owner = "avih";
- repo = pname;
- rev = "v${version}";
- sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh";
- };
+ pname = "dejsonlz4";
+ version = "1.1";
- buildPhase = ''
- ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c
- '';
+ src = fetchFromGitHub {
+ owner = "avih";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh";
+ };
- installPhase = ''
- mkdir -p $out/bin/
- cp dejsonlz4 $out/bin/
- '';
+ buildPhase = ''
+ ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c
+ '';
- meta = with lib; {
- description = "Decompress Mozilla Firefox bookmarks backup files";
- homepage = "https://github.com/avih/dejsonlz4";
- license = licenses.bsd2;
- maintainers = with maintainers; [ mt-caret ];
- platforms = platforms.all;
- };
- }
+ installPhase = ''
+ mkdir -p $out/bin/
+ cp dejsonlz4 $out/bin/
+ '';
+
+ meta = with lib; {
+ description = "Decompress Mozilla Firefox bookmarks backup files";
+ homepage = "https://github.com/avih/dejsonlz4";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ mt-caret ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/gzrt/default.nix b/third_party/nixpkgs/pkgs/tools/compression/gzrt/default.nix
index 18efc1b64c..664c1eb785 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/gzrt/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/gzrt/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
- name = "gzrt-0.8";
+ pname = "gzrt";
+ version = "0.8";
src = fetchurl {
- url = "https://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz";
+ url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${version}.tar.gz";
sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh";
};
@@ -15,10 +16,11 @@ stdenv.mkDerivation rec {
cp gzrecover $out/bin
'';
- meta = {
+ meta = with lib; {
homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/";
description = "The gzip Recovery Toolkit";
- license = lib.licenses.gpl2Plus;
- platforms = lib.platforms.unix;
+ maintainers = with maintainers; [ ];
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/kzipmix/default.nix b/third_party/nixpkgs/pkgs/tools/compression/kzipmix/default.nix
index 73931f6bca..9072a24b7f 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/kzipmix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/kzipmix/default.nix
@@ -1,25 +1,26 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "kzipmix-20091108";
+stdenv.mkDerivation rec {
+ pname = "kzipmix";
+ version = "20200115";
src = fetchurl {
- url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz";
- sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph";
+ url = "http://static.jonof.id.au/dl/kenutils/kzipmix-${version}-linux.tar.gz";
+ sha256 = "sha256-ePgye0D6/ED53zx6xffLnYhkjed7SPU4BLOZQr9E3yA=";
};
installPhase = ''
mkdir -p $out/bin
- cp kzip zipmix $out/bin
+ cp amd64/{kzip,zipmix} $out/bin
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix
'';
- meta = {
+ meta = with lib; {
description = "A tool that aggressively optimizes the sizes of Zip archives";
- license = lib.licenses.unfree;
+ license = licenses.unfree;
homepage = "http://advsys.net/ken/utils.htm";
- maintainers = [ lib.maintainers.sander ];
+ maintainers = [ maintainers.sander ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lbzip2/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lbzip2/default.nix
index ad36ebb81d..6d4017ac62 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/lbzip2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/lbzip2/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }:
stdenv.mkDerivation rec {
+ pname = "lbzip2";
version = "2.5";
- name = "lbzip2-${version}";
src = fetchFromGitHub {
owner = "kjn";
repo = "lbzip2";
- sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8";
rev = "v${version}";
+ sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8";
};
buildInputs = [ gnulib perl ];
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lhasa/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lhasa/default.nix
index 77df84879b..4f1ba70283 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/lhasa/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/lhasa/default.nix
@@ -1,21 +1,24 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "lhasa";
+ version = "0.3.1";
-stdenv.mkDerivation {
- name = "lhasa-0.3.1";
src = fetchurl {
- url = "https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz";
+ url = "https://soulsphere.org/projects/lhasa/lhasa-${version}.tar.gz";
sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z";
};
- meta = {
+
+ meta = with lib; {
description = "Free Software replacement for the Unix LHA tool";
longDescription = ''
Lhasa is a Free Software replacement for the Unix LHA tool, for
decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for
the tool is a library, so that it can be reused for other purposes.
'';
- license = lib.licenses.isc;
+ license = licenses.isc;
homepage = "http://fragglet.github.io/lhasa";
- maintainers = with lib; [ maintainers.sander ];
- platforms = with lib.platforms; linux ++ darwin;
+ maintainers = [ maintainers.sander ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix
index 820389300e..02f62c3e3c 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix
@@ -1,8 +1,8 @@
-{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}:
+{ lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl }:
stdenv.mkDerivation rec {
- version = "0.641";
pname = "lrzip";
+ version = "0.641";
src = fetchurl {
url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz";
@@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
"--disable-asm"
];
- meta = {
+ meta = with lib; {
homepage = "http://ck.kolivas.org/apps/lrzip/";
description = "The CK LRZIP compression program (LZMA + RZIP)";
- license = lib.licenses.gpl2Plus;
- platforms = lib.platforms.unix;
+ maintainers = with maintainers; [ ];
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzop/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lzop/default.nix
index be31048c21..8bf58d9cc3 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/lzop/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/lzop/default.nix
@@ -1,9 +1,11 @@
-{lib, stdenv, fetchurl, lzo}:
+{ lib, stdenv, fetchurl, lzo }:
stdenv.mkDerivation rec {
- name = "lzop-1.04";
+ pname = "lzop";
+ version = "1.04";
+
src = fetchurl {
- url = "https://www.lzop.org/download/${name}.tar.gz";
+ url = "https://www.lzop.org/download/lzop-${version}.tar.gz";
sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky";
};
@@ -12,6 +14,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://www.lzop.org";
description = "Fast file compressor";
+ maintainers = with maintainers; [ ];
license = licenses.gpl2;
platforms = platforms.unix;
};
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix
index a4cdcc0854..6dbe190c40 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix
@@ -1,36 +1,34 @@
{ lib, stdenv, fetchurl, zlib, util-linux }:
-let name = "pigz";
- version = "2.6";
-in
-stdenv.mkDerivation {
- name = name + "-" + version;
+stdenv.mkDerivation rec {
+ pname = "pigz";
+ version = "2.6";
src = fetchurl {
- url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz";
+ url = "https://www.zlib.net/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0=";
};
enableParallelBuilding = true;
- buildInputs = [zlib] ++ lib.optional stdenv.isLinux util-linux;
+ buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux;
makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ];
doCheck = stdenv.isLinux;
checkTarget = "tests";
- installPhase =
- ''
- install -Dm755 pigz "$out/bin/pigz"
- ln -s pigz "$out/bin/unpigz"
- install -Dm755 pigz.1 "$out/share/man/man1/pigz.1"
- ln -s pigz.1 "$out/share/man/man1/unpigz.1"
- install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf"
+ installPhase = ''
+ install -Dm755 pigz "$out/bin/pigz"
+ ln -s pigz "$out/bin/unpigz"
+ install -Dm755 pigz.1 "$out/share/man/man1/pigz.1"
+ ln -s pigz.1 "$out/share/man/man1/unpigz.1"
+ install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf"
'';
meta = with lib; {
- homepage = "http://www.zlib.net/pigz/";
+ homepage = "https://www.zlib.net/pigz/";
description = "A parallel implementation of gzip for multi-core machines";
+ maintainers = with maintainers; [ ];
license = licenses.zlib;
platforms = platforms.unix;
};
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix
index bb504e85f6..ec05a44a51 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix
@@ -1,25 +1,42 @@
-{
- lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config
- , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl
- , libarchive, xz
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoconf
+, automake
+, libtool
+, pkg-config
+, asciidoc
+, libxslt
+, libxml2
+, docbook_xml_dtd_45
+, docbook_xsl
+, libarchive
+, xz
}:
+
stdenv.mkDerivation rec {
- baseName = "pixz";
+ pname = "pixz";
version = "1.0.7";
- name = "${baseName}-${version}";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- autoconf automake libtool asciidoc libxslt libxml2
- docbook_xml_dtd_45 docbook_xsl
- libarchive xz
+ autoconf
+ automake
+ libtool
+ asciidoc
+ libxslt
+ libxml2
+ docbook_xml_dtd_45
+ docbook_xsl
+ libarchive
+ xz
];
preBuild = ''
echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'"
'';
src = fetchFromGitHub {
owner = "vasi";
- repo = baseName;
+ repo = pname;
rev = "v${version}";
sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2";
};
@@ -27,10 +44,10 @@ stdenv.mkDerivation rec {
./autogen.sh
'';
- meta = {
+ meta = with lib; {
description = "A parallel compressor/decompressor for xz format";
- license = lib.licenses.bsd2;
- maintainers = [lib.maintainers.raskin];
- platforms = lib.platforms.unix;
+ license = licenses.bsd2;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/third_party/nixpkgs/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch
deleted file mode 100644
index fac8f1fc14..0000000000
--- a/third_party/nixpkgs/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b8f9827fc4de9296c7a6f5e6fdac46e070cd6cb4 Mon Sep 17 00:00:00 2001
-From: Igor Pashev
-Date: Sat, 1 Nov 2014 18:10:05 +0300
-Subject: [PATCH] Fixed crash on Linux when stack size is unlimited
-
----
- pxz.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/pxz.c b/pxz.c
-index 9cb843e..52713e2 100644
---- a/pxz.c
-+++ b/pxz.c
-@@ -65,7 +65,7 @@ FILE **ftemp;
- char str[0x100];
- char buf[BUFFSIZE];
- char *xzcmd;
--size_t xzcmd_max;
-+const size_t xzcmd_max = 10240;
-
- unsigned opt_complevel = 6, opt_stdout, opt_keep, opt_threads, opt_verbose;
- unsigned opt_force, opt_stdout;
-@@ -243,9 +243,12 @@ int main( int argc, char **argv ) {
- lzma_filter filters[LZMA_FILTERS_MAX + 1];
- lzma_options_lzma lzma_options;
-
-- xzcmd_max = sysconf(_SC_ARG_MAX);
- page_size = sysconf(_SC_PAGE_SIZE);
- xzcmd = malloc(xzcmd_max);
-+ if (!xzcmd) {
-+ fprintf(stderr, "Failed to allocate %lu bytes for xz command.\n", xzcmd_max);
-+ return -1;
-+ }
- snprintf(xzcmd, xzcmd_max, XZ_BINARY);
-
- parse_args(argc, argv);
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix
index eb1f5d3570..4ea95a3f78 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/pxz/default.nix
@@ -1,21 +1,18 @@
-{ lib, stdenv, fetchgit, xz }:
+{ lib, stdenv, fetchFromGitHub, xz }:
-let name = "pxz";
- version = "4.999.9beta+git";
-in
-stdenv.mkDerivation {
- name = name + "-" + version;
+stdenv.mkDerivation rec {
+ pname = "pxz";
+ version = "4.999.9beta+git";
- src = fetchgit {
- url = "https://github.com/jnovy/pxz.git";
- rev = "ae808463c2950edfdedb8fb49f95006db0a18667";
- sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc";
+ src = fetchFromGitHub {
+ owner = "jnovy";
+ repo = "pxz";
+ rev = "124382a6d0832b13b7c091f72264f8f3f463070a";
+ sha256 = "15mmv832iqsqwigidvwnf0nyivxf0y8m22j2szy4h0xr76x4z21m";
};
buildInputs = [ xz ];
- patches = [ ./_SC_ARG_MAX.patch ];
-
buildPhase = ''
gcc -o pxz pxz.c -llzma \
-fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \
@@ -30,15 +27,18 @@ stdenv.mkDerivation {
cp pxz.1 $out/share/man/man1
'';
- meta = {
+ meta = with lib; {
homepage = "https://jnovy.fedorapeople.org/pxz/";
- license = lib.licenses.gpl2Plus;
- maintainers = with lib.maintainers; [pashev];
- description = ''Parallel XZ is a compression utility that takes advantage of
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ pashev ];
+ description = "compression utility that runs LZMA compression of different parts on multiple cores simultaneously";
+ longDescription = ''
+ Parallel XZ is a compression utility that takes advantage of
running LZMA compression of different parts of an input file on multiple
cores and processors simultaneously. Its primary goal is to utilize all
resources to speed up compression time with minimal possible influence
- on compression ratio'';
- platforms = with lib.platforms; linux;
+ on compression ratio
+ '';
+ platforms = with platforms; linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/rzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/rzip/default.nix
index 60364afa9f..5f878f8c49 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/rzip/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/rzip/default.nix
@@ -1,9 +1,11 @@
-{lib, stdenv, fetchurl, fetchpatch, bzip2}:
+{ lib, stdenv, fetchurl, fetchpatch, bzip2 }:
+
+stdenv.mkDerivation rec {
+ pname = "rzip";
+ version = "2.1";
-stdenv.mkDerivation {
- name = "rzip-2.1";
src = fetchurl {
- url = "mirror://samba/rzip/rzip-2.1.tar.gz";
+ url = "mirror://samba/rzip/rzip-${version}.tar.gz";
sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7";
};
buildInputs = [ bzip2 ];
@@ -16,10 +18,11 @@ stdenv.mkDerivation {
})
];
- meta = {
+ meta = with lib; {
homepage = "https://rzip.samba.org/";
description = "Compression program";
- license = lib.licenses.gpl2Plus;
- platforms = lib.platforms.unix;
+ maintainers = with maintainers; [ ];
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/compression/zsync/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zsync/default.nix
index 94921397e3..b92112a481 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/zsync/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/zsync/default.nix
@@ -1,20 +1,21 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "zsync-0.6.2";
+ pname = "zsync";
+ version = "0.6.2";
src = fetchurl {
- url = "http://zsync.moria.org.uk/download/${name}.tar.bz2";
+ url = "http://zsync.moria.org.uk/download/${pname}-${version}.tar.bz2";
sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b";
};
makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
- meta = {
+ meta = with lib; {
homepage = "http://zsync.moria.org.uk/";
description = "File distribution system using the rsync algorithm";
- license = lib.licenses.free;
- maintainers = with lib.maintainers; [viric];
- platforms = with lib.platforms; all;
+ license = licenses.free;
+ maintainers = with maintainers; [ viric ];
+ platforms = with platforms; all;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix
index 03e76e5fb2..b5b1256a9b 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
'from pygit2 import RemoteCallbacks'
'';
- checkInputs = with python3Packages; [ pytest pytestcov mock ];
+ checkInputs = with python3Packages; [ pytest pytest-cov mock ];
propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ];
checkPhase = "py.test";
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix
index 37b398ef1c..d12a213a31 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gmic";
- version = "2.9.7";
+ version = "2.9.8";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
- sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY=";
+ sha256 = "sha256-GNa7xzGuO02oplasGJR2eTsRGp3Rn3LbIxLwdN983II=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pdfread/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pdfread/default.nix
deleted file mode 100644
index 8350e95188..0000000000
--- a/third_party/nixpkgs/pkgs/tools/graphics/pdfread/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{lib, stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre
-, optipng, unrar}:
-
-stdenv.mkDerivation {
- name = "pdfread-1.8.2";
-
- src = fetchurl {
- # I got it from http://www.mobileread.com/forums/showthread.php?t=21906
- # But that needs user registration to allow downloading.
- # This is an evolution from pdfread 1.7 in http://pdfread.sourceforge.net/
- # Temporary place:
- url = "http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip";
- sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an";
- };
-
- nativeBuildInputs = [ makeWrapper unzip ];
- buildInputs = [ python ];
-
- broken = true; # Not found.
-
- phases = "unpackPhase patchPhase installPhase";
-
- unpackPhase = ''
- unzip $src
- sourceRoot=`pwd`/PDFRead/src
- '';
-
- patchPhase = ''
- sed -i 's,#!/usr.*,#!${python}/bin/python,' pdfread.py
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp pdfread.py $out/bin
- chmod +x $out/bin/pdfread.py
-
- LIBSUFFIX=lib/${python.libPrefix}/site-packages/
- PYDIR=$out/$LIBSUFFIX
- mkdir -p $PYDIR
- cp -R *.py pylrs $PYDIR
-
- wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \
- --prefix PATH : ${lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]}
- '';
-
- meta = with lib; {
- description = "PDF/DJVU to ebook format converter";
- homepage = "https://www.mobileread.com/forums/showthread.php?t=21906";
- license = licenses.mit;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index acb2d41e04..aaef2dd2d0 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ibus-m17n";
- version = "1.4.5";
+ version = "1.4.6";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus-m17n";
rev = version;
- sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg=";
+ sha256 = "sha256-hdm1ObzN9pFLeO1ujobHxiQYnA+dg9zIp/qho6S0H78=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index 258ab93689..18fc21e980 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ibus-table-others";
- version = "1.3.11";
+ version = "1.3.12";
src = fetchurl {
url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "0763wnlklcs3d8fk21nkp7dgn4qzqgxh1s24q3kl8gzgng2a88jj";
+ sha256 = "sha256-2k7JtLr+zO71rbTz11CCiIPx+orn0dw/Y8m47WfRDEU=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix
index 35b3b1e336..ad18becfc7 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -3,23 +3,17 @@
stdenv.mkDerivation rec {
pname = "interception-tools";
- version = "0.6.6";
+ version = "0.6.7";
src = fetchFromGitLab {
owner = "interception/linux";
repo = "tools";
rev = "v${version}";
- sha256 = "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj";
+ sha256 = "0wcmppa7092b33wb8vc782day5phf90pc25cn1x7rk0rlw565z36";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libevdev udev libyamlcpp boost ];
- prePatch = ''
- substituteInPlace CMakeLists.txt --replace \
- '"/usr/include/libevdev-1.0"' \
- "\"$(pkg-config --cflags libevdev | cut -c 3-)\""
- '';
-
meta = {
description = "A minimal composable infrastructure on top of libudev and libevdev";
homepage = "https://gitlab.com/interception/linux/tools";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix
index 69a74e465c..1654b008aa 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "android-tools";
- version = "31.0.0p1";
+ version = "31.0.2";
src = fetchurl {
url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
- sha256 = "1dn7v10gdx1pi0pkddznd5sdz941qz0x4jww8h2mk50nbyxc792i";
+ sha256 = "sha256-YbO/bCQMsLTQzP72lsVZhuBmV4Q2J9+VD9z2iBrw+NQ=";
};
nativeBuildInputs = [ cmake perl go ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bonfire/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bonfire/default.nix
index a3f1608c3a..f71d8a8b8e 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/bonfire/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/bonfire/default.nix
@@ -29,7 +29,7 @@ buildPythonApplication rec {
--replace "data_files = *.rst, *.txt" ""
'';
- buildInputs = [ httpretty pytest pytestcov ];
+ buildInputs = [ httpretty pytest pytest-cov ];
preCheck = ''
# fix compatibility with pytest 4
diff --git a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix
index 560ad46047..cc2d979ca7 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "code-minimap";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "wfxr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-nWfvRrKkUrr2owv9sLgORVPYp68/Ibdu/P1VddMb61s=";
+ sha256 = "sha256-eCHmMtndcQJqKmjxhkcLvjMUXApkSnH+7qyG7PDfcwo=";
};
- cargoSha256 = "sha256-OmWn6Z/r/gXMD4gp/TDo0Hokliq8Qgb354q8ZFpVG2s=";
+ cargoSha256 = "sha256-wKCANWznOJMlQ8T2q39NNNRmgPYMpbkJhXpxojusNsE=";
buildInputs = lib.optional stdenv.isDarwin libiconv;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
index a4b2b888fa..88a9846e83 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
@@ -72,6 +72,7 @@ python3Packages.buildPythonApplication rec {
"test_sbin_added_to_path"
"test_diff_meta"
"test_diff_meta2"
+ "test_obj_no_differences"
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix
index d097beca91..0c3d319f2a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, Foundation }:
rustPlatform.buildRustPackage rec {
pname = "dua";
- version = "2.14.1";
+ version = "2.14.2";
- buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
- sha256 = "sha256-46azJ7q0Ix/8wdg01hYQ2V2E4tBD/NDdHpexnFBD5so=";
+ sha256 = "sha256-gUTDiUH/jlGAGbhOOCa63wfNy5Y8W6VWlSb9E+hQjHY=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
'';
};
- cargoSha256 = "sha256-hCf6Ih2bJrMX2ntWbIrX3Dk8wI5tio+OcN4WNWuU7j4=";
+ cargoSha256 = "sha256-P8QFeP5KD5YeD4Px7OQNwCrvErgT9ytr4OlFkXuPgGU=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix
index a701fbd73b..beaffadab9 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix
@@ -4,11 +4,11 @@
with python3.pkgs; buildPythonPackage rec {
pname = "esphome-dashboard";
- version = "20210623.0";
+ version = "20210719.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0fc6xgi1naydm3wgk5lljnf6zggzdk6558cpyqlriw031gqnab77";
+ sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc=";
};
# no tests
diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix
index 37c37de839..69a67a6e91 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix
@@ -16,13 +16,13 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
- version = "1.19.4";
+ version = "1.20.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "029ykjk24h21b0s0gha6kv9pvgallin6marzkb2vfbvr3icsmbz2";
+ sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4=";
};
patches = [
@@ -36,12 +36,6 @@ with python.pkgs; buildPythonApplication rec {
# drop coverage testing
sed -i '/--cov/d' pytest.ini
-
- # migrate use of hypothesis internals to be compatible with hypothesis>=5.32.1
- # https://github.com/esphome/issues/issues/2021
- substituteInPlace tests/unit_tests/strategies.py --replace \
- "@st.defines_strategy_with_reusable_values" \
- "@st.defines_strategy(force_reusable_values=True)"
'';
# Remove esptool and platformio from requirements
diff --git a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix
index 9bda86db9b..d0fae336d9 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix
@@ -10,7 +10,7 @@
let
sha256 = {
- "x86_64-linux" = "sha256-nGIUOS4LzfeXamcT0uigbQsVkULH2R3bli0DDEpg3ns=";
+ "x86_64-linux" = "sha256-FRZTUOlOK1bIbrHdR9yQv45zMhby3tWbMPpaPPq3L9s=";
"i686-linux" = "0z6y45sz086njpywg7f0jn6n02qynb1qbi889g2kcgwbfjvmcpm1";
}."${stdenv.system}";
@@ -25,7 +25,7 @@ in
stdenv.mkDerivation rec {
pname = "etcher";
- version = "1.5.120";
+ version = "1.5.121";
src = fetchurl {
url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix
index db4330e5b0..7124e90784 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fcp";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "svetlitski";
repo = pname;
rev = "v${version}";
- sha256 = "0ahd79dh48hsi4bhs4zs0a7hr55jzsjix9c61lc42ipdbqgifg2d";
+ sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x";
};
- cargoSha256 = "1arrw4fz3f3wfjy9nb8vm707vhh4x0vv9wv8z2s07b4qcwwih8k4";
+ cargoSha256 = "0gw7gjfwc4r03rg6z65ml0y37sh4yf716isqs0mb4jqkp7rwfbc9";
nativeBuildInputs = [ expect ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix
index 93e13996f7..4ed308643e 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fend";
- version = "0.1.20";
+ version = "0.1.21";
src = fetchFromGitHub {
owner = "printfn";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2CzpPzUylzDiP9rbjneRR6joa9UEgnDfJ4Ffa/orhkk=";
+ sha256 = "sha256-LrHZsnW96+QsXuGxWoGqIEKTE86m3tMnh4fpDPIhd1w=";
};
- cargoSha256 = "sha256-xDh7SF73Qnx/GeW43JDmF+qeljSHbWWq4unWdTmAO+c=";
+ cargoSha256 = "sha256-GZ4Yt5iQkgupJMTYIbvCPtz19985MFf8IDy3ui0M6DE=";
doInstallCheck = true;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gparted/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gparted/default.nix
index f661f2cf97..08e4641fb4 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/gparted/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/gparted/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gparted";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz";
- sha256 = "sha256-jcGAJF3Z6kXm4vS8aVEvGH4Ivn95nJioJaCwTBYcvSo=";
+ sha256 = "sha256-Xu4ubXSxXvlrE7OiMQyGjtIpjgM0ECHn0SpamKHR4Qk=";
};
# Tries to run `pkexec --version` to get version.
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kisslicer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kisslicer/default.nix
index fb69610e4e..73d86e7dfc 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/kisslicer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/kisslicer/default.nix
@@ -26,8 +26,6 @@ stdenv.mkDerivation {
stripRoot = false;
};
- phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
buildInputs = [
makeWrapper
libGLU libGL
diff --git a/third_party/nixpkgs/pkgs/tools/misc/poweralertd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/poweralertd/default.nix
index a00a5b9a40..4121b0712b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/poweralertd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/poweralertd/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "poweralertd";
- version = "0.1.0";
+ version = "0.2.0";
outputs = [ "out" "man" ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "~kennylevinsen";
repo = "poweralertd";
rev = version;
- sha256 = "136xcrp7prilh905a6v933vryqy20l7nw24ahc4ycax8f0s906x9";
+ sha256 = "19rw9q4pcqw56nmzjfglfikzx5wwjl4n08awwdhg0jy1k0bm3dvp";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix
index 1781187481..aafdfe07ff 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "system-config-printer";
- version = "1.5.12";
+ version = "1.5.15";
src = fetchFromGitHub {
owner = "openPrinting";
repo = pname;
- rev = version;
- sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf";
+ rev = "v${version}";
+ sha256 = "0a3v8fp1dfb5cwwpadc3f6mv608b5yrrqd8ddkmnrngizqwlswsc";
};
prePatch = ''
@@ -26,17 +26,6 @@ stdenv.mkDerivation rec {
patches = [
./detect_serverbindir.patch
-
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104
- # (Fixes will be included in next upstream release.)
- (fetchpatch {
- url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch";
- sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n";
- })
- (fetchpatch {
- url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch";
- sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23";
- })
];
buildInputs = [
@@ -55,6 +44,10 @@ stdenv.mkDerivation rec {
pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
+ preConfigure = ''
+ intltoolize --copy --force --automake
+ '';
+
configureFlags = [
"--with-udev-rules"
"--with-udevdir=${placeholder "out"}/etc/udev"
diff --git a/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
index dbc00e13e1..301f6163d7 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "trash-cli";
- version = "0.21.6.30";
+ version = "0.21.7.23";
src = fetchFromGitHub {
owner = "andreafrancia";
repo = "trash-cli";
rev = version;
- sha256 = "09vwg4jpx7pl7rd5ybq5ldgwky8zzf59msmzvmim9vipnmjgkxv7";
+ sha256 = "1kdkzs9mbyac8ndc6r0wa39z8d3fj8zglqp149id4j37aydxb10l";
};
propagatedBuildInputs = [ python3Packages.psutil ];
@@ -18,8 +18,27 @@ python3Packages.buildPythonApplication rec {
pytestCheckHook
];
- # Skip `test_user_specified` since its result depends on the mount path.
- disabledTests = [ "test_user_specified" ];
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+
+ # Create a home directory with a test file.
+ HOME="$(mktemp -d)"
+ touch "$HOME/deleteme"
+
+ # Verify that trash list is initially empty.
+ [[ $($out/bin/trash-list) == "" ]]
+
+ # Trash a test file and verify that it shows up in the list.
+ $out/bin/trash "$HOME/deleteme"
+ [[ $($out/bin/trash-list) == *" $HOME/deleteme" ]]
+
+ # Empty the trash and verify that it is empty.
+ $out/bin/trash-empty
+ [[ $($out/bin/trash-list) == "" ]]
+
+ runHook postInstallCheck
+ '';
meta = with lib; {
homepage = "https://github.com/andreafrancia/trash-cli";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix
index 8a96248e71..9959fe9375 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix
@@ -5,28 +5,21 @@
buildGoModule rec {
pname = "trillian";
- version = "1.3.11";
- vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l";
+ version = "1.3.13";
+ vendorSha256 = "1ad0vaw0k57njzk9x233iqjbplyvw66qjk8r9j7sx87pdc6a4lpb";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
- sha256 = "1lh19wba90y91l5jj8ilzjqxgmqqqdvyn7pzrwvmzv7iiy18wcmh";
+ sha256 = "1ns394yd4js9g1psd1dkrffidyzixqvjp5lhw2x2iycrxbnm3y44";
};
- # Remove tests that require networking
- postPatch = ''
- rm cmd/get_tree_public_key/main_test.go
- '';
-
subPackages = [
"cmd/trillian_log_server"
"cmd/trillian_log_signer"
- "cmd/trillian_map_server"
"cmd/createtree"
"cmd/deletetree"
- "cmd/get_tree_public_key"
"cmd/updatetree"
];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vial/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vial/default.nix
index 2900a64299..c8d38d826d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/vial/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/vial/default.nix
@@ -1,12 +1,12 @@
{ lib, fetchurl, appimageTools }:
let
name = "vial-${version}";
- version = "0.3";
+ version = "0.4";
pname = "Vial";
src = fetchurl {
url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
- sha256 = "sha256-hUwVp2tpKelbISQU/Q30yUeQfWp56dtgtfF/rpq1h5M=";
+ sha256 = "sha256-4EDEVSqjQ6Ybqx4BoNwE4pT5yFLYM05FBHc5deQU9f8=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix
index cd04e2020b..209072da3b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix
@@ -12,12 +12,12 @@ python3Packages.buildPythonApplication rec {
};
propagatedBuildInputs = with python3Packages; [
- attrs ConfigArgParse ffmpeg future lxml requests
+ attrs configargparse ffmpeg future lxml requests
];
pythonPath = [ rtmpdump php wget ];
doCheck = false; # tests require network access
- checkInputs = with python3Packages; [ ffmpeg pytest pytestrunner ];
+ checkInputs = with python3Packages; [ ffmpeg pytest pytest-runner ];
meta = with lib; {
description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix
new file mode 100644
index 0000000000..6ac69b95db
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchurl, libpcap }:
+
+stdenv.mkDerivation rec {
+ pname = "cdpr";
+ version = "2.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tgz";
+ sha256 = "1idyvyafkk0ifcbi7mc65b60qia6hpsdb6s66j4ggqp7if6vblrj";
+ };
+
+ buildInputs = [ libpcap ];
+
+ installPhase = ''
+ install -Dm755 cdpr $out/bin/cdpr
+ '';
+
+ meta = with lib; {
+ description = "Cisco Discovery Protocol Reporter";
+ homepage = "http://cdpr.sourceforge.net/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.sgo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
index 96528a78d4..ffa2138ffa 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
- version = "0.38.2";
+ version = "0.38.3";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-v2uVIFPc8h58W03Jo2vsbLT5f7F8bJw4uMtSErrBYdo=";
+ sha256 = "sha256-VfEfxcewKo8D8kNsMuCvrLOZNl632ZIFyD+RG8qzjQ4=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/iwgtk/default.nix b/third_party/nixpkgs/pkgs/tools/networking/iwgtk/default.nix
new file mode 100644
index 0000000000..5c89facd3f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/networking/iwgtk/default.nix
@@ -0,0 +1,28 @@
+{ fetchFromGitHub, gtk3, lib, pkg-config, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "iwgtk";
+ version = "0.4";
+
+ src = fetchFromGitHub {
+ owner = "j-lentz";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "129h7vq9b1r9a5c79hk8d06bj8lgzrnhq55x54hqri9c471jjh0s";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ gtk3 ];
+
+ makeFlags = [ "prefix=$(out)" ];
+
+ meta = with lib; {
+ description = "Lightweight, graphical wifi management utility for Linux";
+ homepage = "https://github.com/j-lentz/iwgtk";
+ changelog = "https://github.com/j-lentz/iwgtk/blob/v${version}/CHANGELOG";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
index 05da924c47..480321ad15 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix
@@ -16,7 +16,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ gettext ];
propagatedBuildInputs = [
- ConfigArgParse
+ configargparse
argcomplete
beautifulsoup4
pyopenssl
diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix
index 70b663edde..06ec1b5a83 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix
@@ -2,18 +2,16 @@
buildGoModule rec {
pname = "minio-client";
- version = "2021-03-23T05-46-11Z";
+ version = "2021-06-13T17-48-22Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
- sha256 = "sha256-AtE9Zy8tRvcE+gYc0pqJDEFnXL4jSbJ4b6l3ZOe69Y4=";
+ sha256 = "sha256-u0WO7KSalDqlRwbN3b74FOb632fIGPZ2F0T8qLrvt+U=";
};
- vendorSha256 = "sha256-cIr8d5jz4EfBFuOBZG4Kz20wSXy1Cni77V+JR6vLHwQ=";
-
- doCheck = false;
+ vendorSha256 = "sha256-BadW8AKHcrkCS3sXR7bqdgNhRYkfXIQOteMxIbiLvwg=";
subPackages = [ "." ];
@@ -23,10 +21,15 @@ buildGoModule rec {
sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/mc --version | grep ${version} > /dev/null
+ '';
+
meta = with lib; {
homepage = "https://github.com/minio/mc";
description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage";
- maintainers = with maintainers; [ eelco bachp ];
+ maintainers = with maintainers; [ bachp eelco superherointj ];
platforms = platforms.unix;
license = licenses.asl20;
};
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix
index 36d156a399..708932ac1c 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix
@@ -1,45 +1,37 @@
-{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, substituteAll, libpcap, openssl }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, substituteAll
+, libpcap
+, openssl
+}:
stdenv.mkDerivation rec {
- version = "2.4.8";
+ version = "2.4.9";
pname = "ppp";
src = fetchFromGitHub {
- owner = "paulusmack";
- repo = "ppp";
- rev = "ppp-${version}";
- sha256 = "1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv";
+ owner = "ppp-project";
+ repo = pname;
+ rev = "${pname}-${version}";
+ sha256 = "sha256-8+nbqRNfKPLDx+wmuKSkv+BSeG72hKJI4dNqypqeEK4=";
};
- patches =
- [
- ( substituteAll {
- src = ./nix-purity.patch;
- inherit libpcap;
- glibc = stdenv.cc.libc.dev or stdenv.cc.libc;
- openssl = openssl.dev;
- })
- # Without nonpriv.patch, pppd --version doesn't work when not run as
- # root.
- ./nonpriv.patch
- (fetchpatch {
- name = "CVE-2015-3310.patch";
- url = "https://github.com/paulusmack/ppp/commit/858976b1fc3107f1261aae337831959b511b83c2.patch";
- sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4";
- })
- (fetchurl {
- url = "https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch";
- sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia";
- })
- (fetchpatch {
- name = "CVE-2020-8597.patch";
- url = "https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426.patch";
- sha256 = "129wnhwxmzvr3y9gzxv82jnb5y8m4yg8vkpa0xl2rwkl8anbzgkh";
- })
- ./musl-fix-headers.patch
- ];
+ patches = [
+ (substituteAll {
+ src = ./nix-purity.patch;
+ glibc = stdenv.cc.libc.dev or stdenv.cc.libc;
+ openssl_dev = openssl.dev;
+ openssl_out = openssl.out;
+ })
+ # Without nonpriv.patch, pppd --version doesn't work when not run as root.
+ ./nonpriv.patch
+ ];
- buildInputs = [ libpcap openssl ];
+ buildInputs = [
+ libpcap
+ openssl
+ ];
postPatch = ''
# strip is not found when cross compiling with seemingly no way to point
@@ -66,9 +58,14 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- homepage = "https://ppp.samba.org/";
- description = "Point-to-point implementation for Linux and Solaris";
- license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ];
+ homepage = "https://ppp.samba.org";
+ description = "Point-to-point implementation to provide Internet connections over serial lines";
+ license = with licenses; [
+ bsdOriginal
+ publicDomain
+ gpl2
+ lgpl2
+ ];
platforms = platforms.linux;
maintainers = [ ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ppp/musl-fix-headers.patch b/third_party/nixpkgs/pkgs/tools/networking/ppp/musl-fix-headers.patch
deleted file mode 100644
index d6252a5267..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/ppp/musl-fix-headers.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
-index b06eda5..dafa36c 100644
---- a/include/net/ppp_defs.h
-+++ b/include/net/ppp_defs.h
-@@ -38,6 +38,8 @@
- #ifndef _PPP_DEFS_H_
- #define _PPP_DEFS_H_
-
-+#include
-+
- /*
- * The basic PPP frame.
- */
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index a74c914..7acd2cf 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -126,7 +126,7 @@ LIBS += -lcrypt
- endif
-
- ifdef USE_LIBUTIL
--CFLAGS += -DHAVE_LOGWTMP=1
-+#CFLAGS += -DHAVE_LOGWTMP=1
- LIBS += -lutil
- endif
-
-diff --git a/pppd/magic.h b/pppd/magic.h
-index c81213b..305aece 100644
---- a/pppd/magic.h
-+++ b/pppd/magic.h
-@@ -42,6 +42,8 @@
- * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
- */
-
-+#include
-+
- void magic_init (void); /* Initialize the magic number generator */
- u_int32_t magic (void); /* Returns the next magic number */
-
-diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c
-index 91e9a57..9c0fac3 100644
---- a/pppd/plugins/rp-pppoe/if.c
-+++ b/pppd/plugins/rp-pppoe/if.c
-@@ -30,10 +30,6 @@ static char const RCSID[] =
- #include
- #endif
-
--#ifdef HAVE_NET_ETHERNET_H
--#include
--#endif
--
- #ifdef HAVE_ASM_TYPES_H
- #include
- #endif
-diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
-index a8c2bb4..ca34d79 100644
---- a/pppd/plugins/rp-pppoe/plugin.c
-+++ b/pppd/plugins/rp-pppoe/plugin.c
-@@ -46,7 +46,6 @@ static char const RCSID[] =
- #include
- #include
- #include
--#include
- #include
- #include
- #include
-diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-index 3d3bf4e..b5f82d3 100644
---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
-+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-@@ -27,10 +27,6 @@
- #include
- #endif
-
--#ifdef HAVE_NET_ETHERNET_H
--#include
--#endif
--
- #ifdef HAVE_ASM_TYPES_H
- #include
- #endif
-@@ -55,6 +51,8 @@ void die(int status)
- exit(status);
- }
-
-+#define error(x...) fprintf(stderr, x)
-+
- /* Initialize frame types to RFC 2516 values. Some broken peers apparently
- use different frame types... sigh... */
-
-diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
-index c4aaa6e..70aef85 100644
---- a/pppd/plugins/rp-pppoe/pppoe.h
-+++ b/pppd/plugins/rp-pppoe/pppoe.h
-@@ -88,18 +88,6 @@ typedef unsigned long UINT32_t;
- #include
- #endif
-
--#ifdef HAVE_NETINET_IF_ETHER_H
--#include
--
--#ifdef HAVE_SYS_SOCKET_H
--#include
--#endif
--#ifndef HAVE_SYS_DLPI_H
--#include
--#endif
--#endif
--
--
- /* Ethernet frame types according to RFC 2516 */
- #define ETH_PPPOE_DISCOVERY 0x8863
- #define ETH_PPPOE_SESSION 0x8864
-diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
-index 6d71530..86d224e 100644
---- a/pppd/sys-linux.c
-+++ b/pppd/sys-linux.c
-@@ -102,19 +102,11 @@
- #define MAX_ADDR_LEN 7
- #endif
-
--#if !defined(__GLIBC__) || __GLIBC__ >= 2
- #include /* glibc 2 conflicts with linux/types.h */
- #include
- #include
- #include
- #include
--#else
--#include
--#include
--#include
--#include
--#include
--#endif
- #include
- #include
-
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch b/third_party/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch
index 975ea9db60..c3363e0ccb 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch
+++ b/third_party/nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch
@@ -1,31 +1,33 @@
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 9664f70..d07e01e 100644
+index 22837c5..6f6fff5 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
-@@ -125,7 +125,7 @@ CFLAGS += -DHAS_SHADOW
+@@ -111,8 +111,8 @@ endif
+
+ # EAP SRP-SHA1
+ ifdef USE_SRP
+-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
+-LIBS += -lsrp -L/usr/local/ssl/lib
++CFLAGS += -DUSE_SRP -DOPENSSL -I@openssl_dev@/include/openssl
++LIBS += -lsrp -L@openssl_out@/lib
+ NEEDCRYPTOLIB = y
+ TARGETS += srp-entry
+ EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
+@@ -143,7 +143,7 @@ CFLAGS += -DHAS_SHADOW
#LIBS += -lshadow $(LIBS)
endif
--ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),)
+-ifeq ($(shell echo '\#include ' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes)
+ifneq ($(wildcard @glibc@/include/crypt.h),)
CFLAGS += -DHAVE_CRYPT_H=1
- LIBS += -lcrypt
+ LIBS += -lcrypt
endif
-@@ -137,7 +137,7 @@ endif
+@@ -155,7 +155,7 @@ endif
ifdef NEEDDES
ifndef USE_CRYPT
-CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl
-+CFLAGS += -I@openssl@/include/openssl
- LIBS += -lcrypto
++CFLAGS += -I@openssl_dev@/include/openssl
+ NEEDCRYPTOLIB = y
else
CFLAGS += -DUSE_CRYPT=1
-@@ -188,7 +188,7 @@ LIBS += -ldl
- endif
-
- ifdef FILTER
--ifneq ($(wildcard /usr/include/pcap-bpf.h),)
-+ifneq ($(wildcard @libpcap@/include/pcap-bpf.h),)
- LIBS += -lpcap
- CFLAGS += -DPPP_FILTER
- endif
diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix
index 97c758e19b..54de621763 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "telepresence2";
- version = "2.2.1";
+ version = "2.3.6";
src = fetchFromGitHub {
owner = "telepresenceio";
repo = "telepresence";
rev = "v${version}";
- sha256 = "0pr6vm68jr5ld7hy2b4dwmjziir59vg137c74rdn1wlhq3n8vr41";
+ sha256 = "1bs4h450109vhy18kpyy6y4p5l9kvz4w09m56fxh5z547m5ax6k3";
};
- vendorSha256 = "0d0p879zchhrzrf6f5zc3vdcd5zi1ind7ibvb46y6wx6lp0f1nrp";
+ vendorSha256 = "0xmw9mc0iy64kb12lsii4nn63ynh6gab9ls8z6mrizjjqz845sa5";
buildFlagsArray = ''
-ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix
index 734c6d9f4e..776e8450d1 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit
, makeWrapper
-, nettools, gawk, systemd, openresolv, coreutils, gnugrep
+, nettools, gawk, systemd, openresolv, coreutils, gnugrep, iproute2
}:
stdenv.mkDerivation {
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
--replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl"
'' + ''
wrapProgram $out/bin/vpnc-script \
- --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv ])}"
+ --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv iproute2 ])}"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/security/cewl/Gemfile b/third_party/nixpkgs/pkgs/tools/security/cewl/Gemfile
new file mode 100644
index 0000000000..97d9ae757a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/cewl/Gemfile
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+gem 'mime'
+gem 'mime-types', ">=3.3.1"
+gem 'mini_exiftool'
+gem 'nokogiri'
+gem 'rexml'
+gem 'rubyzip'
+gem 'spider'
diff --git a/third_party/nixpkgs/pkgs/tools/security/cewl/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/cewl/Gemfile.lock
new file mode 100644
index 0000000000..85bb2eb4b8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/cewl/Gemfile.lock
@@ -0,0 +1,31 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ mime (0.4.4)
+ mime-types (3.3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2021.0704)
+ mini_exiftool (2.10.2)
+ mini_portile2 (2.5.3)
+ nokogiri (1.11.7)
+ mini_portile2 (~> 2.5.0)
+ racc (~> 1.4)
+ racc (1.5.2)
+ rexml (3.2.5)
+ rubyzip (2.3.2)
+ spider (0.5.4)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ mime
+ mime-types (>= 3.3.1)
+ mini_exiftool
+ nokogiri
+ rexml
+ rubyzip
+ spider
+
+BUNDLED WITH
+ 2.1.4
diff --git a/third_party/nixpkgs/pkgs/tools/security/cewl/default.nix b/third_party/nixpkgs/pkgs/tools/security/cewl/default.nix
new file mode 100644
index 0000000000..06d983c14e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/cewl/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, fetchFromGitHub, bundlerEnv }:
+
+let
+ rubyEnv = bundlerEnv {
+ name = "cewl-ruby-env";
+ gemdir = ./.;
+ };
+in
+stdenv.mkDerivation rec {
+ pname = "cewl";
+ version = "5.5.2";
+ src = fetchFromGitHub {
+ owner = "digininja";
+ repo = "CeWL";
+ rev = version;
+ sha256 = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc=";
+ };
+
+ buildInputs = [ rubyEnv.wrappedRuby ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp *.rb $out/bin/
+ mv $out/bin/cewl.rb $out/bin/cewl
+ '';
+
+ meta = with lib; {
+ description = "Custom wordlist generator";
+ homepage = "https://digi.ninja/projects/cewl.php/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ elohmeier ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/cewl/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/cewl/gemset.nix
new file mode 100644
index 0000000000..851a6d2442
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/cewl/gemset.nix
@@ -0,0 +1,104 @@
+{
+ mime = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr";
+ type = "gem";
+ };
+ version = "0.4.4";
+ };
+ mime-types = {
+ dependencies = ["mime-types-data"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+ type = "gem";
+ };
+ version = "3.3.1";
+ };
+ mime-types-data = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy";
+ type = "gem";
+ };
+ version = "3.2021.0704";
+ };
+ mini_exiftool = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ir4wigpm6nkd3f40wcjdqrhjx3l60w1hwcg143is1a95ypnvqhr";
+ type = "gem";
+ };
+ version = "2.10.2";
+ };
+ mini_portile2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";
+ type = "gem";
+ };
+ version = "2.5.3";
+ };
+ nokogiri = {
+ dependencies = ["mini_portile2" "racc"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
+ type = "gem";
+ };
+ version = "1.11.7";
+ };
+ racc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
+ rexml = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+ type = "gem";
+ };
+ version = "3.2.5";
+ };
+ rubyzip = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+ type = "gem";
+ };
+ version = "2.3.2";
+ };
+ spider = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fix7zhnvlfqg66bxwdpbsffbynzdnaifnxpakn07bjh3rdj75cx";
+ type = "gem";
+ };
+ version = "0.5.4";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix b/third_party/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix
index bd558b7ab6..e0252dac82 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ecryptfs/helper.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "0gp4m22zc80814ng80s38hp930aa8r4zqihr7jr23m0m2iq4pdpg";
};
- phases = [ "installPhase" ];
+ dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/enpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/enpass/default.nix
index 2444d1f1d7..63f25bc12e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/enpass/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/enpass/default.nix
@@ -61,7 +61,6 @@ let
nativeBuildInputs = [ makeWrapper ];
buildInputs = [dpkg];
- phases = [ "unpackPhase" "installPhase" ];
unpackPhase = "dpkg -X $src .";
installPhase=''
diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix
index bd3057896f..9509288b58 100644
--- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
- version = "2021-07-20";
+ version = "2021-07-22";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
- sha256 = "sha256-WjCayhpWeZ19DygKNLfwE5OGi4sQI+I+j3BMLuce9Z4=";
+ sha256 = "sha256-pmi1oKam3t4iKqbisFghdVlzp1Ozmc9Nmn19JLrsams=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix b/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix
index 1bc0d77878..b41f6bc67f 100644
--- a/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix
@@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "fido2luks";
- version = "0.2.16";
+ version = "0.2.17";
src = fetchFromGitHub {
owner = "shimunn";
repo = pname;
rev = version;
- sha256 = "sha256-WOdbdJAcMZHSnf7AkGnEumjaDut9J8VwSJYjqLUtPXs=";
+ sha256 = "sha256-rrtPMCgp2Xe8LXzFN57rzay2kyPaLT1+2m1NZQ9EsW4=";
};
buildInputs = [ cryptsetup ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
'';
- cargoSha256 = "sha256-d6t/bvHpnH4lKv78tp/8DC/VrQBnaiZhnf8GrlcYhJw=";
+ cargoSha256 = "sha256-5CzQuzmKuEi4KTR1jNh4avwqA3qYzTj+rV/zbIeUjAM=";
meta = with lib; {
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
diff --git a/third_party/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix b/third_party/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix
index 68aa7c4881..228271742c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gorilla-bin/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ patchelf makeWrapper ];
- phases = [ "unpackPhase" "installPhase" ];
unpackCmd = ''
mkdir gorilla;
diff --git a/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix
index c04f885a91..6c4f79195e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
- version = "0.7.0";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
- sha256 = "sha256-WUD6KZdtMJ/nEbC5MStK8qWKK05lXuk8+VD741g448s=";
+ sha256 = "sha256-2FnSCTq+Im7sbiEkbKZ9f09i/lWme/aCrcCOgcIlXp4=";
};
- cargoSha256 = "sha256-uF9mbJ7Nd+JaoZN886NX8iRv8/LZSqYntoosyFzzAIs=";
+ cargoSha256 = "sha256-v2aZPVBT5XEaffTZHnAgRWGs6HDvL9b8ihR50I4VnJ4=";
nativeBuildInputs = [
gpgme # for gpgme-config
diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix
index 7df1090b2b..c24515dd1b 100644
--- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "grype";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-fYeZFNtftG46/QHdV5UhCNCdP7ErOgwWfEB4V14ei5k=";
+ sha256 = "sha256-xiUDyuVNVkVT+kxOEFOq4RKxMc5nNjsom/ZTKzfkOhU=";
};
vendorSha256 = "sha256-mW3e4WFa9pKSpyTZYmPA2j8nZz+94G2PqdqI0BDo3wc=";
diff --git a/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix b/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix
index 37af42e33c..176cc5e706 100644
--- a/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/kpcli/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl ];
- phases = [ "installPhase" "fixupPhase" ];
+ dontUnpack = true;
installPhase = ''
mkdir -p $out/{bin,share}
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
index 8b90f7dd5f..5fa9ad3b4d 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.53"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.54"
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
index 53b1170b21..e23841b82a 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: b7cef30d11f0509b7e27334030dae6b8cb34e7f2
- ref: refs/tags/6.0.53
+ revision: 0d6c0cfe63f494a04b46700a4317d52484f3a398
+ ref: refs/tags/6.0.54
specs:
- metasploit-framework (6.0.53)
+ metasploit-framework (6.0.54)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -31,7 +31,7 @@ GIT
metasploit-concern (~> 3.0.0)
metasploit-credential (~> 4.0.0)
metasploit-model (~> 3.1.0)
- metasploit-payloads (= 2.0.47)
+ metasploit-payloads (= 2.0.48)
metasploit_data_models (~> 4.1.0)
metasploit_payloads-mettle (= 1.0.10)
mqtt
@@ -127,22 +127,22 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
- aws-partitions (1.478.0)
+ aws-partitions (1.479.0)
aws-sdk-core (3.117.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.249.0)
+ aws-sdk-ec2 (1.251.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-iam (1.56.0)
+ aws-sdk-iam (1.57.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.44.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.96.1)
+ aws-sdk-s3 (1.96.2)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -232,7 +232,7 @@ GEM
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
- metasploit-payloads (2.0.47)
+ metasploit-payloads (2.0.48)
metasploit_data_models (4.1.4)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -332,11 +332,11 @@ GEM
rex-arch
rex-ole (0.1.7)
rex-text
- rex-powershell (0.1.91)
+ rex-powershell (0.1.92)
rex-random_identifier
rex-text
ruby-rc4
- rex-random_identifier (0.1.5)
+ rex-random_identifier (0.1.7)
rex-text
rex-registry (0.1.4)
rex-rop_builder (0.1.4)
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
index 5217322fd6..6bee3ddf81 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.0.53";
+ version = "6.0.54";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-0tg2FSRtwo1LRxA5jNQ1Pxx54TPs3ZwErXim8uj24VI=";
+ sha256 = "sha256-Aoj0KTp8WiY5a5YxssGjvFlVkVHb6ERVFGhyHS7GZ7o=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
index ab8a1a21ca..e1ebae7da2 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
@@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vsxqayzh04gxxan5i8vvfxh0n238dc9305bc89xs2mx2x1pw167";
+ sha256 = "090s6b7lz9wz6rclklshxbksgvdf4wji7yy2vha6cz8vg6lbz1xh";
type = "gem";
};
- version = "1.478.0";
+ version = "1.479.0";
};
aws-sdk-core = {
groups = ["default"];
@@ -134,20 +134,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n6yl7qbzmjlxp3rzm3a62vinzdg9a8rqspq7xdaa9sxrf4zsamf";
+ sha256 = "0vs4k390h8sqv6zcmrgixsc8z1smpglrxvnzl1ci522w9jcn6az7";
type = "gem";
};
- version = "1.249.0";
+ version = "1.251.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d30abab908434nmfi5j97vmv63466bmcvhvaknma27qc04s53ph";
+ sha256 = "0nmd4g0cdvb38z9mpx13z6mwgbyyn84vj8wn0yf5y4kfzmi47q4y";
type = "gem";
};
- version = "1.56.0";
+ version = "1.57.0";
};
aws-sdk-kms = {
groups = ["default"];
@@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0q28bdmpm2c2fw9wh00zhqxnb8p2nzdfi5l6wwa6bl63fm28816h";
+ sha256 = "1qgr1x2ykkbbfh6krv4wb97ihjq6w785gh21qrk77s9xjq4lcfqw";
type = "gem";
};
- version = "1.96.1";
+ version = "1.96.2";
};
aws-sigv4 = {
groups = ["default"];
@@ -594,12 +594,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "b7cef30d11f0509b7e27334030dae6b8cb34e7f2";
- sha256 = "0lp1yvlg59kqml29rpgc6ghpj71z6pa8qf8h8x5qvhkd4hakdn6j";
+ rev = "0d6c0cfe63f494a04b46700a4317d52484f3a398";
+ sha256 = "1fk7qqp1swk82ial9s6va68mandwlg0v4ccndcwjcnkw78lz9202";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.0.53";
+ version = "6.0.54";
};
metasploit-model = {
groups = ["default"];
@@ -616,10 +616,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jxa9q8jzfy91i4khnzmd36p3g2sq7df34csgwbmv6caarzs7732";
+ sha256 = "0jg96v1a7q3ypq33jaflnfvpqm6cz0ihaiilag2y6qvd0ypv297d";
type = "gem";
};
- version = "2.0.47";
+ version = "2.0.48";
};
metasploit_data_models = {
groups = ["default"];
@@ -1106,20 +1106,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zrc0pr1pla0amw6hagllj82hyq8pyy6wb38xry2cxg7q70ghfq7";
+ sha256 = "02gpfw43r0pkzp7jj3n0lwn4lgbgkgadrn4p33x7b0xh1dalzgj1";
type = "gem";
};
- version = "0.1.91";
+ version = "0.1.92";
};
rex-random_identifier = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pqd8pfcxqd44ql8dawk59k9s5jnhx7inc8wnpjhkbx0y0sldq8q";
+ sha256 = "1zaqndyy04c4fn021ibh05xim3wr7l2i71713amz6pvhgs2939r3";
type = "gem";
};
- version = "0.1.5";
+ version = "0.1.7";
};
rex-registry = {
groups = ["default"];
diff --git a/third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix b/third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix
index 5c07add905..00ff112ba8 100644
--- a/third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/open-ecard/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
src = srcs.richclient;
- phases = "installPhase";
+ dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix
index a40e2ce33c..d84f6f2990 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
checkInputs = lib.optionals pythonSupport [
pythonPackages.pytest
- pythonPackages.pytestrunner
+ pythonPackages.pytest-runner
];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/security/ssss/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssss/default.nix
index 34407f5f5a..61d1011112 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ssss/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ssss/default.nix
@@ -1,28 +1,45 @@
-{ lib, stdenv, fetchurl, gmp }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, gmp
+, installShellFiles
+}:
-stdenv.mkDerivation {
- name = "ssss-0.5";
+stdenv.mkDerivation rec {
+ pname = "ssss";
+ version = "0.5.7";
- src = fetchurl {
- url = "http://point-at-infinity.org/ssss/ssss-0.5.tar.gz";
- sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx";
+ src = fetchFromGitHub {
+ owner = "MrJoy";
+ repo = pname;
+ rev = "releases%2Fv${version}";
+ sha256 = "18r1hwch6nq6gjijavr4pvrxz2plrlrvdx8ssqhdj2vmqvlqwbvd";
};
- buildInputs = [ gmp ];
+ nativeBuildInputs = [
+ installShellFiles
+ ];
- preBuild =
- ''
- sed -e s@/usr/@$out/@g -i Makefile
- cp ssss.manpage.xml ssss.1
- cp ssss.manpage.xml ssss.1.html
- mkdir -p $out/bin $out/share/man/man1
- echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
- '';
+ buildInputs = [
+ gmp
+ ];
- meta = {
+ preBuild = ''
+ sed -e s@/usr/@$out/@g -i Makefile
+ cp ssss.manpage.xml ssss.1
+ mkdir -p $out/bin
+ echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
+ '';
+
+ postInstall = ''
+ installManPage ssss.1
+ '';
+
+ meta = with lib; {
description = "Shamir Secret Sharing Scheme";
homepage = "http://point-at-infinity.org/ssss/";
- platforms = lib.platforms.unix;
- license = lib.licenses.gpl2;
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix
index 5fd0578bc8..d3af5e368f 100644
--- a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix
@@ -5,7 +5,7 @@
buildGoModule rec {
pname = "terrascan";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "accurics";
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-eCkinYJtZNf5Fo+LXu01cHRInA9CfDONvt1OIs3XJSk=";
};
- vendorSha256 = "sha256-eez/g0Np/vnSO6uvUA8vtqR3DEaKlBo6lyd9t25LE7s=";
+ vendorSha256 = "1fqk9dpbfz97jwx1m54a8q67g95n5w7m1bxb7g9gkzk98f1zzv3r";
# Tests want to download a vulnerable Terraform project
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix b/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix
index d49c1e925d..037adda92e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [
freezegun
pytest
- pytestcov
+ pytest-cov
pytest-flake8
];
diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
index 547265196c..c50b2a4c84 100644
--- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gdu";
- version = "5.2.0";
+ version = "5.3.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-PByW1wj9B6aJhYZYPT1uUDUDVtZHGYC2ingvxdr8Gbc=";
+ sha256 = "sha256-hf5jTEAN5oOPg2PaAlYjIDMYcwXkaFAqPtWTwZV98N0=";
};
vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc=";
diff --git a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix
index 1cc0ba8773..dffbaaa818 100644
--- a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix
@@ -1,31 +1,32 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "gotop";
- version = "4.1.1";
+ version = "4.1.2";
src = fetchFromGitHub {
owner = "xxxserxxx";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-3t6I4ah9gUmPlIBRL86BdgiUaMNiKNEeoUSRMASz1Yc=";
+ sha256 = "15bsxaxqxp17wsr0p9fkpvgfyqnhhwm3j8jxkvcs4cdw73qaxdsy";
};
runVend = true;
- vendorSha256 = "sha256-GcIaUIuTiSY1aKxRtclfl7hMNaZZx4uoVG7ahjF/4Hs=";
+ vendorSha256 = "06hl1npwmy9dvpf4kljvw8lwwiigm52wf106lmf9k6k2gi5ikprz";
- buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ];
+ ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];
preCheck = ''
export HOME=$(mktemp -d)
'';
+ doCheck = !stdenv.isDarwin;
+
meta = with lib; {
description = "A terminal based graphical activity monitor inspired by gtop and vtop";
homepage = "https://github.com/xxxserxxx/gotop";
- changelog = "https://github.com/xxxserxxx/gotop/blob/v${version}/CHANGELOG.md";
+ changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.magnetophon ];
- platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix b/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix
index 6f557e05cd..54bc72144e 100644
--- a/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hostctl";
- version = "1.0.14";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "guumaster";
repo = pname;
rev = "v${version}";
- sha256 = "02bjii97l4fy43v2rb93m9b0ad8y6mjvbvp4sz6a5n0w9dm1z1q9";
+ sha256 = "sha256-X07JvXN1mwOQE2XBfaYbqQnQ92fBSg/Erj0yUygAqmM=";
};
- vendorSha256 = "1lqk3cda0frqp2vwkqa4b3xkdw814wgkbr7g9r2mwxn85fpdcq5c";
+ vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M=";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ];
diff --git a/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix b/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix
index 1b4a173d50..a7f4337ce8 100644
--- a/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "natscli";
- version = "0.0.24";
+ version = "0.0.25";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = version;
- sha256 = "11rpgvcnd2m4g0jnv6g0zdvnhs37jwn1c4hc86xgnk2vipvy0nw2";
+ sha256 = "180511x3sciqs0njz80qc1a785m84ks9l338qi3liv7bcd541xcr";
};
- vendorSha256 = "0nrgbwc10pp7adj0w1jjj6677y2dpqq969ij7i0pmvr08ni95sxw";
+ vendorSha256 = "1j2a6wmyb9akndiwq79jqy5lz84bz2k01xp505j60ynsflim7shq";
meta = with lib; {
description = "NATS Command Line Interface";
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix
index b29fbbd6e0..741bc652e5 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-mermaid/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-mermaid";
- version = "0.8.1";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "badboy";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-UMYWRQeSQwWVJla/+RPlAXPMuFVnxqDtYDxLKmbMw4g=";
+ sha256 = "sha256-maYFOlWNqKFmyDM2nDF25rzYnUXMlV9Ry9TMoXReUUg=";
};
- cargoSha256 = "sha256-nhJS2QZUyGeNRMS9D+P+QPMDHK2PqVK/H2AKaP7EECw=";
+ cargoSha256 = "sha256-GL5Z4KfRu0zQAzVCWRIhaYtG5FrDdQabsbyFX7SjZvg=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix
index 93f65f45d3..67f69ecc71 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix
@@ -8,33 +8,24 @@
, Security
, ansi2html
, installShellFiles
-, fetchpatch
}:
rustPlatform.buildRustPackage rec {
pname = "mdcat";
- version = "0.23.1";
+ version = "0.23.2";
src = fetchFromGitHub {
owner = "lunaryorn";
repo = pname;
rev = "mdcat-${version}";
- sha256 = "sha256-aJ7rL+EKa5zWmCmekVuRmdeOwTmVo0IQ+GJ8Ga4iTI0=";
+ sha256 = "sha256-PM6bx7qzEx4He9aX4WRO7ad/f9+wzT+gPGXKwYwG8+A=";
};
- patches = [
- # detect wezterm through TERM again which was removed in 0.23.1
- (fetchpatch {
- url = "https://github.com/lunaryorn/mdcat/commit/a897b223904748a47c277f7c9a07d59e7d5c916b.patch";
- sha256 = "sha256-tSeNyrlqoGvlfQ3xMRkvqZ7HajMvPCIk7kyt/sVjmTo=";
- })
- ];
-
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
- cargoSha256 = "sha256-r0dJ/lDOfRzEdwySR/eEvsrO8qn4g7ZIfpekiirUp3Q=";
+ cargoSha256 = "sha256-GL9WGoyM1++QFAR+bzj0XkjaRaDCWcbcahles5amNpk=";
checkInputs = [ ansi2html ];
# Skip tests that use the network and that include files.
diff --git a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix
index 0e13e4c5f3..0dff6d76ff 100644
--- a/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix
@@ -30,14 +30,13 @@ let
in
buildPythonApplication rec {
pname = "ocrmypdf";
- version = "11.7.3";
- disabled = ! python3Packages.isPy3k;
+ version = "12.3.0";
src = fetchFromGitHub {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
- sha256 = "0gs2w9kl5wwrs0hx2sivq3pdvpf3lkaifblwfbz5g31yl770blji";
+ sha256 = "122yv3p0v4fbx30zgppcznwnm7svg97gv0sa103xb6zcld68ggn2";
};
nativeBuildInputs = with python3Packages; [
@@ -64,7 +63,7 @@ buildPythonApplication rec {
pypdf2
pytest
pytest-helpers-namespace
- pytest_xdist
+ pytest-xdist
pytest-cov
python-xmp-toolkit
pytestCheckHook
diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix
index 8c59db87b7..8ece1dde07 100644
--- a/third_party/nixpkgs/pkgs/top-level/aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix
@@ -448,6 +448,7 @@ mapAliases ({
linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22
loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28
+ lobster-two = google-fonts; # added 2021-07-22
lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15
lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31
@@ -527,6 +528,7 @@ mapAliases ({
oauth2_proxy = oauth2-proxy; # added 2021-04-18
opencascade_oce = opencascade; # added 2018-04-25
oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
+ ofp = throw "ofp is not compatible with odp-dpdk";
opencl-icd = ocl-icd; # added 2017-01-20
openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21
openexr_ctl = ctl; # added 2018-04-25
@@ -886,6 +888,7 @@ mapAliases ({
virtviewer = virt-viewer; # added 2015-12-24
virtmanager = virt-manager; # added 2019-10-29
virtmanager-qt = virt-manager-qt; # added 2019-10-29
+ virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21
vorbisTools = vorbis-tools; # added 2016-01-26
webkit = webkitgtk; # added 2019-03-05
webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
@@ -1134,6 +1137,7 @@ mapAliases ({
kwin-dynamic-workspaces
kwin-tiling
krohnkite
+ krunner-symbols
;
inherit (libsForQt5)
sddm
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index 44319d78c8..066abf31ea 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -241,6 +241,8 @@ in
cereal = callPackage ../development/libraries/cereal { };
+ cewl = callPackage ../tools/security/cewl { };
+
checkov = callPackage ../development/tools/analysis/checkov {};
chrysalis = callPackage ../applications/misc/chrysalis { };
@@ -931,6 +933,10 @@ in
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
+ coreterminal = libsForQt5.callPackage ../applications/terminal-emulators/coreterminal {
+ inherit (lxqt) qtermwidget;
+ };
+
eterm = callPackage ../applications/terminal-emulators/eterm { };
evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {});
@@ -1155,6 +1161,8 @@ in
argyllcms = callPackage ../tools/graphics/argyllcms {};
+ arj = callPackage ../tools/archivers/arj { };
+
arp-scan = callPackage ../tools/misc/arp-scan { };
inherit (callPackages ../data/fonts/arphic {})
@@ -1556,6 +1564,8 @@ in
github-commenter = callPackage ../development/tools/github-commenter { };
+ github-desktop = callPackage ../applications/version-management/github-desktop { };
+
github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite;
gitless = callPackage ../applications/version-management/gitless { python = python3; };
@@ -1737,7 +1747,7 @@ in
xcodeenv = callPackage ../development/mobile/xcodeenv { };
gomobile = callPackage ../development/mobile/gomobile {
- buildGoModule = buildGo115Module;
+ buildGoModule = buildGo116Module;
};
ssh-agents = callPackage ../tools/networking/ssh-agents { };
@@ -2559,7 +2569,9 @@ in
dtrx = callPackage ../tools/compression/dtrx { };
- dua = callPackage ../tools/misc/dua { };
+ dua = callPackage ../tools/misc/dua {
+ inherit (darwin.apple_sdk.frameworks) Foundation;
+ };
duf = callPackage ../tools/misc/duf { };
@@ -2839,6 +2851,8 @@ in
gping = callPackage ../tools/networking/gping { };
+ gpu-burn = callPackage ../applications/misc/gpu-burn { };
+
greg = callPackage ../applications/audio/greg {
pythonPackages = python3Packages;
};
@@ -3597,6 +3611,8 @@ in
cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { };
+ cdpr = callPackage ../tools/networking/cdpr { };
+
cdrdao = callPackage ../tools/cd-dvd/cdrdao { };
cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
@@ -6083,6 +6099,8 @@ in
itm-tools = callPackage ../development/tools/misc/itm-tools { };
+ iwgtk = callPackage ../tools/networking/iwgtk { };
+
ix = callPackage ../tools/misc/ix { };
jaaa = callPackage ../applications/audio/jaaa { };
@@ -6351,6 +6369,8 @@ in
lf = callPackage ../tools/misc/lf {};
+ lha = callPackage ../tools/archivers/lha { };
+
lhasa = callPackage ../tools/compression/lhasa {};
libcpuid = callPackage ../tools/misc/libcpuid { };
@@ -6359,6 +6379,8 @@ in
libscrypt = callPackage ../development/libraries/libscrypt { };
+ libcprime = libsForQt5.callPackage ../development/libraries/libcprime { };
+
libcloudproviders = callPackage ../development/libraries/libcloudproviders { };
libcoap = callPackage ../applications/networking/libcoap {
@@ -7923,9 +7945,7 @@ in
pdfarranger = callPackage ../applications/misc/pdfarranger { };
- pdfread = callPackage ../tools/graphics/pdfread {
- inherit (pythonPackages) pillow;
- };
+ pdfread = throw "pdfread has been remove from nixpkgs, because it is unmaintained for years and the sources are no longer available";
briss = callPackage ../tools/graphics/briss { };
@@ -10736,6 +10756,8 @@ in
cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { };
+ comby = callPackage ../development/tools/comby { };
+
compcert = coqPackages.compcert.override { version = "3.9"; };
computecpp-unwrapped = callPackage ../development/compilers/computecpp {};
@@ -13947,7 +13969,9 @@ in
nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { };
- nexus = callPackage ../development/tools/repository-managers/nexus { };
+ nexus = callPackage ../development/tools/repository-managers/nexus {
+ jre_headless = jre8_headless;
+ };
nwjs = callPackage ../development/tools/nwjs {
gconf = pkgs.gnome2.GConf;
@@ -14349,6 +14373,8 @@ in
todoist-electron = callPackage ../applications/misc/todoist-electron { };
+ toil = callPackage ../applications/science/misc/toil { };
+
travis = callPackage ../development/tools/misc/travis { };
tree-sitter = callPackage ../development/tools/parsing/tree-sitter {
@@ -17132,8 +17158,6 @@ in
libtap = callPackage ../development/libraries/libtap { };
- libtgvoip = callPackage ../development/libraries/libtgvoip { };
-
libtsm = callPackage ../development/libraries/libtsm { };
libgeotiff = callPackage ../development/libraries/libgeotiff { };
@@ -21601,8 +21625,6 @@ in
odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
- ofp = callPackage ../os-specific/linux/ofp { };
-
ofono = callPackage ../tools/networking/ofono { };
openpam = callPackage ../development/libraries/openpam { };
@@ -22423,8 +22445,6 @@ in
lmodern = callPackage ../data/fonts/lmodern { };
- lobster-two = callPackage ../data/fonts/lobster-two {};
-
logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules {};
# lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi
@@ -22962,7 +22982,7 @@ in
acd-cli = callPackage ../applications/networking/sync/acd_cli {
inherit (python3Packages)
buildPythonApplication appdirs colorama python-dateutil
- requests requests_toolbelt setuptools sqlalchemy fusepy;
+ requests requests-toolbelt setuptools sqlalchemy fusepy;
};
adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { };
@@ -23459,6 +23479,8 @@ in
corrscope = libsForQt5.callPackage ../applications/video/corrscope { };
+ coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { };
+
csa = callPackage ../applications/audio/csa { };
csound = callPackage ../applications/audio/csound {
@@ -23565,6 +23587,7 @@ in
infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { };
lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { };
mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { };
+ statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { };
};
deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix {
@@ -23954,6 +23977,8 @@ in
fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { };
+ fritzprofiles = with python3.pkgs; toPythonApplication fritzprofiles;
+
fsv = callPackage ../applications/misc/fsv {
autoreconfHook = buildPackages.autoreconfHook269;
};
@@ -25212,6 +25237,8 @@ in
ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
+ kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { };
+
kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
kube-score = callPackage ../applications/networking/cluster/kube-score { };
@@ -25538,7 +25565,7 @@ in
matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli {
inherit (python3Packages) buildPythonApplication buildPythonPackage
- pygobject3 pytestrunner requests responses pytest python-olm
+ pygobject3 pytest-runner requests responses pytest python-olm
canonicaljson;
};
@@ -25662,6 +25689,8 @@ in
mmtc = callPackage ../applications/audio/mmtc { };
+ mnamer = callPackage ../applications/misc/mnamer { };
+
moc = callPackage ../applications/audio/moc { };
mod-distortion = callPackage ../applications/audio/mod-distortion { };
@@ -25906,6 +25935,8 @@ in
nootka = qt5.callPackage ../applications/audio/nootka { };
nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { };
+ nwg-drawer = callPackage ../applications/misc/nwg-drawer { };
+
nwg-launchers = callPackage ../applications/misc/nwg-launchers { };
nwg-menu = callPackage ../applications/misc/nwg-menu { };
@@ -26823,7 +26854,7 @@ in
rofi-systemd = callPackage ../tools/system/rofi-systemd { };
rofimoji = callPackage ../applications/misc/rofimoji {
- inherit (python3Packages) buildPythonApplication ConfigArgParse;
+ inherit (python3Packages) buildPythonApplication configargparse;
};
rootlesskit = callPackage ../tools/virtualization/rootlesskit {};
@@ -27500,7 +27531,10 @@ in
tut = callPackage ../applications/misc/tut { };
- tuxguitar = callPackage ../applications/editors/music/tuxguitar { };
+ tuxguitar = callPackage ../applications/editors/music/tuxguitar {
+ jre = jre8;
+ swt = swt_jdk8;
+ };
twister = callPackage ../applications/networking/p2p/twister { };
@@ -27703,8 +27737,6 @@ in
qtermwidget = lxqt.qtermwidget;
};
- virtinst = callPackage ../applications/virtualization/virtinst {};
-
virtscreen = callPackage ../tools/admin/virtscreen {};
virtual-ans = callPackage ../applications/audio/virtual-ans {};
@@ -28759,6 +28791,8 @@ in
cdogs-sdl = callPackage ../games/cdogs-sdl { };
+ cgoban = callPackage ../games/cgoban { };
+
chessdb = callPackage ../games/chessdb { };
chessx = libsForQt5.callPackage ../games/chessx { };
@@ -28975,6 +29009,8 @@ in
gmad = callPackage ../games/gmad { };
+ gnonograms = callPackage ../games/gnonograms { };
+
gnubg = callPackage ../games/gnubg { };
gnuchess = callPackage ../games/gnuchess { };
@@ -30052,6 +30088,8 @@ in
### SCIENCE/MACHINE LEARNING
+ nengo-gui = callPackage ../applications/science/machine-learning/nengo-gui { };
+
sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { };
### SCIENCE/MATH
@@ -32099,6 +32137,11 @@ in
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
};
+ bsnes-hd = callPackage ../misc/emulators/bsnes-hd {
+ inherit (gnome2) gtksourceview;
+ inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
+ };
+
yapesdl = callPackage ../misc/emulators/yapesdl { };
x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { };
diff --git a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix
index 06d7693006..1ca8621b71 100644
--- a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix
@@ -285,24 +285,24 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "*" ];
};
- Nuget = buildDotnetPackage {
+ Nuget = buildDotnetPackage rec {
baseName = "Nuget";
- version = "4.9.1";
+ version = "5.6.0.6489";
src = fetchFromGitHub {
owner = "mono";
- repo = "nuget-binary";
- rev = "7871fa26914593fdb2f2500df1196df7b8aecb1c";
- sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
+ repo = "linux-packaging-nuget";
+ rev = "upstream/${version}.bin";
+ sha256 = "sha256-71vjM7a+F0DNTY+dML3UBSkrVyXv/k5rdl7iXBKSpNM=";
};
# configurePhase breaks the binary and results in
# `File does not contain a valid CIL image.`
dontConfigure = true;
dontBuild = true;
+ dontPlacateNuget = true;
outputFiles = [ "*" ];
- dllFiles = [ "NuGet*.dll" ];
exeFiles = [ "nuget.exe" ];
};
diff --git a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
index 34f9956160..4d4c172296 100644
--- a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
@@ -30,6 +30,10 @@ let
inherit lib;
};
+ mkNongnuPackages = { lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix {
+ inherit lib;
+ };
+
# Contains both melpa stable & unstable
melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/melpa-packages.nix {
inherit lib pkgs;
@@ -53,12 +57,14 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
pkgs ? pkgs'
, lib ? pkgs.lib
, elpaPackages ? mkElpaPackages { inherit pkgs lib; } self
+ , nongnuPackages ? mkNongnuPackages { inherit lib; } self
, melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self
, melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
, orgPackages ? mkOrgPackages { inherit lib; } self
, manualPackages ? mkManualPackages { inherit pkgs lib; } self
}: ({}
// elpaPackages // { inherit elpaPackages; }
+ // nongnuPackages // { inherit nongnuPackages; }
// melpaStablePackages // { inherit melpaStablePackages; }
// melpaPackages // { inherit melpaPackages; }
// orgPackages // { inherit orgPackages; }
diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
index 28f8436ea9..2e8a4fa59d 100644
--- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
@@ -415,6 +415,8 @@ let
h2 = callPackage ../development/ocaml-modules/h2 { };
+ hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { };
+
hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { };
hacl-star = callPackage ../development/ocaml-modules/hacl-star { };
@@ -794,6 +796,8 @@ let
mparser = callPackage ../development/ocaml-modules/mparser { };
+ mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { };
+
mtime = callPackage ../development/ocaml-modules/mtime { };
mustache = callPackage ../development/ocaml-modules/mustache { };
@@ -848,8 +852,6 @@ let
ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { };
ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { };
- ocaml_http = callPackage ../development/ocaml-modules/http { };
-
ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { };
ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
@@ -866,9 +868,7 @@ let
ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
- ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic {
- ocaml-migrate-parsetree = ocaml-migrate-parsetree-2;
- };
+ ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { };
ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };
@@ -1233,6 +1233,34 @@ let
terminal_size = callPackage ../development/ocaml-modules/terminal_size { };
+ tezos-base = callPackage ../development/ocaml-modules/tezos/base.nix { };
+ tezos-clic = callPackage ../development/ocaml-modules/tezos/clic.nix { };
+ tezos-crypto = callPackage ../development/ocaml-modules/tezos/crypto.nix { };
+ tezos-error-monad = callPackage ../development/ocaml-modules/tezos/error-monad.nix { };
+ tezos-event-logging = callPackage ../development/ocaml-modules/tezos/event-logging.nix { };
+ tezos-lmdb = callPackage ../development/ocaml-modules/tezos/lmdb.nix { };
+ tezos-lwt-result-stdlib = callPackage ../development/ocaml-modules/tezos/lwt-result-stdlib.nix { };
+ tezos-micheline = callPackage ../development/ocaml-modules/tezos/micheline.nix { };
+ tezos-p2p-services = callPackage ../development/ocaml-modules/tezos/p2p-services.nix { };
+ tezos-p2p = callPackage ../development/ocaml-modules/tezos/p2p.nix { };
+ tezos-protocol-008-PtEdo2Zk-parameters = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix { };
+ tezos-protocol-008-PtEdo2Zk = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix { };
+ tezos-protocol-compiler = callPackage ../development/ocaml-modules/tezos/protocol-compiler.nix { };
+ tezos-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/protocol-demo-noops.nix { };
+ tezos-protocol-environment-packer = callPackage ../development/ocaml-modules/tezos/protocol-environment-packer.nix { };
+ tezos-protocol-environment-sigs = callPackage ../development/ocaml-modules/tezos/protocol-environment-sigs.nix { };
+ tezos-protocol-environment-structs = callPackage ../development/ocaml-modules/tezos/protocol-environment-structs.nix { };
+ tezos-protocol-environment = callPackage ../development/ocaml-modules/tezos/protocol-environment.nix { };
+ tezos-requester = callPackage ../development/ocaml-modules/tezos/requester.nix { };
+ tezos-rpc = callPackage ../development/ocaml-modules/tezos/rpc.nix { };
+ tezos-sapling = callPackage ../development/ocaml-modules/tezos/sapling.nix { };
+ tezos-shell-services = callPackage ../development/ocaml-modules/tezos/shell-services.nix { };
+ tezos-stdlib-unix = callPackage ../development/ocaml-modules/tezos/stdlib-unix.nix { };
+ tezos-stdlib = callPackage ../development/ocaml-modules/tezos/stdlib.nix { };
+ tezos-test-services = callPackage ../development/ocaml-modules/tezos/test-services.nix { };
+ tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { };
+ tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { };
+
toml = callPackage ../development/ocaml-modules/toml { };
topkg = callPackage ../development/ocaml-modules/topkg { };
diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
index 017d27a8a2..294c90f665 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
@@ -34,12 +34,15 @@ in
mapAliases ({
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
+ bt_proximity = bt-proximity; # added 2021-07-02
bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27
+ ConfigArgParse = configargparse; # added 2021-03-18
dateutil = python-dateutil; # added 2021-07-03
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
dftfit = throw "it's dependency lammps-cython no longer builds";
diff_cover = diff-cover; # added 2021-07-02
discogs_client = discogs-client; # added 2021-07-02
+ djangorestframework-jwt = drf-jwt;
dns = dnspython; # Alias for compatibility, 2017-12-10
faulthandler = throw "faulthandler is built into ${python.executable}";
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
@@ -52,10 +55,17 @@ mapAliases ({
privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
+ pytestcov = pytest-cov; # added 2021-01-04
pytest-pep8 = pytestpep8; # added 2021-01-04
pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
+ pytestquickcheck = pytest-quickcheck; # added 2021-07-20
+ pytestrunner = pytest-runner; # added 2021-01-04
+ pytest_xdist = pytest-xdist; # added 2021-01-04
+ python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
+ requests_toolbelt = requests-toolbelt; # added 2017-09-26
rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
+ scikitlearn = scikit-learn; # added 2021-07-21
selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10
setuptools_scm = setuptools-scm; # added 2021-06-03
smart_open = smart-open; # added 2021-03-14
@@ -63,5 +73,5 @@ mapAliases ({
topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22
tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05
websocket_client = websocket-client;
- bt_proximity = bt-proximity; # added 2021-07-02
+ zc_buildout221 = zc_buildout; # added 2021-07-21
})
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index c4654534e6..80fec63540 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -199,6 +199,8 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
};
+ addict = callPackage ../development/python-modules/addict { };
+
addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { };
adext = callPackage ../development/python-modules/adext { };
@@ -1607,7 +1609,6 @@ in {
conda = callPackage ../development/python-modules/conda { };
- ConfigArgParse = self.configargparse; # added 2021-03-18
configargparse = callPackage ../development/python-modules/configargparse { };
configobj = callPackage ../development/python-modules/configobj { };
@@ -1769,6 +1770,8 @@ in {
d2to1 = callPackage ../development/python-modules/d2to1 { };
+ dacite = callPackage ../development/python-modules/dacite { };
+
daemonize = callPackage ../development/python-modules/daemonize { };
daemonocle = callPackage ../development/python-modules/daemonocle { };
@@ -1913,6 +1916,8 @@ in {
devpi-common = callPackage ../development/python-modules/devpi-common { };
+ devtools = callPackage ../development/python-modules/devtools { };
+
diagrams = callPackage ../development/python-modules/diagrams { };
diceware = callPackage ../development/python-modules/diceware { };
@@ -2064,8 +2069,6 @@ in {
djangorestframework = callPackage ../development/python-modules/djangorestframework { };
- djangorestframework-jwt = self.drf-jwt;
-
djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { };
django_reversion = callPackage ../development/python-modules/django_reversion { };
@@ -2297,6 +2300,8 @@ in {
enamlx = callPackage ../development/python-modules/enamlx { };
+ enlighten = callPackage ../development/python-modules/enlighten { };
+
enocean = callPackage ../development/python-modules/enocean { };
enrich = callPackage ../development/python-modules/enrich { };
@@ -2731,6 +2736,8 @@ in {
fritzconnection = callPackage ../development/python-modules/fritzconnection { };
+ fritzprofiles = callPackage ../development/python-modules/fritzprofiles { };
+
frozendict = callPackage ../development/python-modules/frozendict { };
frozenlist = callPackage ../development/python-modules/frozenlist { };
@@ -3095,6 +3102,8 @@ in {
graphene = callPackage ../development/python-modules/graphene { };
+ graphqlclient= callPackage ../development/python-modules/graphqlclient { };
+
graphql-core = callPackage ../development/python-modules/graphql-core { };
graphql-relay = callPackage ../development/python-modules/graphql-relay { };
@@ -3972,6 +3981,8 @@ in {
leather = callPackage ../development/python-modules/leather { };
+ leb128 = callPackage ../development/python-modules/leb128 { };
+
ledger_agent = callPackage ../development/python-modules/ledger_agent { };
ledgerblue = callPackage ../development/python-modules/ledgerblue { };
@@ -4734,6 +4745,8 @@ in {
ndtypes = callPackage ../development/python-modules/ndtypes { };
+ nengo = callPackage ../development/python-modules/nengo { };
+
neo = callPackage ../development/python-modules/neo { };
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
@@ -5409,6 +5422,8 @@ in {
python-juicenet = callPackage ../development/python-modules/python-juicenet { };
+ python-lsp-black = callPackage ../development/python-modules/python-lsp-black { };
+
python-openems = callPackage ../development/python-modules/python-openems { };
python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { };
@@ -5544,6 +5559,8 @@ in {
precis-i18n = callPackage ../development/python-modules/precis-i18n { };
+ prefixed = callPackage ../development/python-modules/prefixed { };
+
pre-commit = callPackage ../development/python-modules/pre-commit { };
pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { };
@@ -5683,6 +5700,8 @@ in {
py-ubjson = callPackage ../development/python-modules/py-ubjson { };
+ py17track = callPackage ../development/python-modules/py17track { };
+
py2bit = callPackage ../development/python-modules/py2bit { };
py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });
@@ -6004,6 +6023,8 @@ in {
pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };
+ pygame-gui = callPackage ../development/python-modules/pygame-gui { };
+
pygatt = callPackage ../development/python-modules/pygatt { };
pygbm = callPackage ../development/python-modules/pygbm { };
@@ -6176,6 +6197,8 @@ in {
pyls-black = callPackage ../development/python-modules/pyls-black { };
+ pyls-flake8 = callPackage ../development/python-modules/pyls-flake8 { };
+
pyls-isort = callPackage ../development/python-modules/pyls-isort { };
pyls-mypy = callPackage ../development/python-modules/pyls-mypy { };
@@ -6264,6 +6287,8 @@ in {
pymumble = callPackage ../development/python-modules/pymumble { };
+ pymunk = callPackage ../development/python-modules/pymunk { };
+
pymupdf = callPackage ../development/python-modules/pymupdf { };
PyMVGLive = callPackage ../development/python-modules/pymvglive { };
@@ -6786,8 +6811,7 @@ in {
pytest-console-scripts = callPackage ../development/python-modules/pytest-console-scripts { };
- pytest-cov = self.pytestcov; # self 2021-01-04
- pytestcov = callPackage ../development/python-modules/pytest-cov { };
+ pytest-cov = callPackage ../development/python-modules/pytest-cov { };
pytest-cram = callPackage ../development/python-modules/pytest-cram { };
@@ -6863,8 +6887,7 @@ in {
pytest-qt = callPackage ../development/python-modules/pytest-qt { };
- pytest-quickcheck = self.pytestquickcheck;
- pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { };
+ pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { };
pytest-raises = callPackage ../development/python-modules/pytest-raises { };
@@ -6884,8 +6907,7 @@ in {
pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { };
- pytest-runner = self.pytestrunner; # added 2021-01-04
- pytestrunner = callPackage ../development/python-modules/pytestrunner { };
+ pytest-runner = callPackage ../development/python-modules/pytest-runner { };
pytest-sanic = callPackage ../development/python-modules/pytest-sanic {
sanic = self.sanic.override { doCheck = false; };
@@ -6929,7 +6951,6 @@ in {
pytest-watch = callPackage ../development/python-modules/pytest-watch { };
- pytest_xdist = self.pytest-xdist; # added 2021-01-04
pytest-xdist = callPackage ../development/python-modules/pytest-xdist { };
pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
@@ -7128,7 +7149,6 @@ in {
python-sat = callPackage ../development/python-modules/python-sat { };
python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { };
- python_simple_hipchat = self.python-simple-hipchat;
python-slugify = callPackage ../development/python-modules/python-slugify { };
@@ -7542,6 +7562,8 @@ in {
requests-file = callPackage ../development/python-modules/requests-file { };
+ requests-futures = callPackage ../development/python-modules/requests-futures { };
+
requests-http-signature = callPackage ../development/python-modules/requests-http-signature { };
requests-kerberos = callPackage ../development/python-modules/requests-kerberos { };
@@ -7556,8 +7578,6 @@ in {
requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { };
- requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26
-
requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { };
requirements-detector = callPackage ../development/python-modules/requirements-detector { };
@@ -7811,8 +7831,6 @@ in {
inherit (pkgs) gfortran glibcLocales;
};
- scikitlearn = self.scikit-learn;
-
scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
scikits-odes = callPackage ../development/python-modules/scikits-odes { };
@@ -8238,6 +8256,8 @@ in {
sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { };
+ sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { };
+
sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };
sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { };
@@ -9456,9 +9476,7 @@ in {
zarr = callPackage ../development/python-modules/zarr { };
- zc_buildout221 = callPackage ../development/python-modules/buildout { };
-
- zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix
+ zc_buildout = callPackage ../development/python-modules/buildout { };
zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };
diff --git a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix
index 471548b9fa..48ddb18291 100644
--- a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix
@@ -478,9 +478,8 @@ with self; with super; {
pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { };
- pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { };
+ pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { };
- pytest_xdist = self.pytest-xdist; # added 2021-01-04
pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { };
python-otr = callPackage ../development/python-modules/python-otr { };